tex4ht r270-277

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

4 files changed, 143 insertions, 54 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 6742dd47c34..3a0e0f56bef 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 (2017-03-28-14:49), generated from tex4ht-html4.tex
+% html4.4ht (2017-04-11-16:02), generated from tex4ht-html4.tex
 % Copyright 2009-2017 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 2017-03-28-14:49}
+\immediate\write-1{version 2017-04-11-16:02}
 
 \exit:ifnot{8859-6,% 
 CJK,% 
@@ -1970,15 +1970,25 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{udot}{#1}}     {\b:accents{udot}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname OT1\string\H\endcsname}%
-   \csname OT1\string\H\endcsname{{}{}}
+   \csname OT1\string\H\endcsname{o{0151}O{0150}U{0170}u{0171}%
+{}{}}
    {\a:accents{Huml}{#1}} {\b:accents{Huml}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname OT1\string\b\endcsname}%
-   \csname OT1\string\b\endcsname{{}{}}
+   \csname OT1\string\b\endcsname{B{1E06}b{1E07}%
+D{1E0E}d{1E0F}K{1E34}k{1E35}L{1E3A}l{1E3B}N{1E48}n{1E49}%
+R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}%
+{}{}}
    {\a:accents{b}{#1}}     {\b:accents{b}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname OT1\string\d\endcsname}%
-   \csname OT1\string\d\endcsname{{}{}}
+   \csname OT1\string\d\endcsname{A{1EA0}a{1Ea1}B{1E04}b{1E05}D{1E0C}d{1E0D}%
+E{1EB8}e{1EB9}H{1E24}h{1E25}I{1ECA}i{1ECB}%
+K{1E32}k{1E33}L{1E36}l{1E37}M{1E42}m{1E43}%
+N{1E46}n{1E47}O{1ECC}o{1ECD}R{1E5A}r{1E5B}%
+S{1E62}s{1E63}T{1E6C}t{1E6D}U{1EE4}u{1EE5}%
+V{1E7E}v{1E7F}W{1E88}w{1E89}Y{1EF4}y{1EF5}%
+{}{}}
    {\a:accents{d}{#1}}     {\b:accents{d}{#1}{#2}}
 \expand:after{\Configure{accent}}\csname OT1\string\.\endcsname
    \dot{C{010A}c{010B}E{0116}e{0117}G{0120}g{0121}%
@@ -2079,11 +2089,20 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{Huml}{#1}}{\b:accents{Huml}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\b\endcsname}%
-   \csname T1\string\b\endcsname{{}{}}
+   \csname T1\string\b\endcsname{B{1E06}b{1E07}%
+D{1E0E}d{1E0F}K{1E34}k{1E35}L{1E3A}l{1E3B}N{1E48}n{1E49}%
+R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}%
+{}{}}
    {\a:accents{b}{#1}}     {\b:accents{b}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\d\endcsname}%
-   \csname T1\string\d\endcsname{{}{}}
+   \csname T1\string\d\endcsname{A{1EA0}a{1Ea1}B{1E04}b{1E05}D{1E0C}d{1E0D}%
+E{1EB8}e{1EB9}H{1E24}h{1E25}I{1ECA}i{1ECB}%
+K{1E32}k{1E33}L{1E36}l{1E37}M{1E42}m{1E43}%
+N{1E46}n{1E47}O{1ECC}o{1ECD}R{1E5A}r{1E5B}%
+S{1E62}s{1E63}T{1E6C}t{1E6D}U{1EE4}u{1EE5}%
+V{1E7E}v{1E7F}W{1E88}w{1E89}Y{1EF4}y{1EF5}%
+{}{}}
    {\a:accents{d}{#1}}     {\b:accents{d}{#1}{#2}}
 \expand:after{\Configure{accent}}\csname T1\string\.\expandafter\endcsname
    \csname T1\string\.\endcsname
@@ -3109,15 +3128,25 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{udot}{#1}}     {\b:accents{udot}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\H\endcsname}%
-   \csname T1\string\H\endcsname{{}{}}
+   \csname T1\string\H\endcsname{o{0151}O{0150}U{0170}u{0171}%
+{}{}}
    {\a:accents{Huml}{#1}} {\b:accents{Huml}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\b\endcsname}%
-   \csname T1\string\b\endcsname{{}{}}
+   \csname T1\string\b\endcsname{B{1E06}b{1E07}%
+D{1E0E}d{1E0F}K{1E34}k{1E35}L{1E3A}l{1E3B}N{1E48}n{1E49}%
+R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}%
+{}{}}
    {\a:accents{b}{#1}}     {\b:accents{b}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\d\endcsname}%
-   \csname T1\string\d\endcsname{{}{}}
+   \csname T1\string\d\endcsname{A{1EA0}a{1Ea1}B{1E04}b{1E05}D{1E0C}d{1E0D}%
+E{1EB8}e{1EB9}H{1E24}h{1E25}I{1ECA}i{1ECB}%
+K{1E32}k{1E33}L{1E36}l{1E37}M{1E42}m{1E43}%
+N{1E46}n{1E47}O{1ECC}o{1ECD}R{1E5A}r{1E5B}%
+S{1E62}s{1E63}T{1E6C}t{1E6D}U{1EE4}u{1EE5}%
+V{1E7E}v{1E7F}W{1E88}w{1E89}Y{1EF4}y{1EF5}%
+{}{}}
    {\a:accents{d}{#1}}     {\b:accents{d}{#1}{#2}}
 \expand:after{\Configure{accent}}\csname T1\string\.\expandafter\endcsname
    \csname T1\string\.\endcsname
@@ -11187,9 +11216,8 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
       `graphics-num' or `graphics-'. The `num' should provide
       the density of pixels in the bitmaps (e.g., 110).
    }
-\else
-   \def\int:pt#1.#2!*?: {#1}
 \fi
+\def\int:pt#1.#2!*?: {#1}
 
    \Configure{graphics}
      {\bgroup
@@ -11198,8 +11226,8 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
      {\EndPicture        \ifx\noBoundingBox\UnDefined
           \ifx \gr:density\empty
    \HCode{
-      width="\the\Gin@req@width"
-      height="\the\Gin@req@height"
+      width="\expandafter\int:pt\the\Gin@req@width!*?: "
+      height="\expandafter\int:pt\the\Gin@req@height!*?: "
    }%
 \else
    \bgroup
@@ -11251,8 +11279,8 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}%
 \:CheckOption{Gin-dim} \if:Option
    \Configure{Gin-dim}
      {\ifx\noBoundingBox\UnDefined
-        width="\the\Gin@req@width"
-height="\the\Gin@req@height"
+        width="\expandafter\int:pt\the\Gin@req@width!*?: "
+height="\expandafter\int:pt\the\Gin@req@height!*?: "
 %
       \else
         \ifx \Gin:ewidth\Gin@exclamation \else
@@ -11270,8 +11298,8 @@ height="\the\Gin@req@height"
      {\ifx \Gin:ewidth\Gin@exclamation
          \ifx \Gin:eheight\Gin@exclamation
             \ifx\noBoundingBox\UnDefined
-               width="\the\Gin@req@width"
-height="\the\Gin@req@height"
+               width="\expandafter\int:pt\the\Gin@req@width!*?: "
+height="\expandafter\int:pt\the\Gin@req@height!*?: "
 %
             \fi
          \else
@@ -11291,8 +11319,8 @@ height="\the\Gin@req@height"
        try `Gin-dim+'; neither is recommended}
    \Configure{Gin-dim}
      {\ifx\noBoundingBox\UnDefined
-        width="\the\Gin@req@width"
-height="\the\Gin@req@height"
+        width="\expandafter\int:pt\the\Gin@req@width!*?: "
+height="\expandafter\int:pt\the\Gin@req@height!*?: "
 %
       \fi
      }
@@ -19136,8 +19164,10 @@ s{015B}u{00FA}y{00FD}z{017A}j{FFFD}J{FFDD}\i{00ED}\j{FFFD}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     \ConfigureEnv{aligned}{\m:env{aligned}}{\endm:env}{}{}
 \def\m:env#1{\relax\ifmmode\else\par\fi\:xhtml{\IgnorePar\EndP}%
-  \HCode{<center class="#1"><table class="#1"\Hnewline
-   border="0" cellpadding="0" cellspacing="15"><tr><td>}}
+  \HCode{<div class="center-#1"><table class="#1"\Hnewline
+   border="0" cellpadding="0" cellspacing="15"><tr><td>}
+   \Css{div.center-#1{text-align: center;}}
+ }
 \def\endm:env{\:xhtml{\IgnorePar\EndP}%
    \HCode{</td></tr></table></center>}\IgnorePar
    \ifmmode\else\par\fi}
@@ -19170,8 +19200,8 @@ s{015B}u{00FA}y{00FD}z{017A}j{FFFD}J{FFDD}\i{00ED}\j{FFFD}%
    {\IgnorePar\EndP\HCode{<h1 class="amsspecialheadHead"\a:LRdir>}}
    {\HCode{</h1>}\IgnoreIndent}
 \ConfigureToc{specialhead}
-   {\HCode{<center>}\ignorespaces}{ }
-   {}{\HCode{</center>}}
+   {\HCode{<div class="center">}\ignorespaces}{ }
+   {}{\HCode{</div>}}
 \Configure{head}{}{}
    {\IgnorePar\EndP\HCode{<h2 class="amsheadHead"\a:LRdir>}}
    {\HCode{</h2>}\IgnoreIndent}
@@ -19194,7 +19224,8 @@ s{015B}u{00FA}y{00FD}z{017A}j{FFFD}J{FFDD}\i{00ED}\j{FFFD}%
        \HCode{<table cellpadding="15"><tr><td>}\IgnorePar\par}
    {\IgnorePar\HCode{</td></tr></table>}\IgnorePar\par}
 \Configure{caption}
-   {\:xhtml{\IgnorePar\EndP}\HCode{<center>}}{}{\HCode{</center>}}
+   {\:xhtml{\IgnorePar\EndP}\HCode{<div class="caption">}}{}{\HCode{</div>}}
+\Css{div.caption {text-align:center;}}
 
 \Configure{roster}
     {\IgnorePar\EndP\HCode{<table>}\let\end:item\empty}
@@ -19407,11 +19438,20 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{Huml}{#1}}{\b:accents{Huml}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\b\endcsname}%
-   \csname T1\string\b\endcsname{{}{}}
+   \csname T1\string\b\endcsname{B{1E06}b{1E07}%
+D{1E0E}d{1E0F}K{1E34}k{1E35}L{1E3A}l{1E3B}N{1E48}n{1E49}%
+R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}%
+{}{}}
    {\a:accents{b}{#1}}     {\b:accents{b}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\d\endcsname}%
-   \csname T1\string\d\endcsname{{}{}}
+   \csname T1\string\d\endcsname{A{1EA0}a{1Ea1}B{1E04}b{1E05}D{1E0C}d{1E0D}%
+E{1EB8}e{1EB9}H{1E24}h{1E25}I{1ECA}i{1ECB}%
+K{1E32}k{1E33}L{1E36}l{1E37}M{1E42}m{1E43}%
+N{1E46}n{1E47}O{1ECC}o{1ECD}R{1E5A}r{1E5B}%
+S{1E62}s{1E63}T{1E6C}t{1E6D}U{1EE4}u{1EE5}%
+V{1E7E}v{1E7F}W{1E88}w{1E89}Y{1EF4}y{1EF5}%
+{}{}}
    {\a:accents{d}{#1}}     {\b:accents{d}{#1}{#2}}
 \expand:after{\Configure{accent}}\csname T1\string\.\expandafter\endcsname
    \csname T1\string\.\endcsname
@@ -28922,9 +28962,9 @@ Y{0178}\i{00EF}%
    {\endgroup\IgnorePar\HCode{</div>}}
 \Css{div.title {margin-top: 0.5em;}}
 \Configure{author}
-   {\IgnorePar\EndP\HCode{<br /><center>}\IgnorePar\par}
-   {\IgnorePar\EndP\HCode{</center>}}
-
+   {\IgnorePar\EndP\HCode{<br /><div class="author">}\IgnorePar\par}
+   {\IgnorePar\EndP\HCode{</div>}}
+   \Css{div.author{text-align:center;}}
 
 \Configure{matrix}
    {\EndP\HCode{<center><table\Hnewline
@@ -32555,7 +32595,7 @@ description">}%
 %
 }
 \Css{.caption td.id{font-weight: bold; white-space: nowrap; }}
-\Css{div.cation {text-align:center;}}
+\Css{div.caption {text-align:center;}}
 
 \ConfigureEnv{verse}
    {\ifvmode \IgnorePar\fi\EndP\Tg<div class="verse">}
@@ -32941,7 +32981,7 @@ description">}%
 %
 }
 \Css{.caption td.id{font-weight: bold; white-space: nowrap; }}
-\Css{div.cation {text-align:center;}}
+\Css{div.caption {text-align:center;}}
 
 
 \ConfigureEnv{verse}
@@ -38223,11 +38263,20 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{Huml}{#1}}{\b:accents{Huml}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\b\endcsname}%
-   \csname T1\string\b\endcsname{{}{}}
+   \csname T1\string\b\endcsname{B{1E06}b{1E07}%
+D{1E0E}d{1E0F}K{1E34}k{1E35}L{1E3A}l{1E3B}N{1E48}n{1E49}%
+R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}%
+{}{}}
    {\a:accents{b}{#1}}     {\b:accents{b}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\d\endcsname}%
-   \csname T1\string\d\endcsname{{}{}}
+   \csname T1\string\d\endcsname{A{1EA0}a{1Ea1}B{1E04}b{1E05}D{1E0C}d{1E0D}%
+E{1EB8}e{1EB9}H{1E24}h{1E25}I{1ECA}i{1ECB}%
+K{1E32}k{1E33}L{1E36}l{1E37}M{1E42}m{1E43}%
+N{1E46}n{1E47}O{1ECC}o{1ECD}R{1E5A}r{1E5B}%
+S{1E62}s{1E63}T{1E6C}t{1E6D}U{1EE4}u{1EE5}%
+V{1E7E}v{1E7F}W{1E88}w{1E89}Y{1EF4}y{1EF5}%
+{}{}}
    {\a:accents{d}{#1}}     {\b:accents{d}{#1}{#2}}
 \expand:after{\Configure{accent}}\csname T1\string\.\expandafter\endcsname
    \csname T1\string\.\endcsname
@@ -38446,11 +38495,20 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{Huml}{#1}}{\b:accents{Huml}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\b\endcsname}%
-   \csname T1\string\b\endcsname{{}{}}
+   \csname T1\string\b\endcsname{B{1E06}b{1E07}%
+D{1E0E}d{1E0F}K{1E34}k{1E35}L{1E3A}l{1E3B}N{1E48}n{1E49}%
+R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}%
+{}{}}
    {\a:accents{b}{#1}}     {\b:accents{b}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\d\endcsname}%
-   \csname T1\string\d\endcsname{{}{}}
+   \csname T1\string\d\endcsname{A{1EA0}a{1Ea1}B{1E04}b{1E05}D{1E0C}d{1E0D}%
+E{1EB8}e{1EB9}H{1E24}h{1E25}I{1ECA}i{1ECB}%
+K{1E32}k{1E33}L{1E36}l{1E37}M{1E42}m{1E43}%
+N{1E46}n{1E47}O{1ECC}o{1ECD}R{1E5A}r{1E5B}%
+S{1E62}s{1E63}T{1E6C}t{1E6D}U{1EE4}u{1EE5}%
+V{1E7E}v{1E7F}W{1E88}w{1E89}Y{1EF4}y{1EF5}%
+{}{}}
    {\a:accents{d}{#1}}     {\b:accents{d}{#1}{#2}}
 \expand:after{\Configure{accent}}\csname T1\string\.\expandafter\endcsname
    \csname T1\string\.\endcsname
@@ -38635,11 +38693,20 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{Huml}{#1}}{\b:accents{Huml}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\b\endcsname}%
-   \csname T1\string\b\endcsname{{}{}}
+   \csname T1\string\b\endcsname{B{1E06}b{1E07}%
+D{1E0E}d{1E0F}K{1E34}k{1E35}L{1E3A}l{1E3B}N{1E48}n{1E49}%
+R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}%
+{}{}}
    {\a:accents{b}{#1}}     {\b:accents{b}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\d\endcsname}%
-   \csname T1\string\d\endcsname{{}{}}
+   \csname T1\string\d\endcsname{A{1EA0}a{1Ea1}B{1E04}b{1E05}D{1E0C}d{1E0D}%
+E{1EB8}e{1EB9}H{1E24}h{1E25}I{1ECA}i{1ECB}%
+K{1E32}k{1E33}L{1E36}l{1E37}M{1E42}m{1E43}%
+N{1E46}n{1E47}O{1ECC}o{1ECD}R{1E5A}r{1E5B}%
+S{1E62}s{1E63}T{1E6C}t{1E6D}U{1EE4}u{1EE5}%
+V{1E7E}v{1E7F}W{1E88}w{1E89}Y{1EF4}y{1EF5}%
+{}{}}
    {\a:accents{d}{#1}}     {\b:accents{d}{#1}{#2}}
 \expand:after{\Configure{accent}}\csname T1\string\.\expandafter\endcsname
    \csname T1\string\.\endcsname
@@ -38948,11 +39015,20 @@ C{00C7}c{00E7}G{0122}g{0123}%
    {\a:accents{Huml}{#1}}{\b:accents{Huml}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\b\endcsname}%
-   \csname T1\string\b\endcsname{{}{}}
+   \csname T1\string\b\endcsname{B{1E06}b{1E07}%
+D{1E0E}d{1E0F}K{1E34}k{1E35}L{1E3A}l{1E3B}N{1E48}n{1E49}%
+R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}%
+{}{}}
    {\a:accents{b}{#1}}     {\b:accents{b}{#1}{#2}}
 \expand:after{\expand:after{\Configure{accent}}%
    \csname T1\string\d\endcsname}%
-   \csname T1\string\d\endcsname{{}{}}
+   \csname T1\string\d\endcsname{A{1EA0}a{1Ea1}B{1E04}b{1E05}D{1E0C}d{1E0D}%
+E{1EB8}e{1EB9}H{1E24}h{1E25}I{1ECA}i{1ECB}%
+K{1E32}k{1E33}L{1E36}l{1E37}M{1E42}m{1E43}%
+N{1E46}n{1E47}O{1ECC}o{1ECD}R{1E5A}r{1E5B}%
+S{1E62}s{1E63}T{1E6C}t{1E6D}U{1EE4}u{1EE5}%
+V{1E7E}v{1E7F}W{1E88}w{1E89}Y{1EF4}y{1EF5}%
+{}{}}
    {\a:accents{d}{#1}}     {\b:accents{d}{#1}{#2}}
 \expand:after{\Configure{accent}}\csname T1\string\.\expandafter\endcsname
    \csname T1\string\.\endcsname
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
index 7b56da2a078..8b5395ec02b 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
@@ -1,5 +1,5 @@
-% mathml.4ht (2016-11-23-15:58), generated from tex4ht-mathml.tex
-% Copyright 2009-2015 TeX Users Group
+% mathml.4ht (2017-04-11-16:02), generated from tex4ht-mathml.tex
+% Copyright 2009-2017 TeX Users Group
 % Copyright 1999-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2016-11-23-15:58}
+\immediate\write-1{version 2017-04-11-16:02}
 
 \exit:ifnot{Preamble,% 
 accents,% 
@@ -1617,7 +1617,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 \Configure{mathbf}%
   {\bgroup \Tg<\a:mathml mi
              mathvariant="bold">\PauseMathClass}%
-  {\Tg</\a:mathml mi>\egroup }%
+  {\EndPauseMathClass\Tg</\a:mathml mi>\egroup }%
 \Configure{mathit}%
   {\bgroup \Tg<\a:mathml mi  mathvariant="\ifx
                  \bold:version\math@version bold-\fi italic">\PauseMathClass}%
@@ -4143,5 +4143,12 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
+
+
+
+
+
+
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
index 196ebeea8a8..e56169f36b8 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
@@ -1,8 +1,8 @@
 \ifnum\the\catcode`\%=14\else \expandafter\edef\csname
   \string:RestoreCatcodes\endcsname{\catcode`\%\the
   \catcode`\%}\catcode`\%14\fi
-% tex4ht.4ht (2016-11-25-14:50), generated from tex4ht-options.tex
-% Copyright 2009-2016 TeX Users Group
+% tex4ht.4ht (2017-04-11-16:02), generated from tex4ht-options.tex
+% Copyright 2009-2017 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -20,7 +20,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2016-11-25-14:50}
+\immediate\write-1{version 2017-04-11-16:02}
 
 \expandafter\edef\csname :RestoreCatcodes\endcsname{%
    \expandafter\ifx \csname :RestoreCatcodes\endcsname\relax\else
@@ -168,8 +168,14 @@
                \Hinclude[*]{infomml.4ht}\fi
    \Hinclude[*]{html4.4ht}%
    \Hinclude[*]{unicode.4ht}%
-   \Hinclude[*]{mathml.4ht}%
-   \Hinclude[*]{html-mml.4ht}%
+   \:CheckOption{mathml}\if:Option%
+   \else\:CheckOption{mathml-}\fi%
+   \if:Option%
+      \Hinclude[*]{mathml.4ht}%
+      \Hinclude[*]{html-mml.4ht}%
+   \else
+      \Hinclude[*]{html4-math.4ht}%
+   \fi
    \Hinclude[*]{html5.4ht}%
 }
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht
index 37d599e9b0b..e894d5259a5 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht
@@ -1,4 +1,4 @@
-% fontspec.4ht (2017-01-31-15:40), generated from tex4ht-4ht.tex
+% usepackage-fontspec.4ht (2017-04-11-16:02), generated from tex4ht-4ht.tex
 % Copyright 2017 TeX Users Group
 %
 % This work may be distributed and/or modified under the
@@ -11,16 +11,16 @@
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work
-% is the TeX4ht Project <tex4ht@tug.org>.
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2017-01-31-15:40}
+\immediate\write-1{version 2017-04-11-16:02}
 
 \:dontusepackage{fontenc}
 \RequirePackage{expl3}
-\append:def\config:opt{,new-accents}
+\PassOptionsToPackage{no-math}{fontspec}
 \ExplSyntaxOn
 \AtEndOfPackage{%
   \tl_gset:Nx \l__fontspec_nfss_enc_tl {T1}