3 files changed, 307 insertions, 43 deletions

diff --git a/zh_CN.GB2312/share/sgml/dbl1zhcn.ent b/zh_CN.GB2312/share/sgml/dbl1zhcn.ent
new file mode 100644
index 0000000000..3cd9ad3559
--- /dev/null
+++ b/zh_CN.GB2312/share/sgml/dbl1zhcn.ent
@@ -0,0 +1,170 @@
+<!-- $FreeBSD$ -->
+<?xml version="1.0" encoding="US-ASCII"?>
+<!-- The translation override for docbook stock file -->
+
+<!ENTITY Abstract		"\U-6458;\U-8981;">
+<!ENTITY abstract		"\U-6458;\U-8981;">
+<!ENTITY Answer			"\U-7B54;\U-FF1A;">
+<!ENTITY answer			"\U-7B54;\U-FF1A;">
+<!ENTITY Appendix		"\U-9644;\U-5F55;">
+<!ENTITY appendix		"\U-9644;\U-5F55;">
+<!ENTITY Article		"\U-6587;\U-7AE0;">
+<!ENTITY article		"\U-6587;\U-7AE0;">
+<!ENTITY Bibliography		"\U-53C2;\U-8003;\U-4E66;\U-76EE;">
+<!ENTITY bibliography		"\U-53C2;\U-8003;\U-4E66;\U-76EE;">
+<!ENTITY Book			"\U-4E66;">
+<!ENTITY book			"\U-4E66;">
+<!ENTITY CAUTION		"\U-5C0F;\U-5FC3;">
+<!ENTITY Caution		"\U-5C0F;\U-5FC3;">
+<!ENTITY caution		"\U-5C0F;\U-5FC3;">
+<!ENTITY Chapter		"\U-7AE0;">
+<!ENTITY chapter		"\U-7AE0;">
+<!ENTITY Colophon		"Colophon">
+<!ENTITY colophon		"Colophon">
+<!ENTITY Copyright		"\U-7248;\U-6743;">
+<!ENTITY copyright		"\U-7248;\U-6743;">
+<!ENTITY Dedication		"\U-9898;\U-8BCD;">
+<!ENTITY dedication		"\U-9898;\U-8BCD;">
+<!ENTITY Edition		"\U-7248;">
+<!ENTITY edition		"\U-7248;">
+<!ENTITY Equation		"\U-516C;\U-5F0F;">
+<!ENTITY equation		"\U-516C;\U-5F0F;">
+<!ENTITY Example		"\U-4F8B;">
+<!ENTITY example		"\U-4F8B;">
+<!ENTITY Figure			"\U-56FE;">
+<!ENTITY figure			"\U-56FE;">
+<!ENTITY Glossary		"\U-672F;\U-8BED;\U-8868;">
+<!ENTITY glossary		"\U-672F;\U-8BED;\U-8868;">
+<!ENTITY GlossSee		"\U-89C1;">
+<!ENTITY glosssee		"\U-89C1;">
+<!ENTITY GlossSeeAlso		"\U-53C2;\U-89C1;">
+<!ENTITY glossseealso		"\U-53C2;\U-89C1;">
+<!ENTITY IMPORTANT		"\U-91CD;\U-8981;">
+<!ENTITY important		"\U-91CD;\U-8981;">
+<!ENTITY Important		"\U-91CD;\U-8981;">
+<!ENTITY Index			"\U-7D22;\U-5F15;">
+<!ENTITY index			"\U-7D22;\U-5F15;">
+<!ENTITY ISBN			"ISBN">
+<!ENTITY isbn			"ISBN">
+<!ENTITY LegalNotice		"\U-6CD5;\U-5F8B;\U-901A;\U-544A;">
+<!ENTITY legalnotice		"\U-6CD5;\U-5F8B;\U-901A;\U-544A;">
+<!ENTITY MsgAud			"\U-53D7;\U-4F17;">
+<!ENTITY msgaud			"\U-53D7;\U-4F17;">
+<!ENTITY MsgLevel		"\U-7EA7;\U-522B;">
+<!ENTITY msglevel		"\U-7EA7;\U-522B;">
+<!ENTITY MsgOrig		"\U-51FA;\U-5904;">
+<!ENTITY msgorig		"\U-51FA;\U-5904;">
+<!ENTITY NOTE			"\U-6CE8;\U-610F;">
+<!ENTITY Note			"\U-6CE8;\U-610F;">
+<!ENTITY note			"\U-6CE8;\U-610F;">
+<!ENTITY numbercn		"\U-7B2C;">
+<!ENTITY Part			"\U-90E8;\U-5206;">
+<!ENTITY part			"\U-90E8;\U-5206;">
+<!ENTITY Preface		"\U-524D;\U-8A00;">
+<!ENTITY preface		"\U-524D;\U-8A00;">
+<!ENTITY Procedure		"\U-8FC7;\U-7A0B;">
+<!ENTITY procedure		"\U-8FC7;\U-7A0B;">
+<!ENTITY ProductionSet		"Production">
+<!ENTITY PubDate		"\U-51FA;\U-7248;\U-65E5;\U-671F;">
+<!ENTITY pubdate		"\U-51FA;\U-7248;\U-65E5;\U-671F;">
+<!ENTITY Published		"\U-51FA;\U-7248;\U-65B9;">
+<!ENTITY published		"\U-51FA;\U-7248;\U-65B9;">
+<!ENTITY Qandadiv		"\U-8D28;\U-4FDD;">
+<!ENTITY qandadiv		"\U-8D28;\U-4FDD;">
+<!ENTITY Question		"\U-95EE;\U-FF1A;">
+<!ENTITY question		"\U-95EE;\U-FF1A;">
+<!ENTITY RefEntry		"">
+<!ENTITY refentry		"">
+<!ENTITY Reference		"\U-53C2;\U-8003;">
+<!ENTITY reference		"\U-53C2;\U-8003;">
+<!ENTITY RefName		"\U-540D;\U-79F0;">
+<!ENTITY refname		"\U-540D;\U-79F0;">
+<!ENTITY RefSection		"">
+<!ENTITY refsection		"">
+<!ENTITY RefSynopsisDiv		"\U-5927;\U-7EB2;">
+<!ENTITY refsynopsisdiv		"\U-5927;\U-7EB2;">
+<!ENTITY RevHistory		"\U-4FEE;\U-8BA2;\U-5386;\U-53F2;">
+<!ENTITY revhistory		"\U-4FEE;\U-8BA2;\U-5386;\U-53F2;">
+<!ENTITY revision		"\U-4FEE;\U-8BA2;">
+<!ENTITY Revision		"\U-4FEE;\U-8BA2;">
+<!ENTITY sect1			"\U-8282;">
+<!ENTITY sect2			"\U-8282;">
+<!ENTITY sect3			"\U-8282;">
+<!ENTITY sect4			"\U-8282;">
+<!ENTITY sect5			"\U-8282;">
+<!ENTITY section		"\U-8282;">
+<!ENTITY Section		"\U-8282;">
+<!ENTITY see			"\U-89C1;">
+<!ENTITY See			"\U-89C1;">
+<!ENTITY seealso		"\U-53C2;\U-89C1;">
+<!ENTITY Seealso		"\U-53C2;\U-89C1;">
+<!ENTITY SeeAlso		"\U-53C2;\U-89C1;">
+<!ENTITY set			"Set">
+<!ENTITY Set			"Set">
+<!ENTITY setindex		"Set Index">
+<!ENTITY SetIndex		"Set Index">
+<!ENTITY Sidebar		"">
+<!ENTITY sidebar		"sidebar">
+<!ENTITY step			"\U-6B65;\U-9AA4;">
+<!ENTITY Step			"\U-6B65;\U-9AA4;">
+<!ENTITY Table			"\U-8868;">
+<!ENTITY table			"\U-8868;">
+<!ENTITY tip			"\U-63D0;\U-793A;">
+<!ENTITY TIP			"\U-63D0;\U-793A;">
+<!ENTITY Tip			"\U-63D0;\U-793A;">
+<!ENTITY Warning		"\U-8B66;\U-544A;">
+<!ENTITY warning		"\U-8B66;\U-544A;">
+<!ENTITY WARNING		"\U-8B66;\U-544A;">
+<!ENTITY and			"\U-548C;">
+<!ENTITY by			"\U-7531;">
+<!ENTITY called			"\U-79F0;\U-4E3A;">
+<!ENTITY Edited			"\U-7F16;\U-8F91;\U-65F6;\U-95F4;">
+<!ENTITY edited			"\U-7F16;\U-8F91;\U-65F6;\U-95F4;">
+<!ENTITY Editedby		"\U-7F16;\U-8F91;\U-8005;">
+<!ENTITY editedby		"\U-7F16;\U-8F91;\U-8005;">
+<!ENTITY in			"\U-4E8E;">
+<!ENTITY lastlistcomma		"">
+<!ENTITY listcomma		"\U-3001;">
+<!ENTITY nonexistantelement	"\U-4E0D;\U-5B58;\U-5728;\U-7684;\U-5143;\U-7D20;">
+<!ENTITY notes			"\U-5907;\U-6CE8;">
+<!ENTITY Notes			"\U-5907;\U-6CE8;">
+<!ENTITY Pgs			"\U-9875;">
+<!ENTITY pgs			"\U-9875;">
+<!ENTITY Revisedby		"\U-4FEE;\U-8BA2;\U-8005;\U-FF1A;">
+<!ENTITY revisedby		"\U-4FEE;\U-8BA2;\U-8005;\U-FF1A;">
+<!ENTITY TableNotes		"\U-8868;\U-6CE8;">
+<!ENTITY tablenotes		"\U-8868;\U-6CE8;">
+<!ENTITY TableofContents	"\U-76EE;\U-5F55;">
+<!ENTITY tableofcontents	"\U-76EE;\U-5F55;">
+<!ENTITY the			"">
+<!ENTITY unexpectedelementname	"\U-672A;\U-9884;\U-671F;\U-7684;\U-540D;\U-79F0;">
+<!ENTITY unsupported		"\U-4E0D;\U-652F;\U-6301;">
+<!ENTITY xrefto			"xref to">
+<!ENTITY listofequations	"\U-516C;\U-5F0F;\U-6E05;\U-5355;">
+<!ENTITY ListofEquations	"\U-516C;\U-5F0F;\U-6E05;\U-5355;">
+<!ENTITY ListofExamples		"\U-8303;\U-4F8B;\U-6E05;\U-5355;">
+<!ENTITY listofexamples		"\U-8303;\U-4F8B;\U-6E05;\U-5355;">
+<!ENTITY ListofFigures		"\U-63D2;\U-56FE;\U-6E05;\U-5355;">
+<!ENTITY listoffigures		"\U-63D2;\U-56FE;\U-6E05;\U-5355;">
+<!ENTITY ListofProcedures	"\U-8FC7;\U-7A0B;\U-6E05;\U-5355;">
+<!ENTITY listofprocedures	"\U-8FC7;\U-7A0B;\U-6E05;\U-5355;">
+<!ENTITY listoftables		"\U-8868;\U-683C;\U-6E05;\U-5355;">
+<!ENTITY ListofTables		"\U-8868;\U-683C;\U-6E05;\U-5355;">
+<!ENTITY ListofUnknown		"\U-672A;\U-77E5;\U-6E05;\U-5355;">
+<!ENTITY listofunknown		"\U-672A;\U-77E5;\U-6E05;\U-5355;">
+<!ENTITY nav-home		"\U-8D77;\U-59CB;\U-9875;">
+<!ENTITY nav-next		"\U-4E0B;\U-4E00;\U-9875;">
+<!ENTITY nav-next-sibling	"\U-5FEB;\U-8FDB;">
+<!ENTITY nav-prev		"\U-4E0A;\U-4E00;\U-9875;">
+<!ENTITY nav-prev-sibling	"\U-5FEB;\U-9000;">
+<!ENTITY nav-up			"\U-4E0A;\U-4E00;\U-7EA7;">
+<!ENTITY nav-toc		"\U-76EE;\U-5F55;">
+<!ENTITY Draft			"\U-8349;\U-7A3F;">
+<!ENTITY above			"above">
+<!ENTITY below			"below">
+<!ENTITY sectioncalled		"\U-4E00;\U-8282;">
+<!ENTITY lowercase.alpha	"abcdefghijklmnopqrstuvwxyz">
+<!ENTITY uppercase.alpha	"ABCDEFGHIJKLMNOPQRSTUVWXYZ">
+<!ENTITY hyphenation-character "-">
+<!ENTITY hyphenation-push-character-count "2">
+<!ENTITY hyphenation-remain-character-count "2">
diff --git a/zh_CN.GB2312/share/sgml/freebsd.dsl b/zh_CN.GB2312/share/sgml/freebsd.dsl
index e18debc982..583b2f0f13 100644
--- a/zh_CN.GB2312/share/sgml/freebsd.dsl
+++ b/zh_CN.GB2312/share/sgml/freebsd.dsl
@@ -3,6 +3,10 @@
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
 <!ENTITY % lang.zhcn.dsssl "IGNORE">
