diff --git a/Sda1/Etest/Xslt2/Book2Html/Book1/book1Test.xspec b/Sda1/Etest/Xslt2/Book2Html/Book1/book1Test.xspec index 9fe81d0851bee34e1cfe8910cb04ef01745cfd65..4146b3665fcfe61caa95409220e58933c09b92dc 100644 --- a/Sda1/Etest/Xslt2/Book2Html/Book1/book1Test.xspec +++ b/Sda1/Etest/Xslt2/Book2Html/Book1/book1Test.xspec @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec" - stylesheet="book2html.xsl"> + +<x:description stylesheet="book1ToHtml.xsl" + xmlns:x="http://www.jenitennison.com/xslt/xspec"> <x:scenario label="Testing 'title' being immediate child of 'book'"> diff --git a/Sda1/Etest/Xslt2/Book2Html/Book2/book2Test.xspec b/Sda1/Etest/Xslt2/Book2Html/Book2/book2Test.xspec index 38c331527556111f3dc0440ab08eb79c0ae0e6f2..3231775822ac4c97d97b17b1da2f9e572ce4ae3f 100644 --- a/Sda1/Etest/Xslt2/Book2Html/Book2/book2Test.xspec +++ b/Sda1/Etest/Xslt2/Book2Html/Book2/book2Test.xspec @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec" - stylesheet="book2html.xsl"> +<x:description stylesheet="book2ToHtml.xsl" + xmlns:x="http://www.jenitennison.com/xslt/xspec"> - - <x:import href="../Book1/bookBasicTest.xspec" /> + <x:import href="../Book1/book1Test.xspec" /> <x:scenario label="Testing @id in 'chapter'"> diff --git a/Sda1/Etest/Xslt2/Book2Html/Book2/work2.reference.html b/Sda1/Etest/Xslt2/Book2Html/Book2/work2.reference.html index 7a08231f204c6f489d3152beffdd27a9d1ec3863..6deda3b2dd583fee65b9e91692f39c6101046f3d 100644 --- a/Sda1/Etest/Xslt2/Book2Html/Book2/work2.reference.html +++ b/Sda1/Etest/Xslt2/Book2Html/Book2/work2.reference.html @@ -5,11 +5,11 @@ </head> <body id="top"> <h1>Beginning XSL</h1> - <h2 id="firstChapter">Basic structure</h2> + <h2 id="firstChapter">Basic structure</h2> <p>An XSLT consists of a stylesheet declaration and a set of templates.</p> <p>Do <em>not forget</em>: template elements must not be nested!</p> <h2>Important elements</h2> - <p id="someText">Some more text.</p> + <p id="someText">Basic information on XML.</p> <p>The <a href="#firstChapter">first chapter</a> explains <em>basic</em> structures.</p> </body> </html> diff --git a/Sda1/Etest/Xslt2/Book2Html/Book2/work2.xml b/Sda1/Etest/Xslt2/Book2Html/Book2/work2.xml index eb1ac6c2f04d02af6f90d6b96fc69a0cf7678e9a..a1b2b477c59c5d99457eb17730cf11c76ee9d107 100644 --- a/Sda1/Etest/Xslt2/Book2Html/Book2/work2.xml +++ b/Sda1/Etest/Xslt2/Book2Html/Book2/work2.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="top" xsi:noNamespaceSchemaLocation="book2.xsd"> - <title>Beginning XSL</title> + <title>Beginning <link linkend="someText">XSL</link></title> <chapter id="firstChapter"> <title>Basic <link linkend="someText">XML</link> structure</title> <para>An XSLT consists of a stylesheet declaration and a set of templates.</para> diff --git a/Sda1/Etest/Xslt2/Solution/Book1/book2html.xsl b/Sda1/Etest/Xslt2/Solution/Book1/book1ToHtml.xsl similarity index 100% rename from Sda1/Etest/Xslt2/Solution/Book1/book2html.xsl rename to Sda1/Etest/Xslt2/Solution/Book1/book1ToHtml.xsl diff --git a/Sda1/Etest/Xslt2/Solution/Book2/book2html.xsl b/Sda1/Etest/Xslt2/Solution/Book2/book2ToHtml.xsl similarity index 100% rename from Sda1/Etest/Xslt2/Solution/Book2/book2html.xsl rename to Sda1/Etest/Xslt2/Solution/Book2/book2ToHtml.xsl