Make localizations separate, stand-alone XML documents

diff --git a/gentext/Makefile b/gentext/Makefile
index b6c4c16df88e1c5621ef5946f61769d8d604298c..f20082365162c31af5d59109337663e32c5c6554 100644 (file)
--- a/gentext/Makefile
+++ b/gentext/Makefile
@@ -1,17 +1,62 @@
+XSLT=../buildbin/saxon
+XJPARSE=../buildbin/xjparse
+
+SOURCES=ca.xml cs.xml da.xml de.xml el.xml en.xml es.xml et.xml fi.xml \
+          fr.xml hu.xml id.xml it.xml ja.xml ko.xml nl.xml no.xml pl.xml \
+          pt.xml pt_br.xml ro.xml ru.xml sk.xml sl.xml sv.xml zh_cn.xml \
+          zh_tw.xml
+
+DSSSLENT=dbl1ca.ent dbl1cs.ent dbl1da.ent dbl1de.ent dbl1el.ent \
+         dbl1en.ent dbl1es.ent dbl1et.ent dbl1fi.ent dbl1fr.ent \
+         dbl1hu.ent dbl1id.ent dbl1it.ent dbl1ja.ent dbl1ko.ent \
+         dbl1nl.ent dbl1no.ent dbl1pl.ent dbl1pt.ent dbl1ro.ent \
+         dbl1ru.ent dbl1sk.ent dbl1sl.ent dbl1sv.ent \
+         dbl1ptbr.ent dbl1zhcn.ent dbl1zhtw.ent
+
 all:
        @echo ""
        @echo Choose a target: dsssl-files, xsl-files, or clean
        @echo ""
 
-test:
-       xjparse locale/l10n.xml
+xsl-files: $(SOURCES)
 
-dsssl-files:
-       saxon locale/l10n.xml xsl/dsssl.xsl
+dsssl-files: $(DSSSLENT)
 
-xsl-files:
-       saxon locale/l10n.xml xsl/xsl.xsl
+dbl1ca.ent: locale/ca.xml
+dbl1cs.ent: locale/cs.xml
+dbl1da.ent: locale/da.xml
+dbl1de.ent: locale/de.xml
+dbl1el.ent: locale/el.xml
+dbl1en.ent: locale/en.xml
+dbl1es.ent: locale/es.xml
+dbl1et.ent: locale/et.xml
+dbl1fi.ent: locale/fi.xml
+dbl1fr.ent: locale/fr.xml
+dbl1hu.ent: locale/hu.xml
+dbl1id.ent: locale/id.xml
+dbl1it.ent: locale/it.xml
+dbl1ja.ent: locale/ja.xml
+dbl1ko.ent: locale/ko.xml
+dbl1nl.ent: locale/nl.xml
+dbl1no.ent: locale/no.xml
+dbl1pl.ent: locale/pl.xml
+dbl1pt.ent: locale/pt.xml
+dbl1ptbr.ent: locale/pt_br.xml
+dbl1ro.ent: locale/ro.xml
+dbl1ru.ent: locale/ru.xml
+dbl1sk.ent: locale/sk.xml
+dbl1sl.ent: locale/sl.xml
+dbl1sv.ent: locale/sv.xml
+dbl1zhcn.ent: locale/zh_cn.xml
+dbl1zhtw.ent: locale/zh_tw.xml
+
+%.xml: locale/%.xml
+       $(XJPARSE) -w $<
+       $(XSLT) $< xsl/xsl.xsl $@
+
+%.ent:
+       $(XJPARSE) -w $<
+       $(XSLT) $< xsl/dsssl.xsl $@
 
 clean:
        rm -f *.ent *.xml
-

