summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/tex4ht/latex.4ht')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/latex.4ht67
1 files changed, 41 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
index a140891dc52..ebd55ab85f6 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% latex.4ht 2006-12-01-16:02 %
-% Copyright (C) 1997--2006 Eitan M. Gurari %
+% latex.4ht 2007-01-03-21:02 %
+% Copyright (C) 1997--2007 Eitan M. Gurari %
% %
% This work may be distributed and/or modified under the %
% conditions of the LaTeX Project Public License, either %
@@ -24,7 +24,7 @@
% gurari@cse.ohio-state.edu %
% http://www.cse.ohio-state.edu/~gurari %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2006-12-01-16:02}
+\immediate\write-1{version 2007-01-03-21:02}
\ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi
@@ -542,12 +542,13 @@
\pend:def\@verbatim{%
\Configure{obeylines}{\let\ \v:ch}{}{\v:par}}
-\let\o:begin:\begin
-\let\choose:begin\@firstoftwo
-\def\begin#1{\csname @begin:#1\endcsname \choose:begin
- {\let\choose:begin\@firstoftwo \ifx \EndPicture\:Undef
- \PushStack\envn:list\n:list \SaveEverypar
-\else \bgroup \let\end \o:end: \append:defI\end{\egroup}%
+ \pend:defI\begin{\let\chk:pic\EndPicture }
+ \let\o:begin:\begin
+ \let\choose:begin\@firstoftwo
+\def\begin#1{\csname @begin:#1\endcsname
+ \choose:begin
+ {\let\choose:begin\@firstoftwo \ifx \EndPicture\:Undef
+ \PushStack\envn:list\n:list \SaveEverypar
\fi
\let\chk:pic\EndPicture
\ifx \EndPicture\:UnDef \list:save
@@ -555,22 +556,26 @@
%
\@ifundefined{#1}%
{\def\reserved@a{\@latex@error{Environment #1 undefined}\@eha}}%
- {\def\reserved@a{\def\@currenvir{#1}%
- \edef\@currenvline{\on@line}%
- \ifx \EndPicture\:UnDef
+ {\def\reserved@a{%
+ \def\@currenvir{#1}%
+ \edef\@currenvline{\on@line}%
+ \ifx \EndPicture\:UnDef
\ifx \this:listConfigure\empty
\null:listConfigure \csname on#1:list\endcsname \fi
\fi
%
- \csname #1\endcsname
- %
-}}%
+ \csname #1\endcsname
+ %
+%
+ }}%
\global\@ignorefalse
-\begingroup\@endpefalse \reserved@a
+\begingroup
+ \@endpefalse
+ \reserved@a
}%
- {\o:begin:{#1}}}
+ {\o:begin:{#1}}}
\def\recall:afterend{\ifx \chk:pic\:UnDef
- \ifhmode \hfill\break\fi
+ \ifhmode \hfill\break\fi
\RecallEverypar
\fi}
\:CheckOption{hooks+} \if:Option
@@ -598,10 +603,12 @@
\expandafter\expandafter\expandafter\:temp}
\expandafter\:temp
\fi
- \csname end#1\endcsname\@checkend{#1}%
+\csname end#1\endcsname
+\@checkend{#1}%
\aftergroup\recall:afterend
- \expandafter\endgroup\if@endpe\@doendpe\fi
- \ifx \chk:pic\:UnDef \csname after:end\endcsname
+\expandafter\endgroup\if@endpe\@doendpe\fi
+ \ifx \chk:pic\:UnDef
+ \csname after:end\endcsname
\expandafter\let\csname after:end\endcsname\:UnDef
%
\PopStack\envn:list\:tempb
@@ -610,8 +617,12 @@
\else\:warning{\string\SaveEverypar's: \:tempb\space at
\string\begin{#1} and \n:list\space \string\end{#1}}%
\fi \fi
-\list:recall \fi
- \if@ignore\global\@ignorefalse\ignorespaces\fi
+%
+ \list:recall
+ \else
+ \let\chk:pic\:UnDef
+ \fi
+\if@ignore\global\@ignorefalse\ignorespaces\fi
}%
{\o:end:{#1}}}
\def\:tempc{\@endpetrue
@@ -800,10 +811,10 @@ $\vcenter
\catcode`\#13 \catcode`\!6
\def\reg:eq:narray!1\cr{\SaveMkHalignConf:g{eq:narray\if@eqnsw\else *\fi}
\MkHalign#{\hskip\@centering$\displaystyle\tabskip\z@skip{#}$\@eqnsel
-&\global\@eqcnt\@ne\hskip \tw@\arraycolsep \hfil${#}$\hfil
-&\global\@eqcnt\tw@ \hskip \tw@\arraycolsep
+ &\global\@eqcnt\@ne\hskip \tw@\arraycolsep \hfil${#}$\hfil
+ &\global\@eqcnt\tw@ \hskip \tw@\arraycolsep
$\displaystyle{#}$\hfil\tabskip\@centering
-&\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss#\egroup \tabskip\z@skip
+ &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss#\egroup \tabskip\z@skip
}%
}
\catcode`\#=6 \catcode`\!=12
@@ -1298,6 +1309,10 @@ $\vcenter
\expandafter\let\csname end#1\endcsname\float@end
\expandafter\let\csname end#1*\endcsname\float@dblend
\fi
+ \@parboxrestore
+ \reset@font
+ \normalsize
+ \everypar{\HtmlPar}%
}
\let\o:end@float:\end@float
\def\end@float{\endgroup\:clearpage \af:float}