From 008d30cf1d5af7a4a3e35458a39ad79bd19eec55 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 26 Apr 2022 22:00:14 +0000 Subject: xr subdirs r1118; tex4ht ulem fixes, tex4ht r1119 git-svn-id: svn://tug.org/texlive/trunk@63150 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 12 +++ .../source/generic/tex4ht/tex4ht-4ht.tex | 59 ++++++++++++--- .../source/generic/tex4ht/tex4ht-html4.tex | 52 +++++++++---- .../source/generic/tex4ht/tex4ht-mathml.tex | 30 +++++++- Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 87 ++++++++++++++-------- Master/texmf-dist/tex/generic/tex4ht/mathml.4ht | 68 ++++++++++++++--- Master/texmf-dist/tex/generic/tex4ht/ulem.4ht | 83 +++++++++++++-------- Master/texmf-dist/tex/generic/tex4ht/xr-hooks.4ht | 10 ++- Master/texmf-dist/tex/generic/tex4ht/xr.4ht | 11 ++- 9 files changed, 304 insertions(+), 108 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 578132db29e..27cce11cff6 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,15 @@ +2022-04-26 Michal Hoftich + + * 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 * tex4ht-4ht.tex (xr-hyper.4ht, diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 5e3d3106bd5..eb4ca2f77d8 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/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}'. \<<< \: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}'. >>> \<<< -\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|\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. + \<<< -\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/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index 95b77afb6b4..d9d3ae88ada 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex +++ b/Master/texmf-dist/source/generic/tex4ht/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{uline} - {\HCode{}} {\HCode{}} -\Css{.uline{ text-decoration:underline; }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Configure{uline-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.uline,.uline-math{ text-decoration:underline; }} \Configure{uuline} - {\HCode{}} {\HCode{}} -\Css{.uuline{ text-decoration:underline; }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Configure{uuline-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.uuline,.uuline-math{ text-decoration:underline double; }} \Configure{sout} - {\HCode{}} {\HCode{}} -\Css{span.sout {text-decoration: line-through }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Configure{sout-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{span.sout, .sout-math {text-decoration: line-through }} \Configure{xout} - {\HCode{}} - {\HCode{}} -\Css{span.xout {text-decoration: line-through }} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Configure{xout-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{span.xout, .xout-math {text-decoration: line-through underline }} \Configure{uwave} - {\HCode{}} - {\HCode{}} -\Css{span.uwave {text-decoration:underline }} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Configure{uwave-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{span.uwave, .uwave-math {text-decoration:underline wavy; }} +\Configure{dashuline} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Configure{dashuline-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{span.dashuline, .dashuline-math {text-decoration:underline dashed;}} +\Configure{dotuline} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Configure{dotuline-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{span.dotuline, .dotuline-math {text-decoration:underline dotted;}} >>> diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex index 4be5595c60b..5f5da30c082 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex +++ b/Master/texmf-dist/source/generic/tex4ht/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;}% {\HCode{}} >>> +Support for the Ulem package in MathML +\<<< +\Configure{uline-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.uline-math{ text-decoration:underline; }} +\Configure{uuline-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.uuline-math{ text-decoration:underline double; }} +\Configure{sout-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.sout-math {text-decoration: line-through }} +\Configure{xout-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{.xout-math {text-decoration: line-through underline }} +\Configure{uwave-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{.uwave-math {text-decoration:underline wavy; }} +\Configure{dashuline-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{.dashuline-math {text-decoration:underline dashed;}} +\Configure{dotuline-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{.dotuline-math {text-decoration:underline dotted;}} +>>> diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index 22f2411d03e..70c092e7164 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht @@ -1,4 +1,4 @@ -% html4.4ht (2022-04-17-09:34), generated from tex4ht-html4.tex +% html4.4ht (2022-04-26-14:01), generated from tex4ht-html4.tex % Copyright 2009-2022 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-04-17-09:34} +\immediate\write-1{version 2022-04-26-14:01} \exit:ifnot{8859-6,% CJK,% @@ -29341,7 +29341,6 @@ Y{0178}\i{00EF}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{eplain} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -29434,7 +29433,6 @@ Y{0178}\i{00EF}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{context} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -30660,6 +30658,7 @@ description">}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{titlesec} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -37153,22 +37152,48 @@ description">}% \ConfigureHinput{ulem} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \Configure{uline} - {\HCode{}} {\HCode{}} -\Css{.uline{ text-decoration:underline; }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Configure{uline-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.uline,.uline-math{ text-decoration:underline; }} \Configure{uuline} - {\HCode{}} {\HCode{}} -\Css{.uuline{ text-decoration:underline; }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Configure{uuline-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.uuline,.uuline-math{ text-decoration:underline double; }} \Configure{sout} - {\HCode{}} {\HCode{}} -\Css{span.sout {text-decoration: line-through }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Configure{sout-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{span.sout, .sout-math {text-decoration: line-through }} \Configure{xout} - {\HCode{}} - {\HCode{}} -\Css{span.xout {text-decoration: line-through }} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Configure{xout-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{span.xout, .xout-math {text-decoration: line-through underline }} \Configure{uwave} - {\HCode{}} - {\HCode{}} -\Css{span.uwave {text-decoration:underline }} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Configure{uwave-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{span.uwave, .uwave-math {text-decoration:underline wavy; }} +\Configure{dashuline} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Configure{dashuline-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{span.dashuline, .dashuline-math {text-decoration:underline dashed;}} +\Configure{dotuline} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Configure{dotuline-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{span.dotuline, .dotuline-math {text-decoration:underline dotted;}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38105,6 +38130,8 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{nicefrac} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38118,7 +38145,6 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{multicol} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38151,6 +38177,7 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ProTex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38399,6 +38426,7 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{writer} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38443,7 +38471,6 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{mdwlist} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38542,6 +38569,7 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{soul} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38594,7 +38622,6 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{manmac} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38698,6 +38725,7 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{cp852} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38708,7 +38736,6 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{cp862} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38739,6 +38766,7 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{cp437} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38749,7 +38777,6 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{cp437de} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38782,6 +38809,7 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{polish} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38794,7 +38822,6 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{polski} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39017,6 +39044,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{russianb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39040,7 +39068,6 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{scottish} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39453,6 +39480,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{spanish} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39497,7 +39525,6 @@ Y{1EF8}y{1EF9}\i{0129}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{swedish} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39534,6 +39561,7 @@ Y{1EF8}y{1EF9}\i{0129}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{usorbian} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39546,7 +39574,6 @@ Y{1EF8}y{1EF9}\i{0129}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{welsh} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39583,6 +39610,7 @@ Y{1EF8}y{1EF9}\i{0129}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{catalan} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39595,7 +39623,6 @@ Y{1EF8}y{1EF9}\i{0129}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{croatian} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39820,6 +39847,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{dutch} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39832,7 +39860,6 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{english} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39869,6 +39896,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{finnish} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -39881,7 +39909,6 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{francais} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -40178,6 +40205,7 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{mdframed} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -40204,7 +40232,6 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{tcolorbox} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -40292,6 +40319,7 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{sectionbreak} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -40314,6 +40342,5 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}% - \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index aad2e3dacc1..bf3fe8e2cdc 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht @@ -1,4 +1,4 @@ -% mathml.4ht (2021-11-30-15:01), generated from tex4ht-mathml.tex +% mathml.4ht (2022-04-26-14:01), generated from tex4ht-mathml.tex % Copyright 2009-2021 TeX Users Group % Copyright 1999-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-11-30-15:01} +\immediate\write-1{version 2022-04-26-14:01} \exit:ifnot{Preamble,% accents,% @@ -43,6 +43,7 @@ rlbabel,% sistyle,% subeqnarray,% tex4ht,% +ulem,% ushort,% vanilla} @@ -1725,10 +1726,6 @@ accent="true">&\#x0332;}% - - - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2099,6 +2096,7 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsfonts} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2183,6 +2181,7 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amstex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2349,6 +2348,8 @@ accent="true">&\#x0332;}% + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{plain} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3246,6 +3247,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3317,6 +3319,11 @@ accent="true">&\#x0332;}% + + + + + @@ -3376,8 +3383,6 @@ accent="true">&\#x0332;}% - - @@ -3418,7 +3423,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3708,7 +3712,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{rlbabel} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3744,6 +3747,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3813,6 +3817,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3951,7 +3956,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4041,6 +4045,7 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ushort} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4078,7 +4083,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{bm} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4126,6 +4130,46 @@ accent="true">&\#x0332;}% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \ConfigureHinput{ulem} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \Configure{uline-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.uline-math{ text-decoration:underline; }} +\Configure{uuline-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.uuline-math{ text-decoration:underline double; }} +\Configure{sout-math} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.sout-math {text-decoration: line-through }} +\Configure{xout-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{.xout-math {text-decoration: line-through underline }} +\Configure{uwave-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{.uwave-math {text-decoration:underline wavy; }} +\Configure{dashuline-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{.dashuline-math {text-decoration:underline dashed;}} +\Configure{dotuline-math} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} +\Css{.dotuline-math {text-decoration:underline dotted;}} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput\empty\empty\empty\empty\empty\empty +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + + + + diff --git a/Master/texmf-dist/tex/generic/tex4ht/ulem.4ht b/Master/texmf-dist/tex/generic/tex4ht/ulem.4ht index c8e55280dba..c483c3ae412 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/ulem.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/ulem.4ht @@ -1,44 +1,61 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ulem.4ht 2009-05-21-09:32 % -% Copyright (C) 2001--2009 Eitan M. Gurari % -% % -% This work may be distributed and/or modified under the % -% conditions of the LaTeX Project Public License, either % -% version 1.3c of this license or (at your option) any % -% later version. The latest version of this license is % -% in % -% http://www.latex-project.org/lppl.txt % -% and version 1.3c or later is part of all distributions % -% of LaTeX version 2005/12/01 or later. % -% % -% This work has the LPPL maintenance status "maintained".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-05-21-09:32} +% ulem.4ht 2022-04-26-14:00 % +% Copyright (C) 2001-2009 Eitan M. Gurari % +% Copyright 2009-2022 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. +\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} -\expandafter\def\csname uline \endcsname{\relax - \ifmmode\expandafter\underline - \else \a:uline \bgroup \aftergroup\b:uline \expandafter\ULset\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 diff --git a/Master/texmf-dist/tex/generic/tex4ht/xr-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/xr-hooks.4ht index 4365525869c..9db247c22ee 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/xr-hooks.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/xr-hooks.4ht @@ -1,6 +1,6 @@ -% xr-hooks.4ht (2020-10-17-13:53), generated from tex4ht-4ht.tex +% xr-hooks.4ht (2022-04-26-14:00), generated from tex4ht-4ht.tex % Copyright 2020 TeX Users Group -% Copyright 2009-2020 TeX Users Group +% Copyright 2009-2022 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,10 +17,14 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-10-17-13:53} +\immediate\write-1{version 2022-04-26-14:00} \: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}}{}}% } diff --git a/Master/texmf-dist/tex/generic/tex4ht/xr.4ht b/Master/texmf-dist/tex/generic/tex4ht/xr.4ht index 3e6ddac571c..66e4fe0d122 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/xr.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/xr.4ht @@ -1,6 +1,6 @@ -% xr.4ht (2016-12-21-15:03), generated from tex4ht-4ht.tex +% xr.4ht (2022-04-26-14:00), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari -% Copyright 2009-2016 TeX Users Group +% Copyright 2009-2022 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2016-12-21-15:03} +\immediate\write-1{version 2022-04-26-14:00} \let\XR:loop=\XR@loop \def\XR@loop#1{% @@ -52,7 +52,10 @@ \ifeof\@inputcheck\expandafter\XR@aux \else\expandafter\XR@read\fi} - \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} -- cgit v1.2.3