Moved XSL stylesheets out of docsrc dir and into tools/xsl/build

diff --git a/xsl/doc/.cvsignore b/xsl/doc/.cvsignore
index 780629c3bbb3794b92e316d65d6828c3fc7cd4cd..adbe11dd7b83a987cde6f10fd23d52f44d5aac26 100644 (file)
--- a/xsl/doc/.cvsignore
+++ b/xsl/doc/.cvsignore
@@ -1,5 +1,6 @@
 *.html
 reference.pdf.gz
 reference.txt.gz
+reference.fo
 reference.pdf
 reference.txt

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index f8762b57203208db2d9f1b509a75c8f0d77e5f0e..909ec69cfb7e4ae0c2b54bcef5a5847049ae7be1 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -4,9 +4,7 @@ PROCOPT=
 
 XEP=xep
 XEPFLAGS=
-REFERENCEFOXSL=../docsrc/reference-fo.xsl
 
-REFERENCETXTXSL=../docsrc/reference-txt.xsl
 TXT_MAKER = LANG=C w3mmee
 TXT_MAKER_FLAGS = -dump -config $(W3MMEECONFIG)
 W3MMEECONFIG = ../../releasetools/w3mmee_config
@@ -16,7 +14,6 @@ GZIPFLAGS=
 
 .PHONY : clean
 
-RSTYLE=../docsrc/reference.xsl
 VPATH=../docsrc
 
 DIRS=common refentry lib html fo manpages wordml slides website template

diff --git a/xsl/doc/Makefile.incl b/xsl/doc/Makefile.incl
index bf14b6085c8d89ee2a0171ba0c499eb130fe45ba..be23532ac46736f75fca06206970871677788458 100644 (file)
--- a/xsl/doc/Makefile.incl
+++ b/xsl/doc/Makefile.incl
@@ -6,7 +6,7 @@ all: $(HTMLFILES)
        $(XSLT) $< $(JREFHTML) $@ $(XSLTOPT)
 
 param.html: docparam.xml
-       $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT)
+       $(XSLT) $< $(CLREFENTRY) $(XSLTOPT)
        touch param.html
 
 clean:

diff --git a/xsl/doc/pi/Makefile b/xsl/doc/pi/Makefile
index 67f17b787e3239eaa284d5e72a973ab8af0aaab1..f8f9f4ffca86f719431a6388603a9c07ceccb190 100644 (file)
--- a/xsl/doc/pi/Makefile
+++ b/xsl/doc/pi/Makefile
@@ -4,5 +4,5 @@ HTMLFILES = pi.html
 include ../Makefile.incl
 
 pi.html: pi.xml
-       $(XSLT) $< ../../docsrc/pirefentry.xsl $(XSLTOPT)
-       touch pi.html
+       $(XSLT) $< $(PIREFENTRY) $(XSLTOPT)
+       touch $@

diff --git a/xsl/docsrc/.cvsignore b/xsl/docsrc/.cvsignore
index 5befc41e4b57dd0d0f857d8127b4afcb0b0e0de8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/xsl/docsrc/.cvsignore
+++ b/xsl/docsrc/.cvsignore
@@ -1,2 +0,0 @@
-xsl-params.xsl
-docbook-elements.xsl

diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index 035e5bd52655e7a331d8ecd11642a5fb85b4ffe9..6ab4c811247b9f243e35bb71b4241e693892c05e 100644 (file)
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -1,14 +1,11 @@
-include ../../cvstools/Makefile.incl
+include ../../releasetools/Variables.mk
 DIRS=common refentry html fo manpages wordml slides website template
 
 DOCBOOK5_RNG=../../docbook/relaxng/docbook/docbook.rng
 PARAM_XSL_FILES=$(shell for file in $$(find . -name "param.xsl"); do \
        readlink -f $$file; done | grep -v xhtml)
 
-MAKE_ELEMENTS_XSL=make-elements.xsl
-MAKE_PARAMS_XSL=make-xsl-params.xsl
-
-all: base docbook-elements.xsl xsl-params.xsl
+all: base $(DOCBOOK_ELEMENTS) $(XSL_PARAMS)
 
 base:
        for i in $(DIRS) __bogus__; do \