diff --git a/gentext/locale/l10n.xml b/gentext/locale/l10n.xml
deleted file mode 100644 (file)
index c998410..0000000
--- a/gentext/locale/l10n.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE localization SYSTEM "../dtd/l10n.dtd" [
-
-<!ENTITY % lat1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-                "../../xml-entities/iso-lat1.ent">
-%lat1;
-<!ENTITY % lat2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
-                "../../xml-entities/iso-lat2.ent">
-%lat2;
-<!ENTITY % cyr1 PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
-                "../../xml-entities/iso-cyr1.ent">
-%cyr1;
-
-<!ENTITY ca SYSTEM "ca.xml">
-<!ENTITY cs SYSTEM "cs.xml">
-<!ENTITY da SYSTEM "da.xml">
-<!ENTITY de SYSTEM "de.xml">
-<!ENTITY el SYSTEM "el.xml">
-<!ENTITY en SYSTEM "en.xml">
-<!ENTITY es SYSTEM "es.xml">
-<!ENTITY et SYSTEM "et.xml">
-<!ENTITY fi SYSTEM "fi.xml">
-<!ENTITY fr SYSTEM "fr.xml">
-<!ENTITY hu SYSTEM "hu.xml">
-<!ENTITY id SYSTEM "id.xml">
-<!ENTITY it SYSTEM "it.xml">
-<!ENTITY ja SYSTEM "ja.xml">
-<!ENTITY ko SYSTEM "ko.xml">
-<!ENTITY nl SYSTEM "nl.xml">
-<!ENTITY no SYSTEM "no.xml">
-<!ENTITY pl SYSTEM "pl.xml">
-<!ENTITY pt SYSTEM "pt.xml">
-<!ENTITY pt_br SYSTEM "pt_br.xml">
-<!ENTITY ro SYSTEM "ro.xml">
-<!ENTITY ru SYSTEM "ru.xml">
-<!ENTITY sk SYSTEM "sk.xml">
-<!ENTITY sl SYSTEM "sl.xml">
-<!ENTITY sv SYSTEM "sv.xml">
-<!ENTITY zh_cn SYSTEM "zh_cn.xml">
-<!ENTITY zh_tw SYSTEM "zh_tw.xml">
-]>
-<localization>
-&ca;
-&cs;
-&da;
-&de;
-&el;
-&en;
-&es;
-&et;
-&fi;
-&fr;
-&hu;
-&id;
-&it;
-&ja;
-&ko;
-&nl;
-&no;
-&pl;
-&pt;
-&pt_br;
-&ro;
-&ru;
-&sk;
-&sl;
-&sv;
-&zh_cn;
-&zh_tw;
-</localization>

diff --git a/gentext/xsl/dsssl.xsl b/gentext/xsl/dsssl.xsl
index 41ea653cd396a7a0b27422a57fe8b1de5e932c8e..3f6a47a1085a486a0a530b3608bdb67b6a8cd8d7 100644 (file)
--- a/gentext/xsl/dsssl.xsl
+++ b/gentext/xsl/dsssl.xsl
@@ -1,44 +1,26 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:saxon="http://icl.com/saxon"
-                extension-element-prefixes="saxon"
+                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+                exclude-result-prefixes="doc"
                 version="1.0">
 
-<xsl:output method="xml" encoding="US-ASCII"/>
+<xsl:output method="xml" encoding="US-ASCII" indent="no"/>
 
-<xsl:strip-space elements="localization locale"/>
+<xsl:strip-space elements="localization locale context"/>
 
-<xsl:template match="i18n">
-  <xsl:apply-templates select="localization"/>
-</xsl:template>
+<xsl:template match="doc:*"/>
 
 <xsl:template match="locale">
