Moved xsl stylesheets out of doc/ directory and into docsrc/

directory. mobe css stylesheets into css/ subdirectory within the
doc dir. Reason for the changes is that the docbook-xsl-doc is now
distributed as a separate package, and having the actual doc files
at the root level of the doc directory makes it quicker and easier
for users to get to the docs when they're installed (e.g., in
/usr/share/doc/docbook-xsl/doc on Debian).

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index a84c21344be6f4270e7407d8b2d8e89d4dac3311..04d73836836a59affaf4f99a0e07e89c0cd2d5c5 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -4,9 +4,7 @@ PROCOPT=
 
 .PHONY : clean
 
-RSTYLE=reference.xsl
-CRSTYLE=creference.xsl
-BSTYLE=book.xsl
+RSTYLE=../docsrc/reference.xsl
 VPATH=../docsrc
 
 DIRS=common refentry lib html fo manpages wordml slides website template pi

diff --git a/xsl/doc/book.xsl b/xsl/doc/book.xsl
deleted file mode 100644 (file)
index e60e294..0000000
--- a/xsl/doc/book.xsl
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<xsl:import href="../html/chunk.xsl"/>
-
-<xsl:param name="toc.section.depth" select="'1'"/>
-
-<xsl:param name="html.stylesheet" select="'reference.css'"/>
-
-<xsl:template match="olink[@type='title']">
-  <xsl:variable name="xml"
-                select="document(unparsed-entity-uri(@targetdocent))"/>
-  <xsl:variable name="title" select="($xml/*/title[1]
-                                      |$xml/*/bookinfo/title[1]
-                                      |$xml/*/referenceinfo/title[1])[1]"/>
-  <i>
-    <a href="{@localinfo}">
-      <xsl:apply-templates select="$title/*|$title/text()"/>
-    </a>
-  </i>
-</xsl:template>
-
-<xsl:template match="bookinfo/copyright|reference/copyright"
-              mode="titlepage.mode">
-  <p class="{name(.)}">
-    <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: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="holder" mode="titlepage.mode"/>
-    <xsl:text>. </xsl:text>
-    <a href="warranty.html">No Warranty</a>
-    <xsl:text>.</xsl:text>
-  </p>
-</xsl:template>
-
-</xsl:stylesheet>

diff --git a/xsl/doc/common/Makefile b/xsl/doc/common/Makefile
index eea93a7a22578a9ed874fc45232ace38e1e62e4e..0388cbb1ec1305d1f05782791c8dc1c39970c7cc 100644 (file)
--- a/xsl/doc/common/Makefile
+++ b/xsl/doc/common/Makefile
@@ -1,6 +1,6 @@
 include ../../../cvstools/Makefile.incl
 
-STYLE=../jrefhtml.xsl
+STYLE=../../docsrc/jrefhtml.xsl
 VPATH=../../docsrc/common
 XSLTOPT=
 

diff --git a/xsl/doc/ref.css b/xsl/doc/css/ref.css
similarity index 100%
rename from xsl/doc/ref.css
rename to xsl/doc/css/ref.css

diff --git a/xsl/doc/reference.css b/xsl/doc/css/reference.css
similarity index 100%
rename from xsl/doc/reference.css
rename to xsl/doc/css/reference.css

diff --git a/xsl/doc/fo/Makefile b/xsl/doc/fo/Makefile
index 4a1e60b6799e4a5e781cf4cc1d3acb107efd2f28..2b483f70c390aa4c3e3ed9a5cd9d8cd2eaba880c 100644 (file)
--- a/xsl/doc/fo/Makefile
+++ b/xsl/doc/fo/Makefile
@@ -1,6 +1,6 @@
 include ../../../cvstools/Makefile.incl
 
-STYLE=../jrefhtml.xsl
+STYLE=../../docsrc/jrefhtml.xsl
 VPATH=../../docsrc/fo
 XSLTOPT=
 

diff --git a/xsl/doc/html/Makefile b/xsl/doc/html/Makefile
index 4e46d49669f28b896836386a9288ddae2d8457c8..3428ece205acd9b0893b6d40d4d4fb2922af03d4 100644 (file)
--- a/xsl/doc/html/Makefile
+++ b/xsl/doc/html/Makefile
@@ -1,6 +1,6 @@
 include ../../../cvstools/Makefile.incl
 
