[Scummvm-cvs-logs] SF.net SVN: scummvm: [25896] docs/trunk/docbook

[fingolfin at users.sourceforge.net]

Revision: 25896
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25896&view=rev
Author:   fingolfin
Date:     2007-02-27 06:28:37 -0800 (Tue, 27 Feb 2007)

Log Message:
-----------
Merge the xsltproc parts of the dblatex/fop Makefiles into a new shared Makefile.xsltproc; add --xinclud to the xsltproc options

Modified Paths:
--------------
    docs/trunk/docbook/Makefile.dblatex
    docs/trunk/docbook/Makefile.fop

Added Paths:
-----------
    docs/trunk/docbook/Makefile.xsltproc

Modified: docs/trunk/docbook/Makefile.dblatex
===================================================================
--- docs/trunk/docbook/Makefile.dblatex	2007-02-27 12:26:47 UTC (rev 25895)
+++ docs/trunk/docbook/Makefile.dblatex	2007-02-27 14:28:37 UTC (rev 25896)
@@ -1,36 +1,6 @@
-include Makefile.common
+include Makefile.xsltproc
 
-#
-# Try various potential locations for the stylesheets, picking the
-# first one we find.
-#
-XSL_CANDIDATES = \
-  $(strip $(foreach TMP_XSL, \
-    /sw/share/xml/xsl/docbook-xsl \
-    /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
-    ./docbook-xsl, \
-    $(shell test -d $(TMP_XSL) && echo $(TMP_XSL))))
-DOCBOOK_XSL := $(firstword $(XSL_CANDIDATES))
-
-
-#
-# These rules use docbook-xsl and xsltproc (from libxslt)
-# as well as dblatex to create HTML, XHTML and PDF output.
-#
-
-XSL_PARAM = --catalogs \
-	--stringparam draft.mode no \
-	--stringparam paper.type A4 \
-	--stringparam html.stylesheet ./docbook-xsl.css
-
-%.html: %.xml
-	SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
-	  xsltproc $(XSL_PARAM) --output $@ $(DOCBOOK_XSL)/html/docbook.xsl $<
-
-%.xhtml: %.xml
-	SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
-	  xsltproc $(XSL_PARAM) --output $@ $(DOCBOOK_XSL)/xhtml/docbook.xsl $<
-
+# Use dblatex to create PDF output.
 %.pdf: %.xml
 	dblatex --pdf --no-external --output=$@ $<
 
@@ -38,3 +8,8 @@
 # such as lynk, links, elinks, w3m, ... to do the work
 %.txt: %.html
 	w3m -dump $< > $@
+
+# Of course we could also use a tool like htmldoc to convert
+# HTML to PDF (though the quality is IMO not that good).
+# And there is clearly ample opportunity for experiments when
+# it comes to the plain text generation.

Modified: docs/trunk/docbook/Makefile.fop
===================================================================
--- docs/trunk/docbook/Makefile.fop	2007-02-27 12:26:47 UTC (rev 25895)
+++ docs/trunk/docbook/Makefile.fop	2007-02-27 14:28:37 UTC (rev 25896)
@@ -1,33 +1,9 @@
-include Makefile.common
+include Makefile.xsltproc
 
 #
-# Try various potential locations for the stylesheets, picking the
-# first one we find.
+# Use FOP to create PDF and plain text output
 #
-XSL_CANDIDATES = \
-  $(strip $(foreach TMP_XSL, \
-    /sw/share/xml/xsl/docbook-xsl \
-    /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
-    ./docbook-xsl, \
-    $(shell test -d $(TMP_XSL) && echo $(TMP_XSL))))
-DOCBOOK_XSL := $(firstword $(XSL_CANDIDATES))
 
-
-#
-# These rules use docbook-xsl and xsltproc (from libxslt)
-# as well as fop to create HTML, XHTML and PDF output.
-#
-
-XSL_PARAM = --catalogs --stringparam draft.mode no --stringparam paper.type A4
-
-%.html: %.xml
-	SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
-	  xsltproc $(XSL_PARAM) --output $@ $(DOCBOOK_XSL)/html/docbook.xsl $<
-
-%.xhtml: %.xml
-	SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
-	  xsltproc $(XSL_PARAM) --output $@ $(DOCBOOK_XSL)/xhtml/docbook.xsl $<
-
 %.fo: %.xml
 	SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
 	  xsltproc $(XSL_PARAM) --output $@ $(DOCBOOK_XSL)/fo/docbook.xsl $<
@@ -37,10 +13,3 @@
 
 %.txt: %.fo
 	fop $< -txt $@
-
-#
-# Some more notes: Of course we can also use a tool like htmldoc to convert
-# HTML to PDF (though the quality is IMO not as good as that of the two ways
-# above).
-# Also, there is room for experiments when it comes to the plain text generation.
-#

Added: docs/trunk/docbook/Makefile.xsltproc
===================================================================
--- docs/trunk/docbook/Makefile.xsltproc	                        (rev 0)
+++ docs/trunk/docbook/Makefile.xsltproc	2007-02-27 14:28:37 UTC (rev 25896)
@@ -0,0 +1,34 @@
+include Makefile.common
+
+#
+# Try various potential locations for the stylesheets, picking the
+# first one we find.
+#
+XSL_CANDIDATES = \
+  $(strip $(foreach TMP_XSL, \
+    /sw/share/xml/xsl/docbook-xsl \
+    /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
+    ./docbook-xsl, \
+    $(shell test -d $(TMP_XSL) && echo $(TMP_XSL))))
+DOCBOOK_XSL := $(firstword $(XSL_CANDIDATES))
+
+
+#
+# These rules use docbook-xsl and xsltproc (from libxslt)
+# HTML and XHTML output
+#
+
+XSL_PARAM = \
+	--catalogs \
+	--xinclude \
+	--stringparam draft.mode no \
+	--stringparam paper.type A4 \
+	--stringparam html.stylesheet ./docbook-xsl.css
+
+%.html: %.xml
+	SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
+	  xsltproc $(XSL_PARAM) --output $@ $(DOCBOOK_XSL)/html/docbook.xsl $<
+
+%.xhtml: %.xml
+	SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
+	  xsltproc $(XSL_PARAM) --output $@ $(DOCBOOK_XSL)/xhtml/docbook.xsl $<


Property changes on: docs/trunk/docbook/Makefile.xsltproc
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Date Rev Author URL Id
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.