@@ -27,12 +24,12 @@ clean:
 $(DOCBOOK5_RNG):
        $(MAKE) -C $(dir $@) $(notdir $@)
 
-docbook-elements.xsl: $(MAKE_ELEMENTS_XSL) $(DOCBOOK5_RNG)
+$(DOCBOOK_ELEMENTS): $(MAKE_ELEMENTS_XSL) $(DOCBOOK5_RNG)
        $(XSLT) $(DOCBOOK5_RNG) $< $@
 
-xsl-params.xsl: $(MAKE_PARAMS_XSL) $(PARAM_XSL_FILES)
+$(XSL_PARAMS): $(MAKE_PARAMS_XSL) $(PARAM_XSL_FILES)
        $(XSLT) $< $< $@
 
 realclean: clean
-       $(RM) docbook-elements.xsl
-       $(RM) xsl-params.xsl
+       $(RM) $(DOCBOOK_ELEMENTS)
+       $(RM) $(XSL_PARAMS)

diff --git a/xsl/docsrc/release-notes-fo.xsl b/xsl/docsrc/release-notes-fo.xsl
deleted file mode 100644 (file)
index bf67ddd..0000000
--- a/xsl/docsrc/release-notes-fo.xsl
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<!-- This doesn't really belong in docsrc... -->
-
-<xsl:import href="../fo/docbook.xsl"/>
-
-<xsl:template match="para[@role='commit-changes']">
-  <!-- suppress -->
-</xsl:template>
-
-</xsl:stylesheet>

diff --git a/xsl/docsrc/release-notes.xsl b/xsl/docsrc/release-notes.xsl
deleted file mode 100644 (file)
index 17f9616..0000000
--- a/xsl/docsrc/release-notes.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<!-- This doesn't really belong in docsrc... -->
-
-<xsl:import href="doc-link-docbook.xsl"/>
-
-<xsl:template name="user.head.content">
-  <xsl:param name="node" select="."/>
-
-  <style type="text/css"><xsl:text>
-p.commit-changes { font-size: 8pt;
-                   font-family: monospace;
-                   color: #9F9F9F;
-                 }
-</xsl:text></style>
-
-</xsl:template>
-
-</xsl:stylesheet>

diff --git a/xsl/fo/Makefile b/xsl/fo/Makefile
index 9e6476258df0d21519260173989b17239268503e..beff554ebed0274531f458415d09682a771bc16a 100644 (file)
--- a/xsl/fo/Makefile
+++ b/xsl/fo/Makefile
@@ -1,15 +1,15 @@
-XSLT=../../cvstools/saxon
-XJPARSE=../../cvstools/xjparse
+include ../../cvstools/Makefile.incl
 
 PARAMPROF=.param.profiled
 PARAMSTRIP=.param.stripped
+LREFENTRY=../tools/xsl/build/lrefentry.xsl
 
 include Makefile.param
 
 all: titlepage.templates.xsl param.xsl profile-docbook.xsl
 
 param.html: param.xml
-       $(XSLT) $< ../docsrc/lrefentry.xsl $@
+       $(XSLT) $< $(LREFENTRY) $@
 
 param.xml: param.xweb $(PARAMS)
        ../../cvstools/paramchk -m Makefile.param $<

diff --git a/xsl/html/Makefile b/xsl/html/Makefile
index 78727805d806fe04a421b29d44bcf7886a154ec1..fff19a8fd0307e229225931ba181a488254da723 100644 (file)
--- a/xsl/html/Makefile
+++ b/xsl/html/Makefile
@@ -1,8 +1,8 @@
-XSLT=../../cvstools/saxon
-XJPARSE=../../cvstools/xjparse
+include ../../cvstools/Makefile.incl
 
 PARAMPROF=.param.profiled
 PARAMSTRIP=.param.stripped
+LREFENTRY=../tools/xsl/build/lrefentry.xsl
 
 include Makefile.param
 
@@ -14,7 +14,7 @@ xml: param.xml
 html: param.html
 
 param.html: param.xml titlepage.templates.xsl
-       $(XSLT) $< ../docsrc/lrefentry.xsl $@
+       $(XSLT) $< $(LREFENTRY) $@
 
 param.xml: param.xweb $(PARAMS)
        ../../cvstools/paramchk -m Makefile.param $<

