Fix dependencies; fix copyright formatting

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 2e0bd36bfe2f73047583ded12a567b15adcb59ee..0e3bdc293088ae014602d7877ee50db9bb0701cf 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -32,9 +32,11 @@ reference.html: reference.xml $(RSTYLE) ../lib/lib.xml common/common.xml \
        $(XJPARSE) $(VPATH)/$<
        $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT)
 
-index.html: documentation.xml $(BSTYLE) reference.xml
+index.html: documentation.xml $(BSTYLE) reference.xml \
+            publishing.xml extensions.xml templates.xml html/param.xml \
+            tools/profiling.xml htmlhelp.xml
        $(XJPARSE) $(VPATH)/$<
-       $(XSLT) $(PROCOPT) $< $(BSTYLE) $@ $(XSLTOPT)
+       $(XSLT) $(PROCOPT) $< $(BSTYLE) $(XSLTOPT)
 
 clean:
        rm -f *.html

diff --git a/xsl/doc/book.xsl b/xsl/doc/book.xsl
index 45f6880a5766c0c28793e8d3082c70dff7f185d3..e60e29489963907e5c3c2df61e9fcb52a722d3db 100644 (file)
--- a/xsl/doc/book.xsl
+++ b/xsl/doc/book.xsl
@@ -23,23 +23,23 @@
 
 <xsl:template match="bookinfo/copyright|reference/copyright"
               mode="titlepage.mode">
-  <xsl:variable name="years" select="year"/>
-  <xsl:variable name="holders" select="holder"/>
-
   <p class="{name(.)}">
-    <a href="copyright.html">
-      <xsl:call-template name="gentext.element.name"/>
-    </a>
+    <xsl:call-template name="gentext">
+      <xsl:with-param name="key" select="'Copyright'"/>
+    </xsl:call-template>
     <xsl:call-template name="gentext.space"/>
     <xsl:call-template name="dingbat">
       <xsl:with-param name="dingbat">copyright</xsl:with-param>
     </xsl:call-template>
     <xsl:call-template name="gentext.space"/>
-    <xsl:apply-templates select="$years" mode="titlepage.mode"/>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="gentext.by"/>
+    <xsl:call-template name="copyright.years">
+      <xsl:with-param name="years" select="year"/>
+      <xsl:with-param name="print.ranges" select="$make.year.ranges"/>
+      <xsl:with-param name="single.year.ranges"
+                      select="$make.single.year.ranges"/>
+    </xsl:call-template>
     <xsl:call-template name="gentext.space"/>
-    <xsl:apply-templates select="$holders" mode="titlepage.mode"/>
+    <xsl:apply-templates select="holder" mode="titlepage.mode"/>
     <xsl:text>. </xsl:text>
     <a href="warranty.html">No Warranty</a>
     <xsl:text>.</xsl:text>