1 files changed, 38 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
index d7450e6e43b..a61c384ca6b 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
@@ -2,8 +2,8 @@
   \string:RestoreCatcodes\endcsname{\catcode`\%\the
   \catcode`\%}\catcode`\%14\fi
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht.sty                           2005-09-27-01:01  %
-% Copyright (C) 1996--2005      Eitan M. Gurari          %
+% tex4ht.sty                           2006-10-28-15:32  %
+% Copyright (C) 1996--2006      Eitan M. Gurari          %
 %                                                        %
 % This work may be distributed and/or modified under the %
 % conditions of the LaTeX Project Public License, either %
@@ -27,7 +27,7 @@
 %                             gurari@cse.ohio-state.edu  %
 %                 http://www.cse.ohio-state.edu/~gurari  %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2005-09-27-01:01}
+\immediate\write-1{version 2006-10-28-15:32}
 
 \ifx  \Preamble\UnDef  \else
    \csname expand:after\endcsname{\csname
@@ -495,8 +495,13 @@
 
 \let\:Hincl\empty
 \def\Hinclude[#1]#2{\xdef\:Hincl{\:Hincl{#1}{#2}}}
-\NewConfigure{html}[1]{\edef\:html{#1}}
-\Configure{html}{html}
+\NewConfigure{ext}[1]{%
+   \def\:temp##1ext=##2,##3!*?: {%
+      \if !##2!\edef\:html{#1}%
+      \else \edef\:html{##2}\fi}%
+   \expandafter\:temp\Preamble ,ext=,!*?: 
+}
+\Configure{ext}{html}
 \def\c:HtmlPar:#1#2#3#4{%
    \def\:temp{#3}\ifx \:temp\empty \c:def\a:Par{#1}\else
      \c:def\a:Par{#1\Next:EndP{#3}}\fi
@@ -1098,7 +1103,8 @@
 \long\def\:gobbleVI#1#2#3#4#5#6{}
 \long\def\:gobbleVIII#1#2#3#4#5#6#7#8{}
 
-\ifHtml \def\exit:ifnot#1{%
+\ifHtml \csname newskip\endcsname\tmp:dim
+\def\exit:ifnot#1{%
    \edef\:temp{\def\noexpand\:temp####1,\:Hin,####2..//{%
       \noexpand\if !####2!\noexpand\else
       \noexpand\expandafter\noexpand\:gobble\noexpand\fi
@@ -1138,7 +1144,6 @@
    \expandafter\gHAdvance\csname big:#1:#2\endcsname  1
    \edef\big:fn{#1#2\csname big:#1:#2\endcsname}}
 \def\Hnewline{\:newlnch}
-\csname newskip\endcsname\tmp:dim
 \def\Needs{\bgroup\catcode`\"=12 \cat:Needs}
 \def\cat:Needs#1{\def\:temp{-}\def\:tempa{#1}\ifx \:temp\:tempa
    \aftergroup\Log:Needs \else \ht:special{t4ht+@\:Needs{#1}}\fi
@@ -1215,6 +1220,7 @@
 
 \fi
 \ifx \xml:empty\:UnDef
+   \edef\Preamble{\Preamble}
    \:CheckOption{xhtml}
    \if:Option \else \:CheckOption{xml}\fi
    \if:Option
@@ -2604,6 +2610,16 @@
 \def\:l:mits{\futurelet\:temp\::limits}
 \catcode`\ =13\relax\def\blank:spc{\let\blank:spc= }\blank:spc%
 \catcode`\ =10\relax
+\NewConfigure{displaylimits}[1]{\def\:temp{#1}\ifx \:temp\empty
+   \let\displaylimits\o:displaylimits: \else
+   \def\:displaylimits{\ifx \:temp\nolimits \else#1\fi}%
+   \def\:temp{\o:displaylimits:\display:l:mits}%
+   \HLet\displaylimits\:temp \fi}
+\let\o:displaylimits:\displaylimits
+\def\::displaylimits{\expandafter\ifx \blank:spc\:temp
+     \afterassignment\display:l:mits \tmp:cnt0%
+  \else\expandafter\:displaylimits \fi}
+\def\display:l:mits{\futurelet\:temp\::displaylimits}
 
    \def\:temp{\a:mathord \o:mathord:}      \HLet\mathord\:temp
 \let\a:mathord\empty
@@ -3549,8 +3565,8 @@
    \xdef\lastsec:id{\file:id}%
    \PopStack\prv:fl\:temp
    \bgroup
-      \ifx\a:crsbt\empty
-         \ifx\aa:crsbt\empty\else
+      \ifx\b:crsbt\empty
+         \ifx\bb:crsbt\empty\else
             \:hookI{Back#1}{\default:bts{tail}{}}{}%
          \fi
       \else
@@ -4071,13 +4087,14 @@
    \ifx \:temp\empty
        \expandafter\chs:halgn\string ~1!*?: %
 \:tempb{%
-   \expand:after{\Picture+}\pic:hlng{ \a:@Picture{pic-halign}}\ifmmode
+   \csname a:embedded-halign\endcsname
+      \ifmmode
         \vbox{\Rc:sharp
 $$\TeXhalign:cr \to:dim{~1}$$}%
       \else \vbox{\Rc:sharp
 \TeXhalign:cr \to:dim{~1}}\fi
       \:nopartrue
-   \EndPicture
+   \csname b:embedded-halign\endcsname
  }%
 \let\:temp\endgroup
 \:tempb!*?: %
@@ -4100,6 +4117,10 @@ $$\TeXhalign:cr \to:dim{~1}$$}%
 \expand:after{\h:align#1\cr!*?: #1!*?: }%
 %
     \fi}
+\NewConfigure{embedded-halign}{2}
+\Configure{embedded-halign}
+    {\expand:after{\Picture+}\pic:hlng{ \a:@Picture{pic-halign}}}
+    {\EndPicture}
 \catcode`\#=13
 \def\Rc:sharp{\let#=\sv:sharp}
 \catcode`\#=6
@@ -4338,6 +4359,8 @@ $$\TeXhalign:cr \to:dim{~1}$$}%
 
 
 
+\def\hyphenation#1{}
+
 \def\at:startdoc{%
     \let\:startdoc\:UnDef    \let\at:startdoc\:UnDef
     \edef\NoHtmlEnv{\NoHtmlEnv}%
@@ -4439,7 +4462,8 @@ $$\TeXhalign:cr \to:dim{~1}$$}%
 
                     
 \ifx\beginL\@undefined \else
-   \def\:temp{\o:beginL:\a:Lregion}
+   \ifHtml
+      \def\:temp{\o:beginL:\a:Lregion}
 \HLet\beginL=\:temp
 \def\:temp{\b:Lregion\o:endL:}
 \HLet\endL=\:temp
@@ -4450,8 +4474,8 @@ $$\TeXhalign:cr \to:dim{~1}$$}%
 \HLet\endR=\:temp
 \NewConfigure{Rregion}{2}
 
-   \Hinput{etex4ht}
-\fi
+      \Hinput{etex4ht}
+\fi\fi
 \ifHtml      \def\:tempa{\:Hinclude}
 \else
     \:CheckOption{th4}\if:Option  \def\:tempa{\input th4.4ht}