-STYLE=../jrefhtml.xsl
+STYLE=../../docsrc/jrefhtml.xsl
 VPATH=../../docsrc/html
 XSLTOPT=
 

diff --git a/xsl/doc/jrefhtml.xsl b/xsl/doc/jrefhtml.xsl
deleted file mode 100644 (file)
index 5123b27..0000000
--- a/xsl/doc/jrefhtml.xsl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<xsl:import href="../docsrc/jrefhtml.xsl"/>
-
-<xsl:param name="html.stylesheet" select="'../reference.css'"/>
-
-<xsl:template match="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.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="gentext.space"/>
-    <xsl:apply-templates select="$holders" mode="titlepage.mode"/>
-    <xsl:text>. </xsl:text>
-    <a href="../warranty.html">No Warranty</a>
-    <xsl:text>.</xsl:text>
-  </p>
-</xsl:template>
-
-</xsl:stylesheet>

diff --git a/xsl/doc/manpages/Makefile b/xsl/doc/manpages/Makefile
index af54c24f5713e54ae3fa296ec167d2255911474b..d7dc3792f9049627d8202457cafef7051ef70a66 100644 (file)
--- a/xsl/doc/manpages/Makefile
+++ b/xsl/doc/manpages/Makefile
@@ -1,6 +1,6 @@
 include ../../../cvstools/Makefile.incl
 
-STYLE=../jrefhtml.xsl
+STYLE=../../docsrc/jrefhtml.xsl
 VPATH=../../docsrc/manpages
 XSLTOPT=
 

diff --git a/xsl/doc/pi/Makefile b/xsl/doc/pi/Makefile
index 8315cdb2db3c1b2d9ded0319f80532de09825f40..fc44777d904dfcd00467c40de12cbe7435a6218a 100644 (file)
--- a/xsl/doc/pi/Makefile
+++ b/xsl/doc/pi/Makefile
@@ -1,6 +1,6 @@
 include ../../../cvstools/Makefile.incl
 
-STYLE=../jrefhtml.xsl
+STYLE=../../docsrc/jrefhtml.xsl
 VPATH=../../docsrc/pi
 XSLTOPT=
 

diff --git a/xsl/doc/refentry/Makefile b/xsl/doc/refentry/Makefile
index 4195e61a918c57efcb4bb47de1ca679707b6cf08..a5393cf889565070a0f6dac0565ef31cd121ed24 100644 (file)
--- a/xsl/doc/refentry/Makefile
+++ b/xsl/doc/refentry/Makefile
@@ -1,6 +1,6 @@
 include ../../../cvstools/Makefile.incl
 
-STYLE=../jrefhtml.xsl
+STYLE=../../docsrc/jrefhtml.xsl
 VPATH=../../docsrc/refentry
 XSLTOPT=
 

diff --git a/xsl/doc/slides/Makefile b/xsl/doc/slides/Makefile
index fca566ed6f4acd0cc41149f19ac16d63c33aa3bf..9989462fb66b417e719a35156fc1681974307e14 100644 (file)
--- a/xsl/doc/slides/Makefile
+++ b/xsl/doc/slides/Makefile
@@ -1,6 +1,6 @@
 include ../../../cvstools/Makefile.incl
 
-STYLE=../jrefhtml.xsl
+STYLE=../../docsrc/jrefhtml.xsl
 VPATH=../../docsrc/slides/
 XSLTOPT=
 

diff --git a/xsl/doc/template/Makefile b/xsl/doc/template/Makefile
index dad6b22f5f6f4b209180f3c956bb96b536c3e76d..49c6904bd233636dc6f969cc6804de043d3c9d17 100644 (file)
--- a/xsl/doc/template/Makefile
+++ b/xsl/doc/template/Makefile
@@ -1,6 +1,6 @@
 include ../../../cvstools/Makefile.incl
 
-STYLE=../jrefhtml.xsl
+STYLE=../../docsrc/jrefhtml.xsl
 VPATH=../../docsrc/template
 XSLTOPT=
 

