Abandon wdocbook.xsl and make w2docbook.xsl instead (convert woven files into proper...

diff --git a/litprog/weave.xweb b/litprog/weave.xweb
index 6b692ba6ef39f606538cee73c590e31b9e990063..8861fd6927a42056f29874e1220355df0797c32a 100644 (file)
--- a/litprog/weave.xweb
+++ b/litprog/weave.xweb
@@ -1133,16 +1133,35 @@ instruction.</para>
 weaving functionality and simply sets the public and system identifiers.
 </para>
 
-<src:fragment id="wdocbook" mundane-result-prefixes="xsl">
+<src:fragment id="w2docbook" mundane-result-prefixes="xsl">
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
                 exclude-result-prefixes="xsl src xml"
                 version="1.0">
 
-  <xsl:import href="weave.xsl"/>
   <xsl:output method="xml"
-              doctype-public="-//DocBook Open Repository//DTD DocBook Literate Programming V0.0//EN"
-              doctype-system="http://docbook.sourceforge.net/release/litprog/current/dtd/ldocbook.dtd"/>
+              indent="no"
+              doctype-public="-//OASIS//DTD DocBook XML V4.2//EN"
+              doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
+
+  <xsl:preserve-space elements="*"/>
+
+  <xsl:template match="*">
+    <xsl:copy>
+      <xsl:copy-of select="@*"/>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="src:fragment" priority="2">
+    <programlisting id="@id">
+      <xsl:apply-templates/>
+    </programlisting>
+  </xsl:template>
+
+  <xsl:template match="src:fragref" priority="2">
+    <xref linkend="@linkend"/>
+  </xsl:template>
 </xsl:stylesheet>
 </src:fragment>
 </section>