This is the mail archive of the cygwin-patches mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

doc: use xmlto pdf


As reported recently on the list[1], openjade cannot handle the ISO
encodings shipped with docbook-xml45.  While I need to look into a fix,
in this case there is a simple workaround.  Since we already use xmlto
to build the HTML, we can also use it to build the PDFs.

Note that this does require the appropriate backend to be installed.  On
Linux, xmlto has used PassiveTeX as a DVI/PDF/PS backend since at least
0.0.18; later versions also support dblatex and fop.  On Cygwin, I just
adopted xmlto[2] and updated it to use dblatex as the DVI/PDF/PS
backend, as that is the only backend currently in the distro.  (fop is
in Ports but requires its GNU Classpath environment plus a bunch of Java
libraries, and neither passivetex nor its dependency xmltex are
currently available.)

Patch attached; please test.


Yaakov

[1] http://cygwin.com/ml/cygwin/2010-06/msg00448.html
[2] http://cygwin.com/ml/cygwin-announce/2010-06/msg00041.html

2010-06-25  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>

	* Makefile.in: Use "xmlto pdf" instead of docbook2pdf.
	* README: Remove docbook-utils and update docbook-xml deps.
	* faq-programming.xml: Ditto.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/winsup/doc/Makefile.in,v
retrieving revision 1.26
diff -u -r1.26 Makefile.in
--- Makefile.in	26 Jan 2010 16:16:19 -0000	1.26
+++ Makefile.in	25 Jun 2010 19:24:52 -0000
@@ -56,7 +56,7 @@
 
 # Some versions of jw hang with the -o option
 cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.sgml
-	-cd cygwin-ug-net && docbook2pdf ../$<
+	-${XMLTO} pdf -o cygwin-ug-net/ $<
 
 cygwin-ug-net.sgml : cygwin-ug-net.in.sgml ./doctool Makefile
 	-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $<
@@ -65,7 +65,7 @@
 	-${XMLTO} html -o cygwin-api/ -m $(srcdir)/cygwin.dsl $<
 
 cygwin-api/cygwin-api.pdf : cygwin-api.sgml
-	-cd cygwin-api && docbook2pdf ../$<
+	-${XMLTO} pdf -o cygwin-api/ $<
 
 cygwin-api.sgml : cygwin-api.in.sgml ./doctool Makefile
 	-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $<
Index: README
===================================================================
RCS file: /cvs/src/src/winsup/doc/README,v
retrieving revision 1.2
diff -u -r1.2 README
--- README	2 Feb 2010 01:02:49 -0000	1.2
+++ README	25 Jun 2010 19:24:52 -0000
@@ -7,8 +7,7 @@
 bzip2
 coreutils
 cygwin
-docbook-utils
-docbook-xml42
+docbook-xml45
 docbook-xsl
 gzip
 make
Index: faq-programming.xml
===================================================================
RCS file: /cvs/src/src/winsup/doc/faq-programming.xml,v
retrieving revision 1.15
diff -u -r1.15 faq-programming.xml
--- faq-programming.xml	2 Feb 2010 01:18:03 -0000	1.15
+++ faq-programming.xml	25 Jun 2010 19:24:53 -0000
@@ -420,7 +420,7 @@
 <literal>perl</literal>, and <literal>cocom</literal>. If you want to run 
 the tests, <literal>dejagnu</literal> is also required.
 Normally, building ignores any errors in building the documentation,
-which requires the <literal>docbook-utils</literal>, <literal>docbook-xml42</literal>, <literal>docbook-xsl</literal>, and
+which requires the <literal>docbook-xml45</literal>, <literal>docbook-xsl</literal>, and
 <literal>xmlto</literal> packages.  For more information on building the
 documentation, see the README included in the <literal>cygwin-doc</literal> package.
 </para>

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]