diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty | 298 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty | 56 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-changelayout.sty | 46 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty | 134 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-inputtrc.sty | 33 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty | 28 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty | 21 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-metalogox.sty | 27 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 283 |
13 files changed, 537 insertions, 398 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty index 1a48f6551e5..f131bc06e2c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty @@ -35,288 +35,78 @@ } }% not mathjax -\BeforeBeginEnvironment{multline}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@syncmathjax - \booltrue{LWR@amsmultline} - \LWR@beginhideamsmath -} -{ - \begin{BlockClass}{displaymathnumbered} - \LWR@newautoidanchor% - \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@amsmathbodynumbered{multline}] - \LWR@applyxfakebold% -} -} - -\AfterEndEnvironment{multline}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@endhideamsmath - \boolfalse{LWR@amsmultline} - \LWR@addmathjax{multline}{\the\@envbody} -} -{\end{lateximage}\end{BlockClass}} - -} - -\BeforeBeginEnvironment{multline*}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@syncmathjax - \booltrue{LWR@amsmultline} - \LWR@beginhideamsmath -} -{ - \begin{BlockClass}{displaymath} - \LWR@newautoidanchor - \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@amsmathbody{multline*}] - \LWR@applyxfakebold% -} -} - -\AfterEndEnvironment{multline*}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@endhideamsmath - \boolfalse{LWR@amsmultline} - \LWR@addmathjax{multline*}{\the\@envbody} -} -{\end{lateximage}\end{BlockClass}} - -} - - -\BeforeBeginEnvironment{gather}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@syncmathjax - \boolfalse{LWR@amsmultline} - \LWR@beginhideamsmath -} -{ - \begin{BlockClass}{displaymathnumbered} - \LWR@newautoidanchor% - \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@amsmathbodynumbered{gather}] - \LWR@applyxfakebold% -} -} - -\AfterEndEnvironment{gather}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@endhideamsmath - \LWR@addmathjax{gather}{\the\@envbody} -} -{\end{lateximage}\end{BlockClass}} - -} - -\BeforeBeginEnvironment{gather*}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@syncmathjax - \boolfalse{LWR@amsmultline} - \LWR@beginhideamsmath -} -{ - \begin{BlockClass}{displaymath} - \LWR@newautoidanchor% - \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@amsmathbody{gather*}] - \LWR@applyxfakebold% -} -} - -\AfterEndEnvironment{gather*}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@endhideamsmath - \LWR@addmathjax{gather*}{\the\@envbody} -} -{\end{lateximage}\end{BlockClass}} - -} - -\BeforeBeginEnvironment{align}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@syncmathjax - \boolfalse{LWR@amsmultline} - \LWR@beginhideamsmath -} -{ +\newcommand*{\LWR@amsmathenv@@before}[1]{% \begin{BlockClass}{displaymathnumbered} \LWR@newautoidanchor% \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@amsmathbodynumbered{align}] + \begin{lateximage}[\LWR@amsmathbodynumbered{#1}] \LWR@applyxfakebold% } +\newcommand*{\LWR@amsmathenv@before}[1]{% + \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% + { + \LWR@syncmathjax + \boolfalse{LWR@amsmultline} + \ifstrequal{#1}{multline}{\booltrue{LWR@amsmultline}}{} + \ifstrequal{#1}{multline*}{\booltrue{LWR@amsmultline}}{} + \LWR@beginhideamsmath + } + { + \LWR@amsmathenv@@before{multline} + } } - -\AfterEndEnvironment{align}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@endhideamsmath - \LWR@addmathjax{align}{\the\@envbody} +\newcommand*{\LWR@amsmathenv@@after}{% + \end{lateximage}\end{BlockClass} } -{\end{lateximage}\end{BlockClass}} - +\newcommand*{\LWR@amsmathenv@after}[1]{% + \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% + { + \LWR@endhideamsmath + \boolfalse{LWR@amsmultline} + \LWR@addmathjax{#1}{\the\@envbody} + } + {\LWR@amsmathenv@@after} } +\BeforeBeginEnvironment{multline}{\LWR@amsmathenv@before{multline}} -\BeforeBeginEnvironment{align*}{ +\AfterEndEnvironment{multline}{\LWR@amsmathenv@after{multline}} -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@syncmathjax - \boolfalse{LWR@amsmultline} - \LWR@beginhideamsmath -} -{ - \begin{BlockClass}{displaymath} - \LWR@newautoidanchor% - \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@amsmathbody{align*}] - \LWR@applyxfakebold% -} -} +\BeforeBeginEnvironment{multline*}{\LWR@amsmathenv@before{multline*}} -\AfterEndEnvironment{align*}{ +\AfterEndEnvironment{multline*}{\LWR@amsmathenv@after{multline*}} -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@endhideamsmath - \LWR@addmathjax{align*}{\the\@envbody} -} -{\end{lateximage}\end{BlockClass}} -} +\BeforeBeginEnvironment{gather}{\LWR@amsmathenv@before{gather}} -\BeforeBeginEnvironment{flalign}{ +\AfterEndEnvironment{gather}{\LWR@amsmathenv@after{gather}} -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@syncmathjax - \boolfalse{LWR@amsmultline} - \LWR@beginhideamsmath -} -{ - \begin{BlockClass}{displaymathnumbered} - \LWR@newautoidanchor% - \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@amsmathbodynumbered{flalign}] - \LWR@applyxfakebold% -} -} +\BeforeBeginEnvironment{gather*}{\LWR@amsmathenv@before{gather*}} -\AfterEndEnvironment{flalign}{ +\AfterEndEnvironment{gather*}{\LWR@amsmathenv@after{gather*}} -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@endhideamsmath - \LWR@addmathjax{flalign}{\the\@envbody} -} -{\end{lateximage}\end{BlockClass}} +\BeforeBeginEnvironment{align}{\LWR@amsmathenv@before{align}} -} +\AfterEndEnvironment{align}{\LWR@amsmathenv@after{align}} -\BeforeBeginEnvironment{flalign*}{ +\BeforeBeginEnvironment{align*}{\LWR@amsmathenv@before{align*}} -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@syncmathjax - \boolfalse{LWR@amsmultline} - \LWR@beginhideamsmath -} -{ - \begin{BlockClass}{displaymath} - \LWR@newautoidanchor% - \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@amsmathbody{flalign*}] - \LWR@applyxfakebold% -} -} - -\AfterEndEnvironment{flalign*}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@endhideamsmath - \LWR@addmathjax{flalign*}{\the\@envbody} -} -{\end{lateximage}\end{BlockClass}} - -} - -\BeforeBeginEnvironment{alignat}{ - -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@syncmathjax - \boolfalse{LWR@amsmultline} - \LWR@beginhideamsmath -} -{ - \begin{BlockClass}{displaymathnumbered} - \LWR@newautoidanchor% - \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@amsmathbodynumbered{alignat}] - \LWR@applyxfakebold% -} -} +\AfterEndEnvironment{align*}{\LWR@amsmathenv@after{align*}} -\AfterEndEnvironment{alignat}{ +\BeforeBeginEnvironment{flalign}{\LWR@amsmathenv@before{flalign}} -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@endhideamsmath - \LWR@addmathjax{alignat}{\the\@envbody} -} -{\end{lateximage}\end{BlockClass}} +\AfterEndEnvironment{flalign}{\LWR@amsmathenv@after{flalign}} -} +\BeforeBeginEnvironment{flalign*}{\LWR@amsmathenv@before{flalign*}} -\BeforeBeginEnvironment{alignat*}{ +\AfterEndEnvironment{flalign*}{\LWR@amsmathenv@after{flalign*}} -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@syncmathjax - \boolfalse{LWR@amsmultline} - \LWR@beginhideamsmath -} -{ - \begin{BlockClass}{displaymath} - \LWR@newautoidanchor% - \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@amsmathbody{alignat*}] - \LWR@applyxfakebold% -} -} +\BeforeBeginEnvironment{alignat}{\LWR@amsmathenv@before{alignat}} -\AfterEndEnvironment{alignat*}{ +\AfterEndEnvironment{alignat}{\LWR@amsmathenv@after{alignat}} -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ - \LWR@endhideamsmath - \LWR@addmathjax{alignat*}{\the\@envbody} -} -{\end{lateximage}\end{BlockClass}} +\BeforeBeginEnvironment{alignat*}{\LWR@amsmathenv@before{alignat*}} -} +\AfterEndEnvironment{alignat*}{\LWR@amsmathenv@after{alignat*}} \endinput %% %% End of file `lwarp-amsmath.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty new file mode 100644 index 00000000000..53909f35735 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty @@ -0,0 +1,56 @@ +%% +%% This is file `lwarp-autonum.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `autonum') +%% This is a generated file. +%% Copyright 2016-2018 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{autonum}[2015/01/18] +\RequirePackage{amsmath} + +\newenvironment{equation+}{\equation}{\endequation} + +\newenvironment{gather+}{\gather}{\endgather} + +\BeforeBeginEnvironment{gather+}{\LWR@amsmathenv@@before{gather+}} + +\AfterEndEnvironment{gather+}{\LWR@amsmathenv@@after} + +\newenvironment{multline+}{\multline}{\endmultline} + +\BeforeBeginEnvironment{multline+}{\LWR@amsmathenv@@before{multline+}} + +\AfterEndEnvironment{multline+}{\LWR@amsmathenv@@after} + +\newenvironment{flalign+}{\flalign}{\endflalign} + +\BeforeBeginEnvironment{flalign+}{\LWR@amsmathenv@@before{flaline+}} + +\AfterEndEnvironment{flalign+}{\LWR@amsmathenv@@after} + +\newenvironment{align+}{\align}{\endalign} + +\BeforeBeginEnvironment{align+}{\LWR@amsmathenv@@before{aline+}} + +\AfterEndEnvironment{align+}{\LWR@amsmathenv@@after} + +\newenvironment{alignat+}{\alignat}{\endalignat} + +\BeforeBeginEnvironment{alignat+}{\LWR@amsmathenv@@before{alineat+}} + +\AfterEndEnvironment{alignat+}{\LWR@amsmathenv@@after} + +\newenvironment{split+}{\split}{\endsplit} +\endinput +%% +%% End of file `lwarp-autonum.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty index 85ff82bca8a..a9641a2aeda 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty @@ -80,7 +80,7 @@ \let\caption@makeanchor\@firstofone \fi \@makecaption{\csname fnum@#1\endcsname}% - {\ignorespaces\caption@makeanchor{#3}}\par + {\ignorespaces\caption@makeanchor{#3}}% \caption@if@minipage\@minipagetrue\@minipagefalse}% \caption@end% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changelayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changelayout.sty new file mode 100644 index 00000000000..99dbbbac276 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changelayout.sty @@ -0,0 +1,46 @@ +%% +%% This is file `lwarp-changelayout.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `changelayout') +%% This is a generated file. +%% Copyright 2016-2018 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@ProvidesPackagePass{changelayout}[2009/10/07] +\renewrobustcmd\cpl@backtodefaults{} + +\renewrobustcmd\cpl@checkifoddpage{% + \cpl@oddpagefalse% +} + +\renewrobustcmd\changepagelayout[1]{% + \setkeys[KV]{changelay}{#1}% +} + +\renewrobustcmd{\changetextlayout}[1]{\changepagelayout{#1}} + +\renewrobustcmd\adjustpagelayout[1]{% + \setkeys[KV@X]{changelay}{#1}% +} + +\renewrobustcmd{\adjusttextlayout}[1]{\adjustpagelayout{#1}} + +\renewrobustcmd\adjusttextwidth[1]{% + \setkeys[KV]{changelay}{#1}% + \begin{BlockClass}[color:\LWR@colorstyle{named}{\cpl@textcolor}]{changelayout} + \color{\cpl@textcolor}% + \cpl@content + \end{BlockClass} +} +\endinput +%% +%% End of file `lwarp-changelayout.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty index 513da060de7..a9ccf40293d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty @@ -15,56 +15,118 @@ %% 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@ProvidesPackagePass{changes}[2015/04/27] -\xpatchcmd{\Changes@output} - {#1} - {\LWR@textcurrentcolor{#1}} - {} - {\LWR@patcherror{changes}{Changes@output}} +\LWR@ProvidesPackagePass{changes}[2019/01/26] +\renewcommand{\ChangesListline}[4]{% + \IfSubStr{\Changes@loc@show}{#1}{% + \LWR@startpars% + #2: #3 \qquad + \nameref{autopage-#4}% + \LWR@stoppars% + }{}% +} -\xpatchcmd{\listofchanges} - { - \ifthenelse{\equal{\Changes@InID}{\@empty}} - {\changesauthorname: \changesanonymousname} - {% - \changesauthorname: \Changes@InID - \ifthenelse{\equal{\Changes@InName}{\@empty}} - {} - { (\Changes@InName)} - } - } - { - \LWR@textcurrentcolor{% lwarp - \ifthenelse{\equal{\Changes@InID}{\@empty}} - {\changesauthorname: \changesanonymousname} +\renewcommand{\Changes@summaryline}[4]{% + \IfSubStr{\Changes@loc@show}{#1}{% + \ifthenelse{\not\equal{\Changes@loc@style}{compactsummary} \or #2 > 0}% {% - \changesauthorname: \Changes@InID - \ifthenelse{\equal{\Changes@InName}{\@empty}} - {} - { (\Changes@InName)} - } - } - } + #3:~#2#4% + }{}% + }{}% +} + +\xpatchcmd{\listofchanges} + {{\changesauthorname: \changesanonymousname}} + {{\LWR@textcurrentcolor{\changesauthorname: \changesanonymousname}}} {} - {\LWR@patcherror{changes}{listofchanges}} + {\LWR@patcherror{changes}{listofchanges A}} \xpatchcmd{\listofchanges} - {\parbox{\Changes@Len@summ}} + {\changesauthorname: \Changes@InID} + {\LWR@textcurrentcolor{\changesauthorname: \Changes@InID}} {} + {\LWR@patcherror{changes}{listofchanges B}} + +\xpatchcmd{\listofchanges} + {(\Changes@InName)} + {\LWR@textcurrentcolor{(\Changes@InName)}} {} - {\LWR@patcherror{changes}{listofchanges}} + {\LWR@patcherror{changes}{listofchanges C}} \xpatchcmd{\listofchanges} - {\parbox{\Changes@Len@summ}} + {\parbox{\Changes@summary@width}} {} {} - {\LWR@patcherror{changes}{listofchanges}} + {\LWR@patcherror{changes}{listofchanges D}} -\xpatchcmd{\listofchanges} - {\parbox{\Changes@Len@summ}} +\xpatchcmd{\Changes@Markup@comment} + {% + \ifthenelse{\isAnonymous{#2}}% + {\textbf{[\arabic{Changes@commentCount#2}]:} }% + {\textbf{[#3~\arabic{Changes@commentCount#2}]:} }% + #1% + } + {% + \LWR@textcurrentcolor{% lwarp + \ifthenelse{\isAnonymous{#2}}% + {\textbf{[\arabic{Changes@commentCount#2}]:} }% + {\textbf{[#3~\arabic{Changes@commentCount#2}]:} }% + #1% + }% lwarp + } + {} + {\LWR@patcherror{changes}{\Changes@Markup@comment A}} + +\xpatchcmd{\Changes@Markup@comment} + {% + \uwave{% + \ifthenelse{\isAnonymous{#2}}% + {\textbf{[\arabic{Changes@commentCount#2}]:} }% + {\textbf{[#3~\arabic{Changes@commentCount#2}]:} }% + #1% + }% + } + {% + \LWR@textcurrentcolor{% lwarp + \uwave{% + \ifthenelse{\isAnonymous{#2}}% + {\textbf{[\arabic{Changes@commentCount#2}]:} }% + {\textbf{[#3~\arabic{Changes@commentCount#2}]:} }% + #1% + }% + }% lwarp + } {} + {\LWR@patcherror{changes}{\Changes@Markup@comment B}} + +\xpatchcmd{\Changes@output} + {\Changes@Markup@author{\Changes@output@author{#2}{left}}} + {\LWR@textcurrentcolor{\Changes@Markup@author{\Changes@output@author{#2}{left}}}} + {} + {\LWR@patcherror{changes}{Changes@output A}} + +\xpatchcmd{\Changes@output} + {% + \ifthenelse{\equal{#1}{added}}{\Changes@Markup@added{#3}}{}% + \ifthenelse{\equal{#1}{deleted}}{\Changes@Markup@deleted{#4}}{}% + \ifthenelse{\equal{#1}{replaced}}{{\Changes@Markup@added{#3}}\allowbreak\Changes@Markup@deleted{#4}}{}% + \ifthenelse{\equal{#1}{highlight}}{\Changes@Markup@highlight{#3}}{}% + } + {% + \LWR@textcurrentcolor{% + \ifthenelse{\equal{#1}{added}}{\Changes@Markup@added{#3}}{}% + \ifthenelse{\equal{#1}{deleted}}{\Changes@Markup@deleted{#4}}{}% + \ifthenelse{\equal{#1}{replaced}}{{\Changes@Markup@added{#3}}\allowbreak\Changes@Markup@deleted{#4}}{}% + \ifthenelse{\equal{#1}{highlight}}{\Changes@Markup@highlight{#3}}{}% + }% + } + {} + {\LWR@patcherror{changes}{Changes@output B}} + +\xpatchcmd{\Changes@output} + {\Changes@Markup@author{\Changes@output@author{#2}{right}}} + {\LWR@textcurrentcolor{\Changes@Markup@author{\Changes@output@author{#2}{right}}}} {} - {\LWR@patcherror{changes}{listofchanges}} + {\LWR@patcherror{changes}{Changes@output C}} \endinput %% %% End of file `lwarp-changes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputtrc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputtrc.sty new file mode 100644 index 00000000000..82a471ea9d9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputtrc.sty @@ -0,0 +1,33 @@ +%% +%% This is file `lwarp-inputtrc.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `inputtrc') +%% This is a generated file. +%% Copyright 2016-2018 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@ProvidesPackagePass{inputtrc}[2012/10/10] +\renewcommand*{\IT@prim@input}[1]{% + \typeout{\IT@indent\IT@currfile INPUTTING #1}% +%% ... TODO: option to write to `.log' only. + \xdef\IT@filestack{{\IT@currfile}\IT@filestack}% + \xdef\IT@currfile{#1}% + \expandafter \gdef\expandafter \IT@indent\expandafter{% + \IT@indent \IT@indent@unit}% lwarp + \@@input#1% lwarp + \expandafter\IT@pop@indent\IT@indent \@nil% lwarp + \expandafter\IT@pop@file \IT@filestack\@nil% lwarp + \IT@maybe@returnmessage%% v0.2 lwarp +} +\endinput +%% +%% End of file `lwarp-inputtrc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty new file mode 100644 index 00000000000..c6b6cd27963 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty @@ -0,0 +1,28 @@ +%% +%% This is file `lwarp-mathtools.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `mathtools') +%% This is a generated file. +%% Copyright 2016-2018 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@ProvidesPackagePass{mathtools}[2018/01/08] +\RequirePackage{graphicx} +\MHInternalSyntaxOn +\renewcommand*\MT_showonlyrefs_true:{\MT_showonlyrefs_false:} +\mathtoolsset{showonlyrefs=false} +\renewcommand*{\MT_mathic_true:}{\MT_mathic_false:} +\mathtoolsset{mathic=false} +\MHInternalSyntaxOff +\endinput +%% +%% End of file `lwarp-mathtools.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty index 5dfa7a1f522..0c7c7fe9fe8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty @@ -15,13 +15,20 @@ %% 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{metalogo}[2010/05/29] -\newcommand\setlogokern[2]{} -\newcommand\setlogodrop[2][XeTeX]{} -\newcommand\setLaTeXa[1]{} -\newcommand\setLaTeXee[1]{} -\newcommand\seteverylogo[1]{} -\newcommand\everylogo[1]{} +\LWR@ProvidesPackagePass{metalogo}[2010/05/29] +\newcommand*{\LWR@HTML@setlogokern}[2]{} +\newcommand*{\LWR@HTML@setlogodrop}[2][XeTeX]{} +\newcommand*{\LWR@HTML@setLaTeXa}[1]{} +\newcommand*{\LWR@HTML@setLaTeXee}[1]{} +\newcommand*{\LWR@HTML@seteverylogo}[1]{} +\newcommand*{\LWR@HTML@everylogo}[1]{} + +\LWR@formatted{setlogokern} +\LWR@formatted{setlogodrop} +\LWR@formatted{setLaTeXa} +\LWR@formatted{setLaTeXee} +\LWR@formatted{seteverylogo} +\LWR@formatted{everylogo} \endinput %% %% End of file `lwarp-metalogo.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogox.sty new file mode 100644 index 00000000000..35a262e19b1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogox.sty @@ -0,0 +1,27 @@ +%% +%% This is file `lwarp-metalogox.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `metalogox') +%% This is a generated file. +%% Copyright 2016-2018 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@ProvidesPackagePass{metalogox}[2019/01/20] +\AtBeginDocument{ + \let\LWR@metalogox@currentformatting\LWR@formatting + \renewcommand*{\LWR@formatting}{print}% + \autoadjustlogos* + \let\LWR@formatting\LWR@metalogox@currentformatting +} +\endinput +%% +%% End of file `lwarp-metalogox.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty index d810e74ded7..a662c9a4c53 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty @@ -33,6 +33,7 @@ \newcommand*{\LWR@HTML@textnaira}{\HTMLunicode{20A6}} \newcommand*{\LWR@HTML@textpeso}{\HTMLunicode{20B1}} \newcommand*{\LWR@HTML@textrecipe}{\HTMLunicode{211E}} +\newcommand*{\LWR@HTML@textinterrobang}{\HTMLunicode{203D}} \newcommand*{\LWR@HTML@textinterrobangdown}{\HTMLunicode{2E18}} \newcommand*{\LWR@HTML@textperthousand}{\HTMLunicode{2030}} \newcommand*{\LWR@HTML@textpertenthousand}{\HTMLunicode{2031}} @@ -53,6 +54,7 @@ \newcommand*{\LWR@HTML@textnaira}{₦} \newcommand*{\LWR@HTML@textpeso}{₱} \newcommand*{\LWR@HTML@textrecipe}{℞} +\newcommand*{\LWR@HTML@textinterrobang}{‽} \newcommand*{\LWR@HTML@textinterrobangdown}{⸘} \newcommand*{\LWR@HTML@textperthousand}{‰} \newcommand*{\LWR@HTML@textpertenthousand}{‱} @@ -74,6 +76,7 @@ \LWR@formatted{textnaira} \LWR@formatted{textpeso} \LWR@formatted{textrecipe} +\LWR@formatted{textinterrobang} \LWR@formatted{textinterrobangdown} \LWR@formatted{textperthousand} \LWR@formatted{textpertenthousand} @@ -125,6 +128,7 @@ \renewcommand*{\textnaira}{}% \renewcommand*{\textpeso}{}% \renewcommand*{\textrecipe}{}% + \renewcommand*{\textinterrobang}{}% \renewcommand*{\textinterrobangdown}{}% \renewcommand*{\textperthousand}{}% \renewcommand*{\textpertenthousand}{}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty index 204068e6d97..2b80bf0e8a2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty @@ -20,7 +20,7 @@ \LWR@ProvidesPackageDrop{textpos}[2016/06/07] -\NewDocumentEnvironment{textblock}{m r()}{}{} +\NewDocumentEnvironment{textblock}{m o r()}{}{} \NewDocumentEnvironment{textblock*}{m o r()}{}{} \newcommand*{\TPGrid}[3][]{} \NewDocumentCommand{\TPMargin}{s o}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty index 0fdc5f0a601..eb293653423 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty @@ -38,6 +38,7 @@ \renewcommand*{\textnaira}{}% \renewcommand*{\textpeso}{}% \renewcommand*{\textrecipe}{}% + \renewcommand*{\textinterrobang}{}% \renewcommand*{\textinterrobangdown}{}% \renewcommand*{\textperthousand}{}% \renewcommand*{\textpertenthousand}{}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index e041933521a..df6b7f398ae 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/03/21 v0.69 Allows LaTeX to directly produce HTML5 output.] + [2019/04/03 v0.70 Allows LaTeX to directly produce HTML5 output.] @@ -211,6 +211,7 @@ \LWR@loadafter{attachfile} \LWR@loadafter{attachfile2} \LWR@loadafter{authblk} +\LWR@loadafter{autonum} \LWR@loadafter{axessibility} \LWR@loadafter{axodraw2} \LWR@loadafter{backref} @@ -239,6 +240,7 @@ \LWR@loadafter{caption2} \LWR@loadafter{cases} \LWR@loadafter{changebar} +\LWR@loadafter{changelayout} \LWR@notmemoirloadafter{changepage} \LWR@loadafter{changes} \LWR@loadafter{chappg} @@ -385,10 +387,12 @@ \LWR@loadafter{marginfix} \LWR@loadafter{marginnote} \LWR@loadafter{marvosym} +\LWR@loadafter{mathtools} \LWR@loadafter{mcaption} \LWR@loadafter{mdframed} \LWR@loadafter{memhfixc} \LWR@loadafter{metalogo} +\LWR@loadafter{metalogox} \LWR@loadafter{mhchem} \LWR@loadafter{microtype} \LWR@loadafter{midfloat} @@ -627,6 +631,32 @@ \fi \fi +\ifxetexorluatex +\else + \ifdefstring{\f@family}{cmr}{ + \IfFileExists{type1ec.sty}% found in cm-super + {} + {% cm-super not installed + \IfFileExists{lmodern.sty}{ + \PackageInfo{lwarp}{cm-super not installed, loading lmodern} + \RequirePackage{lmodern} + }{ + \PackageError{lwarp} + {% + Lwarp requires a vector font.\MessageBreak + Install and load cm-super, lmodern, or another\MessageBreak + Type-1 vector font before loading lwarp% + } + {% + Install cm-super or lmodern.\MessageBreak + If lmodern, load it before lwarp:\MessageBreak + \space\space\protect\usepackage{lmodern}\MessageBreak + \space\space\protect\usepackage{lwarp}% + } + } + }% cm-super not installed + }{}% f@family +\fi \ifPDFTeX \RequirePackage{upquote} \fi @@ -1085,6 +1115,7 @@ {}% no filename {% yes filename was found \ifdefstring{\LWR@strresulttwo}{easyReview}{\LWR@nullifycomment}{}% + \ifdefstring{\LWR@strresulttwo}{changes}{\LWR@nullifycomment}{}% \ifbool{warpingHTML}{\LWR@checkloadfilename{\LWR@strresulttwo}}{}% \ifboolexpr{ bool{warpingHTML} and @@ -2421,6 +2452,11 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;} overflow: auto; } +.inlineminipage { + display: inline-block ; + text-align: left +} + /* Paragraphs in the flexbox did not collapse their margins. */ /* Have not yet researched this. */ .minipage p {margin: .75ex 0em .75ex 0em ;} @@ -3882,16 +3918,17 @@ MathJax.Hub.Register.StartupHook("TeX AMSmath Ready",function () { <script type="text/x-mathjax-config"> MathJax.Hub.Config({ TeX: { - equationNumbers: { - autoNumber: "AMS" - } + extensions: ["autoload-all.js"] , + equationNumbers: { + autoNumber: "AMS" + } } }); </script> <!-- Alternative CDN provider: --> <script type="text/javascript" async -src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-AMS_HTML-full"> +src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS_HTML-full"> </script> <!-- No longer supported after April 30, 2017: --> @@ -3914,7 +3951,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- -- Copyright 2016-2018 Brian Dunn -printversion = "v0.69" +printversion = "v0.70" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -4300,7 +4337,7 @@ function warnlimages () print ("lwarpmk: \"" .. sourcename .. "-images.txt\" does not exist.") print ("lwarpmk: Your project does not use SVG math or other lateximages,") print ("lwarpmk: or the file has been deleted somehow.") - print ("lwarpmk: Use \"lwarpmk html\" to recompile your project") + print ("lwarpmk: Use \"lwarpmk html1\" to recompile your project") print ("lwarpmk: and recreate \"" .. sourcename .. "-images.txt\".") print ("lwarpmk: If your project does not use SVG math or other lateximages,") print ("lwarpmk: then \"" .. sourcename .. "-images.txt\" will never exist, and") @@ -4312,8 +4349,9 @@ function warnlimagesrecompile () -- Warning if must recompile before creating limages: print ("") print ("lwarpmk: ===") + print ("lwarpmk: Cross-references are not yet correct.") print ("lwarpmk: The document must be recompiled before creating the lateximages.") - print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.") + print ("lwarpmk: Enter \"lwarpmk html1\" again, then try \"lwarpmk limages\" again.") print ("lwarpmk: ===") end --warnlimagesrecompile @@ -5234,7 +5272,9 @@ end -- not --version {% not in a lateximage \LWR@traceinfo{LWR@nestspan: NOT inside a lateximage}% \addtocounter{LWR@spandepth}{1}% - \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}% + \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}% + {\LWR@subhtmlelementclass{span}{inlineminipage}}% + {\LWR@htmltagc{/span}}% \RenewDocumentEnvironment{BlockClass}{o m}{}{}% \renewcommand{\BlockClassSingle}[2]{##2}% \renewcommand{\LWR@forcenewpage}{}% @@ -5554,7 +5594,7 @@ end -- not --version {% yes nest par tags \leavevmode\LWR@orignewline% \LWR@htmltagc{/\LWR@tagregularparagraph}% - \LWR@orignewline% + \LWR@origpar% \global\boolfalse{LWR@doingapar}% \global\boolfalse{LWR@minipagethispar}% \PN@parnotes@auto% @@ -5671,6 +5711,21 @@ end -- not --version \newcommand*{\CSSFilename}[1]{} \end{warpprint} + +\begin{warpHTML} + +\newcommand*{\LWR@mathjaxfilename}{lwarp_mathjax.txt} + +\newcommand*{\MathJaxFilename}[1]{% + \renewcommand*{\LWR@mathjaxfilename}{#1}% + \@onelevel@sanitize\LWR@mathjaxfilename% +} + +\end{warpHTML} +\begin{warpprint} +\newcommand*{\MathJaxFilename}[1]{} +\end{warpprint} + \begin{warpHTML} \let\LWR@origtitle\title @@ -6610,7 +6665,7 @@ end -- not --version \begingroup% \LWR@restoreoriglists% \boolfalse{LWR@verbtags}% - \verbatiminput{lwarp_mathjax.txt}% + \verbatiminput{\LWR@mathjaxfilename}% \booltrue{LWR@verbtags}% \endgroup% \LWR@stoppars% @@ -6655,13 +6710,6 @@ end -- not --version \let\LWR@origcaption\caption \let\LWR@origltx@label\ltx@label \let\ltx@label\LWR@htmlmathlabel -\LetLtxMacro\TeX\LWR@TeX -\LetLtxMacro\LaTeX\LWR@LaTeX -\LetLtxMacro\LuaTeX\LWR@LuaTeX -\LetLtxMacro\LuaLaTeX\LWR@LuaLaTeX -\LetLtxMacro\XeTeX\LWR@XeTeX -\LetLtxMacro\XeLaTeX\LWR@XeLaTeX -\LetLtxMacro\ConTeXt\LWR@ConTeXt \global\boolfalse{LWR@doingapar} \global\boolfalse{LWR@doingstartpars} \mainmatter @@ -6728,12 +6776,37 @@ end -- not --version \LWR@htmltag{/body}\LWR@orignewline \LWR@htmltag{/html}\LWR@orignewline \LWR@orignewpage -\immediate\write\LWR@lateximagesfile{% - |end|end|end|% -}% -\immediate\closeout\LWR@lateximagesfile } +\xpatchcmd{\enddocument} + {% + \if@tempswa + \@latex@warning@no@line{Label(s) may have changed. + Rerun to get cross-references right}% + \fi + } + {% + \if@tempswa + \@latex@warning@no@line{Label(s) may have changed. + Rerun to get cross-references right}% + \else + \immediate\write\LWR@lateximagesfile{% + |end|end|end|% + }% + \fi + } + {} + { + \PackageWarningNoLine{lwarp} + {% + Could not patch \protect\enddocument.\MessageBreak + If labels have changed, be sure to recompile before\MessageBreak + creating lateximages with\MessageBreak + \space\space lwarpmk limages,\MessageBreak + or the images may be corrupt% + } + } + \end{warpHTML} \begin{warpall} @@ -9310,13 +9383,13 @@ autopage-\theLWR@currentautosec% \newcommand*{\LWR@newautoidanchor}{% \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {}% -{ +{% \ifbool{LWR@freezethisautoid}{}{% \addtocounter{LWR@thisautoid}{1}% \LWR@htmltag{a id="\LWR@print@mbox{autoid-\arabic{LWR@thisautoid}}"}% \LWR@htmltag{/a}% }% -} +}% } \newcommand*{\@captype}{} @@ -9374,7 +9447,7 @@ autopage-\theLWR@currentautosec% } {\endBlockClass} \newcommand*{\LWR@HTML@caption@begin}[1] -{ +{% \LWR@traceinfo{LWR@HTML@caption@begin}% \begingroup% \@setpar{\LWR@closeparagraph\@@par}% @@ -9812,6 +9885,7 @@ autopage-\theLWR@currentautosec% \let\textellipsis\LWR@origtextellipsis% \let\textless\LWR@origtextless% \let\textgreater\LWR@origtextgreater% +\let\&\LWR@origampersand% \LetLtxMacro\rmfamily\LWR@origrmfamily% \LetLtxMacro\sffamily\LWR@origsffamily% \LetLtxMacro\ttfamily\LWR@origttfamily% @@ -9841,10 +9915,6 @@ autopage-\theLWR@currentautosec% \LetLtxMacro\hline\LWR@orighline% \let\newline\LWR@orignewline% \LetLtxMacro\includegraphics\LWR@origincludegraphics% -\let\TeX\LWR@origTeX% -\let\LaTeX\LWR@origLaTeX% -\let\LaTeXe\LWR@origLaTeXe% -\renewcommand*{\Xe}{X\textsubscript{E}}% \LetLtxMacro\@ensuredmath\LWR@origensuredmath% \LWR@restoreorigaccents% \LWR@restoreoriglists% @@ -9906,13 +9976,13 @@ autopage-\theLWR@currentautosec% \LWR@origincludegraphics{\LWR@baselinename}% } }{ - \PackageWarning{lwarp}{Load graphicx or graphics + \PackageWarningNoLine{lwarp}{Load graphicx or graphics for improved SVG math baselines,} \newcommand*{\LWR@addbaselinemarker}{} } } }{% lwarp_baseline_marker.png or .eps is not present - \PackageWarning{lwarp}{File \LWR@baselinename\space is not installed alongside + \PackageWarningNoLine{lwarp}{File \LWR@baselinename\space is not installed alongside the lwarp-*.sty files, so SVG math baselines may not be accurate,} \newcommand*{\LWR@addbaselinemarker}{} } @@ -10785,6 +10855,9 @@ autopage-\theLWR@currentautosec% }% {}% } + +\LWR@PreloadedPackage{inputtrc} + \LWR@PreloadedPackage{textcomp} \LWR@PreloadedPackage{xunicode} @@ -10961,7 +11034,7 @@ autopage-\theLWR@currentautosec% \begin{warpHTML} \AtEndPreamble{ -\RequirePackage{cleveref} + \RequirePackage{cleveref} } \AfterEndPreamble{ \LWR@traceinfo{Patching cleveref.} @@ -11235,7 +11308,7 @@ autopage-\theLWR@currentautosec% \LWR@print@mbox{text-align:\LWR@align} ; % }% } -\NewDocumentCommand{\LWR@HTML@makebox}{>{\SplitArgument{1}{,}}d() o o m}{% +\NewDocumentCommand{\LWR@HTML@makebox}{>{\SplitArgument{1}{,}}d() o o +m}{% {% scope \def\LWR@temptwo{}% \IfValueTF{#1}% @@ -11247,15 +11320,20 @@ autopage-\theLWR@currentautosec% }% }% {% [width] - \setlength{\LWR@tempwidth}{#2}% - \appto{\LWR@temptwo}{% - width:\LWR@printlength{\LWR@tempwidth} ; % space - }% - \IfValueT{#3}% - {% [width] [posn] - \LWR@@makebox@align{#3}% + \IfValueT{#2}% [width] + {% + \setlength{\LWR@tempwidth}{#2}% + \ifdimgreater{\LWR@tempwidth}{0pt}{% + \appto{\LWR@temptwo}{% + width:\LWR@printlength{\LWR@tempwidth} ; % space + }% + }{}% }% }% + \IfValueT{#3}% + {% [width] [posn] + \LWR@@makebox@align{#3}% + }% \InlineClass[% \LWR@print@mbox{display:inline-block} ; % \LWR@temptwo% @@ -11265,9 +11343,7 @@ autopage-\theLWR@currentautosec% }% scope } \LWR@formatted{makebox} -\LetLtxMacro\LWR@origframebox\framebox - -\NewDocumentCommand{\LWR@HTML@framebox}{d() o o m}{% +\NewDocumentCommand{\LWR@HTML@framebox}{d() o o +m}{% \fbox{\makebox(#1)[#2][#3]{#4}}% } @@ -11294,7 +11370,8 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@traceinfo{HTML fbox}% \LWR@forceminwidth{\fboxrule}% \InlineClass[% -\LWR@fboxstyle% + \LWR@print@mbox{display:inline-block} ; % + \LWR@fboxstyle% ]{fbox}{#1}% } \AtBeginDocument{\LWR@formatted{fbox}} @@ -11376,9 +11453,6 @@ color:\LWR@origpound\LWR@tempcolor% } \LWR@formattedenv{fminipage} -\end{warpHTML} -\begin{warpHTML} - \NewDocumentCommand{\LWR@HTML@raisebox}{m o o m}{% #4% } @@ -12013,11 +12087,38 @@ color:\LWR@origpound\LWR@tempcolor% \end{warpHTML} -\begin{warpHTML} +\begin{warpall} +\newrobustcmd*{\Xe} + {X\hspace{-.1667em}\raisebox{-.5ex}{E}} -\LetLtxMacro\LWR@origTeX\TeX +\AtBeginDocument{ +\@ifpackageloaded{graphics}{ + \@ifpackageloaded{metalogo}{}{ + \renewrobustcmd*{\Xe} + {X\hspace{-.1667em}\raisebox{-.5ex}{\reflectbox{E}}} + } +}{ + \PackageWarningNoLine{lwarp}{Load graphicx or graphics + for improved XeTeX logo} +} +} -\newrobustcmd*{\LWR@TeX} +\providerobustcmd*{\XeTeX}{\mbox{\Xe\hspace{-.125em}\TeX}} +\providerobustcmd*{\XeLaTeX}{\mbox{\Xe\hspace{-.125em}\LaTeX}} +\providerobustcmd*{\AmS}{% + \leavevmode\hbox{$\mathcal A\kern-.2em\lower.376ex% + \hbox{$\mathcal M$}\kern-.2em\mathcal S$}% +} +\newrobustcmd*{\LyX}{\textsf{LyX}} +\providerobustcmd*{\LuaTeX}{\mbox{Lua\TeX}} +\providerobustcmd*{\LuaLaTeX}{\mbox{Lua\LaTeX}} +\providerobustcmd*{\BibTeX}{\mbox{B\textsc{ib}\TeX}} +\providerobustcmd*{\MakeIndex}{\mbox{\textit{MakeIndex}}} +\providerobustcmd*{\ConTeXt}{\mbox{Con\TeX{}t}} +\providerobustcmd*{\MiKTeX}{\mbox{MiK\TeX}} +\end{warpall} +\begin{warpHTML} +\newrobustcmd*{\LWR@HTML@TeX} {% \InlineClass{latexlogofont}% {% @@ -12029,9 +12130,8 @@ color:\LWR@origpound\LWR@tempcolor% }% }% } -\LetLtxMacro\LWR@origLaTeX\LaTeX - -\newrobustcmd*{\LWR@LaTeX} +\AtBeginDocument{\LWR@formatted{TeX}}% may have been patched by metalogo +\newrobustcmd*{\LWR@HTML@LaTeX} {% \InlineClass{latexlogofont}% {% @@ -12046,9 +12146,9 @@ color:\LWR@origpound\LWR@tempcolor% }% } -\LetLtxMacro\LWR@origLaTeXe\LaTeXe +\AtBeginDocument{\LWR@formatted{LaTeX}}% may have been patched by metalogo -\renewrobustcmd*{\LaTeXe} +\newrobustcmd*{\LWR@HTML@LaTeXe} {% \LaTeX% \InlineClass{latexlogofont}{% @@ -12058,27 +12158,38 @@ color:\LWR@origpound\LWR@tempcolor% }% }% } -\newrobustcmd*{\LWR@LuaTeX}{\InlineClass{latexlogofont}{Lua}\TeX} -\newrobustcmd*{\LWR@LuaLaTeX}{\InlineClass{latexlogofont}{Lua}\LaTeX} -\newrobustcmd*{\Xe} +\AtBeginDocument{\LWR@formatted{LaTeXe}}% may have been patched by metalogo +\newrobustcmd*{\LWR@HTML@LuaTeX}{\InlineClass{latexlogofont}{Lua}\TeX} +\AtBeginDocument{\LWR@formatted{LuaTeX}}% may have been patched by metalogo + +\newrobustcmd*{\LWR@HTML@LuaLaTeX}{\InlineClass{latexlogofont}{Lua}\LaTeX} +\AtBeginDocument{\LWR@formatted{LuaLaTeX}}% may have been patched by metalogo +\newrobustcmd*{\LWR@HTML@Xe} {% X% \InlineClass{xelatexlogosub}{\HTMLunicode{18e}}% } +\AtBeginDocument{\LWR@formatted{Xe}}% may have been patched by metalogo -\newrobustcmd*{\LWR@XeTeX}{\InlineClass{xelatexlogo}{\Xe}\TeX} +\newrobustcmd*{\LWR@HTML@XeTeX}{\InlineClass{xelatexlogo}{\Xe}\TeX} +\AtBeginDocument{\LWR@formatted{XeTeX}}% may have been patched by metalogo -\newrobustcmd*{\LWR@XeLaTeX}{\InlineClass{xelatexlogo}{\Xe}\LaTeX} -\newrobustcmd*{\LWR@ConTeXt} -{\InlineClass{latexlogofont}{Con}\TeX{}% -\InlineClass{latexlogofont}{t}} -\providerobustcmd*{\BibTeX} -{\InlineClass{latexlogofont}{B\textsc{ib}}\TeX} +\newrobustcmd*{\LWR@HTML@XeLaTeX}{\InlineClass{xelatexlogo}{\Xe}\LaTeX} +\AtBeginDocument{\LWR@formatted{XeLaTeX}}% may have been patched by metalogo +\newrobustcmd*{\LWR@HTML@ConTeXt}{% + \InlineClass{latexlogofont}{Con}\TeX{}% + \InlineClass{latexlogofont}{t}% +} +\LWR@formatted{ConTeXt} +\newrobustcmd*{\LWR@HTML@BibTeX} + {\InlineClass{latexlogofont}{B\textsc{ib}}\TeX} +\LWR@formatted{BibTeX} -\newrobustcmd*{\MakeIndex} -{\InlineClass{latexlogofont}{\textit{MakeIndex}}} +\newrobustcmd*{\LWR@HTML@MakeIndex} + {\InlineClass{latexlogofont}{\textit{MakeIndex}}} +\LWR@formatted{MakeIndex} \AtBeginDocument{% -\DeclareDocumentCommand{\AmS}{} +\newrobustcmd*{\LWR@HTML@AmS} {% \InlineClass{amslogo}{% \textit{% @@ -12088,39 +12199,13 @@ color:\LWR@origpound\LWR@tempcolor% }% }% }% +\LWR@formatted{AmS} } -\newrobustcmd*{\MiKTeX}{\InlineClass{latexlogofont}{MiK}\TeX} -\newrobustcmd*{\LyX}{\InlineClass{lyxlogo}{LyX}} +\newrobustcmd*{\LWR@HTML@MiKTeX}{\InlineClass{latexlogofont}{MiK}\TeX} +\LWR@formatted{MiKTeX} +\newrobustcmd*{\LWR@HTML@LyX}{\InlineClass{lyxlogo}{LyX}} +\LWR@formatted{LyX} \end{warpHTML} -\begin{warpprint} - -\newrobustcmd*{\XeTeXrevE} - {\hspace{-.1667em}\raisebox{-.5ex}{E}\hspace{-.125em}} - -\AtBeginDocument{ -\@ifpackageloaded{graphics}{ - \renewrobustcmd*{\XeTeXrevE} - {\hspace{-.1667em}\raisebox{-.5ex}{\reflectbox{E}}\hspace{-.125em}} -}{ - \PackageWarning{lwarp}{Load graphicx or graphics - for improved XeTeX logo} -} -} - -\providerobustcmd*{\XeTeX}{\mbox{X\XeTeXrevE\TeX}} -\providerobustcmd*{\XeLaTeX}{\mbox{X\XeTeXrevE\LaTeX}} -\providerobustcmd*{\AmS}{% - \leavevmode\hbox{$\mathcal A\kern-.2em\lower.376ex% - \hbox{$\mathcal M$}\kern-.2em\mathcal S$}% -} -\newrobustcmd*{\LyX}{\textsf{LyX}} -\providerobustcmd*{\LuaTeX}{\mbox{Lua\TeX}} -\providerobustcmd*{\LuaLaTeX}{\mbox{Lua\LaTeX}} -\providerobustcmd*{\BibTeX}{\mbox{B\textsc{ib}\TeX}} -\providerobustcmd*{\MakeIndex}{\mbox{\textit{MakeIndex}}} -\providerobustcmd*{\ConTeXt}{\mbox{Con\TeX{}t}} -\providerobustcmd*{\MiKTeX}{\mbox{MiK\TeX}} -\end{warpprint} \begin{warpHTML} |