summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
Diffstat (limited to 'support')
-rw-r--r--support/TeX4ht/source/ChangeLog12
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex59
-rw-r--r--support/TeX4ht/source/tex4ht-html4.tex52
-rw-r--r--support/TeX4ht/source/tex4ht-mathml.tex30
4 files changed, 127 insertions, 26 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 578132db29..27cce11cff 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,15 @@
+2022-04-26 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (ulem.4ht),
+ * tex4ht-html4.tex (html4.4ht),
+ * tex4ht-mathml.tex (mathml.4ht): fixed support for the Ulem
+ package.
+ https://github.com/michal-h21/make4ht/issues/72
+
+ * tex4ht-4ht.tex (xr.4ht, xr-hooks.4ht): added support for external
+ documents in subdirectories.
+ https://puszcza.gnu.org.ua/bugs/?560
+
2022-04-25 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (xr-hyper.4ht,
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index 5e3d3106bd..eb4ca2f77d 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1117 2022-04-25 13:31:56Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1119 2022-04-26 15:53:45Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -3799,6 +3799,10 @@ before \''\begin{document}'.
\<wait with xr\><<<
\:AtEndOfPackage{\let\XR:\XR@
\def\XR@[#1]#2{%
+ % save directory for the linked file
+ \filename@parse{#2}%
+ % \filename@base is filename, \filename@area directory
+ \expandafter\xdef\csname xr:dir:\filename@base\endcsname{\filename@area}%
\Configure{AtBeginDocument}{\XR:[#1]{#2}}{}}%
}
>>>
@@ -3836,7 +3840,10 @@ before \''\begin{document}'.
>>>
\<fix xr-nonhyper\><<<
-\def\XRrEfLiNK[#1]#2#3{\a:xr[#1]{#2}{}%
+\def\XRrEfLiNK[#1]#2#3{%
+ \filename@parse{#1}% Get basename of the linked html file,
+ % xr:dir\filename@base contains file's directory
+ \a:xr[\csname xr:dir:\filename@base\endcsname#1]{#2}{}%
\ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr}
\NewConfigure{xr}{2}
\Configure{xr}{\Link}{\EndLink}
@@ -3921,9 +3928,9 @@ it, so we can safely eat that.
\:AtEndOfPackage{\let\XR:\XR@
\def\XR@[#1][#2]#3{%
% save directory for the linked file
- \filename@parse{#3}
+ \filename@parse{#3}%
% \filename@base is filename, \filename@area directory
- \expandafter\xdef\csname xr:dir:\filename@base\endcsname{\filename@area}
+ \expandafter\xdef\csname xr:dir:\filename@base\endcsname{\filename@area}%
\AtBeginDocument{\XR:[#1][#2]{#3}}
}%
}
@@ -30871,21 +30878,49 @@ d|<haddr prefix|>\last:haddr
\endinput
>>> \AddFile{9}{ulem}
+We use different configurations, depending on the fact if we are inside math mode or not.
+Configurations in math mode are named after the command with the "-math" suffix.
+
\<ulem sty\><<<
-\expandafter\def\csname uline \endcsname{\relax
- \ifmmode\expandafter\underline
- \else \a:uline \bgroup \aftergroup\b:uline \expandafter\ULset\fi}
+\def\:ulemchoose#1#2{\relax\ifmmode\csname a:#1-math\endcsname#2\csname b:#1-math\endcsname\else\csname a:#1\endcsname#2\csname b:#1\endcsname\fi}
+
\NewConfigure{uline}{2}
-\def\uuline#1{\relax \a:uuline {#1}\b:uuline}
+\NewConfigure{uline-math}{2}
+\def\:tempa#1{\:ulemchoose{uline}{#1}}
+\HLet\uline\:tempa
+
\NewConfigure{uuline}{2}
-\def\sout#1{\relax \a:sout {#1}\b:sout}
+\NewConfigure{uuline-math}{2}
+\def\:tempa#1{\:ulemchoose{uuline}{#1}}
+\HLet\uuline\:tempa
+
\NewConfigure{sout}{2}
-\def\xout#1{\relax \a:xout {#1}\b:xout}
+\NewConfigure{sout-math}{2}
+\def\:tempa#1{\:ulemchoose{sout}{#1}}
+\HLet\sout\:tempa
+
\NewConfigure{xout}{2}
-\def\uwave#1{\relax \a:uwave {#1}\b:uwave}
+\NewConfigure{xout-math}{2}
+\def\:tempa#1{\:ulemchoose{xout}{#1}}
+\HLet\xout\:tempa
+
\NewConfigure{uwave}{2}
+\NewConfigure{uwave-math}{2}
+\def\:tempa#1{\:ulemchoose{uwave}{#1}}
+\HLet\uwave\:tempa
+
+\NewConfigure{dashuline}{2}
+\NewConfigure{dashuline-math}{2}
+\def\:tempa#1{\:ulemchoose{dashuline}{#1}}
+\HLet\dashuline\:tempa
+
+\NewConfigure{dotuline}{2}
+\NewConfigure{dotuline-math}{2}
+\def\:tempa#1{\:ulemchoose{dotuline}{#1}}
+\HLet\dotuline\:tempa
+
\def\:temp{\z@}
-\HLet\ULthickness|=\:temp
+\HLet\ULthickness\:temp
>>>
%%%%%%%%%%%%%%%%%%%
diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex
index 95b77afb6b..d9d3ae88ad 100644
--- a/support/TeX4ht/source/tex4ht-html4.tex
+++ b/support/TeX4ht/source/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1113 2022-04-17 10:39:05Z michal_h21 $
+% $Id: tex4ht-html4.tex 1119 2022-04-26 15:53:45Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -22054,22 +22054,48 @@ gets something wrong there.
\<configure html4 ulem\><<<
\Configure{uline}
- {\HCode{<span class="uline">}} {\HCode{</span>}}
-\Css{.uline{ text-decoration:underline; }}
+ {\HCode{<span class="uline">}\NoFonts} {\EndNoFonts\HCode{</span>}}
+\Configure{uline-math}
+ {\HCode{<span class="uline">}\NoFonts} {\EndNoFonts\HCode{</span>}}
+\Css{.uline,.uline-math{ text-decoration:underline; }}
\Configure{uuline}
- {\HCode{<span class="uuline">}} {\HCode{</span>}}
-\Css{.uuline{ text-decoration:underline; }}
+ {\HCode{<span class="uuline">}\NoFonts} {\EndNoFonts\HCode{</span>}}
+\Configure{uuline-math}
+ {\HCode{<span class="uuline">}\NoFonts} {\EndNoFonts\HCode{</span>}}
+\Css{.uuline,.uuline-math{ text-decoration:underline double; }}
\Configure{sout}
- {\HCode{<span class="sout">}} {\HCode{</span>}}
-\Css{span.sout {text-decoration: line-through }}
+ {\HCode{<span class="sout">}\NoFonts} {\EndNoFonts\HCode{</span>}}
+\Configure{sout-math}
+ {\HCode{<span class="sout">}\NoFonts} {\EndNoFonts\HCode{</span>}}
+\Css{span.sout, .sout-math {text-decoration: line-through }}
\Configure{xout}
- {\HCode{<span class="xout"><span class="underline">}}
- {\HCode{</span></span>}}
-\Css{span.xout {text-decoration: line-through }}
+ {\HCode{<span class="xout">}\NoFonts}
+ {\EndNoFonts\HCode{</span>}}
+\Configure{xout-math}
+ {\HCode{<span class="xout">}\NoFonts}
+ {\EndNoFonts\HCode{</span>}}
+\Css{span.xout, .xout-math {text-decoration: line-through underline }}
\Configure{uwave}
- {\HCode{<span class="uwave">}}
- {\HCode{</span>}}
-\Css{span.uwave {text-decoration:underline }}
+ {\HCode{<span class="uwave">}\NoFonts}
+ {\EndNoFonts\HCode{</span>}}
+\Configure{uwave-math}
+ {\HCode{<span class="uwave">}\NoFonts}
+ {\EndNoFonts\HCode{</span>}}
+\Css{span.uwave, .uwave-math {text-decoration:underline wavy; }}
+\Configure{dashuline}
+ {\HCode{<span class="dashuline">}\NoFonts}
+ {\EndNoFonts\HCode{</span>}}
+\Configure{dashuline-math}
+ {\HCode{<span class="dashuline">}\NoFonts}
+ {\EndNoFonts\HCode{</span>}}
+\Css{span.dashuline, .dashuline-math {text-decoration:underline dashed;}}
+\Configure{dotuline}
+ {\HCode{<span class="dotuline">}\NoFonts}
+ {\EndNoFonts\HCode{</span>}}
+\Configure{dotuline-math}
+ {\HCode{<span class="dotuline">}\NoFonts}
+ {\EndNoFonts\HCode{</span>}}
+\Css{span.dotuline, .dotuline-math {text-decoration:underline dotted;}}
>>>
diff --git a/support/TeX4ht/source/tex4ht-mathml.tex b/support/TeX4ht/source/tex4ht-mathml.tex
index 4be5595c60..5f5da30c08 100644
--- a/support/TeX4ht/source/tex4ht-mathml.tex
+++ b/support/TeX4ht/source/tex4ht-mathml.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathml.tex 1020 2021-11-30 14:23:44Z michal_h21 $$
+% $Id: tex4ht-mathml.tex 1119 2022-04-26 15:53:45Z michal_h21 $$
% compile 3 times: latex tex4ht-mathltx
% or xhlatex tex4ht-mathltx "html,3,sections+"
%
@@ -3828,6 +3828,34 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
{\HCode{</mrow></munder>}}
>>>
+Support for the Ulem package in MathML
+\<configure mathml ulem\><<<
+\Configure{uline-math}
+ {\HCode{<mstyle class="uline-math">}\NoFonts} {\EndNoFonts\HCode{</mstyle>}}
+\Css{.uline-math{ text-decoration:underline; }}
+\Configure{uuline-math}
+ {\HCode{<mstyle class="uuline-math">}\NoFonts} {\EndNoFonts\HCode{</mstyle>}}
+\Css{.uuline-math{ text-decoration:underline double; }}
+\Configure{sout-math}
+ {\HCode{<mstyle class="sout-math">}\NoFonts} {\EndNoFonts\HCode{</mstyle>}}
+\Css{.sout-math {text-decoration: line-through }}
+\Configure{xout-math}
+ {\HCode{<mstyle class="xout-math">}\NoFonts}
+ {\EndNoFonts\HCode{</mstyle>}}
+\Css{.xout-math {text-decoration: line-through underline }}
+\Configure{uwave-math}
+ {\HCode{<mstyle class="uwave-math">}\NoFonts}
+ {\EndNoFonts\HCode{</mstyle>}}
+\Css{.uwave-math {text-decoration:underline wavy; }}
+\Configure{dashuline-math}
+ {\HCode{<mstyle class="dashuline-math">}\NoFonts}
+ {\EndNoFonts\HCode{</mstyle>}}
+\Css{.dashuline-math {text-decoration:underline dashed;}}
+\Configure{dotuline-math}
+ {\HCode{<mstyle class="dotuline-math">}\NoFonts}
+ {\EndNoFonts\HCode{</mstyle>}}
+\Css{.dotuline-math {text-decoration:underline dotted;}}
+>>>