diff --git a/xsl/lib/Makefile b/xsl/lib/Makefile
index 8ab61708a354c1c4aa015833df53f22453147a48..9817f06a49843f2a2ca290523fab0eea38a8c522 100644 (file)
--- a/xsl/lib/Makefile
+++ b/xsl/lib/Makefile
@@ -1,13 +1,13 @@
-XSLT=../../cvstools/saxon
-XJPARSE=../../cvstools/xjparse
+include ../../cvstools/Makefile.incl
 
 PARAMPROF=.lib.profiled
 PARAMSTRIP=.lib.stripped
+LREFENTRY=../tools/xsl/build/lrefentry.xsl
 
 all: lib.xsl lib.xml
 
 lib.html: lib.xml lib.xsl
-       $(XSLT) $< ../docsrc/lrefentry.xsl $@
+       $(XSLT) $< $(LREFENTRY) $@
 
 lib.xml: lib.xweb
        $(XSLT) $< ../profiling/profile.xsl $(PARAMPROF) profile.condition=html

diff --git a/xsl/manpages/Makefile b/xsl/manpages/Makefile
index 10ebfb009d2654a9235de54951c920080ba86fda..e4609d4e4546b0e4cee2b5974845ec5a5ad04d8d 100644 (file)
--- a/xsl/manpages/Makefile
+++ b/xsl/manpages/Makefile
@@ -3,6 +3,7 @@ include ../../cvstools/Makefile.incl
 PARAMPROF=.param.profiled
 PARAMSTRIP=.param.stripped
 MAKE_SYNOP=html2roff.xsl
+LREFENTRY=../tools/xsl/build/lrefentry.xsl
 
 include Makefile.param
 
@@ -13,7 +14,7 @@ xml: param.xml
 html: param.html
 
 param.html: param.xml
-       $(XSLT) $< ../docsrc/lrefentry.xsl $@
+       $(XSLT) $< $(LREFENTRY) $@
 
 param.xml: param.xweb $(PARAMS)
        ../../cvstools/paramchk -m Makefile.param $<

diff --git a/xsl/tools/xsl/build/.cvsignore b/xsl/tools/xsl/build/.cvsignore
new file mode 100644 (file)
index 0000000..820a42a
--- /dev/null
+++ b/xsl/tools/xsl/build/.cvsignore
@@ -0,0 +1,2 @@
+docbook-elements.xsl
+xsl-params.xsl

diff --git a/xsl/docsrc/clrefentry.xsl b/xsl/tools/xsl/build/clrefentry.xsl
similarity index 98%
rename from xsl/docsrc/clrefentry.xsl
rename to xsl/tools/xsl/build/clrefentry.xsl
index 424961de92db3ccc0036682c5385f458a7aa5a8c..a21e6cdfe65aafd11258b68d04b551400c496e42 100644 (file)
--- a/xsl/docsrc/clrefentry.xsl
+++ b/xsl/tools/xsl/build/clrefentry.xsl
@@ -5,7 +5,7 @@
                 exclude-result-prefixes="src verb"
                 version="1.0">
 
-<xsl:import href="../../litprog/html/cldocbook.xsl"/>
+<xsl:import href="../../../../litprog/html/cldocbook.xsl"/>
 
 <xsl:param name="use.id.as.filename" select="1"/>
 <xsl:param name="refentry.separator" select="0"/>

diff --git a/xsl/docsrc/dblatex-release-notes.xsl b/xsl/tools/xsl/build/dblatex-release-notes.xsl
similarity index 100%
rename from xsl/docsrc/dblatex-release-notes.xsl
rename to xsl/tools/xsl/build/dblatex-release-notes.xsl

diff --git a/xsl/docsrc/doc-link-docbook.xsl b/xsl/tools/xsl/build/doc-link-docbook.xsl
similarity index 81%
rename from xsl/docsrc/doc-link-docbook.xsl
rename to xsl/tools/xsl/build/doc-link-docbook.xsl
index ec26c59539906307b7b96b8e4dcc7c8504abca2c..f16b7b4d8569493fb5ac62353f430e3a86c64a32 100644 (file)
--- a/xsl/docsrc/doc-link-docbook.xsl
+++ b/xsl/tools/xsl/build/doc-link-docbook.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
-<xsl:import href="../html/docbook.xsl"/>
+<xsl:import href="../../../html/docbook.xsl"/>
 <xsl:include href="tdg-link.xsl"/>
 <xsl:include href="xsl-param-link.xsl"/>
 

