From 1831401b12cd51c2af051292a80bc743ad2fcf69 Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Tue, 30 Mar 2010 00:35:36 +0000 Subject: [PATCH] Attempt to deal a little more flexibly with element names from other namespaces --- .../relaxng/tools/rng2dtd/style/dtx2dtd.xsl | 140 ++++++++++++------ 1 file changed, 94 insertions(+), 46 deletions(-) diff --git a/docbook/relaxng/tools/rng2dtd/style/dtx2dtd.xsl b/docbook/relaxng/tools/rng2dtd/style/dtx2dtd.xsl index d3da388ca..c55fcd18a 100644 --- a/docbook/relaxng/tools/rng2dtd/style/dtx2dtd.xsl +++ b/docbook/relaxng/tools/rng2dtd/style/dtx2dtd.xsl @@ -11,7 +11,6 @@ - @@ -21,8 +20,52 @@ + + + + + + + + + + + <!ENTITY % db.xmlns.attrib "xmlns + CDATA #FIXED ' + + '" > + + <!ENTITY % xlink.xmlns.attrib "xmlns:xlink + CDATA #FIXED 'http://www.w3.org/1999/xlink'" > + + + <!ENTITY % + + .prefix " + + " > + <!ENTITY % + + .xmlns.attrib "xmlns:% + + .prefix; CDATA #FIXED ' + + '" > + + + + + <!ENTITY % + + .name "% + + .prefix;: + + "> + + @@ -47,46 +90,48 @@ - " > <!ATTLIST - - - - xmlns - - CDATA #FIXED " - - " + + + % + + .name; + + % + + .xmlns.attrib; + + + + + %db.xmlns.attrib; + + - xmlns:xlink - CDATA #FIXED "http://www.w3.org/1999/xlink" - + %xlink.xmlns.attrib; > <!ELEMENT - - + + + + % + + .name; + + + + + @@ -181,8 +226,16 @@ - - + + + % + + .name; + + + + + ? @@ -283,19 +336,6 @@ - - @@ -305,8 +345,17 @@ | - - + + + + % + + .name; + + + + + )* @@ -321,8 +370,7 @@ - + -- 2.40.0