Add a <meta> tag into %html-header-tags% to explicitly declare

the charset of HTML files generated from an DocBook/SGML file.

Note to translators:

  While some of the translations already use this tweak
  in their localized freebsd.dsl, it is no longer needed so
  removed and the necessary changes have been added instead.
  After this commit, please make sure to define
  &doc.html.charset; in <langcode>/share/sgml/l10n.ent.
  If not defined, iso-8859-1 is used by default and it can
  break the translation.

Discussed on:	-doc

el_GR.ISO8859-7/share/sgml/catalog

@@ -18,3 +18,6 @@ PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL"
         "trademarks.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+        "l10n.ent"

el_GR.ISO8859-7/share/sgml/freebsd.dsl

@@ -11,20 +11,10 @@
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <![ %lang.el.dsssl; [
-        (define %gentext-language% "el")
-      ]]>
-
       <!-- HTML only .................................................... -->
 
       <![ %output.html; [
 
-        <!-- Add a header with the correct character-set/encoding -->
-        (define %html-header-tags%
-	  '(("META" ("HTTP-EQUIV" "Content-Type")
-		    ("CONTENT" "text/html; charset=ISO-8859-7"))))
-
-
         <!-- Generate links to HTML man pages -->
         (define %refentry-xref-link% #t)
 

el_GR.ISO8859-7/share/sgml/l10n.ent

@@ -0,0 +1,4 @@
+<!-- $FreeBSD$ -->
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "iso-8859-7">

ja_JP.eucJP/share/sgml/freebsd.dsl

@@ -1,18 +1,13 @@
-<!-- $FreeBSD: doc/ja_JP.eucJP/share/sgml/freebsd.dsl,v 1.2 2000/03/27 04:38:47 kuriyama Exp $ -->
+<!-- $FreeBSD$ -->
 
 <!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.ja.dsssl "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <![ %lang.ja.dsssl; [
-	(define %gentext-language% "ja")
-      ]]>
 
-      (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=EUC-JP")))) 
     </style-specification-body>
   </style-specification>
 

ja_JP.eucJP/share/sgml/l10n.ent

@@ -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">

pl_PL.ISO8859-2/share/sgml/catalog

@@ -9,3 +9,6 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL"
 	"mailing-lists.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+        "l10n.ent"

pl_PL.ISO8859-2/share/sgml/freebsd.dsl

@@ -244,9 +244,6 @@
           (list (normalize "sect4")             "  ")
           (list (normalize "sect5")             "  ")
           ))
-
-	(define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=iso-8859-2"))))
-
     </style-specification-body>
   </style-specification>
 

pl_PL.ISO8859-2/share/sgml/l10n.ent

@@ -0,0 +1,4 @@
+<!-- $FreeBSD$ -->
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "iso-8859-2">

ru_RU.KOI8-R/share/sgml/freebsd.dsl

@@ -30,8 +30,6 @@
         (define %gentext-language% "ru")
       ]]>
 
-      (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=koi8-r")))) 
-
         <!-- Generate links to HTML man pages -->
         (define %refentry-xref-link% #t)
 

ru_RU.KOI8-R/share/sgml/l10n.ent

@@ -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">

share/sgml/freebsd.dsl

@@ -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)

share/sgml/l10n.ent

@@ -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">

sr_YU.ISO8859-2/share/sgml/catalog

@@ -1,9 +1,11 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $FreeBSD: doc/sr_YU.ISO_8859-2/share/sgml/catalog,v 1.1 2000/09/28 23:29:45 nbm Exp $
+  -- $FreeBSD$
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+        "l10n.ent"

sr_YU.ISO8859-2/share/sgml/freebsd.dsl

@@ -45,8 +45,6 @@
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
       ]]>
-
-       (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=iso-8859-2")))) 
     </style-specification-body>
   </style-specification>
 

sr_YU.ISO8859-2/share/sgml/l10n.ent

@@ -0,0 +1,4 @@
+<!-- $FreeBSD$ -->
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "iso-8859-2">

zh_CN.GB2312/share/sgml/freebsd.dsl

@@ -18,7 +18,6 @@
 	    (literal "“")
 	    (process-children)
 	    (literal "”")))
-      (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=GB2312")))) 
     </style-specification-body>
   </style-specification>
 

zh_CN.GB2312/share/sgml/l10n.ent

@@ -7,3 +7,6 @@
 <!-- docformat navi -->
 <!ENTITY docnavi.single-html "完整文件">
 <!ENTITY docnavi.split-html  "章节模式">
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "gb2312">