summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty65
1 files changed, 41 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
index cc2dd5e19d2..83990d875a9 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
@@ -2,7 +2,7 @@
\string:RestoreCatcodes\endcsname{\catcode`\%\the
\catcode`\%}\catcode`\%14\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht.sty 2008-02-25-14:04 %
+% tex4ht.sty 2008-06-09-17:02 %
% Copyright (C) 1996--2008 Eitan M. Gurari %
% %
% This work may be distributed and/or modified under the %
@@ -27,7 +27,7 @@
% gurari@cse.ohio-state.edu %
% http://www.cse.ohio-state.edu/~gurari %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2008-02-25-14:04}
+\immediate\write-1{version 2008-06-09-17:02}
\ifx \Preamble\UnDef \else
\csname expand:after\endcsname{\csname
@@ -345,6 +345,13 @@
\expandafter\expandafter\expandafter\expandafter
\expandafter\expandafter\expandafter\:tempa
\expandafter\expandafter\expandafter{\expandafter\:temp #1}}
+\long\def\pend:defI#1#2{%
+ \def\:tempa{\def#1####1}%
+ \ex:pend{#2}{\expandafter\:temp #1{##1}}}
+\long\def\ex:pend#1{\def\:temp{#1}%
+ \expandafter\expandafter\expandafter\expandafter
+ \expandafter\expandafter\expandafter\:tempa
+ \expandafter\expandafter\expandafter}
\NewConfigure{ProTex}[1]{\def\a:ProTex{#1}}
\ifx \Log:Needs\:UnDef \else
@@ -629,7 +636,6 @@
\fi
\let\:CheckOption\:UnDef
-\let\:ScanOptions\:UnDef
\fi
@@ -704,6 +710,23 @@
\fi
\let\:tempc\:temp
+ \ifx \config:opt\:UnDef \else
+ \ifx\tmp:toks\:UnDeF \csname newtoks\endcsname\tmp:toks\fi
+ \def\:temp{\def\ifOption##1}
+ \expandafter\expandafter\expandafter\:temp
+ \expandafter{\config:opt,,//\if:Option
+ \def\:temp{\the\tmp:toks
+ \def\:temp{\tmp:toks={}}%
+ \afterassignment\:temp \tmp:toks=}%
+\afterassignment\:temp
+\else \def\:temp{%
+ \def\:temp{\the\tmp:toks}%
+ \afterassignment\:temp \tmp:toks=}%
+\afterassignment\:temp
+\fi \tmp:toks=}
+ \pend:defI\ifOption{\def\:temp{##1}\:Optionfalse\:ScanOptions}
+\fi
+
\pend:def\:tempc{\:RestoreCatcodes }
\append:def\:tempc{\endinput}
\let\:temp\:tempc
@@ -835,6 +858,7 @@
\def\HCode#1{\ifx \EndPicture\:UnDef
\relax\ifvmode\leavevmode\fi\ht:special{t4ht=#1}\fi}
\let\:HCode=\HCode
+\let\Hbrakets\empty
\def\NewLineChar{\bgroup \catcode`\^=7 \:NewLineChar}
\def\:NewLineChar#1{\egroup \def\:newlnch{ #1}}
\NewLineChar{^^J}
@@ -844,24 +868,24 @@
\def\get:atr#1 #2!*?: #3#4{\def\:attr{\space#2}%
\def\:te:mpa{#1}\ifx \:te:mpa\empty \let\:te:mpa#4\else
\def\:te:mpa{#3[#1]}\fi \:te:mpa}
-\def\H:Tag#1#2{\:TagHTag{#2}\HCode{<\tag:A\:newlnch
+\def\H:Tag#1#2{\:TagHTag{#2}\HCode{\Hbrakets<\tag:A\:newlnch
\NAME:"#2"\empty:lnk>}}
\def\::hRef[#1]#2{%
- \HCode{<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{}\else
+ \HCode{\Hbrakets<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{}\else
\HREF:"#1\if\relax#1\relax \else\:sharp #2\fi"\fi
\:attr \empty:lnk>}}
\def\:::HRef#1{%
- \HCode{<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{}\else
+ \HCode{\Hbrakets<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{}\else
\HREF:"\get:hfile{#1}\:sharp #1"\fi \:attr \empty:lnk>}}
\def\::hRefTag[#1]#2#3{%
\if\relax#3\relax\else\:TagHTag{#3}\fi
- \HCode{<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{#3}\else
+ \HCode{\Hbrakets<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{#3}\else
\HREF:"#1\if\relax#2\relax \else\:sharp #2\fi"\fi
\if\relax#3\relax\else\space \NAME:"#3"\fi
\:attr \empty:lnk>}}
\def\:::HRefTag#1#2{%
\if\relax#2\relax\else\:TagHTag{#2}\fi
- \HCode{<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{#2}%
+ \HCode{\Hbrakets<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{#2}%
\else\HREF:"\get:hfile{#1}\:sharp #1"\fi
\if\relax#2\relax\else\space \NAME:"#2"\fi
\:attr \empty:lnk>}}
@@ -901,7 +925,7 @@
\fi
-\def\EndLink{\ifx \empty:lnk\empty \HCode{</\tag:A>}\fi}
+\def\EndLink{\ifx \empty:lnk\empty \HCode{\Hbrakets</\tag:A>}\fi}
\def\:HRef{\ifx [\:temp \expandafter\::HRef
\else \expandafter\:::HRef \fi }
\def\HT:tag{\ifx -\let:val \expandafter\H:Tag
@@ -1161,7 +1185,7 @@
\expandafter\edef\csname
End\expandafter\:gobble\string #9\endcsname{%
\ifx\:tempd\empty \noexpand\HCode
- {</\ifx\:tempa\empty \tag:A\else#2\fi>}\fi }%
+ {\Hbrakets</\ifx\:tempa\empty \tag:A\else#2\fi>}\fi }%
\edef\:temp{%
\noexpand\Odef\noexpand#1[####1]####2####3{{%
\def\noexpand\tag:A{\ifx\:tempa\empty\tag:A\else#2\fi}%
@@ -1344,9 +1368,6 @@
\long\def\append:defI#1#2{%
\def\:temp{\def#1####1}%
\expandafter\expandafter\expandafter\:temp\expandafter{#1{##1}#2}}
-\long\def\pend:defI#1#2{%
- \def\:tempa{\def#1####1}%
- \ex:pend{#2}{\expandafter\:temp #1{##1}}}
\long\def\pend:defII#1#2{%
\def\:tempa{\def#1####1####2}%
\ex:pend{#2}{\expandafter\:temp #1{##1}{##2}}}
@@ -1356,10 +1377,6 @@
\long\def\pend:defIII#1#2{%
\def\:tempa{\def#1####1####2####3}%
\ex:pend{#2}{\expandafter\:temp #1{##1}{##2}{##3}}}
-\long\def\ex:pend#1{\def\:temp{#1}%
- \expandafter\expandafter\expandafter\expandafter
- \expandafter\expandafter\expandafter\:tempa
- \expandafter\expandafter\expandafter}
\long\def\append:defIII#1#2{%
\def\:temp{\def#1####1####2####3}%
\expandafter\expandafter\expandafter
@@ -1808,11 +1825,11 @@
\Recall:HPageTag\HP:file \Save:HPageTag\HP:file
\def\:temp{#4}\ifx \:temp\empty \else
\def\CLB:prevup{%
- #1\Link[\RefFile{)B\HP:file}]{}{}#4\EndLink #2}%
+ \def\:temp{#4}#1\Link[\RefFile{)B\HP:file}]{}{}#4\EndLink #2}%
\fi
\def\:temp{#5}\ifx \:temp\empty \else
\def\CLB:prevtailup{%
- #1\Link[\RefFile{)B\HP:file}]{tail\Jobname
+ \def\:temp{#5}#1\Link[\RefFile{)B\HP:file}]{tail\Jobname
}{}#5\EndLink #2}%
\fi
\long\def\:tempb####1####2{\gdef\root:next{%
@@ -1823,7 +1840,7 @@
\Link{}{tail\Jobname}\EndLink
\else
\expandafter\ifx \csname a:next+\endcsname\relax #1\else
- \csname a:next+\endcsname \fi
+ \csname a:next+\endcsname \fi
\expandafter\ifx \csname a:next\endcsname\relax
\def\:next{#3}%
\else \let\:next\a:next \fi
@@ -1847,16 +1864,16 @@
\ifx \:temp\empty
\def\:temp{#6}%
\ifx \:temp\empty \else
- \def\CLB:tail{#1\Link[\RefFileNumber\file:id]{}{}#6\EndLink #2}\fi
+ \def\CLB:tail{\def\:temp{#6}#1\Link[\RefFileNumber\file:id]{}{}#6\EndLink #2}\fi
\else
\def\:temp{#7}%
\ifx \:temp\empty \else
- \def\CLB:front{#1\Link{##2\RefFileNumber\file:id}{}#7\EndLink #2}\fi
+ \def\CLB:front{\def\:temp{#7}#1\Link{##2\RefFileNumber\file:id}{}#7\EndLink #2}\fi
\fi
%
\def\:temp{#8}\ifx \:temp\empty \else
\ifx \cond:bt\:gobbleIII
- \else \def\CLB:up{#1\ExitHPage{#8}#2}\fi\fi
+ \else \def\CLB:up{\def\:temp{#8}#1\ExitHPage{#8}#2}\fi\fi
\CLB:menu
%
\let\cond:bt\sv:cond:bt
@@ -2123,7 +2140,7 @@
}
\Configure{PictureAlt*+[]} {\NoFonts} {\EndNoFonts}
\Configure{PictureAttr*+[]} {\ht:special{t4ht=#1}}
-\def\HChar#1{{\leavevmode\ifmmode\else\expandafter\immediate\fi
+\def\HChar#1{{\leavevmode
\ht:special{t4ht@#1}\ifnum #1>-1 \a:HChar\fi}}
\NewConfigure{HChar}{1}
\Configure{HChar}{x}