diff --git a/xsl/docsrc/jref2refsect1.xsl b/xsl/tools/xsl/build/jref2refsect1.xsl
similarity index 100%
rename from xsl/docsrc/jref2refsect1.xsl
rename to xsl/tools/xsl/build/jref2refsect1.xsl

diff --git a/xsl/docsrc/jrefhtml.xsl b/xsl/tools/xsl/build/jrefhtml.xsl
similarity index 99%
rename from xsl/docsrc/jrefhtml.xsl
rename to xsl/tools/xsl/build/jrefhtml.xsl
index 3d9763338a6070c3b4f825e26c6e6e7c6f1ffaf3..c79f6e993960a9dd3fb836a6f6dcff6c7e576f83 100644 (file)
--- a/xsl/docsrc/jrefhtml.xsl
+++ b/xsl/tools/xsl/build/jrefhtml.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'>
 
-<xsl:import href="../html/docbook.xsl"/>
+<xsl:import href="../../../html/docbook.xsl"/>
 
 <xsl:output
   method="html"

diff --git a/xsl/docsrc/lrefentry.xsl b/xsl/tools/xsl/build/lrefentry.xsl
similarity index 97%
rename from xsl/docsrc/lrefentry.xsl
rename to xsl/tools/xsl/build/lrefentry.xsl
index 641a6ed5ad6ba1c299fe7f772c88c8f7c0214282..92c8b7ac0791d3983eeff614d6a9e3ef7db1cb0d 100644 (file)
--- a/xsl/docsrc/lrefentry.xsl
+++ b/xsl/tools/xsl/build/lrefentry.xsl
@@ -5,7 +5,7 @@
                 exclude-result-prefixes="src verb"
                 version="1.0">
 
-<xsl:import href="../../litprog/html/ldocbook.xsl"/>
+<xsl:import href="../../../../litprog/html/ldocbook.xsl"/>
 
 <xsl:template match="src:fragment" mode="label.markup">
   <xsl:text>&#xA7;</xsl:text>

diff --git a/xsl/docsrc/make-elements.xsl b/xsl/tools/xsl/build/make-elements.xsl
similarity index 100%
rename from xsl/docsrc/make-elements.xsl
rename to xsl/tools/xsl/build/make-elements.xsl

diff --git a/xsl/docsrc/make-xsl-params.xsl b/xsl/tools/xsl/build/make-xsl-params.xsl
similarity index 100%
rename from xsl/docsrc/make-xsl-params.xsl
rename to xsl/tools/xsl/build/make-xsl-params.xsl

diff --git a/xsl/docsrc/pirefentry.xsl b/xsl/tools/xsl/build/pirefentry.xsl
similarity index 100%
rename from xsl/docsrc/pirefentry.xsl
rename to xsl/tools/xsl/build/pirefentry.xsl

diff --git a/xsl/docsrc/reference-fo.xsl b/xsl/tools/xsl/build/reference-fo.xsl
similarity index 98%
rename from xsl/docsrc/reference-fo.xsl
rename to xsl/tools/xsl/build/reference-fo.xsl
index 019e3aa7d0c769c82305cfb07246b7ee13410915..7b090c839a3c84d4814222481157d39eb610bad7 100644 (file)
--- a/xsl/docsrc/reference-fo.xsl
+++ b/xsl/tools/xsl/build/reference-fo.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 version="1.0">
-  <xsl:import href="../fo/docbook.xsl"/>
+  <xsl:import href="../../../fo/docbook.xsl"/>
   <xsl:param name="xep.extensions">1</xsl:param>
   <xsl:param name="paper.type">A4</xsl:param>
   <xsl:param name="draft.watermark.image"></xsl:param>