-  <xsl:variable name="filename">
-    <xsl:text>dbl1</xsl:text>
-    <xsl:choose>
-      <xsl:when test="contains(@language, '_')">
-        <xsl:value-of select="substring-before(@language, '_')"/>
-        <xsl:value-of select="substring-after(@language, '_')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@language"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>.ent</xsl:text>
-  </xsl:variable>
-
-  <xsl:message><xsl:value-of select="$filename"/></xsl:message>
-
-  <saxon:output method="xml" encoding="US-ASCII" href="{$filename}">
-    <xsl:text>&#10;</xsl:text>
-    <xsl:comment> This file is generated automatically. </xsl:comment>
-    <xsl:text>&#10;</xsl:text>
-    <xsl:comment> Do not edit this file by hand! </xsl:comment>
-    <xsl:text>&#10;</xsl:text>
-    <xsl:text>&#10;</xsl:text>
-
-    <xsl:apply-templates select="gentext"/>
-  </saxon:output>
+  <xsl:text>&#10;</xsl:text>
+  <xsl:comment> This file is generated automatically. </xsl:comment>
+  <xsl:text>&#10;</xsl:text>
+  <xsl:comment> Do not edit this file by hand! </xsl:comment>
+  <xsl:text>&#10;</xsl:text>
+  <xsl:comment> See http://docbook.sourceforge.net/ </xsl:comment>
+  <xsl:text>&#10;</xsl:text>
+  <xsl:text>&#10;</xsl:text>
+
+  <xsl:apply-templates select="gentext"/>
 </xsl:template>
 
 <xsl:template match="gentext">

diff --git a/gentext/xsl/xsl.xsl b/gentext/xsl/xsl.xsl
index 59e80a4985b500aa400820a23dca9b8eb8608cea..d8fca6f41b9b3d09b25132f75dd07f0ee6bc8305 100644 (file)
--- a/gentext/xsl/xsl.xsl
+++ b/gentext/xsl/xsl.xsl
@@ -1,40 +1,41 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:saxon="http://icl.com/saxon"
-                extension-element-prefixes="saxon"
+                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+                exclude-result-prefixes="doc"
                 version="1.0">
 
-<xsl:output method="xml" encoding="US-ASCII"/>
+<xsl:output method="xml" encoding="US-ASCII" indent="yes"/>
 
-<xsl:strip-space elements="localization"/>
+<xsl:strip-space elements="localization locale context"/>
 
-<xsl:template match="i18n">
-  <xsl:apply-templates select="localization"/>
-</xsl:template>
+<xsl:template match="doc:*"/>
 
 <xsl:template match="locale">
-  <xsl:variable name="filename">
-    <xsl:value-of select="@language"/>
-    <xsl:text>.xml</xsl:text>
-  </xsl:variable>
-
-  <xsl:message><xsl:value-of select="$filename"/></xsl:message>
-
-  <saxon:output method="xml" encoding="US-ASCII" href="{$filename}">
+  <localization language="{@language}">
+    <xsl:text>&#10;</xsl:text>
     <xsl:text>&#10;</xsl:text>
-    <localization language="{@language}">
-      <xsl:text>&#10;</xsl:text>
-      <xsl:comment> This file is generated automatically. </xsl:comment>
-      <xsl:text>&#10;</xsl:text>
-      <xsl:comment> Do not edit this file by hand! </xsl:comment>
-
-      <xsl:apply-templates/>
-    </localization>
+    <xsl:comment> This file is generated automatically. </xsl:comment>
     <xsl:text>&#10;</xsl:text>
-  </saxon:output>
+    <xsl:comment> Do not edit this file by hand! </xsl:comment>
+    <xsl:text>&#10;</xsl:text>
+    <xsl:comment> See http://docbook.sourceforge.net/ </xsl:comment>
+    <xsl:text>&#10;</xsl:text>
+
+    <xsl:apply-templates/>
+
+  </localization>
+  <xsl:text>&#10;</xsl:text>
+</xsl:template>
+
+<xsl:template match="gentext|dingbat">
+  <xsl:element name="{name(.)}">
+    <xsl:copy-of select="@*"/>
+    <xsl:apply-templates/>
+  </xsl:element>
 </xsl:template>
 
-<xsl:template match="gentext|dingbat|context">
+<xsl:template match="context">
+  <xsl:text>&#10;</xsl:text>
   <xsl:element name="{name(.)}">
     <xsl:copy-of select="@*"/>
     <xsl:apply-templates/>