diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
12 files changed, 219 insertions, 206 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-accessibility.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-accessibility.sty new file mode 100644 index 00000000000..6c341f9587d --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-accessibility.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-accessibility.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `accessibility') +%% This is a generated file. +%% Copyright 2016-2019 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% 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.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{accessibility}[2019/10/14] +\newcommand{\alt}[1]{\ThisAltText{#1}} +\newcommand{\newhref}[3]{\ThisAltText{#2}\href{#1}{#3}}% +\providecommand{\thead}[1]{\textbf{#1}} +\endinput +%% +%% End of file `lwarp-accessibility.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty index 008a8b829cb..324ec8a0d63 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty @@ -17,6 +17,8 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{afterpage}[2014/10/28] \newcommand{\afterpage}[1]{#1} +\LWR@ProvidesPackageDrop{afterpage}[2014/10/28] +\newcommand{\afterpage}[1]{#1} \endinput %% %% End of file `lwarp-afterpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty index 80eac667c92..e0cdac6d6ae 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty @@ -19,20 +19,16 @@ \LetLtxMacro\burl\url \NewDocumentCommand{\LWR@burlaltb}{O{} +m m}{% -\LWR@ensuredoingapar% -\LWR@subhyperref{#2}% -\LWR@subhyperreftext{#3}% -\endgroup% restore catcodes + \LWR@ensuredoingapar% + \LWR@subhyperref{#2}% + \LWR@subhyperreftext{#3}% + \endgroup% restore catcodes } \newrobustcmd*{\burlalt}{% -\begingroup% -\catcode`\#=12% -\catcode`\%=12% -\catcode`\&=12% -\catcode`\~=12% -\catcode`\_=12% -\LWR@burlaltb% + \begingroup% + \LWR@linkcatcodes% + \LWR@burlaltb% } \LetLtxMacro\urlalt\burlalt diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty index 212a0993fb4..b6965b64ee1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty @@ -16,6 +16,13 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. +\typeout{---} +\typeout{Packages lwarp and caption:} +\typeout{If a ``Missing \protect\begin\protect{document\protect}'' error occurs here,} +\typeout{try using \space \protect\usepackage\protect{caption\protect}\space\protect\captionsetup{options}} +\typeout{instead of \protect\usepackage[options]\protect{caption\protect}.} +\typeout{---} + \LWR@ProvidesPackagePass{caption}[2019/09/01] \renewcommand\caption@ibox[3]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty index c57d58df19c..70971ef5625 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty @@ -45,8 +45,8 @@ }{}% } \newcommand*{\LWR@multimedia@fileAV}[4]{% -\filename@parse{#2}% -\IfFileExists{#2}{% +\IfFileExists{#2}{% also sets \@filef@und +\StrSubstitute[100]{\@filef@und}{"}{}[\LWR@parsedfilename]% \ifstrequal{#3}{audio}{% \begin{BlockClass}{AVviewport} }{% @@ -64,10 +64,10 @@ \LWR@htmltag{% source % space src=\textquotedbl% - \@filef@und\unskip\textquotedbl\ % space + \LWR@parsedfilename\unskip\textquotedbl\ % space type=\textquotedbl{}#4\textquotedbl} \LWR@startpars - \href{\@filef@und}{#1} + \href{\LWR@parsedfilename}{#1} \LWR@stoppars \LWR@htmltag{/#3}\LWR@orignewline \end{BlockClass} @@ -154,11 +154,7 @@ } \newrobustcmd*{\LWR@multimedia}{% \begingroup% - \catcode`\#=12% - \catcode`\%=12% - \catcode`\&=12% - \catcode`\~=12% - \catcode`\_=12% + \LWR@linkmediacatcodes% \LWR@multimediab% } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty index c5c2ee4c37a..f1a339ca588 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty @@ -19,16 +19,8 @@ \LWR@ProvidesPackageDropA{geometry}{2018/04/16} \ifbool{LWR@allowanothergeometry}{% -\newcommand*{\LWR@newgeometryoptions}{reset,} - -\DeclareOption*{% - \edef\LWR@newgeometryoptions{\LWR@newgeometryoptions\CurrentOption,}% -} -\ProcessOptions\relax -\ifdefvoid{\LWR@newgeometryoptions}{}{ - \expandafter\LWR@origgeometry\expandafter{\LWR@newgeometryoptions} -} - + \edef\LWR@tempone{reset,\@ptionlist{\@currname.\@currext}}% + \expandafter\LWR@origgeometry\expandafter{\LWR@tempone}% }{}% LWR@allowanothergeometry \renewcommand*{\geometry}[1]{} \renewcommand*{\newgeometry}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 61c5a38bef4..b1781c420ee 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -197,9 +197,9 @@ \renewcommand*{\LWR@igyscale}{1}% \renewcommand*{\LWR@igclass}{inlineimage}% \ifdefvoid{\LWR@ThisAltText}{% - \renewcommand*{\LWR@igalt}{\ImageAltText}% + \edef\LWR@igalt{\ImageAltText}% }{% - \renewcommand*{\LWR@igalt}{\LWR@ThisAltText}% + \edef\LWR@igalt{\LWR@ThisAltText}% }% \IfValueF{#3}{% \IfValueTF{#2}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index 6b959804450..b5bd275e098 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -33,122 +33,98 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \newcommand*{\hyperbaseurl}[1]{} \NewDocumentCommand{\LWR@hyperimageb}{m +m}{% -\LWR@ensuredoingapar% -\def\LWR@templink{#1}% -\@onelevel@sanitize\LWR@templink% -\LWR@htmltag{img src="\LWR@templink" alt="#2" class="hyperimage"}% -\LWR@ensuredoingapar% -\endgroup% + \LWR@ensuredoingapar% + \def\LWR@templink{#1}% + \@onelevel@sanitize\LWR@templink% + \LWR@htmltag{img src="\LWR@templink" alt="#2" class="hyperimage"}% + \LWR@ensuredoingapar% + \endgroup% } \newrobustcmd*{\hyperimage}{% -\begingroup% -\catcode`\#=12% -\catcode`\%=12% -\catcode`\&=12% -\catcode`\~=12% -\catcode`\_=12% -\LWR@hyperimageb% + \begingroup% + \LWR@linkcatcodes% + \LWR@hyperimageb% } \NewDocumentCommand{\LWR@hyperdefb}{m m +m}{% -\LWR@ensuredoingapar% -\LWR@sublabel{#1.#2}% -#3% -\endgroup% + \LWR@ensuredoingapar% + \LWR@sublabel{#1.#2}% + #3% + \endgroup% } \newcommand*{\hyperdef}{% -\begingroup% -\catcode`\#=12% -\catcode`\%=12% -\catcode`\&=12% -\catcode`\~=12% -\catcode`\_=12% -\LWR@hyperdefb% + \begingroup% + \LWR@linkcatcodes% + \LWR@hyperdefb% } \newcommand{\LWR@hyperreffinish}[1]{% -\begingroup% -\RenewDocumentCommand{\ref}{}{\LWR@ref@ignorestar}% -#1% -\endgroup% -\LWR@htmltag{/a}% + \begingroup% + \RenewDocumentCommand{\ref}{}{\LWR@ref@ignorestar}% + #1% + \endgroup% + \LWR@htmltag{/a}% } \newcommand*{\LWR@hyperrefbb}[3]{% -\LWR@htmltag{% - a href="% - \detokenize\expandafter{#1}\LWR@hashmark% - \detokenize\expandafter{#2}.\detokenize\expandafter{#3}% - "% - \LWR@addlinktitle% -}% -\endgroup% -\LWR@hyperreffinish% + \LWR@htmltag{% + a href="% + \detokenize\expandafter{#1}\LWR@hashmark% + \detokenize\expandafter{#2}.\detokenize\expandafter{#3}% + "% + \LWR@addlinktitle% + }% + \endgroup% + \LWR@hyperreffinish% } \newrobustcmd*{\LWR@hyperrefb}{% -\begingroup% -\catcode`\#=12% -\catcode`\%=12% -\catcode`\&=12% -\catcode`\~=12% -\catcode`\_=12% -\LWR@hyperrefbb% + \begingroup% + \LWR@linkcatcodes% + \LWR@hyperrefbb% } \NewDocumentCommand{\LWR@hyperrefcb}{O{label}}{% -\LWR@startref{#1}% -\endgroup% -\LWR@hyperreffinish% + \LWR@startref{#1}% + \endgroup% + \LWR@hyperreffinish% } \newcommand*{\LWR@hyperrefc}{% -\begingroup% -\catcode`\#=12% -\catcode`\%=12% -\catcode`\&=12% -\catcode`\~=12% -\catcode`\_=12% -\LWR@hyperrefcb% + \begingroup% + \LWR@linkcatcodes% + \LWR@hyperrefcb% } \DeclareRobustCommand*{\hyperref}{% -\LWR@ensuredoingapar% -\@ifnextchar[\LWR@hyperrefc\LWR@hyperrefb% + \LWR@ensuredoingapar% + \@ifnextchar[\LWR@hyperrefc\LWR@hyperrefb% } \NewDocumentCommand{\LWR@hypertargetb}{m +m}{% -\label{LWR-ht-#1}% -#2% -\endgroup% + \label{LWR-ht-#1}% + #2% + \endgroup% } \newcommand*{\hypertarget}{% -\begingroup% -\catcode`\#=12% -\catcode`\%=12% -\catcode`\&=12% -\catcode`\~=12% -\catcode`\_=12% -\LWR@hypertargetb% + \begingroup% + \LWR@linkcatcodes% + \LWR@hypertargetb% } \DeclareDocumentCommand{\LWR@hyperlinkb}{m}{% -\LWR@hyperrefcb[LWR-ht-#1]% + \LWR@hyperrefcb[LWR-ht-#1]% } \DeclareDocumentCommand{\hyperlink}{}{% -\LWR@ensuredoingapar% -\begingroup% -\catcode`\#=12% -\catcode`\%=12% -\catcode`\&=12% -\catcode`\~=12% -\catcode`\_=12% -\LWR@hyperlinkb% + \LWR@ensuredoingapar% + \begingroup% + \LWR@linkcatcodes% + \LWR@hyperlinkb% } \NewDocumentCommand{\autoref}{s m}{% @@ -171,7 +147,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \newcommand{\texorpdfstring}[2]{#1} \def\hypercalcbp#1{% -\strip@pt\dimexpr 0.99626401\dimexpr(#1)\relax\relax + \strip@pt\dimexpr 0.99626401\dimexpr(#1)\relax\relax }% \newcommand{\Acrobatmenu}[2]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-media9.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-media9.sty index 4fb95971e0d..47cff027230 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-media9.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-media9.sty @@ -66,10 +66,7 @@ \newrobustcmd*{\includemedia}{% \begingroup% - \catcode`\#=12% - \catcode`\%=12% - \catcode`\~=12% - \catcode`\_=12% + \LWR@linkmediacatcodes% \LWR@includemediab% } \newcommand*{\mediabutton}[2][]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-movie15.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-movie15.sty index 77e505b41d3..1c27357f2b3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-movie15.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-movie15.sty @@ -32,11 +32,7 @@ \newrobustcmd*{\includemovie}{% \begingroup% - \catcode`\#=12% - \catcode`\%=12% - \catcode`\&=12% - \catcode`\~=12% - \catcode`\_=12% + \LWR@linkmediacatcodes% \LWR@includemovieb% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty index c40757c6376..367ee7ab03e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty @@ -59,7 +59,7 @@ \newcommand{\assignpagestyle}[2]{#2} -\NewDocumentCommand{\titleclass}{m o m o} +\NewDocumentCommand{\titleclass}{m o m o}{} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 4dd876182ec..9fb90c6691c 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} - [2019/10/15 v0.77 Allows LaTeX to directly produce HTML5 output.] + [2019/11/07 v0.78 Allows LaTeX to directly produce HTML5 output.] @@ -188,6 +188,7 @@ \LWR@loadafter{a5comb} \LWR@notmemoirloadafter{abstract} \LWR@loadafter{academicons} +\LWR@loadafter{accessibility} \LWR@loadafter{accsupp} \LWR@loadafter{acro} \LWR@loadafter{acronym} @@ -1077,15 +1078,27 @@ \begin{warpall} -\RequirePackage{filecontents} +\@ifundefined{filec@ntents@opt}{% older kernel, discard optional args -\@ifpackagelater{filecontents}{2011/10/09}% -{} -{ -\newwrite\fcwrite -\let\LWR@origfilec@ntents\filec@ntents -\def\filec@ntents{\def\chardef##1\write{\let\reserved@c\fcwrite}\LWR@origfilec@ntents} -} + \RequirePackage{filecontents} + + \LetLtxMacro\LWR@orig@filec@ntents\filec@ntents + + \@ifpackagelater{filecontents}{2011/10/08} + { + \renewcommand*{\filec@ntents}[1][]{\LWR@orig@filec@ntents} + } + {% patch older package for morewrites + \newwrite\fcwrite + \renewcommand*{\filec@ntents}[1][]{% + \def\chardef##1\write{\let\reserved@c\fcwrite}% + \LWR@orig@filec@ntents% + } + } + +}% older kernel +{% newer kernel +}% newer kernel, filecontents env accepts optional args, do not load package \end{warpall} @@ -1138,6 +1151,7 @@ \begin{warpall} \LetLtxMacro\LWR@origRequirePackage\RequirePackage +\LetLtxMacro\LWR@origRequirePackageWithOptions\RequirePackageWithOptions \newcommand*{\LWR@requirepackagenames}{} @@ -1259,13 +1273,13 @@ \IfValueTF{#1}% {% options given \IfValueTF{#3}% version given? - {\LWR@origRequirePackage[#1]{\LWR@parsedrequirepackagenames}[#3]}% - {\LWR@origRequirePackage[#1]{\LWR@parsedrequirepackagenames}}% + {\LWR@origRequirePackage[#1]{\LWR@parsedrequirepackagenames}[#3]}% + {\LWR@origRequirePackage[#1]{\LWR@parsedrequirepackagenames}}% }% {% no options given \IfValueTF{#3}% version given? - {\LWR@origRequirePackage{\LWR@parsedrequirepackagenames}[#3]}% - {\LWR@origRequirePackage{\LWR@parsedrequirepackagenames}}% + {\LWR@origRequirePackage{\LWR@parsedrequirepackagenames}[#3]}% + {\LWR@origRequirePackage{\LWR@parsedrequirepackagenames}}% }% } \LetLtxMacro\usepackage\RequirePackage @@ -1279,15 +1293,17 @@ Using package `#1' and adding lwarp modifications,\MessageBreak including options,}% \IfValueTF{#2} -{\ProvidesPackage{lwarp-#1}[#2]} -{\ProvidesPackage{lwarp-#1}} -\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{#1}} -\ProcessOptions\relax -\IfValueTF{#2} -{\LWR@origRequirePackage{#1}[#2]} -{\LWR@origRequirePackage{#1}} + {\ProvidesPackage{lwarp-#1}[#2]} + {\ProvidesPackage{lwarp-#1}} +\DeclareOption*{% + \PassOptionsToPackage{\CurrentOption}{#1}% +} +\ProcessOptions\relax% +\IfValueTF{#2}% + {\LWR@origRequirePackage{#1}[#2]}% + {\LWR@origRequirePackage{#1}}% \DeclareOption*{}% -\ProcessOptions\relax +\ProcessOptions\relax% } \newcommand*{\LWR@ProvidesPackageDropA}[2]{% @@ -1928,7 +1944,7 @@ \begin{LWRwriteconf} -\begin{filecontents*}{lwarp.css} +\begin{filecontents*}[overwrite]{lwarp.css} /* CSS stylesheet for the LaTeX lwarp package Copyright 2016-2019 Brian Dunn — BD Tech Concepts LLC @@ -3464,7 +3480,7 @@ span.sidetocthetitle { display: none } \begin{LWRwriteconf} -\begin{filecontents*}{lwarp_sagebrush.css} +\begin{filecontents*}[overwrite]{lwarp_sagebrush.css} @import url("lwarp.css") ; A:link {color:#105030 ; text-decoration: none ; } @@ -3696,7 +3712,7 @@ nav.sidetoc a:hover { \begin{LWRwriteconf} -\begin{filecontents*}{lwarp_formal.css} +\begin{filecontents*}[overwrite]{lwarp_formal.css} @import url("lwarp.css") ; A:link {color:#802020 ; text-decoration:none; } @@ -3889,7 +3905,7 @@ nav.botnavigation { \begin{LWRwriteconf} -\begin{filecontents*}{sample_project.css} +\begin{filecontents*}[overwrite]{sample_project.css} /* ( --- Start of project.css --- ) */ /* ( --- A sample project-specific CSS file for lwarp --- ) */ @@ -3907,7 +3923,7 @@ nav.botnavigation { \begin{LWRwriteconf} -\begin{filecontents*}{lwarp.ist} +\begin{filecontents*}[overwrite]{lwarp.ist} preamble "\\begin{theindex} \\providecommand*\\lettergroupDefault[1]{} @@ -3932,7 +3948,7 @@ page_compositor "." \begin{LWRwriteconf} -\begin{filecontents*}{lwarp.xdy} +\begin{filecontents*}[overwrite]{lwarp.xdy} (require "tex/inputenc/latin.xdy") (merge-rule "\\PS *" "Postscript") (require "texindy.xdy") @@ -3982,7 +3998,7 @@ page_compositor "." \begin{LWRwriteconf} -\begin{filecontents*}{lwarp_mathjax.txt} +\begin{filecontents*}[overwrite]{lwarp_mathjax.txt} <!-- https://groups.google.com/forum/#!topic/ mathjax-users/jUtewUcE2bY --> <script type="text/x-mathjax-config"> @@ -4083,12 +4099,12 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js?config=TeX- \begin{LWR@createlwarpmk} -\begin{filecontents*}{lwarpmk.lua} +\begin{filecontents*}[overwrite]{lwarpmk.lua} #!/usr/bin/env texlua -- Copyright 2016-2019 Brian Dunn -printversion = "v0.77" +printversion = "v0.78" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -5390,11 +5406,16 @@ end -- not --version \providecommand*{\LWR@FBcancel}{} \AtBeginDocument{% +\@ifundefined{NoAutoSpacing}% + {}% + {% + \LetLtxMacro\LWR@FBcancel\NoAutoSpacing% + }% + \@ifundefined{frenchbsetup}% {}% {% \frenchbsetup{FrenchFootnotes=false}% - \LetLtxMacro\LWR@FBcancel\NoAutoSpacing% \renewrobustcmd*{\FBcolonspace}{% \begingroup% \LWR@FBcancel% @@ -9104,7 +9125,7 @@ rowspan="#2" % } \AtBeginDocument{ -\@ifundefined{frenchbsetup}% +\@ifundefined{NoAutoSpacing}% {% no babel-french \newcommand*{\LWR@nullifyNoAutoSpacing}{} }% no babel-french @@ -9448,85 +9469,90 @@ autopage-\theLWR@currentautosec% } } +\newcommand*{\LWR@linkcatcodes}{% + \catcode`\#=12% + \catcode`\%=12% + \catcode`\&=12% + \catcode`\~=12% + \catcode`\_=12% + \LWR@FBcancel% +} + +\newcommand*{\LWR@linkmediacatcodes}{% + \catcode`\#=12% + \catcode`\%=12% + \catcode`\~=12% + \catcode`\_=12% + \LWR@FBcancel% +} + \NewDocumentCommand{\LWR@subhyperref}{m}{% -\LWR@traceinfo{LWR@subhyperref !#1!}% -\LWR@sanitize{#1}% -\LWR@htmltag{% - a href="\LWR@sanitized" % space - \LWR@addlinktitle % space - target="\_{}blank" % space -}% + \LWR@traceinfo{LWR@subhyperref !#1!}% + \LWR@sanitize{#1}% + \LWR@htmltag{% + a href="\LWR@sanitized" % space + \LWR@addlinktitle % space + target="\_{}blank" % space + }% } \newcommand{\LWR@subhyperreftext}[1]{% -#1% -\LWR@htmltag{/a}% -\LWR@ensuredoingapar% + #1% + \LWR@htmltag{/a}% + \LWR@ensuredoingapar% } \NewDocumentCommand{\LWR@subhyperrefclass}{m +m m}{% -\LWR@htmltag{% - a % space - href="\begingroup\@sanitize#1\endgroup" % space - class="#3" % space - \LWR@addlinktitle % space -}\LWR@orignewline% -#2\LWR@orignewline% -\LWR@htmltag{/a}% -\LWR@ensuredoingapar% + \LWR@htmltag{% + a % space + href="\begingroup\@sanitize#1\endgroup" % space + class="#3" % space + \LWR@addlinktitle % space + }\LWR@orignewline% + #2% + \LWR@htmltag{/a}% + \LWR@ensuredoingapar% } \DeclareDocumentCommand{\LWR@hrefb}{O{} m}{% -\LWR@ensuredoingapar% -\LWR@subhyperref{#2}% -\endgroup% restore catcodes -\LWR@subhyperreftext% + \LWR@ensuredoingapar% + \LWR@subhyperref{#2}% + \endgroup% restore catcodes + \LWR@subhyperreftext% } \newrobustcmd*{\href}{% -\begingroup% -\catcode`\#=12% -\catcode`\%=12% -\catcode`\&=12% -\catcode`\~=12% -\catcode`\_=12% -\LWR@hrefb% + \begingroup% + \LWR@linkcatcodes% + \LWR@hrefb% } \newcommand*{\LWR@nolinkurlb}[1]{% -\LWR@ensuredoingapar% -\def\LWR@templink{#1}% -\@onelevel@sanitize\LWR@templink% -\LWR@templink% -\endgroup% + \LWR@ensuredoingapar% + \def\LWR@templink{#1}% + \@onelevel@sanitize\LWR@templink% + \LWR@templink% + \endgroup% } \newrobustcmd*{\nolinkurl}{% -\begingroup% -\catcode`\#=12% -\catcode`\%=12% -\catcode`\&=12% -\catcode`\~=12% -\catcode`\_=12% -\LWR@nolinkurlb% + \begingroup% + \LWR@linkcatcodes% + \LWR@nolinkurlb% } \DeclareDocumentCommand{\LWR@urlb}{m}{% -\LWR@ensuredoingapar% -\def\LWR@templink{#1}% -\@onelevel@sanitize\LWR@templink% -\href{\LWR@templink}{\LWR@templink}% -\endgroup% + \LWR@ensuredoingapar% + \def\LWR@templink{#1}% + \@onelevel@sanitize\LWR@templink% + \href{\LWR@templink}{\LWR@templink}% + \endgroup% } \newrobustcmd*{\url}{% -\begingroup% -\catcode`\#=12% -\catcode`\%=12% -\catcode`\&=12% -\catcode`\~=12% -\catcode`\_=12% -\LWR@urlb% + \begingroup% + \LWR@linkcatcodes% + \LWR@urlb% } \newcommand*{\LWR@subinlineimage}[5]{% @@ -12191,7 +12217,8 @@ color:\LWR@origpound\LWR@tempcolor% \newrobustcmd*{\LWR@HTML@slshape}{\renewcommand*{\LWR@f@shape}{sl}} \LWR@formatted{slshape} -\renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape\ulcshape} +\newrobustcmd*{\LWR@HTML@normalfont}{\rmfamily\mdseries\upshape\ulcshape} +\LWR@formatted{normalfont} \renewcommand{\sp}[1]{\text{<sup>#1</sup>}{}} |