As explained in xorg-docs: Xmlto is a script that selects the appropriate back-end based on options and tools availability.
Xmlto uses an xsl "fragment" which is not compatible with the standard use of xsl stylesheets. The customization for xhtml and fo cannot be used with xsltproc in that context. It makes adoption of docbook features like olink and profiling significantly more difficult. The tools that xmlto invokes will be called directly by the makefile, which are xmllint for validation, xsltproc, and w3m for text format. The xorg styleheets no longer have to be xmlto "fragments" and can now be true customization stylesheet of docbook xsl. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> --- Fixed whitespaces and ^M README | 4 ++-- masterdb/masterdb.xml | 2 +- xorg-fo.xsl | 18 ++++++++++-------- xorg-xhtml.xsl | 15 ++++++++------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/README b/README index 4fdcbe9..f4f446a 100644 --- a/README +++ b/README @@ -19,7 +19,7 @@ Not all packages are installed either. Build challenges ---------------- -The X Window System is composed of over 200 packages. The documentation is +The X Window System is composed of over 200 packages. The documentation is included with the package it documents so the information matches the code. The build is organized to satisfy C code building requirements, but this paradigm does not fit very well for building documentation. @@ -34,7 +34,7 @@ Local X builds When building X as a sandbox on a workstation, using a simple build script to configure and build all packages in the right order is all you need to get a working system, including documentation. You will not get all -the links in the documentation resolved correctly due to build order +the links in the documentation resolved correctly due to build order and/or bi-directional references. Unless you are updating or testing the documentation, you do not need to diff --git a/masterdb/masterdb.xml b/masterdb/masterdb.xml index b69d1d8..7480f21 100644 --- a/masterdb/masterdb.xml +++ b/masterdb/masterdb.xml @@ -25,7 +25,7 @@ listed here. This allows crosslinking between documents. <!-- The sitemap represent the directory structure of the installed X docs The toplevel directory name "doc" is irrelevant, just being the root node - Example of a computed href in an xorg-docs/specs/Xserver pointing to libX11: + Example of a computed href in an xorg-docs/specs/Xserver pointing to libX11: href="../../../libX11/libX11.html#libX11" The href first "climbs up" to the "doc" dir and then descends into libX11 diff --git a/xorg-fo.xsl b/xorg-fo.xsl index c14fc40..d57f7ac 100644 --- a/xorg-fo.xsl +++ b/xorg-fo.xsl @@ -1,13 +1,15 @@ -<?xml version="1.0" encoding="UTF-8"?> - +<?xml version="1.0" encoding="UTF-8"?> + <!-- - X.Org DocBook/XML customization - + X.Org DocBook/XML customization + DocBook XSL Stylesheets FO Parameters http://docbook.sourceforge.net/release/xsl/current/doc/fo/ ---> - -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'> +--> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'> +<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/> + <!-- Reference Pages HTML/FO Parameters --> @@ -59,7 +61,7 @@ </xsl:attribute-set> <!-- Linking to a target inside a pdf document. - This feature is only available as of docbook-xsl-1.76.1. + This feature is only available as of docbook-xsl-1.76.1. When set to zero, the link will point to the document --> <xsl:param name="insert.olink.pdf.frag" select="0"></xsl:param> diff --git a/xorg-xhtml.xsl b/xorg-xhtml.xsl index 9841fb5..fc2e95d 100644 --- a/xorg-xhtml.xsl +++ b/xorg-xhtml.xsl @@ -1,13 +1,14 @@ -<?xml version="1.0" encoding="UTF-8"?> - +<?xml version="1.0" encoding="UTF-8"?> + <!-- - X.Org DocBook/XML customization - + X.Org DocBook/XML customization + DocBook XSL Stylesheets HTML Parameters http://docbook.sourceforge.net/release/xsl/current/doc/html/ ---> - -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'> +--> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'> +<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/> <!-- Reference Pages HTML/FO Parameters --> -- 1.6.0.4 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel