pr guidelines, DES's name...

[Hiroki Sato]

Ceri Davies <ceri at submonkey.net> wrote
  in <20041104200223.GO57641 at submonkey.net>:

ceri> On Thu, Nov 04, 2004 at 11:54:18AM +0200, Giorgos Keramidas wrote:
ceri> > You're right, of course.  We already have SP_ENCODING, but I don't know
ceri> > how to read its value from `freebsd.dsl'.  My DSSSL-foo is, I'm afraid,
ceri> > really minimal.
ceri> 
ceri> It's not reading the value from SP_ENCODING, but we already have a
ceri> doc.langcode entity in urls.ent, which could be overridden by
ceri> translations easily enough, so your patch becomes:

 I think that does not work properly because the charset in the META tag,
 SP_ENCODING, and doc.langcode can be different from each other.
 For English they are iso-8859-1, iso-8859-1, and en_US.ISO8859-1,
 for Japanese, euc-jp, euc-jp, and ja_JP.eucJP, respectively.

 What do you think about the attached patch?  I prefer
 to use l10n.ent for this sort of problems.

-- 
| Hiroki SATO
-------------- next part --------------
Index: ja_JP.eucJP/share/sgml/l10n.ent
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/share/sgml/l10n.ent,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 l10n.ent
--- ja_JP.eucJP/share/sgml/l10n.ent	26 Jul 2004 15:28:32 -0000	1.2
+++ ja_JP.eucJP/share/sgml/l10n.ent	5 Nov 2004 11:22:10 -0000
@@ -10,3 +10,6 @@
 
 <!ENTITY doc.langcode.ja "ja_JP.eucJP">
 <!ENTITY doc.langcode    "&doc.langcode.ja;">
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "euc-jp">
Index: ru_RU.KOI8-R/share/sgml/l10n.ent
===================================================================
RCS file: /home/ncvs/doc/ru_RU.KOI8-R/share/sgml/l10n.ent,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 l10n.ent
--- ru_RU.KOI8-R/share/sgml/l10n.ent	10 Aug 2004 10:41:22 -0000	1.2
+++ ru_RU.KOI8-R/share/sgml/l10n.ent	5 Nov 2004 11:24:57 -0000
@@ -17,3 +17,6 @@
 
 <!ENTITY doc.langcode.ru "ru_RU.KOI8-R">
 <!ENTITY doc.langcode    "&doc.langcode.ru;">
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "koi8-r">
Index: zh_CN.GB2312/share/sgml/l10n.ent
===================================================================
RCS file: /home/ncvs/doc/zh_CN.GB2312/share/sgml/l10n.ent,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 l10n.ent
--- zh_CN.GB2312/share/sgml/l10n.ent	10 Sep 2004 16:13:15 -0000	1.1
+++ zh_CN.GB2312/share/sgml/l10n.ent	5 Nov 2004 11:26:35 -0000
@@ -7,3 +7,6 @@
 <!-- docformat navi -->
 <!ENTITY docnavi.single-html "????">
 <!ENTITY docnavi.split-html  "????">
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "GB2312">
Index: share/sgml/freebsd.dsl
===================================================================
RCS file: /home/ncvs/doc/share/sgml/freebsd.dsl,v
retrieving revision 1.83
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.83 freebsd.dsl
--- share/sgml/freebsd.dsl	29 Oct 2004 15:36:27 -0000	1.83
+++ share/sgml/freebsd.dsl	5 Nov 2004 11:17:22 -0000
@@ -37,6 +37,9 @@
 
         (define %hyphenation% #f)        <!-- Silence a warning -->
 
+        (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type")
+          ("CONTENT" "text/html; charset=\"&doc.html.charset;\""))))
+
         (define %gentext-nav-use-tables%
           ;; Use tables to build the navigation headers and footers?
           #t)
Index: share/sgml/l10n.ent
===================================================================
RCS file: /home/ncvs/doc/share/sgml/l10n.ent,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 l10n.ent
--- share/sgml/l10n.ent	19 Apr 2003 11:39:30 -0000	1.1
+++ share/sgml/l10n.ent	5 Nov 2004 11:10:51 -0000
@@ -13,3 +13,6 @@
 <!-- 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">
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-doc/attachments/20041105/91a3773b/attachment.sig>