[PATCH sgml-doctools v2 2/2] Using xsltproc rather than xmlto enables using correct stylesheets

[Gaetan Nadon]

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 <memsize at videotron.ca>
---

	Fixed whitespaces and some ^M charaters.

 xorg-fo.xsl    |   16 +++++++++-------
 xorg-xhtml.xsl |   13 +++++++------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/xorg-fo.xsl b/xorg-fo.xsl
index c14fc40..df206a5 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
-
+
 	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..8c01b02 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
-
+
 	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