Checkpointing of streamline of doc build to the new Way.

diff --git a/xsl/docx/.cvsignore b/xsl/docx/.cvsignore
index adbe11dd7b83a987cde6f10fd23d52f44d5aac26..6d34fe13e20161a522e20002c1e7fdb6b5613d3d 100644 (file)
--- a/xsl/docx/.cvsignore
+++ b/xsl/docx/.cvsignore
@@ -4,3 +4,4 @@ reference.txt.gz
 reference.fo
 reference.pdf
 reference.txt
+HTML.manifest

diff --git a/xsl/docx/Makefile b/xsl/docx/Makefile
index 19afdd203b913e96ba687f01295a39c92ed922a1..ec52bb6e01e349e5dd4e395461adb8c3b19a5f6d 100644 (file)
--- a/xsl/docx/Makefile
+++ b/xsl/docx/Makefile
@@ -15,56 +15,45 @@ W3MMEECONFIG = ../../releasetools/w3mmee_config
 GZIP=gzip
 GZIPFLAGS=
 
-.PHONY : clean
+HTMLMANIFEST=HTML.manifest
 
-VPATH=../docsrc
+DIRS=common fo html lib manpages pi refentry roundtrip slides/fo slides/html template utility website
 
-DIRS=common refentry lib html fo manpages roundtrip slides-html slides-fo website template utility
+.PHONY : clean
 
 %.included: %
        $(XINCLUDE) $< >$@
 
 # build reference.pdf.gz except for snapshot releases
 ifneq (snapshot,$(findstring snapshot,$(RELVER)))
-all: reference.txt.gz reference.pdf.gz html
+all: reference.txt.gz reference.css reference.pdf.gz
 else
-all: reference.txt.gz html
+all: reference.txt.gz reference.css
 endif
 
-html: base copyright.html warranty.html reference.html index.html
+#reference.html: ../docsrcx/reference.xml.included $(REFERENCETXTXSL)
+#      $(XSLT) $< $(REFERENCETXTXSL) > $@
 
-base:
-       for i in $(DIRS) __bogus__; do \
-               if [ $$i != __bogus__ ] ; then \
-                       echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
-               fi \
-       done
+index.html: ../docsrcx/reference.xml.included $(RSTYLE)
+       $(XSLT) $< $(RSTYLE) > $@
 
-copyright.html: copyright.xml $(RSTYLE)
-       $(XJPARSE) $(XJPARSEFLAGS) $(VPATH)/$<
-       $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT)
-
-warranty.html: warranty.xml $(RSTYLE)
-       $(XJPARSE) $(XJPARSEFLAGS) $(VPATH)/$<
-       $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT)
+reference.html: index.html
+       cp -p $< $@
 
-reference.html: reference.xml $(RSTYLE)
-       $(XJPARSE) $(XJPARSEFLAGS) $(VPATH)/$<
-       $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT)
+reference.css: ../docsrcx/reference.css
+       cp -p $< .
+       for dir in $(DIRS); do cp -p $< $$dir; done
 
-index.html: reference.html
-       cp -p $< $@
+debug:
+       @echo $(DIRS)
 
-reference.fo: ../docsrc/reference.dbk.included $(REFERENCEFOXSL)
+reference.fo: ../docsrc/reference.xml.included $(REFERENCEFOXSL)
        $(DOCBOOK_SVN)/buildtools/xslt -$(FO_BUILDER) $< $(REFERENCEFOXSL) > $@
 
 reference.pdf: reference.fo
        $(XEP) $(XEPFLAGS) $<
 
-reference.txt.html: ../docsrc/reference.dbk.included $(REFERENCETXTXSL)
-       $(XSLT) $< $(REFERENCETXTXSL) > $@
-
-reference.txt: reference.txt.html
+reference.txt: reference.html
        $(TXT_MAKER) $(TXT_MAKER_FLAGS) $< > $@
 
 reference.pdf.gz: reference.pdf
@@ -74,19 +63,14 @@ reference.txt.gz: reference.txt
        cat $< | $(GZIP) $(GZIPFLAGS) > $@
 
 clean:
-       for i in $(DIRS) __bogus__; do \
-               if [ $$i != __bogus__ ] ; then \
-                       echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
-               fi \
-       done
-       $(RM) copyright.html
-       $(RM) index.html
+       $(RM) reference.css
+       for dir in $(DIRS); do $(RM) $$dir/reference.css; done
        $(RM) reference.html