diff --git a/xsl/docsrc/reference-txt.xsl b/xsl/tools/xsl/build/reference-txt.xsl
similarity index 92%
rename from xsl/docsrc/reference-txt.xsl
rename to xsl/tools/xsl/build/reference-txt.xsl
index 1f2eaa0b54e785014c72a975f2efb903f54c9df9..ceb31540a0d78fb78e9cfe4970bfc5fa503fbac6 100644 (file)
--- a/xsl/docsrc/reference-txt.xsl
+++ b/xsl/tools/xsl/build/reference-txt.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
-  <xsl:import href="../html/docbook.xsl"/>
+  <xsl:import href="../../../html/docbook.xsl"/>
   <xsl:param name="refentry.generate.name" select="1"/>
   <xsl:param name="refentry.generate.title" select="0"/>
   <xsl:param name="root.filename"></xsl:param>

diff --git a/xsl/docsrc/reference.xsl b/xsl/tools/xsl/build/reference.xsl
similarity index 97%
rename from xsl/docsrc/reference.xsl
rename to xsl/tools/xsl/build/reference.xsl
index f53bd7ac2b5b4462cb23e393bc80ba8035f9c21b..30ad08d352b0b61b7ce37e0b22179f7f1a9f6c2a 100644 (file)
--- a/xsl/docsrc/reference.xsl
+++ b/xsl/tools/xsl/build/reference.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
-<xsl:import href="../html/docbook.xsl"/>
+<xsl:import href="../../../html/docbook.xsl"/>
 
 <xsl:param name="html.stylesheet" select="'css/reference.css'"/>
 <xsl:param name="admon.graphics" select="1"></xsl:param>

diff --git a/xsl/docsrc/tdg-link.xsl b/xsl/tools/xsl/build/tdg-link.xsl
similarity index 100%
rename from xsl/docsrc/tdg-link.xsl
rename to xsl/tools/xsl/build/tdg-link.xsl

diff --git a/xsl/docsrc/xsl-param-link.xsl b/xsl/tools/xsl/build/xsl-param-link.xsl
similarity index 100%
rename from xsl/docsrc/xsl-param-link.xsl
rename to xsl/tools/xsl/build/xsl-param-link.xsl

diff --git a/xsl/docsrc/xsl2jref.xsl b/xsl/tools/xsl/build/xsl2jref.xsl
similarity index 99%
rename from xsl/docsrc/xsl2jref.xsl
rename to xsl/tools/xsl/build/xsl2jref.xsl
index 3a155a1cbe9a77f27f984189f66dbdd0f0b4aff1..24b35fbcc186f87708074149141abf150c56331f 100644 (file)
--- a/xsl/docsrc/xsl2jref.xsl
+++ b/xsl/tools/xsl/build/xsl2jref.xsl
@@ -5,8 +5,8 @@
                 xmlns:lxslt="http://xml.apache.org/xslt"
                 exclude-result-prefixes="doc xsl lxslt">
 
-<xsl:include href="../html/param.xsl"/>
-<xsl:include href="../html/chunker.xsl"/>
+<xsl:include href="../../../html/param.xsl"/>
+<xsl:include href="../../../html/chunker.xsl"/>
 
 <xsl:output
      method="xml"

diff --git a/xsl/wordml/Makefile b/xsl/wordml/Makefile
index 9d7d9285c5a633e7a9b8e8e32c338bdf82f1d931..76c64c48243c3bab677b2865d3598e29ed56d770 100644 (file)
--- a/xsl/wordml/Makefile
+++ b/xsl/wordml/Makefile
@@ -5,6 +5,7 @@ STYLESHEETDIR = .
 
 PARAMPROF=.param.profiled
 PARAMSTRIP=.param.stripped
+LREFENTRY=../tools/xsl/build/lrefentry.xsl
 
 WORDML = $(STYLESHEETDIR)/docbook.xsl
 PAGES = $(STYLESHEETDIR)/docbook-pages.xsl
@@ -20,14 +21,14 @@ PROC = xsltproc
 
 include Makefile.param
 
-all:   param.xsl
+all: param.xsl
 
 xml: param.xml
 
 html: param.html
 
 param.html: param.xml
-       $(XSLT) $< ../docsrc/lrefentry.xsl $@
+       $(XSLT) $< $(LREFENTRY) $@
 
 param.xml: param.xweb $(PARAMS)
        ../../cvstools/paramchk -m Makefile.param $<