+<!ENTITY % zhcn.words
+  PUBLIC "-//Norman Walsh//ENTITIES DocBook Stylesheet Localization//ZHCN"
+	 "dbl1zhcn.ent">
+%zhcn.words;
 ]>
 
 <style-sheet>
@@ -13,11 +17,6 @@
       ]]>
 
 	<!-- Convert " ... " to “ ... ” in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "“")
-	    (process-children)
-	    (literal "”")))
 	<!-- Work around the issue that the current DSL doesn't translate -->
 	(define (gentext-en-nav-prev prev)
 	  (make sequence (literal "上一页")))
@@ -29,51 +28,146 @@
 	  (make sequence (literal "首页")))
 	(define (en-xref-strings)
 	  (list (list (normalize "appendix")    (if %chapter-autolabel%
-						    "附录 %n"
-						    "附录 %t"))
+							"附录 %n"
+							"附录 %t"))
 		(list (normalize "article")     (string-append %gentext-en-start-quote%
-							       "%t"
-							       %gentext-en-end-quote%))
-		(list (normalize "bibliography") "%t")
-		(list (normalize "book")        "%t")
+							"%t"
+							%gentext-en-end-quote%))
+		(list (normalize "bibliography")	"%t")
+		(list (normalize "book")		"%t")
 		(list (normalize "chapter")     (if %chapter-autolabel%
-						    "第 %n 章"
-						    "%t 这章"))
-		(list (normalize "equation")    "公式 %n")
-		(list (normalize "example")     "例 %n")
-		(list (normalize "figure")      "图 %n")
-		(list (normalize "glossary")    "%t")
-		(list (normalize "index")       "%t")
-		(list (normalize "listitem")    "%n")
-		(list (normalize "part")        "第 %n 部分")
-		(list (normalize "preface")     "%t")
-		(list (normalize "procedure")   "过程 %n, %t")
-		(list (normalize "reference")   "参考文献 %n, %t")
+							"第 %n 章"
+							"%t 这章"))
+		(list (normalize "equation")		"公式 %n")
+		(list (normalize "example")		"例 %n")
+		(list (normalize "figure")		"图 %n")
+		(list (normalize "glossary")		"%t")
+		(list (normalize "index")		"%t")
+		(list (normalize "listitem")		"%n")
+		(list (normalize "part")		"第 %n 部分")
+		(list (normalize "preface")		"%t")
+		(list (normalize "procedure")		"过程 %n, %t")
+		(list (normalize "reference")		"参考文献 %n, %t")
 		(list (normalize "section")     (if %section-autolabel%
-						    "第 %n 节"
-						    "%t 小节"))
+							"第 %n 节"
+							"%t 小节"))
 		(list (normalize "sect1")       (if %section-autolabel%
-						    "第 %n 节"
-						    "%t 小节"))
+							"第 %n 节"
+							"%t 小节"))
 		(list (normalize "sect2")       (if %section-autolabel%
-						    "第 %n 节"
-						    "%t 小节"))
+							"第 %n 节"
+							"%t 小节"))
 		(list (normalize "sect3")       (if %section-autolabel%
-						    "第 %n 节"
-						    "%t 小节"))
+							"第 %n 节"
+							"%t 小节"))
 		(list (normalize "sect4")       (if %section-autolabel%
-						    "第 %n 节"
-						    "%t 小节"))
+							"第 %n 节"
+							"%t 小节"))
 		(list (normalize "sect5")       (if %section-autolabel%
-						    "第 %n 节"
-						    "%t 小节"))
+							"第 %n 节"
+							"%t 小节"))
 		(list (normalize "simplesect")  (if %section-autolabel%
-						    "第 %n 节"
-						    "%t 小节"))
-		(list (normalize "sidebar")     "提示 %t")
-		(list (normalize "step")        "第 %n 步")
-		(list (normalize "table")       "表 %n")))
-      (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=GB2312")))) 
+							"第 %n 节"
+							"%t 小节"))
+		(list (normalize "sidebar")		"提示 %t")
+		(list (normalize "step")		"第 %n 步")
+		(list (normalize "table")		"表 %n")))
+	(define (en-element-name)
+	  (list (list (normalize "abstract")		"&Abstract;")
+		(list (normalize "answer")		"&Answer;")
+		(list (normalize "appendix")		"&Appendix;")
+		(list (normalize "article")		"&Article;")
+		(list (normalize "bibliography")	"&Bibliography;")
+		(list (normalize "book")		"&Book;")
+		(list (normalize "calloutlist")	"")
+		(list (normalize "caution")		"&Caution;")
+		(list (normalize "chapter")		"&numbercn;")
+		(list (normalize "copyright")		"&Copyright;")
+		(list (normalize "dedication")		"&Dedication;")
+		(list (normalize "edition")		"&Edition;")
+		(list (normalize "equation")		"&Equation;")
+		(list (normalize "example")		"&Example;")
+		(list (normalize "figure")		"&Figure;")
+		(list (normalize "glossary")		"&Glossary;")
+		(list (normalize "glosssee")		"&GlossSee;")
+		(list (normalize "glossseealso")	"&GlossSeeAlso;")
+		(list (normalize "important")		"&Important;")
+		(list (normalize "index")		"&Index;")
+		(list (normalize "colophon")		"&Colophon;")
+		(list (normalize "setindex")		"&SetIndex;")
+		(list (normalize "isbn")		"&isbn;")
+		(list (normalize "legalnotice")		"&LegalNotice;")
+		(list (normalize "msgaud")		"&MsgAud;")
+		(list (normalize "msglevel")		"&MsgLevel;")
+		(list (normalize "msgorig")		"&MsgOrig;")
+		(list (normalize "note")		"&Note;")
+		(list (normalize "part")		"&Part;")
+		(list (normalize "preface")		"&Preface;")
+		(list (normalize "procedure")		"&Procedure;")
+		(list (normalize "pubdate")		"&Published;")
+		(list (normalize "question")		"&Question;")
+		(list (normalize "refentry")		"&RefEntry;")
+		(list (normalize "reference")		"&Reference;")
+		(list (normalize "refname")		"&RefName;")
+		(list (normalize "revhistory")		"&RevHistory;")
+		(list (normalize "refsect1")		"&RefSection;")
+		(list (normalize "refsect2")		"&RefSection;")
+		(list (normalize "refsect3")		"&RefSection;")
+		(list (normalize "refsynopsisdiv")	"&RefSynopsisDiv;")
+		(list (normalize "revision")		"&Revision;")
+		(list (normalize "sect1")		"&numbercn;")
+		(list (normalize "sect2")		"&numbercn;")
+		(list (normalize "sect3")		"&numbercn;")
+		(list (normalize "sect4")		"&numbercn;")
+		(list (normalize "sect5")		"&numbercn;")
+		(list (normalize "section")		"&numbercn;")
+		(list (normalize "simplesect")		"&numbercn;")
+		(list (normalize "seeie")		"&See;")
+		(list (normalize "seealsoie")		"&Seealso;")
+		(list (normalize "set")			"&Set;")
+		(list (normalize "sidebar")		"&Sidebar;")
+		(list (normalize "step")		"&step;")
+		(list (normalize "table")		"&Table;")
+		(list (normalize "tip")			"&Tip;")
+		(list (normalize "toc")			"&TableofContents;")
+		(list (normalize "warning")		"&Warning;")))
+	(define (en-label-title-sep)
+	  (list (list (normalize "abstract")		": ")
+		(list (normalize "answer")		" ")
+		(list (normalize "appendix")		". ")
+		(list (normalize "caution")		"")
+		(list (normalize "chapter")		" &Chapter;. ")
+		(list (normalize "equation")		". ")
+		(list (normalize "example")		". ")
+		(list (normalize "figure")		". ")
+		(list (normalize "footnote")		". ")
+		(list (normalize "glosssee")		": ")
+		(list (normalize "glossseealso")	": ")
+		(list (normalize "important")		": ")
+		(list (normalize "note")		": ")
+		(list (normalize "orderedlist")		". ")
+		(list (normalize "part")		". ")
+		(list (normalize "procedure")		". ")
+		(list (normalize "prefix")		". ")
+		(list (normalize "question")		" ")
+		(list (normalize "refentry")		"")
+		(list (normalize "reference")		". ")
+		(list (normalize "refsect1")		". ")
+		(list (normalize "refsect2")		". ")
+		(list (normalize "refsect3")		". ")
+		(list (normalize "sect1")		" &Section;. ")
+		(list (normalize "sect2")		" &Section;. ")
+		(list (normalize "sect3")		" &Section;. ")
+		(list (normalize "sect4")		" &Section;. ")
+		(list (normalize "sect5")		" &Section;. ")
+		(list (normalize "section")		" &Section;. ")
+		(list (normalize "simplesect")		" &Section;. ")
+		(list (normalize "seeie")		" ")
+		(list (normalize "seealsoie")		" ")
+		(list (normalize "step")		". ")
+		(list (normalize "table")		". ")
+		(list (normalize "tip")			": ")
+		(list (normalize "warning")		": ")))
     </style-specification-body>
   </style-specification>
 
diff --git a/zh_CN.GB2312/share/sgml/l10n.ent b/zh_CN.GB2312/share/sgml/l10n.ent
index 13dd0136e8..aa7b1477e0 100644
--- a/zh_CN.GB2312/share/sgml/l10n.ent
+++ b/zh_CN.GB2312/share/sgml/l10n.ent
@@ -9,5 +9,5 @@
 <!ENTITY docnavi.single-html "完整文件">
 <!ENTITY docnavi.split-html  "章节模式">
 
-<!ENTITY doc.langcode.en "zh_CN.GB2312">
-<!ENTITY doc.langcode    "&doc.langcode.en;">
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "gb2312">