-       $(RM) warranty.html
        $(RM) reference.fo
        $(RM) reference.pdf
-       $(RM) reference.txt
-       $(RM) reference.txt.html
        $(RM) reference.pdf.gz
        $(RM) reference.txt.gz
-       $(RM) ../docsrc/reference.dbk.included
+       $(RM) reference.txt
+       $(RM) ../docsrc/reference.xml.included
+       for file in $$(cat $(HTMLMANIFEST)); do $(RM) $$file; done
+       $(RM) $(HTMLMANIFEST)

diff --git a/xsl/docx/common/.cvsignore b/xsl/docx/common/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/common/.cvsignore
+++ b/xsl/docx/common/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/fo/.cvsignore b/xsl/docx/fo/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/fo/.cvsignore
+++ b/xsl/docx/fo/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/fo/page.png b/xsl/docx/fo/page.png
deleted file mode 100644 (file)
index 9c15d88..0000000
Binary files a/xsl/docx/fo/page.png and /dev/null differ

diff --git a/xsl/docx/html/.cvsignore b/xsl/docx/html/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/html/.cvsignore
+++ b/xsl/docx/html/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/lib/.cvsignore b/xsl/docx/lib/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/lib/.cvsignore
+++ b/xsl/docx/lib/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/manpages/.cvsignore b/xsl/docx/manpages/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/manpages/.cvsignore
+++ b/xsl/docx/manpages/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/pi/.cvsignore b/xsl/docx/pi/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/pi/.cvsignore
+++ b/xsl/docx/pi/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/refentry/.cvsignore b/xsl/docx/refentry/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/refentry/.cvsignore
+++ b/xsl/docx/refentry/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/reference.css b/xsl/docx/reference.css
deleted file mode 100644 (file)
index 653e0ff..0000000
--- a/xsl/docx/reference.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* reference.css, a stylesheet for reference documentation */
-
-div.legalnotice { font-size: 80%; }
-
-div.note {
-  border-left: solid #d5dee3 20px;
-  border-right: solid #d5dee3 20px;
-  margin-left: 5%;
-  margin-right: 10%;
-  padding: 5px;
-}
-
-div.informalexample        { background-color: #d5dee3;
-                             border-top-width: 2px;
-                             border-top-style: double;
-                             border-top-color: #d3d3d3;
-                             border-bottom-width: 2px;
-                             border-bottom-style: double;
-                             border-bottom-color: #d3d3d3;
-                             padding: 4px;
-                             margin: 0em;
-                             margin-left: 2em;
-                           }
-
-pre.programlisting         { whitespace: pre;
-                             font-family: monospace;
-                             background-color: #d5dee3;
-                             border-top-width: 1px;
-                             border-top-style: single;
-                             border-top-color: #d3d3d3;
-                             border-bottom-width: 1px;
-                             border-bottom-style: single;
-                             border-bottom-color: #d3d3d3;
-                             padding: 4px;
-                             margin: 0em;
-                           }
-
-div.informalexample pre    { whitespace: pre;
-                             font-family: monospace;
-                             border-top-width: 0px;
-                             border-bottom-width: 0px;
-                             padding: 0px;
-                           }

diff --git a/xsl/docx/roundtrip/.cvsignore b/xsl/docx/roundtrip/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/roundtrip/.cvsignore
+++ b/xsl/docx/roundtrip/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/slides/fo/.cvsignore b/xsl/docx/slides/fo/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/slides/fo/.cvsignore
+++ b/xsl/docx/slides/fo/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/slides/html/.cvsignore b/xsl/docx/slides/html/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/slides/html/.cvsignore
+++ b/xsl/docx/slides/html/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/template/.cvsignore b/xsl/docx/template/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/template/.cvsignore
+++ b/xsl/docx/template/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/utility/.cvsignore b/xsl/docx/utility/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/utility/.cvsignore
+++ b/xsl/docx/utility/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css

diff --git a/xsl/docx/website/.cvsignore b/xsl/docx/website/.cvsignore
index 2d19fc766d98a08d9d1437896bfb008a7b15f340..293c39ebb10bc89c79257619bccb4267269124b7 100644 (file)
--- a/xsl/docx/website/.cvsignore
+++ b/xsl/docx/website/.cvsignore
@@ -1 +1,2 @@
 *.html
+reference.css