os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Define l10n.ent as an entity in localized directories and make them be

Browse source 
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   as   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   still in the final XML output.

- Make XML catalog resolution consistent for l10n.ent.  This should be
  revisited for the others later.
This commit is contained in:
Hiroki Sato 2013-11-11 06:52:59 +00:00
parent 13ebce2b52
commit db0b08db8f
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=43161
44 changed files with 114 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

2
share/mk/doc.xml.mk
View file

@ -111,7 +111,7 @@ ${XML_MIRRORS}: ${XML_MIRRORS_MASTER} \
--param 'transtable-word-group' "'country'" \
--param 'transtable-sortkey.xml' "'$@.sort'" \
${XSL_TRANSTABLE} ${XML_MIRRORS_MASTER}
${RM} -f $@.sort $@.sort.tmp
# ${RM} -f $@.sort $@.sort.tmp
.if ${LANGCODE} != .
CLEANFILES+= ${XML_MIRRORS}
CLEANFILES+= ${XML_MIRRORS}.sort

4
share/xml/catalog.xml
View file

@ -35,10 +35,10 @@
publicId="-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
uri="common.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
uri="l10n-common.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
uri="l10n.ent" />
<public
publicId="-//FreeBSD//DOCUMENT FreeBSD Language Neutral XSLT Library//EN"

23
share/xml/freebsd50.dtd
View file

@ -1,11 +1,24 @@
<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
"docbook50.dtd">
%orig-docbook;
<!-- $FreeBSD$ -->
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
"http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
%l10n;
<!ENTITY % l10n.common PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
"http://www.FreeBSD.org/XML/www/lang/share/xml/l10n-common.ent">
%l10n.common;
<!ENTITY % iso8879.ent PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
"http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
%iso8879.ent;
<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
"docbook50.dtd">
%orig-docbook;
<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent">
%orig-entities;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
"authors.ent">
%authors;
@ -13,7 +26,3 @@
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
"man-refs.ent">
%man;
<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent">
%orig-entities;

18
share/xml/l10n-common.ent Normal file
View file

@ -0,0 +1,18 @@
<!-- -*- sgml -*-
DocBook Language Neutral Entities for Localization.
An entity here can be overridden with the localized version
when the entity is defined in
PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
in language-specific directory. Otherwise the following entity
set is used by default.
$FreeBSD$
-->
<!-- docformat navi -->
<!ENTITY docnavi.single-html "Single HTML">
<!ENTITY docnavi.split-html "Split HTML">
<!-- charset for HTML output -->
<!ENTITY doc.html.charset "iso-8859-1">

13
share/xml/l10n.ent
View file

@ -1,18 +1,13 @@
<!-- -*- sgml -*-
DocBook Language Neutral Entities for Localization.
Language Specific Entities for Localization.
An entity here can be overridden with the localized version
when the entity is defined in
PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
in language-specific directory. Otherwise the following entity
set is used by default.
This file should be empty.
$FreeBSD$
-->
<!-- docformat navi -->
<!ENTITY docnavi.single-html "Single HTML">
<!ENTITY docnavi.split-html "Split HTML">
<!-- charset for HTML output -->
<!ENTITY doc.html.charset "iso-8859-1">

6
share/xml/xhtml10-freebsd.dtd
View file

@ -7,10 +7,14 @@
"http://www.FreeBSD.org/XML/cwd/autogen.ent">
%autogen.ent;
<!ENTITY % l10n.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
<!ENTITY % l10n.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
"http://www.FreeBSD.org/XML/doc/share/xml/l10n.ent">
%l10n.ent;
<!ENTITY % l10n.common.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
"http://www.FreeBSD.org/XML/doc/share/xml/l10n-common.ent">
%l10n.common.ent;
<!ENTITY % common.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
"http://www.FreeBSD.org/XML/doc/share/xml/common.ent">
%common.ent;

8
share/xml/xslt10-freebsd.dtd
View file

@ -22,13 +22,13 @@
%autogen.ent;
<!ENTITY % l10n.ent
PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
"http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
"http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
%l10n.ent;
<!ENTITY % l10n-common.ent
PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
"http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
PUBLIC "-//FreeBSD//ENTITIES FreeBSD FreeBSD Language Specific Common Entities//EN"
"http://www.FreeBSD.org/XML/www/share/xml/l10n-common.ent">
%l10n-common.ent;
<!ENTITY % common.ent