From db0b08db8fb356439bc08a22eb3b61eea3022bf9 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 11 Nov 2013 06:52:59 +0000
Subject: - Define l10n.ent as an entity in localized directories and make them
 be   picked up via XML catalog in freebsd50.ent or xhtml10-freebsd.dtd,   not
 entities.ent.  The L10N entities always come first to be able to   override
 everything.

- Define &nbsp; as &#x20; in EUC-JP encoding.  This is a workaround to
  prevent an invalid character in EUC-JP caused by converting 0xa0 in
  UTF-8 (EUC-JP does not allow 0xa0) in XSLT processing.  Theoretically
  it should be &#xa0; still in the final XML output.

- Make XML catalog resolution consistent for l10n.ent.  This should be
  revisited for the others later.
---
 da_DK.ISO8859-1/share/xml/catalog.xml  | 2 ++
 da_DK.ISO8859-1/share/xml/entities.ent | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'da_DK.ISO8859-1')

diff --git a/da_DK.ISO8859-1/share/xml/catalog.xml b/da_DK.ISO8859-1/share/xml/catalog.xml
index 68a49c118f..945a226d14 100644
--- a/da_DK.ISO8859-1/share/xml/catalog.xml
+++ b/da_DK.ISO8859-1/share/xml/catalog.xml
@@ -10,6 +10,8 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
   <public publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
         uri="entities.ent"/>
   <public publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
diff --git a/da_DK.ISO8859-1/share/xml/entities.ent b/da_DK.ISO8859-1/share/xml/entities.ent
index f59c2fe83c..b6e267f855 100644
--- a/da_DK.ISO8859-1/share/xml/entities.ent
+++ b/da_DK.ISO8859-1/share/xml/entities.ent
@@ -7,9 +7,6 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
 	"translators.ent">
 %translators;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK"
 	"mailing-lists.ent">
 %mailing-lists;
-- 
cgit v1.2.3