diff --git a/xsl/doc/website/Makefile b/xsl/doc/website/Makefile
index 247b9ee02017dff21679d5d57ef581803a102d61..2794dafe9aacf2fbf7aa18fba75066536062fe70 100644 (file)
--- a/xsl/doc/website/Makefile
+++ b/xsl/doc/website/Makefile
@@ -1,6 +1,6 @@
 include ../../../cvstools/Makefile.incl
 
-STYLE=../jrefhtml.xsl
+STYLE=../../docsrc/jrefhtml.xsl
 VPATH=../../docsrc/website
 XSLTOPT=
 

diff --git a/xsl/doc/wordml/Makefile b/xsl/doc/wordml/Makefile
index a0a2b58aad8e9699b331c95bfbba6bed35167425..899567a0bb8441874a49cce9191fdaf940e8aaa9 100644 (file)
--- a/xsl/doc/wordml/Makefile
+++ b/xsl/doc/wordml/Makefile
@@ -1,6 +1,6 @@
 include ../../../cvstools/Makefile.incl
 
-STYLE=../jrefhtml.xsl
+STYLE=../../docsrc/jrefhtml.xsl
 VPATH=../../docsrc/wordml
 XSLTOPT=
 

diff --git a/xsl/docsrc/clrefentry.xsl b/xsl/docsrc/clrefentry.xsl
index 0531044fe259f90cec9d4060bc0d075a5ebe9c88..570005242dd1a443b3f21f1881852029c3fdffc8 100644 (file)
--- a/xsl/docsrc/clrefentry.xsl
+++ b/xsl/docsrc/clrefentry.xsl
@@ -11,7 +11,7 @@
 <xsl:param name="refentry.separator" select="0"/>
 
 <!-- n.b. reference pages are one directory down, so we point back up -->
-<xsl:param name="html.stylesheet" select="'../ref.css'"/>
+<xsl:param name="html.stylesheet" select="'../css/ref.css'"/>
 
 <xsl:template match="src:fragment" mode="label.markup">
   <xsl:text>&#xA7;</xsl:text>

diff --git a/xsl/docsrc/jrefhtml.xsl b/xsl/docsrc/jrefhtml.xsl
index 19fc2c67646c2e35e35d414f214548768465ea21..9b5fe83f04b707edf456bc58e2ad4f977c7e2fd9 100644 (file)
--- a/xsl/docsrc/jrefhtml.xsl
+++ b/xsl/docsrc/jrefhtml.xsl
@@ -22,6 +22,8 @@
 <!-- ==================================================================== -->
 
 <xsl:param name="part.autolabel" select="0"/>
+<xsl:param name="html.stylesheet" select="'css/reference.css'"/>
+
 
 <xsl:template match="refentry">
   <xsl:apply-imports/>
@@ -164,6 +166,30 @@
   </div>
 </xsl:template>
 
+<xsl:template match="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.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="gentext.space"/>
+    <xsl:apply-templates select="$holders" mode="titlepage.mode"/>
+    <xsl:text>. </xsl:text>
+    <a href="../warranty.html">No Warranty</a>
+    <xsl:text>.</xsl:text>
+  </p>
+</xsl:template>
+
 <!-- ==================================================================== -->
 
 </xsl:stylesheet>

diff --git a/xsl/doc/reference.xsl b/xsl/docsrc/reference.xsl
similarity index 97%
rename from xsl/doc/reference.xsl
rename to xsl/docsrc/reference.xsl
index 35b2457090c8f436ec80b06bc4903a4b8b94e474..f53bd7ac2b5b4462cb23e393bc80ba8035f9c21b 100644 (file)
--- a/xsl/doc/reference.xsl
+++ b/xsl/docsrc/reference.xsl
@@ -4,7 +4,7 @@
 
 <xsl:import href="../html/docbook.xsl"/>
 
-<xsl:param name="html.stylesheet" select="'reference.css'"/>
+<xsl:param name="html.stylesheet" select="'css/reference.css'"/>
 <xsl:param name="admon.graphics" select="1"></xsl:param>
 <xsl:param name="admon.textlabel" select="0"></xsl:param>
 <xsl:param name="admon.graphics.path">./images/</xsl:param>