From: Bob Stayton <bobs@sagehill.net>
Date: Tue, 17 Apr 2012 03:32:14 +0000 (+0000)
Subject: Fix namespace declaration and usage instructions.
X-Git-Tag: release/1.79.1~6^2~487
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74b471b57eec7aefffee40743fdf42b856c87431;p=docbook-dsssl

Fix namespace declaration and usage instructions.
---

diff --git a/xsl/assembly/README b/xsl/assembly/README
index 765f6a26b..2ef9fed0e 100644
--- a/xsl/assembly/README
+++ b/xsl/assembly/README
@@ -15,14 +15,14 @@ features will be supported as it is further developed.
 
 Content of this directory:
 --------------------------
-topic-maker-chunk.xsl        - stylesheet to modularize an existing document.
+topic-maker-chunk.xsl        - stylesheet to modularize an existing DB5 document.
 topic-maker.xsl              - imported by topic-maker-chunk.xsl.
 assemble.xsl                 - stylesheet to process an <assembly> into a document.
 
 
 The toolkit consists of an assemble.xsl XSL stylesheet
 to process a DocBook <assembly> element to convert it
-to an assembled DocBook document ready to be formatted.
+to an assembled DocBook 5 document ready to be formatted.
 This stylesheet will enable users to structure a book from
 modular files.
 
@@ -37,11 +37,12 @@ back together as a single DocBook document.
 To create an assembly and topic files from a book or article document
 =======================================================================
 
-If you have an existing DocBook book or article document,
+If you have an existing DocBook 5 book or article document,
 you can convert it to an assembly and a collection of
-modular topic files.
+modular topic files.  If you want to convert a DocBook 4
+document, you must first convert it to version 5.
 
-For example, to disassemble a book document named book.xml:
+For example, to disassemble a DocBook 5 book document named book.xml:
 
 xsltproc --xinclude \
          --stringparam assembly.filename myassembly.xml \
diff --git a/xsl/assembly/assemble.xsl b/xsl/assembly/assemble.xsl
index 9cebcdf93..1abc6bf21 100644
--- a/xsl/assembly/assemble.xsl
+++ b/xsl/assembly/assemble.xsl
@@ -2,7 +2,6 @@
 <xsl:stylesheet 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   xmlns:exsl="http://exslt.org/common"
-  xmlns:d="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns="http://docbook.org/ns/docbook"
   exclude-result-prefixes="exsl d xlink"
diff --git a/xsl/assembly/topic-maker-chunk.xsl b/xsl/assembly/topic-maker-chunk.xsl
index 12b16b5ee..a91ef50ff 100644
--- a/xsl/assembly/topic-maker-chunk.xsl
+++ b/xsl/assembly/topic-maker-chunk.xsl
@@ -1,7 +1,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:exsl="http://exslt.org/common"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:d="http://docbook.org/ns/docbook"
                 xmlns="http://docbook.org/ns/docbook"
 		version="1.0"
                 exclude-result-prefixes="exsl">
@@ -77,7 +76,7 @@
           <xsl:value-of select="$root.resourceref"/>
         </xsl:attribute>
     
-        <xsl:copy-of select="($root/d:title | $root/d:info/d:title)[1]"/>
+        <xsl:copy-of select="($root/title | $root/info/title)[1]"/>
     
         <!-- Put the title and info stuff in a content-only module -->
         <module resourceref="{$root.resourceref}{$root.id.suffix}" contentonly="true"/>
diff --git a/xsl/assembly/topic-maker.xsl b/xsl/assembly/topic-maker.xsl
index fffb202ef..b422687a2 100644
--- a/xsl/assembly/topic-maker.xsl
+++ b/xsl/assembly/topic-maker.xsl
@@ -50,7 +50,7 @@
    </xsl:copy>
 </xsl:template>
 
-<xsl:template match="d:preface|d:chapter|d:appendix|d:section|d:article">
+<xsl:template match="preface|chapter|appendix|section|article">
   <xsl:variable name="element.name">
     <xsl:call-template name="element.name"/>
   </xsl:variable>