Tweaks to the l10n.dtd to make it as namespace aware as DTDs can be

diff --git a/xsl/common/l10n.dtd b/xsl/common/l10n.dtd
index 8eafd09e53a58b9d805a668d35cb354dbff161e4..b6fd0c1d3eaf5ff57c6241284edb7add27445e79 100644 (file)
--- a/xsl/common/l10n.dtd
+++ b/xsl/common/l10n.dtd
@@ -1,32 +1,45 @@
-<!ELEMENT i18n (l10n+)>
-<!ATTLIST i18n
-       xmlns           CDATA   #IMPLIED
+<!ENTITY % prefix "l">
+
+<!ENTITY % xmlns "xmlns:%prefix;">
+<!ENTITY % uri "'http://docbook.sourceforge.net/xmlns/l10n/1.0'">
+
+<!ENTITY % i18n "%prefix;:i18n">
+<!ENTITY % l10n "%prefix;:l10n">
+<!ENTITY % gentext "%prefix;:gentext">
+<!ENTITY % dingbat "%prefix;:dingbat">
+<!ENTITY % context "%prefix;:context">
+<!ENTITY % template "%prefix;:template">
+
+<!ELEMENT %i18n; ((%l10n;)+)>
+<!ATTLIST %i18n;
+       %xmlns;         CDATA   #FIXED %uri;
 >
 
-<!ELEMENT l10n (gentext|dingbat|context)*>
-<!ATTLIST l10n
+<!ELEMENT %l10n; (%gentext;|%dingbat;|%context;)*>
+<!ATTLIST %l10n;
+       %xmlns;         CDATA   #FIXED %uri;
        language        CDATA   #REQUIRED
 >
 
-<!ELEMENT gentext EMPTY>
-<!ATTLIST gentext
+<!ELEMENT %gentext; EMPTY>
+<!ATTLIST %gentext;
        key             CDATA   #REQUIRED
        text            CDATA   #REQUIRED
 >
 
-<!ELEMENT dingbat EMPTY>
-<!ATTLIST dingbat
+<!ELEMENT %dingbat; EMPTY>
+<!ATTLIST %dingbat;
        key             CDATA   #REQUIRED
        text            CDATA   #REQUIRED
 >
 
-<!ELEMENT context (template+)>
-<!ATTLIST context
+<!ELEMENT %context; ((%template;)+)>
+<!ATTLIST %context;
        name            CDATA   #REQUIRED
 >
 
-<!ELEMENT template EMPTY>
-<!ATTLIST template
+<!ELEMENT %template; EMPTY>
+<!ATTLIST %template;
        name            CDATA   #REQUIRED
        text            CDATA   #REQUIRED
 >

diff --git a/xsl/common/l10n.xml b/xsl/common/l10n.xml
index e124182d7036a863a920d845ebd59b603082daf6..e6815dae36d31e9ff82af993f6a7b5a48aea3493 100644 (file)
--- a/xsl/common/l10n.xml
+++ b/xsl/common/l10n.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE i18n SYSTEM "l10n.dtd" [
+<!DOCTYPE l:i18n SYSTEM "l10n.dtd" [
 <!ENTITY af SYSTEM "af.xml">
 <!ENTITY ca SYSTEM "ca.xml">
 <!ENTITY cs SYSTEM "cs.xml">
@@ -35,7 +35,7 @@
 <!ENTITY zh_cn SYSTEM "zh_cn.xml">
 <!ENTITY zh_tw SYSTEM "zh_tw.xml">
 ]>
-<i18n xmlns="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
 &af;
 &ca;
 &cs;
@@ -70,4 +70,4 @@
 &xh;
 &zh_cn;
 &zh_tw;
-</i18n>
+</l:i18n>