charset (no) override for html4; alltt/fancyvrb monospace; tex4ht r749-751

git-svn-id: svn://tug.org/texlive/trunk@55714 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 109 insertions, 41 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index ea36fd0df5a..587139aab21 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,4 +1,4 @@
-% html4.4ht (2020-05-27-14:15), generated from tex4ht-html4.tex
+% html4.4ht (2020-06-30-14:08), generated from tex4ht-html4.tex
 % Copyright 2009-2020 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2020-05-27-14:15}
+\immediate\write-1{version 2020-06-30-14:08}
 
 \exit:ifnot{8859-6,% 
 CJK,% 
@@ -905,6 +905,7 @@ switches of tex4ht.c)
 
    \:CheckOption{uni-html4} \if:Option
    \def\A:charset{charset=utf-8}
+   \def\a:charset{charset=utf-8}
 \else
    \def\A:charset{charset=iso-8859-1}
 \fi
@@ -19475,9 +19476,10 @@ Y{0178}\i{00EF}%
 \def\a:temp#1#2#3{%
    \ifOption{charset=#2}{\def\a:charset{charset=#2}}{}%
    \def\:tempa{#1}\ifx \languagename\:tempa
-      \def\A:charset{#2}\ifx \A:charset\empty\else
-         \def\A:charset{charset=#2}%
-      \fi
+      \ifx\A:charset\empty%
+      \def\A:charset{#2}\ifx \A:charset\empty\else%
+         \def\A:charset{charset=#2}%%
+      \fi\fi%
       \if !#3!\else
          \Configure{@HTML}{%
             \iflanguage{#1}{xml:lang="#3" }{}%
@@ -20485,7 +20487,9 @@ Y{0178}\i{00EF}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{latin2}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-2}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-2}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -28581,9 +28585,9 @@ Y{0178}\i{00EF}%
    {\EndP\HCode{</div>}}
    {\gHAdvance\fancyvrb:cnt by 1
     \ifnum \fancyvrb:cnt>1
-    \HCode{<br class="fancyvrb" />}\fi} {}
+    \HCode{<br class="fancyvrb" />\Hnewline}\fi} {}
    {}{}
-\Css{P.fancyvrb {white-space: nowrap; margin:0em;}}
+\Css{div.fancyvrb {white-space: nowrap; margin:0em;font-family:monospace,monospace;}}
 \Configure{fancyvrbcolor}
   {\Css{div\#fancyvrb\fancyvrbNo { color: \HColor; }}}
   {\Css{div\#fancyvrb\fancyvrbNo { background-color: \HColor;}}}
@@ -29087,7 +29091,7 @@ Y{0178}\i{00EF}%
    {\IgnorePar\EndP\HCode{<div class="alltt">}}
    {\IgnorePar\EndP\HCode{</div>}} {}{}
 \Css{.alltt P { margin-bottom : 0em; margin-top : 0em; }}
-\Css{.alltt { margin-bottom : 1em; margin-top : 1em; }}
+\Css{.alltt { margin-bottom : 1em; margin-top : 1em; font-family:monospace,monospace; }}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -30333,7 +30337,9 @@ Y{0178}\i{00EF}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{frenchb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 \Configure{@TITLE}{\Configure{frenchb-thinspace}{}{}}
 \Configure{system-nbsp}
    {\ht:special{t4ht@[unhskip}}
@@ -34608,7 +34614,9 @@ description">}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{germanb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -34618,7 +34626,9 @@ description">}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ngermanb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -38476,7 +38486,9 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{norsk}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -38487,7 +38499,9 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{polish}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-2}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-2}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -38497,7 +38511,9 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{polski}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-2}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-2}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -38507,7 +38523,9 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{portuges}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -38739,7 +38757,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{scottish}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -38749,7 +38769,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{slovak}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-2}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-2}
+\fi
 \:CheckOption{new-accents}     \if:Option \else
    \expand:after{\Configure{accent}}\csname T1\string\`\expandafter\endcsname
    \csname T1\string\`\endcsname{A{00C0}E{00C8}I{00CC}N{01F8}O{00D2}U{00D9}W{1E80}%
@@ -38947,7 +38969,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{slovene}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-2}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-2}
+\fi
 \:CheckOption{new-accents}     \if:Option \else
    \expand:after{\Configure{accent}}\csname T1\string\`\expandafter\endcsname
    \csname T1\string\`\endcsname{A{00C0}E{00C8}I{00CC}N{01F8}O{00D2}U{00D9}W{1E80}%
@@ -39146,7 +39170,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{spanish}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 \Configure{es@accents}{\es:accents}{}
 \def\es:accents#1\b:es@accents{\HCode{&\#x#1;}}
 \Configure{guillemotleft}{\HCode{&\#x00AB;}}
@@ -39188,7 +39214,9 @@ Y{1EF8}y{1EF9}\i{0129}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{swedish}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39198,7 +39226,9 @@ Y{1EF8}y{1EF9}\i{0129}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{turkish}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-9}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-9}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39208,7 +39238,9 @@ Y{1EF8}y{1EF9}\i{0129}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ukraineb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-5}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-5}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39219,7 +39251,9 @@ Y{1EF8}y{1EF9}\i{0129}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{usorbian}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-2}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-2}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39229,7 +39263,9 @@ Y{1EF8}y{1EF9}\i{0129}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{welsh}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39239,7 +39275,9 @@ Y{1EF8}y{1EF9}\i{0129}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{hebrew}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-8}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-8}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39249,7 +39287,9 @@ Y{1EF8}y{1EF9}\i{0129}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{austrian}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39260,7 +39300,9 @@ Y{1EF8}y{1EF9}\i{0129}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{catalan}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39270,7 +39312,9 @@ Y{1EF8}y{1EF9}\i{0129}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{croatian}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-2}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-2}
+\fi
 \:CheckOption{new-accents}     \if:Option \else
    \expand:after{\Configure{accent}}\csname T1\string\`\expandafter\endcsname
    \csname T1\string\`\endcsname{A{00C0}E{00C8}I{00CC}N{01F8}O{00D2}U{00D9}W{1E80}%
@@ -39468,7 +39512,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{czech}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-2}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-2}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39478,7 +39524,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{danish}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39489,7 +39537,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{dutch}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39499,7 +39549,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{english}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39509,7 +39561,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{esperant}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-3}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-3}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39519,7 +39573,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{estonian}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-5}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-5}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39530,7 +39586,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{finnish}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39540,7 +39598,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{francais}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39550,7 +39610,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{galician}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-1}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -39560,7 +39622,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{greek}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \def\A:charset{charset=iso-8859-7}
+    \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-7}
+\fi
 \ifOption{charset=iso-8859-7}
    {\expand:after{\Configure{accent}}\csname OT1\string\'\endcsname
    \acute{A{\ht:special{t4ht@+\string&{35}x00C1{59}}A}%
@@ -39590,7 +39654,9 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}%
           use the command line option `charset=iso-8859-7'}}
 \ifOption{sgreek}
   {\:CheckOption{new-accents}     \if:Option \else
-       \def\A:charset{charset=iso-8859-1}
+       \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 \Configure{htf}{254}{+}{<font \Hnewline
    face="}{}{}{}{}{Sgreek">}{</font>}
 \Configure{htf}{252}{+}{<font \Hnewline
@@ -39624,7 +39690,9 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}%
           use the command line option `sgreek'}}
 \ifOption{oldgreek}
   {\:CheckOption{new-accents}     \if:Option \else
-       \def\A:charset{charset=iso-8859-1}
+       \ifx\A:charset\empty
+\def\A:charset{charset=iso-8859-1}
+\fi
 \Configure{htf}{254}{+}{<font \Hnewline
    face="}{}{}{}{}{Greek Old Face">}{</font>}
 \Configure{htf}{252}{+}{<font \Hnewline