tex4ht r133: omit spurious ; from \textregistered, also incorporate long-ago fix for \H{O}

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

2 files changed, 13 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index ae151fc6585..be28b6c7224 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,5 +1,5 @@
 % html4.4ht (2013-08-07-08:10), generated from tex4ht-html4.tex
-% Copyright (C) 2009-2010 TeX Users Group
+% Copyright (C) 2009-2015 TeX Users Group
 % Copyright (C) 1997-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -16,7 +16,8 @@
 % is the TeX4ht Project <http://tug.org/tex4ht>.
 %
 % If you modify this program, changing the
-% version identification would be appreciated.\immediate\write-1{version 2013-08-07-08:10}
+% version identification would be appreciated.
+\immediate\write-1{version 2015-01-20-08:10}
 
 \exit:ifnot{8859-6,% 
 CJK,% 
@@ -3220,7 +3221,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
        to \string\Configure{HColWidth}{\string\HCode
        { style="width:\string\HColWidth"}}}
 \fi
-\def\:tempc{\special{t4ht@+\string&{35}xAE{59}}x;}
+\def\:tempc{\special{t4ht@+\string&{35}xAE{59}}x}
 \HLet\textregistered\:tempc
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht
index ae3c14cbd29..f17afb93a9a 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht
@@ -1,4 +1,5 @@
 % unicode.4ht (2010-12-18-17:40), generated from tex4ht-unicode.tex
+% Copyright (C) 2009-2015 TeX Users Group
 % Copyright (C) 1998-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -16,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2010-12-18-17:40}
+\immediate\write-1{version 2015-01-20-08:10}
 
 \exit:ifnot{8859-6,% 
 SIunits,% 
@@ -246,7 +247,7 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{}{#1}}     {\b:accents{udot}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname OT1\string\H\endcsname}%
-   \csname OT1\string\H\endcsname{o{0151}O{0151}U{0170}u{0171}%
+   \csname OT1\string\H\endcsname{o{0151}O{0150}U{0170}u{0171}%
 {}{}}
    {\a:accents{}{#1}}  {\b:accents{Huml}{#1}{#2}}
 \Configure{accent}\dot\dot{C{010A}c{010B}E{0116}e{0117}G{0120}g{0121}%
@@ -412,7 +413,7 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{}{#1}}     {\b:accents{udot}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\H\endcsname}%
-   \csname T1\string\H\endcsname{o{0151}O{0151}U{0170}u{0171}%
+   \csname T1\string\H\endcsname{o{0151}O{0150}U{0170}u{0171}%
 {}{}}
    {\a:accents{}{#1}}  {\b:accents{Huml}{#1}{#2}}
 \expand:after{\Configure{accent}}\csname T1\string\.\expandafter\endcsname
@@ -463,7 +464,7 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}%
   {\x:unicode{2160}}{\x:unicode{2164}}{\x:unicode{2169}}
   {\x:unicode{216C}}{\x:unicode{216D}}{\x:unicode{216E}}
   {\x:unicode{216F}}
-\def\:tempc{\special{t4ht@+\string&{35}xAE{59}}x;}
+\def\:tempc{\special{t4ht@+\string&{35}xAE{59}}x}
 \HLet\textregistered\:tempc
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -893,7 +894,7 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{}{#1}}     {\b:accents{udot}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname OT1\string\H\endcsname}%
-   \csname OT1\string\H\endcsname{o{0151}O{0151}U{0170}u{0171}%
+   \csname OT1\string\H\endcsname{o{0151}O{0150}U{0170}u{0171}%
 {}{}}
    {\a:accents{}{#1}}  {\b:accents{Huml}{#1}{#2}}
 \Configure{accent}\dot\dot{C{010A}c{010B}E{0116}e{0117}G{0120}g{0121}%
@@ -1548,7 +1549,7 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{}{#1}}     {\b:accents{udot}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname OT1\string\H\endcsname}%
-   \csname OT1\string\H\endcsname{o{0151}O{0151}U{0170}u{0171}%
+   \csname OT1\string\H\endcsname{o{0151}O{0150}U{0170}u{0171}%
 {}{}}
    {\a:accents{}{#1}}  {\b:accents{Huml}{#1}{#2}}
 \Configure{accent}\dot\dot{C{010A}c{010B}E{0116}e{0117}G{0120}g{0121}%
@@ -1801,7 +1802,7 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{}{#1}}     {\b:accents{udot}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname OT1\string\H\endcsname}%
-   \csname OT1\string\H\endcsname{o{0151}O{0151}U{0170}u{0171}%
+   \csname OT1\string\H\endcsname{o{0151}O{0150}U{0170}u{0171}%
 {}{}}
    {\a:accents{}{#1}}  {\b:accents{Huml}{#1}{#2}}
 \Configure{accent}\dot\dot{C{010A}c{010B}E{0116}e{0117}G{0120}g{0121}%
@@ -1985,7 +1986,7 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{}{#1}}     {\b:accents{udot}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname OT1\string\H\endcsname}%
-   \csname OT1\string\H\endcsname{o{0151}O{0151}U{0170}u{0171}%
+   \csname OT1\string\H\endcsname{o{0151}O{0150}U{0170}u{0171}%
 {}{}}
    {\a:accents{}{#1}}  {\b:accents{Huml}{#1}{#2}}
 \Configure{accent}\dot\dot{C{010A}c{010B}E{0116}e{0117}G{0120}g{0121}%