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.
---
 pt_BR.ISO8859-1/share/xml/catalog.xml  | 6 +++---
 pt_BR.ISO8859-1/share/xml/entities.ent | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'pt_BR.ISO8859-1/share')

diff --git a/pt_BR.ISO8859-1/share/xml/catalog.xml b/pt_BR.ISO8859-1/share/xml/catalog.xml
index d44a80dbca..006a994266 100644
--- a/pt_BR.ISO8859-1/share/xml/catalog.xml
+++ b/pt_BR.ISO8859-1/share/xml/catalog.xml
@@ -10,13 +10,13 @@
   <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//PT"
         uri="translators.ent" />
-  <public
-        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
 </catalog>
diff --git a/pt_BR.ISO8859-1/share/xml/entities.ent b/pt_BR.ISO8859-1/share/xml/entities.ent
index 6776d9dcae..6d0ae757db 100644
--- a/pt_BR.ISO8859-1/share/xml/entities.ent
+++ b/pt_BR.ISO8859-1/share/xml/entities.ent
@@ -10,9 +10,6 @@
 <!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
 	"words.ent">
 %words;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
-	"l10n.ent">
-%l10n;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
 	"mailing-lists.ent">
 %mailing-lists;
-- 
cgit v1.2.3