diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
7 files changed, 135 insertions, 55 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty index 044b87dfe85..3c69b37319a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty @@ -16,7 +16,63 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{acronym}[2015/03/21] +\LWR@ProvidesPackagePass{acronym}[2020/04/17] + +\expandafter\def\csname AC@\AC@prefix{}@acro\endcsname#1[#2]#3{% + \ifAC@nolist% + \else% + \ifnum% + \ifAC@printonlyused 1% + \else\ifAC@printonlyreused 1% + \else 0\fi\fi% + =1\relax% + \ifnum% + \ifAC@printonlyused% + \expandafter\ifx\csname acused@#1@once\endcsname\AC@used 1 \else 0 \fi% + \else\ifAC@printonlyreused% + \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used 1 \else 0 \fi% + \else 0 \fi\fi% + =1\relax% + \item[\protect\AC@hypertarget{#1}{% + \AC@hyperref[acro:#1]{\aclabelfont{#2}\hfill}% + }]\AC@hyperref[acro:#1]{#3}% + \ifAC@withpage% + \expandafter\ifx\csname r@acro:#1\endcsname\relax% + \PackageInfo{acronym}{% + Acronym #1 used in text but not spelled out in + full in text}% + \else% + \qquad --- % lwarp + \AC@pageref{acro:#1}% + \fi% + \fi\\% + \fi% + \else% + \item[\protect\AC@hypertarget{#1}{\AC@hyperref[acro:#1]{\aclabelfont{#2}\hfill}}]% + \AC@hyperref[acro:#1]{#3}% + \fi% + \fi% + \begingroup + \def\acroextra##1{}% + \@bsphack + \ifAC@printonlyreused% + \protected@write\@auxout{}{% + \string\newacro{#1}[% + \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used% + \string\AC@hyperlink{#1}{#2}% + \else% + {#2}% + \fi% + ]{#3}% + }% + \else% + \protected@write\@auxout{}{% + \string\newacro{#1}[\string\AC@hyperlink{#1}{#2}]{#3}% + }% + \fi% + \@esphack + \endgroup + \ignorespaces} \renewcommand{\acfia}[1]{% {\textit{\AC@acl{#1}}} (\ifAC@starred\acs*{#1}\else\acs{#1}\fi)} @@ -45,6 +101,25 @@ }% }% +\BeforeBeginEnvironment{acronym}{\LWR@stoppars} +\AfterEndEnvironment{acronym}{\LWR@startpars} + +\AtBeginDocument{ + \LetLtxMacro\AC@hyperlink\hyperlink + \LetLtxMacro\AC@hyperref\hyperref + \newcommand*\AC@raisedhypertarget[2]{% + \hypertarget{#1}{}% + #2}% + \LetLtxMacro\AC@hypertarget\AC@raisedhypertarget + \def\AC@phantomsection{% + }% +} + +\appto\LWR@restoreorigformatting{% + \LetLtxMacro\AC@hyperlink\@secondoftwo% + \LetLtxMacro\AC@hyperref\LWR@nullify@hyperref% +} + \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty index 956f33eef28..e66156861d6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty @@ -38,29 +38,6 @@ \end{lateximage}\end{BlockClass} } -\makeatletter -\begin{warpHTML} -\AtBeginDocument{ - \@ifpackageloaded{amsmath} - { - \xpatchcmd{\tagform@}{\leftprotrusion{(}}{(} - {} - {\LWR@patcherror{cases}{tagform@ A}}% - \xpatchcmd{\tagform@}{\rightprotrusion{)}}{)} - {} - {\LWR@patcherror{cases}{tagform@ B}}% - } - { - \xpatchcmd{\@eqnnum}{\leftprotrusion{(}}{(} - {} - {\LWR@patcherror{cases}{@eqnnum A}}% - \xpatchcmd{\@eqnnum}{\rightprotrusion{)}}{)} - {} - {\LWR@patcherror{cases}{@eqnnum A}}% - }% -} -\end{warpHTML} -\makeatother \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index c0c8df88dbd..50865b64bb3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -317,7 +317,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \newcommand{\LWR@hyperreffinish}[1]{% \begingroup% \RenewDocumentCommand{\ref}{s m}{\LWR@print@ref{##2}}% - #1% + #1% \endgroup% \LWR@htmltag{/a}% } @@ -340,7 +340,6 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \LWR@hyperrefbb% } - \NewDocumentCommand{\LWR@hyperrefcb}{O{label}}{% \LWR@startref{#1}% \endgroup% @@ -384,6 +383,17 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \LWR@hyperlinkb% } +\newcommand{\LWR@nullify@hyperrefb}[2][]{} + +\newcommand*{\LWR@nullify@hyperref}{% + \@ifnextchar[\LWR@nullify@hyperrefb\@fourthoffour% +} +\appto\LWR@restoreorigformatting{% + \LetLtxMacro\hyperdef\@thirdofthree + \LetLtxMacro\hyperlink\@secondoftwo% + \LetLtxMacro\hyperref\LWR@nullify@hyperref% +} + \NewDocumentCommand{\autoref}{s m}{% \IfBooleanTF{#1}{\ref{#2}}{\cref{#2}}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty index 63be5b898de..bea655dedf9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty @@ -79,17 +79,17 @@ \LetLtxMacro\subsubitem\LWR@indexsubsubitem% } \renewcommand\imki@wrindexentrysplit[3]{% -\addtocounter{LWR@autoindex}{1}% -\label{LWRindex-\arabic{LWR@autoindex}}% - \expandafter\protected@write\csname#1@idxfile\endcsname{}% - {\string\indexentry{#2}{\arabic{LWR@autoindex}}}% + \addtocounter{LWR@autoindex}{1}% + \expandafter\protected@write\csname#1@idxfile\endcsname{}% + {\string\indexentry{#2}{\arabic{LWR@autoindex}}}% + \label{LWRindex-\arabic{LWR@autoindex}}% } \renewcommand\imki@wrindexentryunique[3]{% -\addtocounter{LWR@autoindex}{1}% -\label{LWRindex-\arabic{LWR@autoindex}}% - \protected@write\@indexfile{}% - {\string\indexentry[#1]{#2}{\arabic{LWR@autoindex}}}% + \addtocounter{LWR@autoindex}{1}% + \protected@write\@indexfile{}% + {\string\indexentry[#1]{#2}{\arabic{LWR@autoindex}}}% + \label{LWRindex-\arabic{LWR@autoindex}}% } \def\imki@wrindexsplit#1#2{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty index 9044f663fa0..d46eb2a259f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -976,17 +976,17 @@ \AtBeginDocument{ \def\@@wrindexhyp#1||\\{% - \addtocounter{LWR@autoindex}{1}% - \label{LWRindex-\arabic{LWR@autoindex}}% + \addtocounter{LWR@autoindex}{1}% lwarp \protected@write\@auxout{}% - {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% + {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% lwarp + \label{LWRindex-\arabic{LWR@autoindex}}% lwarp \endgroup \@esphack}% \def\@@wrspindexhyp#1||\\{% \addtocounter{LWR@autoindex}{1}% - \label{LWRindex-\arabic{LWR@autoindex}}% \protected@write\@auxout{}% {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% + \label{LWRindex-\arabic{LWR@autoindex}}% \endgroup \@esphack}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty index 9dc3ae00d47..0de4caeac02 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty @@ -37,8 +37,8 @@ \def\@tempa{#2}% \csname index@#1@hook\endcsname \addtocounter{LWR@autoindex}{1}% lwarp + \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR@autoindex}}}% \label{LWRindex-\arabic{LWR@autoindex}}% lwarp - \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR@autoindex}}}% \endgroup \@esphack \fi diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 19cbcf8832c..ac519c67010 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2022/03/16 v0.904a Allows LaTeX to directly produce HTML5 output.] + [2022/03/22 v0.905 Allows LaTeX to directly produce HTML5 output.] @@ -966,6 +966,9 @@ \LWR@origrule{0pt}{1\baselineskip}% \LWR@orignewline% } +\long\def\LWR@thirdofthree#1#2#3{#3}% +\long\def\LWR@fourthoffour#1#2#3#4{#4}% + \long\def\LWR@firstoffive#1#2#3#4#5{#1} \long\def\LWR@secondoffive#1#2#3#4#5{#2} \long\def\LWR@thirdoffive#1#2#3#4#5{#3} @@ -4854,7 +4857,7 @@ MathJax = { -- Copyright 2016-2022 Brian Dunn -printversion = "v0.904a" +printversion = "v0.905" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -6018,15 +6021,16 @@ end -- not --version \let\LWR@origampersand\& -\newrobustcmd*{\LWR@fontfortags}[1]{% +\newrobustcmd*{\LWR@fontfortags}[2]{% \ifmmode% \PackageError{lwarp}% {% An HTML tag was generated inside math.\MessageBreak This should never occur.\MessageBreak - Something is broken in Lwarp% + Something is broken in Lwarp.\MessageBreak + Enter `h' for details% }% - {(Using #1.)}% + {(Using #1{#2}.)}% \else% \ifdef{\romanencoding}% {% @@ -6045,7 +6049,7 @@ end -- not --version \newcommand*{\HTMLentity}[1]{% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{HTMLentity}% + \LWR@fontfortags{HTMLentity}{\detokenize{#1}}% \protect\LWR@origampersand\LWR@isolate{#1};% \endgroup% } @@ -6419,7 +6423,7 @@ end -- not --version \LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{LWR@htmltagc}% + \LWR@fontfortags{LWR@htmltagc}{\detokenize{#1}}% \protect\LWR@origtextless% \LWR@isolate{#1}% \protect\LWR@origtextgreater% @@ -6522,7 +6526,7 @@ end -- not --version \newcommand*{\LWR@htmlopencomment}{% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{LWR@htmlopencomment}% + \LWR@fontfortags{LWR@htmlopencomment}{}% \LWR@print@mbox{\LWR@origtextless{}!-\/-}% \endgroup% } @@ -6530,7 +6534,7 @@ end -- not --version \newcommand*{\LWR@htmlclosecomment}{% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{LWr@htmlclosecomment}% + \LWR@fontfortags{LWr@htmlclosecomment}{}% \LWR@print@mbox{-\/-\LWR@origtextgreater}% \endgroup% } @@ -11408,7 +11412,8 @@ end -- not --version \LWR@traceinfo{LWR@myshorttoc: loading}% \begingroup% \makeatletter% - \LWR@disablepinyin% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% \@input{\jobname.#1}% \endgroup% }% @@ -11438,7 +11443,7 @@ end -- not --version \boolfalse{LWR@copiedsidetoc} \AtBeginDocument{ -\let\LWR@origtableofcontents\tableofcontents +\LetLtxMacro\LWR@origtableofcontents\tableofcontents \renewcommand*{\tableofcontents}{% \ifboolexpr{bool{FormatWP} and bool{WPMarkTOC}}{ @@ -11452,7 +11457,11 @@ end -- not --version \booltrue{LWR@copiedsidetoc}% }% \LWR@printpendingfootnotes - \LWR@origtableofcontents + \begingroup% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% + \LWR@origtableofcontents% + \endgroup% } }% \tableofcontents @@ -11468,7 +11477,11 @@ end -- not --version } { \LWR@printpendingfootnotes - \LWR@origlistoffigures + \begingroup% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% + \LWR@origlistoffigures% + \endgroup% } } @@ -11482,7 +11495,11 @@ end -- not --version } { \LWR@printpendingfootnotes - \LWR@origlistoftables + \begingroup% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% + \LWR@origlistoftables% + \endgroup% } } @@ -11712,9 +11729,9 @@ end -- not --version \def\LWR@tempone{#1}% }% \addtocounter{LWR@autoindex}{1}% - \label{LWRindex-\arabic{LWR@autoindex}}% \protected@write\@indexfile{}% - {\string\indexentry{\LWR@tempone}{\arabic{LWR@autoindex}}}% +{\string\indexentry{\LWR@tempone}{\arabic{LWR@autoindex}}}% + \label{LWRindex-\arabic{LWR@autoindex}}% \endgroup% \@esphack% } @@ -14582,6 +14599,7 @@ color:\LWR@origpound\LWR@tempcolor% \AfterEndPreamble{\LWR@LwarpStart} \AtEndDocument{\LWR@LwarpEnd} +\DeclareHookRule{enddocument}{lwarp}{after}{legacy} \end{warpHTML} |