Updated build tools

diff --git a/docbook/relaxng/tools/cleanup.pl b/docbook/relaxng/tools/cleanup.pl
index 18131e04264eecf7fca6391695efde9123ad97cf..553400f5bc41b43e61c14461ee482c04056522f1 100644 (file)
--- a/docbook/relaxng/tools/cleanup.pl
+++ b/docbook/relaxng/tools/cleanup.pl
@@ -21,14 +21,23 @@ while (<>) {
     s/\s+xmlns:xlink=([\"\']).*?\1\s+/ /g;
     s/\s*xmlns:xlink=([\"\']).*?\1\s*//g;
 
-    s/\s+xmlns:dtd=([\"\']).*?\1\s+/ /g;
-    s/\s*xmlns:dtd=([\"\']).*?\1\s*//g;
+    s/\s+xmlns:a=([\"\']).*?\1\s+/ /g;
+    s/\s*xmlns:a=([\"\']).*?\1\s*//g;
 
-    s/<grammar /<grammar xmlns:xlink=\"http:\/\/www.w3.org\/1999\/xlink\" xmlns:dtd=\"http:\/\/relaxng.org\/ns\/compatibility\/annotations\/1.0\" /g;
+    s/\s+xmlns:html=([\"\']).*?\1\s+/ /g;
+    s/\s*xmlns:html=([\"\']).*?\1\s*//g;
+
+    s/\s+xmlns:dbx=([\"\']).*?\1\s+/ /g;
+    s/\s*xmlns:dbx=([\"\']).*?\1\s*//g;
+
+    s/<grammar /<grammar xmlns:xlink=\"http:\/\/www.w3.org\/1999\/xlink\" xmlns:a=\"http:\/\/relaxng.org\/ns\/compatibility\/annotations\/1.0\" xmlns:html=\"http:\/\/www.w3.org\/1999\/xhtml\" /g;
 
     s/<(s:rule\s+.*?)>/<\1 xmlns:s=\"http:\/\/www.ascc.net\/xml\/schematron\">/g;
     s/<(ctrl:\S+\s+.*?)(\/?>)/<\1 xmlns:ctrl=\"http:\/\/nwalsh.com\/xmlns\/schema-control\/\"\2/g;
 
+    s/<(dbx:\S+\s+.*?)(\/?>)/<\1 xmlns:dbx=\"http:\/\/sourceforge\.net\/projects\/docbook\/defguide\/schema\/extra-markup\"\2/g;
+    s/<(dbx:\S+)(\/?>)/<\1 xmlns:dbx=\"http:\/\/sourceforge\.net\/projects\/docbook\/defguide\/schema\/extra-markup\"\2/g;
+
     print $_;
     print "\n" if /<\/define>/ || /<ctrl:/ || /<\/start>/;
 }

diff --git a/docbook/relaxng/tools/include.xsl b/docbook/relaxng/tools/include.xsl
index dfd8e1952829ebebe15f041f0035e4737b0c5258..f4d1d73551e428b5766a4d277f7ad64784c829b0 100644 (file)
--- a/docbook/relaxng/tools/include.xsl
+++ b/docbook/relaxng/tools/include.xsl
@@ -21,17 +21,23 @@
       <xsl:apply-templates mode="include"/>
     </xsl:variable>
 
+    <xsl:variable name="conditional">
+      <xsl:apply-templates select="exsl:node-set($expanded)/*"
+                          mode="conditional"/>
+    </xsl:variable>
+
     <xsl:variable name="overridden">
-      <xsl:apply-templates select="exsl:node-set($expanded)/*" mode="override"/>
+      <xsl:apply-templates select="exsl:node-set($conditional)/*"
+                          mode="override"/>
     </xsl:variable>
 
-    <xsl:apply-templates select="exsl:node-set($overridden)/*" mode="combine"/>
+    <xsl:apply-templates select="exsl:node-set($overridden)/*"
+                        mode="combine"/>
   </xsl:template>
 
   <!-- ====================================================================== -->
 
   <xsl:template match="rng:include" mode="include">
-    <xsl:message>Including <xsl:value-of select="@href"/></xsl:message>
     <xsl:variable name="doc" select="document(@href,.)"/>
 
     <xsl:variable name="nestedGrammar">
@@ -39,9 +45,10 @@
       <xsl:apply-templates mode="markOverride"/>
     </xsl:variable>
 
-    <xsl:apply-templates select="exsl:node-set($nestedGrammar)/*" mode="override"/>
+    <xsl:apply-templates select="exsl:node-set($nestedGrammar)/*"
+                        mode="override"/>
 
-    <xsl:message>Done including <xsl:value-of select="@href"/></xsl:message>
+    <xsl:message>Included <xsl:value-of select="@href"/></xsl:message>
   </xsl:template>
 
   <xsl:template match="*" mode="include">
@@ -213,6 +220,40 @@
 
   <!-- ====================================================================== -->
 
+  <xsl:template match="ctrl:conditional" mode="conditional">
+    <xsl:variable name="pat" select="@pattern"/>
+
+    <xsl:choose>
+      <xsl:when test="//rng:define[@name = $pat]">
+       <xsl:message>
+         <xsl:text>Including conditional pattern=</xsl:text>
+         <xsl:value-of select="$pat"/>
+       </xsl:message>
+       <xsl:apply-templates mode="conditional"/>
+      </xsl:when>
+      <xsl:otherwise>
+       <xsl:message>
+         <xsl:text>Excluding conditional pattern=</xsl:text>
+         <xsl:value-of select="$pat"/>
+       </xsl:message>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="*" mode="conditional">
+    <xsl:copy>
+      <xsl:copy-of select="@*"/>
+      <xsl:apply-templates mode="conditional"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="comment()|processing-instruction()|text()"
+               mode="conditional">
+    <xsl:copy/>
+  </xsl:template>
+
+  <!-- ====================================================================== -->
+
   <xsl:template match="rng:start" mode="override">
     <xsl:choose>
       <xsl:when test="@override">
@@ -266,7 +307,8 @@
     </xsl:copy>
   </xsl:template>
 
-  <xsl:template match="comment()|processing-instruction()|text()" mode="override">
+  <xsl:template match="comment()|processing-instruction()|text()"
+               mode="override">
     <xsl:copy/>
   </xsl:template>
 

diff --git a/docbook/relaxng/tools/removedoc.xsl b/docbook/relaxng/tools/removedoc.xsl
new file mode 100644 (file)
index 0000000..ef3fab3
--- /dev/null
+++ b/docbook/relaxng/tools/removedoc.xsl
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                xmlns:ctrl="http://nwalsh.com/xmlns/schema-control/"
+               xmlns:s="http://www.ascc.net/xml/schematron"
+               xmlns:db="http://docbook.org/ns/docbook"
+               xmlns:dbx = "http://sourceforge.net/projects/docbook/defguide/schema/extra-markup"
+               xmlns:html="http://www.w3.org/1999/xhtml"
+               xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+               exclude-result-prefixes="exsl ctrl db dbx html"
+                version="1.0">
+
+<xsl:output method="xml" encoding="utf-8" indent="yes"/>
+
+<xsl:strip-space elements="*"/>
+
+<xsl:template match="db:*"/>
+<xsl:template match="dbx:*"/>
+<xsl:template match="ctrl:*"/>
+
+<xsl:template match="rng:element">
+  <xsl:copy>
+    <xsl:copy-of select="@*"/>
+    <xsl:apply-templates/>
+
+    <xsl:if test="ancestor::rng:div/db:refpurpose">
+      <xsl:element name="a:documentation">
+       <xsl:value-of select="ancestor::rng:div/db:refpurpose"/>
+      </xsl:element>
+    </xsl:if>
+  </xsl:copy>
+</xsl:template>
+
+<xsl:template match="rng:attribute">
+  <xsl:copy>
+    <xsl:copy-of select="@*"/>
+    <xsl:apply-templates/>
+
+    <xsl:if test="db:refpurpose">
+      <xsl:element name="a:documentation">
+       <xsl:value-of select="db:refpurpose"/>
+      </xsl:element>
+    </xsl:if>
+  </xsl:copy>
+</xsl:template>
+
+<xsl:template match="rng:grammar">
+  <xsl:element name="{name(.)}" namespace="http://relaxng.org/ns/structure/1.0">
+    <xsl:for-each select="namespace::*">
+      <xsl:if test="local-name(.) != 'dbx' and local-name(.) != ''">
+       <xsl:copy/>
+      </xsl:if>
+    </xsl:for-each>
+    <xsl:copy-of select="@*"/>
+    <xsl:apply-templates/>
+  </xsl:element>
+</xsl:template>
+
+<xsl:template match="*">
+  <xsl:copy>
+    <xsl:copy-of select="@*"/>
+    <xsl:apply-templates/>
+  </xsl:copy>
+</xsl:template>
+
+<xsl:template match="comment()|processing-instruction()|text()">
+  <xsl:copy/>
+</xsl:template>
+
+</xsl:stylesheet>