diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/tex4ht/latex.4ht')
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/latex.4ht | 102 |
1 files changed, 71 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht index 1ea81998bbc..a140891dc52 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 2005-10-23-04:19 % -% Copyright (C) 1997--2005 Eitan M. Gurari % +% latex.4ht 2006-12-01-16:02 % +% Copyright (C) 1997--2006 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 2005-10-23-04:19} +\immediate\write-1{version 2006-12-01-16:02} \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi @@ -44,7 +44,8 @@ \o:enddocumenthook \at:docend \csname export:hook\endcsname } -\ifx \pageno\:Undef \let\pageno\c@page \fi +\expandafter\ifx \csname pageno\endcsname\relax + \let\pageno\c@page \fi \let\accent:def\def \pend:def\protect:wrtoc{\:protect \Configure{ }{ }\toc:lbl:idx} @@ -223,6 +224,13 @@ \def\scan:accents#1#2#3{\def\:temp{#2#3}\ifx \:temp\empty\else \append:def#1{{#2}{#3}}\expand:after{\scan:accents#1}% \fi} +\def\:tempc{\a:textellipsis} +\expandafter\HLet\csname ?\string\textellipsis\endcsname\:tempc +\NewConfigure{textellipsis}{1} +\edef\:temp{% + \noexpand\Configure{textellipsis}{\expandafter\noexpand + \csname o:?\string\textellipsis:\endcsname}} +\:temp \:CheckOption{enum}\if:Option \def\:temp#1{\a:romannumeral {\expandafter @@ -232,7 +240,8 @@ \:Slowroman\romannumeral #1@}\b:romannumeral} \HLet\@Roman=\:temp \item - :warning{for configure roman numbers use the option 'enum' (unsafe)} + :warning{To configure roman numbers use + the option 'enum' (unsafe)} \fi \NewConfigure{romannumeral}{2} \def\:Slowroman#1{\ifx @#1\else @@ -449,13 +458,14 @@ \def\Make:Label#1#2{% \def\:tempb##1!*?: {% \xdef\Made:Labels{{#1}\Made:Labels}% - \hbox{\Link{}{#1}#2\EndLink}% + \set:label{\hbox{\Link{}{#1}#2\EndLink}}% \trim:Labels }% \def\:tempc##1!*?: {\hbox{#2}}% \let\:next=\check:labels \edef\:tempa{#1}% \expandafter\:next\Made:Labels{}!*?: % } +\let\set:label=\empty \let\Made:Labels=\empty \def\check:labels#1{% \def\:temp{#1}\ifx\:temp\empty \let\:next=\:tempb @@ -488,7 +498,9 @@ \ifx \EndPicture\:UnDef \ifdim #1>0.5\baselineskip \a:centercr\fi \fi \vskip #1\ignorespaces} -\append:def\flushleft{\linepenalty10 } +\ifx \flushleft\:UnDef \else + \append:def\flushleft{\linepenalty10 } +\fi \append:def\flushright{\linepenalty10 \ifx \EndPicture\:UnDef \parfillskip\@flushglue \leftskip\z@skip \rightskip\@flushglue @@ -535,7 +547,7 @@ \def\begin#1{\csname @begin:#1\endcsname \choose:begin {\let\choose:begin\@firstoftwo \ifx \EndPicture\:Undef \PushStack\envn:list\n:list \SaveEverypar -\else \let\end \o:end: +\else \bgroup \let\end \o:end: \append:defI\end{\egroup}% \fi \let\chk:pic\EndPicture \ifx \EndPicture\:UnDef \list:save @@ -641,6 +653,7 @@ \EncMathSymbol\mathop{l}{OT1} \EncMathSymbol\mathop{L}{OT1} \MathSymbol\mathop{mathellipsis} +\MathSymbol\mathord{hbar} \def\bigl#1{\mathopen{\big{#1}}} \def\bigm#1{\mathrel{\big{#1}}} @@ -658,6 +671,15 @@ \def\:tempc{\a:qquad} \HLet\qquad\:tempc \NewConfigure{quad}{1} \Configure{quad}{\o:quad:} \NewConfigure{qquad}{1} \Configure{qquad}{\o:qquad:} +\def\atop:choose#1#2#3{\a:choose} +\def\:temp{% + \expandafter \ifx\csname a:choose\endcsname\relax \else + \ifx\a:choose\empty \else + \Configure{atopwithdelims}{\atop:choose}{}% + \fi\fi + \o:choose:} +\HLet\choose=\:temp +\NewConfigure{choose}{1} \def\:temp#1#2{\a:mthpl\o:mathpalette:{#1}{#2}\b:mthpl} \HLet\mathpalette\:temp \NewConfigure{mathpalette}[2]{\c:def\a:mthpl{#1}\c:def\b:mthpl{#2}} @@ -1072,6 +1094,17 @@ $\vcenter \else \let\@sharp##\fi \@preamble} \HLet\@array\:temp +\let\oo:@array\@array +\def\@array{% + \ifx\EndPicture\:UnDef\else + \iffalse{\fi + \expandafter\let\expandafter\cr\csname 0cr\endcsname + \expandafter\let\expandafter\crcr\csname 0crcr\endcsname + \iffalse}\fi + \fi + \oo:@array +} + \let\:tempc\@@startpbox \append:defI\:tempc{\everypar{\HtmlPar}\a:arrayparbox}% \HLet\@@startpbox\:tempc @@ -1401,10 +1434,18 @@ $\vcenter \def\:temp#1{% {\m@th\ensuremath{^{\mbox{\fontsize\sf@size\z@#1}}}}} \ifx \@textsuperscript\:temp - \def\@textsuperscript#1{% - {\m@th\ensuremath - {{\HCode{}}\sp{\mbox{\fontsize\sf@size\z@#1}}}}} + \def\:tempc#1{{\m@th + \ifmmode {\HCode{}}\sp {\mbox{\fontsize\sf@size\z@#1}}% + \else + \a:textsuperscript + {\mbox{#1}}\b:textsuperscript + \fi }} + \HLet\@textsuperscript\:tempc \fi +\NewConfigure{textsuperscript}{2} +\Configure{textsuperscript} + {$\relax{\HCode{}}\sp} + {$} \NewConfigure{wrindex}[1]{\concat:config\a:wrindex{#1}} \let\a:wrindex\empty @@ -1477,7 +1518,8 @@ $\vcenter \NewConfigure{bibitem}{2} \NewConfigure{bibanchor}{1} \Configure{bibanchor}{X} -\NewConfigure{bibcite}{1} +\NewConfigure{bibcite}[1]{\concat:config\a:bibcite{#1}} +\let\a:bibcite\relax \fi \NewConfigure{cite}[4]{\c:def\a:cite{#1}\c:def\b:cite{#2}% @@ -1859,17 +1901,17 @@ $\vcenter \gdef\empty:D:T:D{\:DT\:DD}% \fi \global\@minipagefalse\global\@newlistfalse - \if@inlabel - \global\@inlabelfalse - \global\let\empty:D:T:D\empty \:DT \hfill\break + \if@inlabel + \global\@inlabelfalse + \global\let\empty:D:T:D\empty \:DT \hfill\break \box\@labels - \:DD \ShowPar + \:DD \ShowPar % - \penalty\z@ - \else \:ListParSkip + \penalty\z@ + \else \:ListParSkip % - \fi - \ht:everypar{\:ListParSkip + \fi + \ht:everypar{\:ListParSkip }}% \leavevmode \ignorespaces \fi } @@ -1884,6 +1926,14 @@ $\vcenter \global\let\:DT\empty \global\let\:DD\empty \fi \fi } +\pend:def\endlist{% + \if@newlist + \:warning{Problem with 'list' environment. Expected syntax: + \string\begin{list}{label}{spacing} + \string\item .... \string\end{list}}% + \global\@newlistfalse + \fi +} \def\list:save{% \let\SVempty:D:T:D\empty:D:T:D \let\SVend:DL\end:DL @@ -1938,17 +1988,7 @@ $\vcenter \def\b:accents##1##2##3{#2}} \fi - \def\AA{{\Protect\:AA}} -\def\aa{{\Protect\:aa}} -\def\:AA{% - \ifx \EndPicture\:UnDef \a:AA\else - \leavevmode\setbox0\hbox{h}\dimen@\ht0\advance\dimen@-1ex% - \rlap{\raise.67\dimen@\hbox{\char'27}}A\fi} -\def\:aa{% - \ifx \EndPicture\:UnDef \HChar{229}\else \accent23a\fi } -\NewConfigure{AA}{1} -\Configure{AA}{\HChar{197}} - + \let\makeheadline\empty \let\makefootline\empty |