diff options
| author | Karl Berry <karl@freefriends.org> | 2018-11-19 21:54:31 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-11-19 21:54:31 +0000 |
| commit | 1850a94e252ed29b333b59a110dbb5a537787d57 (patch) | |
| tree | e9a0a8d95079252240316228273855ab8bcd3708 /Master/texmf-dist/tex | |
| parent | f5e9d83dcdcb9517a654c1ed8287545279f528c8 (diff) | |
lwarp (19nov18)
git-svn-id: svn://tug.org/texlive/trunk@49196 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
41 files changed, 1356 insertions, 522 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-2in1.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-2in1.sty new file mode 100644 index 00000000000..68aefe83556 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-2in1.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-2in1.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `2in1') +%% 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{2in1} +\endinput +%% +%% End of file `lwarp-2in1.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty new file mode 100644 index 00000000000..fb513e2363b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-CJK.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `CJK') +%% 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. +\@ifpackageloaded{xeCJK}{}{ + \LWR@loadnever{CJK}{ctex} +} +\endinput +%% +%% End of file `lwarp-CJK.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty new file mode 100644 index 00000000000..1fd10b579c7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-CJKutf8.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `CJKutf8') +%% 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. +\@ifpackageloaded{xeCJK}{}{ + \LWR@loadnever{CJKutf8}{ctex} +} +\endinput +%% +%% End of file `lwarp-CJKutf8.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty index abd4b8d1748..fddd7183fa4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty @@ -48,31 +48,31 @@ } \renewcommand{\algocf@makecaption}[2]{% \LWR@HTML@caption@begin{algocf}% -\algocf@captiontext{#1}{#2}% +\LWR@isolate{\algocf@captiontext{#1}{#2}}% \LWR@HTML@caption@end% } \renewcommand{\algocf@makecaption@plain}[2]{% \LWR@HTML@caption@begin{algocf}% - \algocf@captiontext{#1}{#2}% + \LWR@isolate{\algocf@captiontext{#1}{#2}}% \LWR@HTML@caption@end% } \renewcommand{\algocf@makecaption@boxed}[2]{% \LWR@HTML@caption@begin{algocf}% - \algocf@captiontext{#1}{#2}% + \LWR@isolate{\algocf@captiontext{#1}{#2}}% \LWR@HTML@caption@end% } \renewcommand{\algocf@makecaption@ruled}[2]{% \LWR@HTML@caption@begin{algocf}% - \algocf@captiontext{#1}{#2}% + \LWR@isolate{\algocf@captiontext{#1}{#2}}% \LWR@HTML@caption@end% } \long\def\algocf@latexcaption#1[#2]#3{% original definition of caption \boolfalse{LWR@algocf@dopars}% lwarp \par% \addcontentsline{\csname ext@#1\endcsname}{#1}% - {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}% + {\protect\numberline{\csname the#1\endcsname}{\ignorespaces \LWR@isolate{#2}}}% \begingroup% \@parboxrestore% \if@minipage% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty index da16201e2df..907fb4c0288 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty @@ -16,12 +16,12 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{asymptote} -\BeforeBeginEnvironment{asy}{\begin{lateximage}} +\BeforeBeginEnvironment{asy}{\begin{lateximage}[(-asymptote-~\packagediagramname)]} \AfterEndEnvironment{asy}{\end{lateximage}} \xpatchcmd{\asyinclude} {\begingroup} - {\begin{lateximage}} + {\begin{lateximage}[(-asymptote-~\packagediagramname)]} {} {\LWR@patcherror{asymptote}{asyinclude-begingroup}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty new file mode 100644 index 00000000000..9de7bb21214 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty @@ -0,0 +1,32 @@ +%% +%% This is file `lwarp-bitpattern.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `bitpattern') +%% 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{bitpattern} +\xpatchcmd{\bitpattern} + {\begingroup} + {\begin{lateximage}[(-bitpattern-~\packagediagramname)]} + {} + {\LWR@patcherror{bitpattern}{bitpattern}} + +\xpatchcmd{\bp@Done} + {\endgroup} + {\end{lateximage}} + {} + {\LWR@patcherror{bitpattern}{bp@Done}} +\endinput +%% +%% End of file `lwarp-bitpattern.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty index 78b451b13b9..43742816932 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty @@ -29,7 +29,7 @@ \newcommand{\LWR@cancelcolor}[5]{% \ifcsempty{#2}% -{\LWR@HTMLtextstyle{#5}{#3}{#1}}% +{\InlineClass(#5){#3}{#1}}% {\LWR@htmlspanclass[#5;#4:\LWR@origpound\LWR@tempcolor]{#3}{#1}}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty index c39f7fb9c20..d5436f48d80 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty @@ -15,7 +15,7 @@ %% 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{changebar} +\LWR@ProvidesPackageDrop{changebar}[2018/03/09] \newcommand*{\cbstart}{} \newcommand*{\cbend}{} \newenvironment*{\changebar}{}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty index e334fa983e0..827698a89ba 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty @@ -18,7 +18,7 @@ \LWR@ProvidesPackageDrop{chngpage} -\LWR@origRequirePackage{changepage} +\LWR@origRequirePackage{lwarp-changepage} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ctex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ctex.sty new file mode 100644 index 00000000000..c68182abd19 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ctex.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-ctex.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ctex') +%% 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{ctex}[2018-05-02] + +\LWR@loadbefore{ctex} + +\endinput +%% +%% End of file `lwarp-ctex.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty index e879ba790d6..de66e41fe05 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty @@ -39,7 +39,7 @@ \normalfont\scriptsize{\bfseries{\thetodos.#1}}% }% }% -\addcontentsline{lod}{todos}{\protect{\thetodos. }#2}% +\addcontentsline{lod}{todos}{\protect{\thetodos. }\LWR@isolate{#2}}% }{}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty index 06a81b286fd..bbd4e3825ee 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty @@ -76,7 +76,7 @@ \csgpreto{Beqnarray*}{\boolfalse{LWR@numbereqnarray}} \renewcommand{\GenericCaption}[1]{% \LWR@figcaption% -#1% +\LWR@isolate{#1}% \endLWR@figcaption% } \RenewDocumentEnvironment{Btrivlist}{m o} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty index 5d687bc5e67..61c57ee783e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -187,7 +187,7 @@ solid \LWR@origpound\LWR@tempcolor ; % div class="fancyvrblabel" % extra space style="color: \LWR@origpound\LWR@tempcolor"% } - \LWR@origtextrm{\FV@LabelBegin}% \textrm preserves emdash + \LWR@print@textrm{\FV@LabelBegin}% \textrm preserves emdash \LWR@htmltagc{/div} \fi \else @@ -199,7 +199,7 @@ solid \LWR@origpound\LWR@tempcolor ; % div class="fancyvrblabel" % extra space style="color: \LWR@origpound\LWR@tempcolor"% } - \LWR@origtextrm{\FV@LabelEnd} + \LWR@print@textrm{\FV@LabelEnd} \LWR@htmltagc{/div} \fi \fi diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-flippdf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-flippdf.sty new file mode 100644 index 00000000000..9e3758c3d32 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-flippdf.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-flippdf.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `flippdf') +%% 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{flippdf}[2006/06/30] +\newcommand\FlipPDF{} +\newcommand\UnFlipPDF{} +\endinput +%% +%% End of file `lwarp-flippdf.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 69b99f40359..1c71e905add 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -205,21 +205,22 @@ \LWR@traceinfo{LWR@parsedfilename is \LWR@parsedfilename}% \ifbool{FormatWP}{% \begingroup% - \ifpdf + \LWR@restoreorigformatting% + \ifpdf% \appto\LWR@restoreorigformatting{% \DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% - } + }% \else% \ifpdf - \ifXeTeX + \ifXeTeX% \appto\LWR@restoreorigformatting{% \DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% - } - \else + }% + \else% \appto\LWR@restoreorigformatting{% \DeclareGraphicsExtensions{.eps,.EPS,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% - } - \fi - \fi + }% + \fi% + \fi% \ifpdf \define@key{Gin}{angle}{}% \IfBooleanTF{#1}% {% starred @@ -255,14 +256,14 @@ \global\renewcommand*{\LWR@igwidthstyle}{width:\LWR@printlength{\LWR@igwidth}}% \settoheight{\LWR@igheight}{\usebox{\LWR@imagesizebox}}% \global\renewcommand*{\LWR@igheightstyle}{height:\LWR@printlength{\LWR@igheight}}% -}{}% +}{}% FormatWP \LWR@traceinfo{LWR@includegraphicsb: about to create href}% \href{\LWR@parsedfilename}% {% start of href \LWR@traceinfo{LWR@includegraphicsb: about to LWR@htmltag}% \LWR@htmltag{% start of image tags img src="% -\begingroup\@sanitize\LWR@parsedfilename\endgroup% +\detokenize\expandafter{\LWR@parsedfilename}% " \LWR@orignewline% \ifthenelse{ \NOT\equal{\LWR@igwidthstyle}{} \OR @@ -272,28 +273,38 @@ img src="% \NOT\equal{\LWR@igxscale}{1} \OR \NOT\equal{\LWR@igyscale}{1} }% -{\LWR@origtilde{} style="% -\ifthenelse{\NOT\equal{\LWR@igwidthstyle}{}}% -{\LWR@igwidthstyle;}{}% -\ifthenelse{\NOT\equal{\LWR@igheightstyle}{}}% -{\LWR@igheightstyle;}{}% -\ifthenelse{\NOT\equal{\LWR@igorigin}{}}% -{\LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; \LWR@orignewline}{}% -\ifthenelse{\NOT\equal{\LWR@igangle}{}}% {% -\LWR@rotstyle{-ms-}{\LWR@igangle} % extra space -\LWR@rotstyle{-webkit-}{\LWR@igangle} % extra space -\LWR@rotstyle{}{\LWR@igangle % -}}{}% -\ifthenelse{\NOT\equal{\LWR@igxscale}{1}\OR% -\NOT\equal{\LWR@igyscale}{1}}% -{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale} % extra space -\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale} % extra space -\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{} % extra space -\ifthenelse{\NOT\equal{\LWR@opacity}{1}}% -{opacity:\LWR@opacity; }% -{}% -" \LWR@orignewline}{}% + \LWR@origtilde{} style="% + \ifthenelse{\NOT\equal{\LWR@igwidthstyle}{}}% + {\LWR@igwidthstyle; }{}% + \ifthenelse{\NOT\equal{\LWR@igheightstyle}{}}% + {\LWR@igheightstyle; }{}% + \ifthenelse{\NOT\equal{\LWR@igorigin}{}}% + {% + \LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; % + \LWR@orignewline% + }{}% + \ifthenelse{\NOT\equal{\LWR@igangle}{}}% + {% + \LWR@rotstyle{-ms-}{\LWR@igangle} % extra space + \LWR@rotstyle{-webkit-}{\LWR@igangle} % extra space + \LWR@rotstyle{}{\LWR@igangle }% + }{}% + \ifthenelse{% + \NOT\equal{\LWR@igxscale}{1}\OR% + \NOT\equal{\LWR@igyscale}{1}% + }% + {% + \LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale} % extra space + \LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale} % extra space + \LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}% + }{} % extra space + % + \ifthenelse{\NOT\equal{\LWR@opacity}{1}}% + {opacity:\LWR@opacity; }{}% + % + " \LWR@orignewline% +}{}% \LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline% }% end of image tags }% end of href diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index e108ce3eb2b..2b998fd2475 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -97,7 +97,7 @@ \LWR@traceinfo{addcontents lst@@caption: -\lst@@caption-}% \addcontentsline{lol}{lstlisting}% {\protect\numberline{\thelstlisting}% -{\protect\ignorespaces \lst@@caption \protect\relax}}% +{\protect\ignorespaces \LWR@isolate{\lst@@caption} \protect\relax}}% \fi \fi \fi diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty new file mode 100644 index 00000000000..1acd8f85a33 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty @@ -0,0 +1,93 @@ +%% +%% This is file `lwarp-musicography.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `musicography') +%% 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{musicography}[2018/05/21] +\RenewDocumentCommand{\musSymbol}{ O{\musFont} m m m m }{% +\begin{lateximage}% +{#1\kern#2\raisebox{#3}{#5}\kern#4}% +\end{lateximage}% +} + +\RenewDocumentCommand{\musStemmedNote}{ m }{% +\begin{lateximage}% +\musSymbol{0.05em}{0.5ex}{0.2em}{#1\musStem}% +\end{lateximage}% +} + +\RenewDocumentCommand{\musFlaggedNote}{ m m }{% +\begin{lateximage}% +\musSymbol{0.05em}{0.5ex}{0pt}{#1\musStem}% +\musSymbol{0pt}{0pt}{0.9em}{#2}% +\end{lateximage}% +} + +\RenewDocumentCommand{\musDottedNote}{ m }{% +\begin{lateximage}% +#1\musDot% +\end{lateximage}% +} + +\RenewDocumentCommand{\musMeter}{ m m }{% +\begin{lateximage}*[#1/#2][#1#2]% +\musStack{#1}{#2}\kern0.05em% +\end{lateximage}% +} + +\RenewDocumentCommand{\meterCplus}{ m }{% +\begin{lateximage}*[C#1]% + \meterC{}\kern-0.7pt#1% +\end{lateximage}% +} + +\RenewDocumentCommand{\meterC}{}{% +\begin{lateximage}*[C]% +\musSymbolMeter{\symbol{83}}% +\end{lateximage}% +} + +\RenewDocumentCommand{\meterCutC}{}{% +\begin{lateximage}*[C|]% +\musSymbolMeter{\symbol{82}}% +\end{lateximage}% +} + +\RenewDocumentCommand{\meterCThreeTwo}{}{% +\begin{lateximage}*[C3/2]% +\meterCplus{\musStack{3}{2}}% +\end{lateximage}% +} + +\RenewDocumentCommand{\musFlat} {}{\HTMLunicode{266D}} +\RenewDocumentCommand{\musDoubleFlat} {}{\HTMLunicode{1D12B}} +\RenewDocumentCommand{\musSharp} {}{\HTMLunicode{266F}} +\RenewDocumentCommand{\musDoubleSharp}{}{\HTMLunicode{1D12A}} +\RenewDocumentCommand{\musNatural} {}{\HTMLunicode{266E}} + +\RenewDocumentCommand{\musWhole}{}{\HTMLunicode{1D15D}} +\RenewDocumentCommand{\musHalf}{}{\HTMLunicode{1D15E}} +\RenewDocumentCommand{\musQuarter}{}{\HTMLunicode{1D15F}} +\RenewDocumentCommand{\musEighth}{}{\HTMLunicode{1D160}} +\RenewDocumentCommand{\musSixteenth}{}{\HTMLunicode{1D161}} + +\RenewDocumentCommand{\musWholeDotted}{}{\HTMLunicode{1D15D}\HTMLunicode{1D16D}} +\RenewDocumentCommand{\musHalfDotted}{}{\HTMLunicode{1D15E}\HTMLunicode{1D16D}} +\RenewDocumentCommand{\musQuarterDotted}{}{\HTMLunicode{1D15F}\HTMLunicode{1D16D}} +\RenewDocumentCommand{\musEighthDotted}{}{\HTMLunicode{1D160}\HTMLunicode{1D16D}} +\RenewDocumentCommand{\musSixteenthDotted}{}{\HTMLunicode{1D161}\HTMLunicode{1D16D}} +\endinput +%% +%% End of file `lwarp-musicography.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty index de194222e08..283424cf4c4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty @@ -17,16 +17,28 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{nicefrac}[1998/08/04] -\LetLtxMacro\LWR@origUnitsNiceFrac\@UnitsNiceFrac +\DeclareRobustCommand*{\LWR@HTML@@UnitsNiceFrac}[3][]{% + {% localize font selection + #1{% + \LWR@textcurrentfont{% + \InlineClass{numerator}{#2}% + /% + \InlineClass{denominator}{#3}% + }% + }% + }% +} + +\LWR@formatted{@UnitsNiceFrac} -\DeclareRobustCommand*{\@UnitsNiceFrac}[3][]{% -\begingroup% -\LetLtxMacro\@ensuredmath\LWR@origensuredmath% -\LWR@origUnitsNiceFrac[#1]{#2}{#3}% -\endgroup% +\DeclareRobustCommand*{\LWR@HTML@@UnitsUglyFrac}[3][]{% + {% localize font selection + #1{\LWR@textcurrentfont{#2/#3}}% + }% } -\CustomizeMathJax{\newcommand{\nicefrac}[3][]{#2/#3}} +\LWR@formatted{@UnitsUglyFrac} +\CustomizeMathJax{\newcommand{\nicefrac}[3][]{#2/#3}} \endinput %% %% End of file `lwarp-nicefrac.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty new file mode 100644 index 00000000000..c302c4b91ed --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty @@ -0,0 +1,38 @@ +%% +%% This is file `lwarp-notespages.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `notespages') +%% 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{notespages} +\newcommand*{\npnotesname}{} +\newcommand*{\npnotestext}{} +\newcommand*{\remainingtextheight}{} +\newdimen\remainingtextheight +\newcommand*{\notestitletext}{} +\newcommand*{\notesareatext}{} +\newcommand*{\npnpinfo}[1]{} +\newcommand*{\tracingnpmarks}{} +\newcommand*{\notespage}[1][]{} +\newcommand*{\notespages}[1][]{} +\newcommand*{\notesfill}[1][]{} +\newcommand*{\setnotespages}[1]{} +\newcommand*{\definenotesoption}[2]{} +\newcommand{\definenotesstyle}[2]{} +\newcommand{\definetitlestyle}[2]{} +\newcommand{\nppatchchapter}[1]{} +\newcommand{\npunpatchchapter}{} +\endinput +%% +%% End of file `lwarp-notespages.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-octave.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-octave.sty new file mode 100644 index 00000000000..01354854536 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-octave.sty @@ -0,0 +1,65 @@ +%% +%% This is file `lwarp-octave.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `octave') +%% 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{octave}[2017/10/31] +\RenewDocumentCommand{\@PrintTicks}{ m }{% +\kern-1pt% lwarp +\@TickNum = #1% +\loop +\@Tick{}% +\advance\@TickNum by -1 +\ifnum\@TickNum > 0 +\repeat +} +\RenewDocumentCommand{\@Tick}{}{\HTMLunicode{2032}} +\RenewDocumentCommand{\pitch}{ m o m }{% +\if@OctaveNumber% +{% + \pitchfont{% + \LWR@textcurrentfont{% lwarp + \MakeUppercase{#1}% + \IfValueTF{#2}{#2}{}\textsubscript{#3}% + }% + }% +}% +\else% +{% + \pitchfont{% + \LWR@textcurrentfont{% lwarp + \@GetOctaveTick{#1}[#2]{#3}% + }% + }% +}% +\fi% +} +\StartDefiningTabulars +\renewcommand{\octavetable}{% +\begin{tabular}{ll} +\octaveprimes \pitch{C}{0} & \octavenumbers \pitch{C}{0} \\ +\octaveprimes \pitch{C}{1} & \octavenumbers \pitch{C}{1} \\ +\octaveprimes \pitch{C}{2} & \octavenumbers \pitch{C}{2} \\ +\octaveprimes \pitch{C}{3} & \octavenumbers \pitch{C}{3} \\ +\octaveprimes \pitch{C}{4} & \octavenumbers \pitch{C}{4} \\ +\octaveprimes \pitch{C}{5} & \octavenumbers \pitch{C}{5} \\ +\octaveprimes \pitch{C}{6} & \octavenumbers \pitch{C}{6} \\ +\octaveprimes \pitch{C}{7} & \octavenumbers \pitch{C}{7} \\ +\end{tabular} +} +\StopDefiningTabulars +\endinput +%% +%% End of file `lwarp-octave.sty'. 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 303de2f3ddc..fc2794699c2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -1013,7 +1013,8 @@ \renewcommand{\midbicaption}[1]{} \renewcommand{\contcaption}[1]{% \begin{LWR@figcaption}% later becomes \caption* -\@nameuse{\@captype name} \thechapter.\the\value{\@captype}\CaptionSeparator #1 +\LWR@isolate{\@nameuse{\@captype name}}~% +\thechapter.\the\value{\@captype}\CaptionSeparator\LWR@isolate{#1}% \end{LWR@figcaption} } @@ -1053,7 +1054,7 @@ \renewcommand{\bicaption}[5][]{% \ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}% \begin{LWR@figcaption}% later becomes \caption* -#4 \thechapter.\the\value{\@captype}\CaptionSeparator #5 +\LWR@isolate{#4} \thechapter.\the\value{\@captype}\CaptionSeparator\LWR@isolate{#5}% \end{LWR@figcaption} \ifblank{#1}{}{\label{#1}}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcomment.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcomment.sty new file mode 100644 index 00000000000..38ab4c923ea --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcomment.sty @@ -0,0 +1,36 @@ +%% +%% This is file `lwarp-pdfcomment.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pdfcomment') +%% 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{pdfcomment}[2016/06/13] +\newenvironment{pdfsidelinecomment}[2][]{}{} +\newcommand{\pdfcomment}[2][]{} +\newcommand{\pdfmargincomment}[2][]{} +\newcommand{\pdfmarkupcomment}[3][]{#2} +\newcommand{\pdffreetextcomment}[2][]{} +\newcommand{\pdfsquarecomment}[2][]{} +\newcommand{\pdfcirclecomment}[2][]{} +\newcommand{\pdflinecomment}[2][]{} +\newcommand{\pdftooltip}[3][]{#2} +\newcommand{\pdfcommentsetup}[2][]{} +\newcommand{\listofpdfcomments}[1][]{} +\newcommand{\setliststyle}[1]{} +\newcommand{\defineliststyle}[2]{} +\newcommand{\defineavatar}[2]{} +\newcommand{\definestyle}[2]{} +\endinput +%% +%% End of file `lwarp-pdfcomment.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfmarginpar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfmarginpar.sty new file mode 100644 index 00000000000..0787bdb2454 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfmarginpar.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-pdfmarginpar.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pdfmarginpar') +%% 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{pdfmarginpar}[2011/08/05] +\newcommand{\pdfmarginpar}[2][]{} +\newcommand{\pdfmarginparset}[1]{} +\endinput +%% +%% End of file `lwarp-pdfmarginpar.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty index f4b75be1e6f..05ed82060ef 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty @@ -16,7 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{register} +\LWR@ProvidesPackagePass{register}[2018/11/10] \xpatchcmd{\register} {\centering} @@ -33,6 +33,20 @@ {} {\LWR@patcherror{register}{endregister}} +\expandafter\xapptocmd\csname register*\endcsname + {\begin{center}\begin{lateximage}[(-register-~\packagediagramname)]} + {} + {\LWR@patcherror{register}{register*}} + +\expandafter\xpatchcmd\csname endregister*\endcsname + {\leftskip} + {% + \end{lateximage}\end{center}% + \leftskip% + }% + {} + {\LWR@patcherror{register}{endregister*}} + \setlength{\regWidth}{5in} \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rviewport.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rviewport.sty new file mode 100644 index 00000000000..b11e454d43d --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rviewport.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-rviewport.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `rviewport') +%% 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{rviewport}[2011/08/27] +\define@key{igraph}{rviewport}{} +\endinput +%% +%% End of file `lwarp-rviewport.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-semantic-markup.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-semantic-markup.sty new file mode 100644 index 00000000000..1a60819de99 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-semantic-markup.sty @@ -0,0 +1,46 @@ +%% +%% This is file `lwarp-semantic-markup.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `semantic-markup') +%% 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{semantic-markup}[2018/05/21] +\ifendnotes +\RenewDocumentCommand{\SetupEndnotes}{}{% + \let\footnote=\endnote +} +\fi +\RequirePackage{musicography} + +\let\fl\musFlat +\let\sh\musSharp +\let\na\musNatural +\RequirePackage{amsmath} + +\RenewDocumentCommand{\musfig}{ m m }{% + \LWR@subsingledollar*% + {#1/#2}% alt tag + {musfig}% addl' hashing + {% contents + \LWR@origensuredmath{% + \genfrac{}{}{0pt}{1}{\text{#1}}{\text{#2}}% + }% + }% +} +\RenewDocumentCommand{\meter}{ m m }{% + \musMeter{#1}{#2}% +} +\endinput +%% +%% End of file `lwarp-semantic-markup.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty index bc21f6c1ec4..62aa54f31a5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty @@ -23,17 +23,19 @@ \newcommand*{\LWR@soulhlcolor}{} \newcommand{\so}[1]{% -\LWR@HTMLtextstyle{letter-spacing:.2ex}{letterspacing}{#1}% +\InlineClass(letter-spacing:.2ex){letterspacing}{#1}% } \newcommand{\caps}[1]{% -\LWR@HTMLtextstyle% - {font-variant:small-caps;letter-spacing:.1ex}% - {capsspacing}{#1}% + \InlineClass% + (font-variant:small-caps;letter-spacing:.1ex)% + {capsspacing}{#1}% } \newcommand{\LWR@soulcolor}[5]{% \ifcsempty{#2}% -{\LWR@HTMLtextstyle{#5}{#3}{#1}}% +{% + \InlineClass(#5){#3}{#1}% +}% {% \convertcolorspec{named}{\@nameuse{#2}}{HTML}\LWR@tempcolor% \LWR@htmlspanclass[#5;#4:\LWR@origpound\LWR@tempcolor]{#3}{#1}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty index b6162923e0b..9bcabeadd7c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty @@ -113,7 +113,7 @@ \caption@make {\@nameuse{sub\@captype name}}% {\@nameuse{thesub\@captype}}% - {#3} + {\LWR@isolate{#3}}% \endLWR@figcaption% lwarp \LWR@traceinfo{sfsubcap B2}% lwarp }% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty index ceb690c16bb..a2381bcfc4e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty @@ -93,7 +93,7 @@ \newcommand*{\LWR@HTML@capitalbreve}[1]{#1\HTMLunicode{306}} \newcommand*{\LWR@HTML@capitalmacron}[1]{#1\HTMLunicode{304}} \newcommand*{\LWR@HTML@capitaldotaccent}[1]{#1\HTMLunicode{307}} -\newcommand*{\LWR@HTML@textcircled}[1]{% +\providecommand*{\LWR@HTML@textcircled}[1]{% \InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty index 7ca19d5e869..e7ded808202 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty @@ -28,7 +28,7 @@ \else \if@dotocind \chapter*{\indexname} - \addcontentsline{toc}{chapter}{\indexname} + \addcontentsline{toc}{chapter}{\LWR@isolate{\indexname}} \else \chapter*{\indexname} \fi @@ -39,7 +39,7 @@ \else \if@dotocind \section*{\indexname} - \addcontentsline{toc}{\@tocextra}{\indexname} + \addcontentsline{toc}{\@tocextra}{\LWR@isolate{\indexname}} \else \section*{\indexname} \fi diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty new file mode 100644 index 00000000000..4fadab9882b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-tram.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tram') +%% 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{tram} +\newenvironment{tram}[1][]% + {\BlockClass[background:lightgray]{tram}} + {\endBlockClass} +\endinput +%% +%% End of file `lwarp-tram.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup.sty new file mode 100644 index 00000000000..7bcd360e730 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-twoup.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `twoup') +%% 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{twoup}[2007/02/26] +\newcommand{\cleartolastpage}{} +\endinput +%% +%% End of file `lwarp-twoup.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty index 4d15fdcac7c..7cb8365957e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty @@ -15,83 +15,73 @@ %% 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. -\ProvidesPackage{lwarp-ulem} -\LetLtxMacro\LWR@ulemorigemph\emph -\LetLtxMacro\LWR@ulemorigtextbf\textbf -\NewDocumentCommand{\uline}{+m}{% -\LWR@HTMLtextstyle% - {text-decoration:underline; text-decoration-skip: auto}% - {uline}{#1}% +\LWR@ProvidesPackagePass{ulem}[2012/05/18] +\NewDocumentCommand{\LWR@HTML@uline}{+m}{% + \InlineClass% + (text-decoration:underline; text-decoration-skip: auto)% + {uline}{\LWR@isolate{#1}}% } +\LWR@formatted{uline} -\NewDocumentCommand{\uuline}{+m}{% -\LWR@HTMLtextstyle% - {% - text-decoration:underline; text-decoration-skip: auto;% - text-decoration-style:double% - }% - {uuline}{#1}% +\NewDocumentCommand{\LWR@HTML@uuline}{+m}{% + \InlineClass% + (% + text-decoration:underline; text-decoration-skip: auto;% + text-decoration-style:double% + )% + {uuline}{\LWR@isolate{#1}}% } +\LWR@formatted{uuline} -\NewDocumentCommand{\uwave}{+m}{% -\LWR@HTMLtextstyle% - {% - text-decoration:underline; text-decoration-skip: auto;% - text-decoration-style:wavy% - }% - {uwave}{#1}% +\NewDocumentCommand{\LWR@HTML@uwave}{+m}{% + \InlineClass% + (% + text-decoration:underline; text-decoration-skip: auto;% + text-decoration-style:wavy% + )% + {uwave}{\LWR@isolate{#1}}% } +\LWR@formatted{uwave} -\NewDocumentCommand{\sout}{+m}{% -\LWR@HTMLtextstyle% - {text-decoration:line-through}% - {sout}{#1}% +\NewDocumentCommand{\LWR@HTML@sout}{+m}{% + \InlineClass% + (text-decoration:line-through)% + {sout}{\LWR@isolate{#1}}% } +\LWR@formatted{sout} -\NewDocumentCommand{\xout}{+m}{% -\LWR@HTMLtextstyle% - {text-decoration:line-through}% - {xout}{#1}% +\NewDocumentCommand{\LWR@HTML@xout}{+m}{% + \InlineClass% + (text-decoration:line-through)% + {xout}{\LWR@isolate{#1}}% } -\NewDocumentCommand{\dashuline}{+m}{% -\LWR@HTMLtextstyle% - {% - text-decoration:underline;% - text-decoration-skip: auto;% - text-decoration-style:dashed% - }% - {dashuline}{#1}% +\NewDocumentCommand{\LWR@HTML@dashuline}{+m}{% + \InlineClass% + (% + text-decoration:underline;% + text-decoration-skip: auto;% + text-decoration-style:dashed% + )% + {dashuline}{\LWR@isolate{#1}}% } +\LWR@formatted{xout} -\NewDocumentCommand{\dotuline}{+m}{% -\LWR@HTMLtextstyle% - {% - text-decoration:underline;% - text-decoration-skip: auto;% - text-decoration-style: dotted% - }% - {dotuline}{#1}% +\NewDocumentCommand{\LWR@HTML@dotuline}{+m}{% + \InlineClass% + (% + text-decoration:underline;% + text-decoration-skip: auto;% + text-decoration-style: dotted% + )% + {dotuline}{\LWR@isolate{#1}}% } -\NewDocumentCommand{\ULthickness}{}{} -\newlength{\ULdepth} -\NewDocumentCommand{\markoverwith}{m}{} -\NewDocumentCommand{\ULon}{+m}{\uline{#1}\egroup} -\NewDocumentCommand{\useunder}{m m m}{% -\relax% -\ifx\relax#3\relax\else % argumentative command - \def#3{#1}\MakeRobust{#3}\fi -} -\newcommand*{\normalem}{\LetLtxMacro\emph\LWR@ulemorigemph} -\newcommand*{\ULforem}{\LetLtxMacro\emph\uline} -\ULforem% default -\DeclareOption{normalem}{\normalem} -\DeclareOption{ULforem}{\ULforem} -\DeclareOption{normalbf}{} -\DeclareOption{UWforbf}{\useunder{\uwave}{\bf}{\textbf}} +\LWR@formatted{dotuline} +\NewDocumentCommand{\LWR@HTML@markoverwith}{m}{} +\LWR@formatted{markoverwith} -\DeclareOption*{} -\ProcessOptions\relax% original LaTeX code +\NewDocumentCommand{\LWR@HTML@ULon}{+m}{\uline{#1}\egroup} +\LWR@formatted{ULon} \endinput %% %% End of file `lwarp-ulem.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty index 28e7405a572..d868e6d83b2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty @@ -17,9 +17,33 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{units}[1998/08/04] +\DeclareRobustCommand*{\LWR@HTML@unit}[2][]{% +\ifblank{#1}% + {\LWR@textcurrentfont{#2}}% + {% + #1% + \ifthenelse{\boolean{B@UnitsLoose}}{~}{\,}% + \LWR@textcurrentfont{#2}% + }% +} +\LWR@formatted{unit} +\DeclareRobustCommand*{\LWR@HTML@unitfrac}[3][]{% +\ifblank{#1}% + {% + \nicefrac{#2}{#3}% + }% + {% + #1% + \ifthenelse{\boolean{B@UnitsLoose}}{~}{\,}% + \nicefrac{#2}{#3}% + }% +} + +\LWR@formatted{unitfrac} \CustomizeMathJax{\newcommand{\unit}[2][]{#1 #2}} \CustomizeMathJax{\newcommand{\unitfrac}[3][]{#1 #2/#3}} + \endinput %% %% End of file `lwarp-units.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty new file mode 100644 index 00000000000..ba42b0aa8fc --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty @@ -0,0 +1,44 @@ +%% +%% This is file `lwarp-unitsdef.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `unitsdef') +%% 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{unitsdef} +\renewcommand{\unitvaluesep}{\,} + +\renewcommand{\unittimes}{\@@setunitsepfalse\HTMLunicode{22c5}}% \cdot + +\renewunit{\arcmin}{% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {\ensuremath{{}^\prime}}% + {\HTMLunicode{2032}}% prime +} + +\renewunit{\arcsec}{% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {\ensuremath{{}^{\prime\prime}}}% + {\HTMLunicode{2033}}% dbl prime +} + +\renewrobustcmd{\SI}[2]{% + \begingroup% + \let\unit@@xspace\relax% + \unitSIdef\selectfont% + \LWR@textcurrentfont{#1#2}% lwarp + \endgroup% +} +\endinput +%% +%% End of file `lwarp-unitsdef.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index 07a28b02ccd..9ebd82e2f96 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -111,6 +111,7 @@ padding:\LWR@printlength{\fboxsep}% \NewDocumentCommand{\LWR@HTML@colorboxBlock}{O{named} m +m}{% \begingroup% \LWR@FBcancel% +\LWR@stoppars% \begin{BlockClass}[% background:\LWR@colorstyle{#1}{#2} ; % padding:\LWR@printlength{\fboxsep}% @@ -118,6 +119,7 @@ padding:\LWR@printlength{\fboxsep}% #3 \end{BlockClass}% \endgroup% +\global\booltrue{LWR@minipagethispar}% } \AtBeginDocument{ @@ -153,6 +155,7 @@ padding:\LWR@printlength{\fboxsep}% \begingroup% \LWR@FBcancel% \LWR@forceminwidth{\fboxrule}% +\LWR@stoppars% \ifthenelse{\equal{#4}{none}}% {% no background color \begin{BlockClass}[% @@ -171,6 +174,7 @@ padding:\LWR@printlength{\fboxsep}% \end{BlockClass}% }% \endgroup% +\global\booltrue{LWR@minipagethispar}% \LWR@traceinfo{HTML fcolorboxBlock done}% } @@ -179,6 +183,7 @@ padding:\LWR@printlength{\fboxsep}% } \NewDocumentCommand{\LWR@subfcolorminipage}{m m m m}{% +\LWR@stoppars% \begin{BlockClass}[% #3% \LWR@borderpadding{#1}{#2} ; % @@ -200,7 +205,10 @@ width:\LWR@printlength{\LWR@tempwidth}% \LWR@subfcolorminipage{#1}{#2}{background:\LWR@origpound\LWR@tempcolortwo\ ; }{#6}% }% } -{\end{BlockClass}} +{% + \end{BlockClass}% + \global\booltrue{LWR@minipagethispar}% +} \AtBeginDocument{ \LWR@formattedenv{fcolorminipage} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xeCJK.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xeCJK.sty new file mode 100644 index 00000000000..1b5767aa3be --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xeCJK.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-xeCJK.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `xeCJK') +%% 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{xeCJK} + +\LWR@loadbefore{xeCJK} + +\endinput +%% +%% End of file `lwarp-xeCJK.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xechangebar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xechangebar.sty new file mode 100644 index 00000000000..08e8444fdff --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xechangebar.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-xechangebar.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `xechangebar') +%% 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{xechangebar}[2017/08/03] +\LWR@origRequirePackage{lwarp-changebar} +\endinput +%% +%% End of file `lwarp-xechangebar.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty index d82834964ad..08d66341e34 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty @@ -29,77 +29,68 @@ \begin{warpHTML} -\newcommand*{\LWR@htmlsmallfontstart}{% -\LWR@htmltagc{span style="font-size:\xfracHTMLfontsize"}% -\LWR@nestspan% -} - -\newcommand*{\LWR@htmlsmallfontend}{% -\LWR@htmltagc{/span}% -\endLWR@nestspan% -} \DeclareInstance{xfrac}{default}{text}{ -numerator-format = {% -\begingroup% -\RenewDocumentCommand{\scalebox}{m o m}{##3}% -\LWR@htmlsmallfontstart\textsuperscript{#1}\,\LWR@htmlsmallfontend% -\endgroup% -}, -denominator-format = {% -\begingroup% -\RenewDocumentCommand{\scalebox}{m o m}{##3}% -\LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend% -\endgroup% -}, -scaling = false + numerator-format = {% + \begingroup% + \RenewDocumentCommand{\scalebox}{m o m}{##3}% + \InlineClass{numerator}{#1}\,% + \endgroup% + }, + denominator-format = {% + \begingroup% + \RenewDocumentCommand{\scalebox}{m o m}{##3}% + \InlineClass{denominator}{#1}% + \endgroup% + }, + scaling = false } \DeclareInstance{xfrac}{lmr}{text}{ -numerator-format = {% -\begingroup% -\RenewDocumentCommand{\scalebox}{m o m}{##3}% -\LWR@htmlsmallfontstart\textsuperscript{#1}\,\LWR@htmlsmallfontend% -\endgroup% -}, -denominator-format = {% -\begingroup% -\RenewDocumentCommand{\scalebox}{m o m}{##3}% -\LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend% -\endgroup% -}, -scaling = false + numerator-format = {% + \begingroup% + \RenewDocumentCommand{\scalebox}{m o m}{##3}% + \InlineClass{numerator}{#1}\,% + \endgroup% + }, + denominator-format = {% + \begingroup% + \RenewDocumentCommand{\scalebox}{m o m}{##3}% + \InlineClass{denominator}{#1}% + \endgroup% + }, + scaling = false } \DeclareInstance{xfrac}{lmss}{text}{ -numerator-format = {% -\begingroup% -\RenewDocumentCommand{\scalebox}{m o m}{##3}% -\LWR@htmlsmallfontstart\textsuperscript{#1}\,\LWR@htmlsmallfontend% -\endgroup% -}, -denominator-format = {% -\begingroup% -\RenewDocumentCommand{\scalebox}{m o m}{##3}% -\LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend% -\endgroup% -}, -scaling = false + numerator-format = {% + \begingroup% + \RenewDocumentCommand{\scalebox}{m o m}{##3}% + \InlineClass{numerator}{#1}\,% + \endgroup% + }, + denominator-format = {% + \begingroup% + \RenewDocumentCommand{\scalebox}{m o m}{##3}% + \InlineClass{denominator}{#1}% + \endgroup% + }, + scaling = false } \DeclareInstance{xfrac}{lmtt}{text}{ -numerator-format = {% -\begingroup% -\RenewDocumentCommand{\scalebox}{m o m}{##3}% -\LWR@htmlsmallfontstart\textsuperscript{#1}\,\LWR@htmlsmallfontend% -\endgroup% -}, -denominator-format = {% -\begingroup% -\RenewDocumentCommand{\scalebox}{m o m}{##3}% -\LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend% -\endgroup% -}, -scaling = false + numerator-format = {% + \begingroup% + \RenewDocumentCommand{\scalebox}{m o m}{##3}% + \InlineClass{numerator}{#1}\,% + \endgroup% + }, + denominator-format = {% + \begingroup% + \RenewDocumentCommand{\scalebox}{m o m}{##3}% + \InlineClass{denominator}{#1}% + \endgroup% + }, + scaling = false } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty index 636cd518cc6..2f352e2511e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty @@ -16,11 +16,11 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\@ifpackageloaded{lwarp}{\LWR@loadbefore{xunicode}}{} +\LWR@loadbefore{xunicode}% \LWR@ProvidesPackagePass{xunicode}[2011/09/09] -\newcommand*{\LWR@HTML@textcircled}[1]{% -\InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}% +\providecommand*{\LWR@HTML@textcircled}[1]{% + \InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}% } \LWR@formatted{textcircled} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 38d80c02841..115f6dcf1e4 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} - [2018/10/13 v0.61 Allows LaTeX to directly produce HTML5 output.] + [2018/11/19 v0.62 Allows LaTeX to directly produce HTML5 output.] @@ -96,7 +96,11 @@ {Unable to patch package #1, macro #2} {Please contact the author of the lwarp package.} } - +\@ifpackageloaded{ctexpatch}{ + \newcommand{\LWR@isolate}[1]{\null#1\null}% +}{ + \newcommand{\LWR@isolate}[1]{#1}% +} \RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc. \RequirePackage{xpatch} @@ -174,6 +178,7 @@ \booltrue{LWR@origmathjax}% } + \DeclareStringOption[\jobname]{BaseJobname} \DeclareStringOption[lwarp.ist]{makeindexStyle} @@ -293,13 +298,10 @@ \def\DefaultCutFileName{\def\CommentCutFile{comment_print.cut}} }{} -\excludecomment{testing} - \includecomment{warpall} -\ifbool{warpingHTML}{% -\includecomment{warpHTML} -} +\ifbool{warpingHTML} +{\includecomment{warpHTML}} {\excludecomment{warpHTML}}% \ifbool{warpingprint} @@ -360,10 +362,15 @@ For a possible alternative, see package(s) #2.} \LWR@earlyloadnever{aecc}{cm-super, lmodern} \LWR@earlyloadnever{boxedminipage}{boxedminipage2e} \LWR@earlyloadnever{caption2}{caption} +\@ifpackageloaded{xeCJK}{}{ + \LWR@earlyloadnever{CJK}{ctex, xeCJK} + \LWR@earlyloadnever{CJKutf8}{ctex, xeCJK} +} \LWR@earlyloadnever{fancyheadings}{fancyhdr} \LWR@earlyloadnever{glossary}{glossaries} \LWR@earlyloadnever{t1enc}{fontenc, inputenc, inputenx} \LWR@earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol} +\LWR@loadafter{2in1} \LWR@loadafter{2up} \LWR@loadafter{a4} \LWR@loadafter{a4wide} @@ -398,6 +405,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{balance} \LWR@loadafter{bigdelim} \LWR@loadafter{bigstrut} +\LWR@loadafter{bitpattern} \LWR@loadafter{blowup} \LWR@loadafter{booklet} \LWR@loadafter{bookmark} @@ -472,6 +480,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fixme} \LWR@loadafter{fixmetodonotes} \LWR@loadafter{flafter} +\LWR@loadafter{flippdf} \LWR@loadafter{float} \LWR@loadafter{floatflt} \LWR@loadafter{floatpag} @@ -551,6 +560,7 @@ For a possible alternative, see package(s) #2.} \LWR@notmemoirloadafter{mparhack} \LWR@loadafter{multirow} \LWR@loadafter{multitoc} +\LWR@loadafter{musicography} \LWR@loadafter{nameref} \LWR@loadafter{natbib} \LWR@notmemoirloadafter{nccfancyhdr} @@ -561,8 +571,10 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{nonfloat} \LWR@loadafter{nonumonpart} \LWR@loadafter{nopageno} +\LWR@loadafter{notespages} \LWR@loadafter{nowidow} \LWR@loadafter{ntheorem} +\LWR@loadafter{octave} \LWR@loadafter{overpic} \LWR@loadafter{pagegrid} \LWR@notmemoirloadafter{pagenote} @@ -571,10 +583,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{parnotes} \LWR@notmemoirloadafter{parskip} \LWR@loadafter{pbox} -\LWR@loadafter{pdfrender} +\LWR@loadafter{pdfcomment} \LWR@loadafter{pdflscape} +\LWR@loadafter{pdfmarginpar} \LWR@loadafter{pdfpages} \LWR@loadafter{pdfprivacy} +\LWR@loadafter{pdfrender} \LWR@loadafter{pdfsync} \LWR@loadafter{pdftricks} \LWR@loadafter{pdfx} @@ -602,6 +616,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{romanbarpagenumber} \LWR@loadafter{rotating} \LWR@loadafter{rotfloat} +\LWR@loadafter{rviewport} \LWR@loadafter{savetrees} \LWR@loadafter{schemata} \LWR@loadafter{scrextend} @@ -612,6 +627,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{section} \LWR@loadafter{sectionbreak} \LWR@loadafter{sectsty} +\LWR@loadafter{semantic-markup} \LWR@notmemoirloadafter{setspace} \LWR@loadafter{shadow} \LWR@notmemoirloadafter{showidx} @@ -655,13 +671,15 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{tocstyle} \LWR@loadafter{todo} \LWR@loadafter{todonotes} +\LWR@loadafter{tram} \LWR@loadafter{transparent} \LWR@loadafter{trimclip} \LWR@loadafter{trivfloat} \LWR@loadafter{turnthepage} -\LWR@loadafter{ulem} +\LWR@loadafter{twoup} \LWR@loadafter{underscore} \LWR@loadafter{units} +\LWR@loadafter{unitsdef} \LWR@loadafter{upref} \LWR@loadafter{url} \LWR@loadafter{uspace} @@ -679,6 +697,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{wrapfig} \LWR@loadafter{xbmks} \LWR@loadafter{xcolor} +\LWR@loadafter{xechangebar} \LWR@loadafter{xellipsis} \LWR@loadafter{xfrac} \LWR@loadafter{xltabular} @@ -694,7 +713,7 @@ For a possible alternative, see package(s) #2.} \begin{warpHTML} \ifxetexorluatex \@ifpackageloaded{fontspec}{}{ -\usepackage[no-math]{fontspec} + \usepackage[no-math]{fontspec} } \defaultfontfeatures[\rmfamily]{Ligatures={NoCommon,TeX}} \defaultfontfeatures[\sffamily]{Ligatures={NoCommon,TeX}} @@ -729,6 +748,8 @@ top=1in,bottom=1in,% \RequirePackage{xparse} +\RequirePackage{calc} + \end{warpall} \begin{warpHTML} @@ -762,8 +783,6 @@ top=1in,bottom=1in,% \RequirePackage{verbatim} -\RequirePackage{calc} - \RequirePackage{refcount} \RequirePackage{newfloat} @@ -892,6 +911,8 @@ top=1in,bottom=1in,% \IfValueTF{#2} {\LWR@origRequirePackage{#1}[#2]} {\LWR@origRequirePackage{#1}} +\DeclareOption*{}% +\ProcessOptions\relax } \NewDocumentCommand{\LWR@ProvidesPackageDrop}{m o}{ @@ -1187,18 +1208,6 @@ top=1in,bottom=1in,% \let\LWR@origtextellipsis\textellipsis -\LetLtxMacro\LWR@origtextrm\textrm -\LetLtxMacro\LWR@origtextsf\textsf -\LetLtxMacro\LWR@origtexttt\texttt -\LetLtxMacro\LWR@origtextnormal\textnormal -\LetLtxMacro\LWR@origtextbf\textbf -\LetLtxMacro\LWR@origtextmd\textmd -\LetLtxMacro\LWR@origtextit\textit -\LetLtxMacro\LWR@origtextsl\textsl -\LetLtxMacro\LWR@origtextsc\textsc -\LetLtxMacro\LWR@origtextup\textup -\LetLtxMacro\LWR@origemph\emph - \LetLtxMacro\LWR@origrmfamily\rmfamily \LetLtxMacro\LWR@origsffamily\sffamily \LetLtxMacro\LWR@origttfamily\ttfamily @@ -1585,11 +1594,18 @@ span.textit, div.textit { font-style: italic; } span.textmd, div.textmd { font-weight: normal; } -span.textsc, div.textsc { font-variant: small-caps; } +span.textsc, div.textsc { + font-variant: small-caps; + font-variant-numeric: oldstyle-nums ; +} span.textsl, div.textsl { font-style: oblique; } -span.textup, div.textup { font-variant: normal; } +span.textup, div.textup { + font-style: normal; + font-variant: normal; + font-variant-numeric: normal ; +} span.textrm, div.textrm { font-family: "DejaVu Serif", "Bitstream Vera Serif", @@ -2325,6 +2341,8 @@ figure div.minipage, figure div.minipage div.minipage { } */ +figure figure { margin: 0pt } + figure div.minipage p { font-size: 85% ; } figure.subfigure, figure.subtable { @@ -2527,7 +2545,7 @@ div.published font-variant: normal ; font-style: italic ; font-size: 1em ; - margin: 3ex 0em 3ex 0em ; + margin: 1ex 0em 1ex 0em ; } div.subtitle @@ -2536,7 +2554,7 @@ div.subtitle font-variant: normal ; font-style: italic ; font-size: 1.25em ; - margin: 3ex 0em 3ex 0em ; + margin: 1ex 0em 1ex 0em ; } div.subtitle p { margin: 1ex ; } @@ -2546,17 +2564,17 @@ div.author font-variant: normal ; font-style: normal ; font-size: 1em ; - margin: 3ex 0em 3ex 0em ; + margin: 1ex 0em 1ex 0em ; } div.oneauthor { display: inline-block ; - margin: 3ex 1em 0ex 1em ; + margin: 0ex 1em 0ex 1em ; } /* div.author table { - margin: 3ex auto 0ex auto ; + margin: 1ex auto 0ex auto ; background: none ; } @@ -2569,7 +2587,7 @@ div.titledate { text-align: center ; font-size: .85em ; font-style: italic; - margin: 6ex 0em 6ex 0em ; + margin: 1ex 0em 1ex 0em ; } nav.topnavigation{ @@ -2669,6 +2687,16 @@ div.multicols { -webkit-columns: 3 380px ; -moz-columns: 3 380px ; columns: 3 380px ; } div.multicols p {margin-top: 0ex} +/* Used for xfrac and nicefrac: */ +span.numerator { + font-size: 60% ; + vertical-align: .4em ; +} + +span.denominator { + font-size: 60% +} + /* Used for algorithm2e: */ div.alg2evline{ margin-left: 1em ; @@ -2771,9 +2799,7 @@ span.amsthmnoteremark {} /* For CSS LaTeX and related logos: -Based on: -http://edward.oconnor.cx/2007/08/tex-poshlet -http://nitens.org/taraborelli/texlogo +Based on spacing demonstrated by the metafont package. */ .latexlogofont { @@ -2785,48 +2811,48 @@ http://nitens.org/taraborelli/texlogo .latexlogo { font-family: "Linux Libertine O", "Nimbus Roman No 9 L", "FreeSerif", "Hoefler Text", Times, "Times New Roman", serif; - letter-spacing: .03em ; font-size: 1.1em; } -.latexlogo sup { +.latexlogosup { text-transform: uppercase; letter-spacing: .03em ; - font-size: 0.85em; - vertical-align: 0.15em; - margin-left: -0.36em; + font-size: 0.7em; + vertical-align: 0.25em; + margin-left: -0.4em; margin-right: -0.15em; } -.latexlogo sub { +.latexlogosub { text-transform: uppercase; - vertical-align: -0.5ex; - margin-left: -0.1667em; - margin-right: -0.125em; + vertical-align: -0.27ex; + margin-left: -0.08em; + margin-right: -0.07em; font-size: 1em; } -.xetexlogo { +.latexlogotwoe { + text-transform: none ; + font-variant-numeric: oldstyle-nums ; +} + +.latexlogotwoesub { + font-style:italic ; + vertical-align: -0.27ex; + margin-left: -0.11em; + margin-right: -0.1em; + font-size: 1em; +} + +.xelatexlogo { font-family: "Linux Libertine O", "Nimbus Roman No 9 L", "FreeSerif", "Hoefler Text", Times, "Times New Roman", serif; letter-spacing: .03em ; font-size: 1.1em; } -/* A smaller gap between Xe and Tex v.s. LaTeX: */ -.xetexlogo sub { - text-transform: uppercase; - vertical-align: -0.5ex; - margin-left: -0.0667em; - margin-right: -0.2em; - font-size: 1em; - letter-spacing: .03em ; -} - -/* A large gap between Xe and LaTeX v.s. TeX: */ -.xelatexlogo sub { - text-transform: uppercase; - vertical-align: -0.5ex; +.xelatexlogosub { + vertical-align: -0.27ex; margin-left: -0.0667em; margin-right: -.05em; font-size: 1em; @@ -2837,8 +2863,8 @@ http://nitens.org/taraborelli/texlogo font-family: "TeXGyreChorus","URW Chancery L", "Apple Chancery","ITC Zapf Chancery","Monotype Corsiva", "Linux Libertine O", "Nimbus Roman No 9 L", "FreeSerif", - "Hoefler Text", Times, "Times New Roman", serif; - font-style: italic; + "Hoefler Text", Times, "Times New Roman", serif ; + font-style: italic ; } .lyxlogo { @@ -3251,13 +3277,6 @@ div.fancyvrblabel{ border: none ; } -.verse { - font-family: "Linux Libertine O", "Hoefler Text", "Garamond", - "Bembo", "Janson", "TeX Gyre Pagella", "Palatino", - "Liberation Serif", "Nimbus Roman No 9 L", "FreeSerif", Times, - "Times New Roman", serif; -} - figure { margin: 5ex 5% 5ex 5% ; padding: 1ex 1em 1ex 1em ; @@ -3486,21 +3505,6 @@ MathJax.Hub.Register.StartupHook("TeX AMSmath Ready",function () { "https://cdn.mathjax.org/mathjax/contrib"; </script> -<!-- https://github.com/burnpanck/MathJax-siunitx --> - -<script type="text/x-mathjax-config"> - MathJax.Hub.Config({ - extensions: ["tex2jax.js","[siunitx]/siunitx.js"], - jax: ["input/TeX","output/HTML-CSS"], - tex2jax: { - inlineMath: [["$","$"],["\\(","\\)"]] , - processClass: "tabbing|verse" - }, - TeX: {extensions: ["AMSmath.js","AMSsymbols.js", "sinuitx.js"]} - }); - MathJax.Ajax.config.path['siunitx'] = 'http://rawgit.com/burnpanck/MathJax-siunitx/master/'; - </script> - <script type="text/x-mathjax-config"> MathJax.Hub.Config({ TeX: { @@ -3527,13 +3531,16 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- \end{LWRwriteconf} + + + \begin{LWR@createlwarpmk} \begin{filecontents*}{lwarpmk.lua} #!/usr/bin/env texlua -- Copyright 2016-2018 Brian Dunn -printversion = "v0.61" +printversion = "v0.62" requiredconfversion = "1" -- also at *lwarpmk.conf function printhelp () @@ -3562,8 +3569,9 @@ lwarpmk pdftohtml [-p project]: Finishes the HTML conversion even if there was a compile error. lwarpmk pdftosvg <list of file names>: Converts each PDF file to SVG. lwarpmk epstopdf <list of file names>: Converts each EPS file to PDF. -lwarpmk clean [-p project]: Remove .aux, .toc, .lof/t, .idx, .ind, .log, *_html_inc.*, .gl* -lwarpmk cleanall [-p project]: Remove auxiliary files and also project.pdf, *.html +lwarpmk clean [-p project]: Remove *.aux, *.toc, *.lof/t, + *.idx, *.ind, *.log, *_html_inc.*, .gl* +lwarpmk cleanall [-p project]: Remove auxiliary files, project.pdf, *.html lwarpmk cleanlimages: Removes all images from the "lateximages" directory. lwarpmk -h: Print this help message. lwarpmk --help: Print this help message. @@ -4545,7 +4553,7 @@ end -- not --version \begingroup% \LWR@FBcancel% \LWR@origampersand#1;% -\endgroup +\endgroup% } \newcommand*{\HTMLunicode}[1]{\HTMLentity{\LWR@origpound{}x#1}} @@ -4610,7 +4618,7 @@ end -- not --version \LWR@traceinfo{Prefixing the index name with an underscore.}% \_#1.html% }% - {\HTMLFilename#1.html}% + {\HTMLFilename\LWR@isolate{#1}.html}% }% \LWR@traceinfo{LWR@htmlsectionfilename Z}% } @@ -4794,7 +4802,7 @@ end -- not --version \LWR@FBcancel% \ifmmode\else\protect\LWR@origttfamily\fi% \protect\LWR@origtextless% -#1% +\LWR@isolate{#1}% \protect\LWR@origtextgreater% \endgroup% } @@ -4980,13 +4988,17 @@ end -- not --version \end{warpHTML} \begin{warpprint} -\NewDocumentCommand{\InlineClass}{o m +m}{#3}% +\NewDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{#4}% \end{warpprint} \begin{warpHTML} -\NewDocumentCommand{\LWR@print@InlineClass}{o m +m}{#3}% +\NewDocumentCommand{\LWR@print@InlineClass}{D{(}{)}{} o m +m}{#4}% -\NewDocumentCommand{\LWR@HTML@InlineClass}{o m +m}{% - \LWR@htmlspanclass[#1]{#2}{#3}% +\NewDocumentCommand{\LWR@HTML@InlineClass}{D{(}{)}{} o m +m}{% +\ifbool{FormatWP}{% + \LWR@htmlspanclass[#1]{#3}{#4}% +}{% + \LWR@htmlspanclass[#2]{#3}{#4}% +}% } \LWR@formatted{InlineClass} @@ -5177,8 +5189,8 @@ end -- not --version }% an intentionally blank line {}% \ifbool{LWR@doingstartpars}% - {\ClearPreHook{par}}% - {}% + {\ClearPreHook{par}}% + {}% \global\setbool{LWR@doingstartpars}{false}% \global\boolfalse{LWR@doingapar}% }% nestspan @@ -5422,6 +5434,7 @@ end -- not --version \edef\LWR@thisnewfilename{#1}% \LWR@traceinfo{LWR@filenamenoblanks edef: !\LWR@thisnewfilename!}% \fullexpandarg% +\StrSubstitute{\LWR@thisnewfilename}{\ }{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{ }{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{,}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{'}{-}[\LWR@thisnewfilename] @@ -5442,7 +5455,6 @@ end -- not --version {\textgreater}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{\LWR@origpound}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{\_}{-}[\LWR@thisnewfilename] -\StrSubstitute{\LWR@thisnewfilename}{\ }{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{\%}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{\{}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{\}}{-}[\LWR@thisnewfilename] @@ -5503,6 +5515,7 @@ end -- not --version }% } + \newcommand*{\LWR@customizedMathJax}{} \newcommand*{\CustomizeMathJax}[1]{% @@ -5530,12 +5543,17 @@ end -- not --version }{} } + + + + \end{warpHTML} \begin{warpprint} \newcommand*{\CustomizeMathJax}[1]{} + \end{warpprint} \begin{warpHTML} @@ -5584,15 +5602,7 @@ end -- not --version \LWR@stoppars -\ifPDFTeX% pdflatex or dvi latex -\ifdefstring{\inputencodingname}{utf8}{% -\LWR@filestart{ — #1}% there is an EMdash in front of the #1 -}{ -\LWR@filestart{ - #1}% hyphen -} -\else% -\LWR@filestart{ — #1}% there is an EMdash in front of the #1 -\fi% +\LWR@filestart[#1] \setcounter{LWR@latestautopage}{\value{page}}% \LWR@newautopagelabel{LWR@latestautopage}% @@ -5682,10 +5692,11 @@ end -- not --version \def\@seccntformat#1{\csname the#1\endcsname\protect\quad} \newcommand*{\simplechapterdelim}{} \let\@chapcntformat\@seccntformat +\let\@partcntformat\@seccntformat +\newcommand*{\@partnameformat}{\LWR@isolate{\partname}~}% \newcounter{LWR@currentautosec} \DeclareDocumentCommand{\LWR@section}{m m m m}{% -\LWR@traceinfo{LWR@section |#2| |#3|}% -\LWR@traceinfo{LWR@section: not an empty section}% +\LWR@traceinfo{LWR@section: starting}% \LWR@stoppars% \global\boolfalse{LWR@minipagethispar}% \LWR@traceinfo{LWR@section: testing whether to start a new HTML file}% @@ -5747,13 +5758,17 @@ end -- not --version {}% \LWR@traceinfo{LWR@section: about to LWR@createautosec}% \LWR@createautosec{\@nameuse{LWR@tag#4}}% -\setcounter{LWR@currentautosec}{\value{page}} +\setcounter{LWR@currentautosec}{\value{page}}% \IfBooleanTF{#1}% {% -\LWR@traceinfo{LWR@section: starred}% -\ifbool{LWR@forcinghtmltoc}% -{\addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}}% -{}% + \LWR@traceinfo{LWR@section: starred}% + \ifbool{LWR@forcinghtmltoc}% + {% + \addcontentsline{toc}{#4}{% + \IfValueTF{#2}{\LWR@isolate{#2}}{\LWR@isolate{#3}}% + }% + }% + {}% }% starred {% not starred \ifthenelse{% @@ -5769,17 +5784,24 @@ end -- not --version \addcontentsline{toc}{#4}% {% \protect\numberline{\@nameuse{the#4}}% - {\ignorespaces\IfValueTF{#2}{#2}{#3}\protect\relax}% + {% + \ignorespaces% + \IfValueTF{#2}{\LWR@isolate{#2}}{\LWR@isolate{#3}}\protect\relax% + }% }% \LWR@traceinfo{LWR@section: finished addcontentsline}% }% end of if main matter {% not main matter \LWR@traceinfo{LWR@section: no main matter}% - \addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}% + \addcontentsline{toc}{#4}{% + \IfValueTF{#2}{\LWR@isolate{#2}}{\LWR@isolate{#3}}% + }% }% end of not main matter }% end of secnumdepth {% - \addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}% + \addcontentsline{toc}{#4}{% + \IfValueTF{#2}{\LWR@isolate{#2}}{\LWR@isolate{#3}}% + }% }% \ifbool{LWR@mainmatter}% {% @@ -5788,23 +5810,28 @@ end -- not --version {\value{secnumdepth}}\) \AND% \(\cnttest{\@nameuse{LWR@depth#4}}{<=}{\LWR@depthpart}\)% }% - {\@nameuse{#4name}~{}}% + {\@partnameformat}% {}% \LWR@traceinfo{LWR@section: about to print section number}% \ifthenelse{% \cnttest{\@nameuse{LWR@depth#4}}{<=}{\value{secnumdepth}}% }% {% - \ifstrequal{#4}{chapter}% - {\protect\LWR@sectionnumber{\@chapcntformat{#4}}}% - {\protect\LWR@sectionnumber{\@seccntformat{#4}}}% + \ifstrequal{#4}{part}% + {% + \protect\LWR@sectionnumber{\@partcntformat{#4}}% + }{% + \ifstrequal{#4}{chapter}% + {\protect\LWR@sectionnumber{\@chapcntformat{#4}}}% + {\protect\LWR@sectionnumber{\@seccntformat{#4}}}% + }% }% {}% \LWR@traceinfo{LWR@section: finished print section number}% }{}% }% end of not starred \LWR@traceinfo{LWR@section: about to print the section name}% -#3% +\LWR@isolate{#3}% \LWR@traceinfo{LWR@section: about to close the heading tag}% \LWR@htmltag{\@nameuse{LWR@tag#4end}}% \LWR@traceinfo{LWR@section: about to create the LaTeX label}% @@ -5874,11 +5901,7 @@ end -- not --version } \DeclareDocumentCommand{\section}{s o o m}{% -\IfValueTF{#2}{ -\LWR@traceinfo{section #2}% -}{ -\LWR@traceinfo{section #4}% -} +\LWR@traceinfo{section: starting}% \LWR@maybeprintpendingfootnotes{\LWR@depthsection}% \LWR@stoppars% @@ -5935,15 +5958,41 @@ end -- not --version \renewcommand*{\LWR@currentHTMLLanguage}{#1}% } +\ifPDFTeX% pdflatex or dvi latex +\ifdefstring{\inputencodingname}{utf8}{% + \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash +}{% + \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen +}% +\else% + \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash +\fi% + +\newcommand*{\HTMLTitleBeforeSection}{% + \def\theHTMLTitleSection{% + \theHTMLTitle\theHTMLTitleSeparator\theHTMLSection% + } +} + +\newcommand*{\HTMLTitleAfterSection}{% + \def\theHTMLTitleSection{% + \theHTMLSection\theHTMLTitleSeparator\theHTMLTitle% + } +} + +\HTMLTitleBeforeSection + +\newcommand*{\theHTMLSection}{} + \end{warpall} \begin{warpHTML} - -\newcommand*{\LWR@filestart}[1]{ -\LWR@traceinfo{LWR@filestart !#1!} -\begingroup -\LWR@nullfonts +\newcommand*{\LWR@filestart}[1][]{% +\LWR@traceinfo{LWR@filestart !#1!}% +\begingroup% +\LWR@nullfonts% +\edef\theHTMLSection{#1}% \LWR@htmltag{!DOCTYPE html}\LWR@orignewline \LWR@htmltag{html lang="\LWR@currentHTMLLanguage"}\LWR@orignewline \LWR@htmltag{head}\LWR@orignewline @@ -5968,7 +6017,13 @@ script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"}% \LWR@htmltag{![endif]{-}{-}}\LWR@orignewline \ifthenelse{\equal{\theHTMLTitle}{}}% {}% -{\LWR@htmltag{title}\theHTMLTitle#1\LWR@htmltag{/title}\LWR@orignewline}% +{% + \LWR@htmltag{title}% + \ifdefempty{\theHTMLSection}% + {\theHTMLTitle}% + {\theHTMLTitleSection}% + \LWR@htmltag{/title}\LWR@orignewline% +}% \LWR@htmltag{% link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@orignewline @@ -5976,11 +6031,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% \begingroup% \LWR@restoreoriglists% - \boolfalse{LWR@verbtags} - \verbatiminput{lwarp_mathjax.txt}% - \booltrue{LWR@verbtags} + \boolfalse{LWR@verbtags}% + \verbatiminput{lwarp_mathjax.txt}% + \booltrue{LWR@verbtags}% \endgroup% - \LWR@stoppars + \LWR@stoppars% }% end of mathjax {}% \LWR@htmltag{/head}\LWR@orignewline @@ -6026,19 +6081,19 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \let\LWR@origcaption\caption \let\LWR@origltx@label\ltx@label \let\ltx@label\LWR@htmlmathlabel -\let\TeX\LWR@TeX -\let\LaTeX\LWR@LaTeX -\let\LuaTeX\LWR@LuaTeX -\let\LuaLaTeX\LWR@LuaLaTeX -\let\XeTeX\LWR@XeTeX -\let\XeLaTeX\LWR@XeLaTeX -\let\ConTeXt\LWR@ConTeXt +\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 \LWR@origpagenumbering{arabic} \LWR@traceinfo{LWR@lwarpStart: Starting new file.} -\LWR@filestart{} +\LWR@filestart \LWR@traceinfo{LWR@lwarpStart: Generating first header.} \LWR@htmltag{header}\LWR@orignewline \LWR@startpars @@ -7853,7 +7908,7 @@ rowspan="#2" % \IfBooleanTF{#1}% star? {% yes star \LWR@figcaption% - #3% + \LWR@isolate{#3}% \endLWR@figcaption% }% {% No star: @@ -7869,7 +7924,9 @@ rowspan="#2" % }% }{}% \LWR@figcaption% - \@nameuse{fnum@\LTcaptype}\CaptionSeparator#3% + \LWR@isolate{\@nameuse{fnum@\LTcaptype}}% + \CaptionSeparator% + \LWR@isolate{#3}% \endLWR@figcaption% \ifblank{#2}% TOC entry empty {}% @@ -7880,9 +7937,9 @@ rowspan="#2" % {\@nameuse{ext@\LTcaptype}}% {\LTcaptype}% {% - \protect\numberline% - {\@nameuse{p@\LTcaptype}\@nameuse{the\LTcaptype}}% - {\ignorespaces #3\protect\relax}% + \protect\numberline% + {\LWR@isolate{\@nameuse{p@\LTcaptype}}\@nameuse{the\LTcaptype}}% + {\ignorespaces \LWR@isolate{#3}\protect\relax}% }% }% end of No TOC entry {% yes TOC entry @@ -7890,9 +7947,9 @@ rowspan="#2" % {\@nameuse{ext@\LTcaptype}}% {\LTcaptype}% {% - \protect\numberline% - {\@nameuse{p@\LTcaptype}\@nameuse{the\LTcaptype}}% - {\ignorespaces #2\protect\relax}% + \protect\numberline% + {\LWR@isolate{\@nameuse{p@\LTcaptype}}\@nameuse{the\LTcaptype}}% + {\ignorespaces \LWR@isolate{#2}\protect\relax}% }% }% end of yes TOC entry }% end of TOC entry not empty @@ -8291,8 +8348,8 @@ rowspan="#2" % \GetTitleStringExpand{#1}% \edef\@currentlabelname{\detokenize\expandafter{\GetTitleStringResult}}% \edef\@currentlabelname{% -\expandafter\LWR@stripperiod\@currentlabelname% -\ltx@empty.\ltx@empty\@nil% + \expandafter\LWR@stripperiod\@currentlabelname% + \ltx@empty.\ltx@empty\@nil% }% } @@ -8641,7 +8698,7 @@ autopage-\theLWR@currentautosec% \AtBeginDocument{\renewcommand{\@makecaption}[2]{% \LWR@traceinfo{@makecaption}% - #1\CaptionSeparator#2% + \LWR@isolate{#1}\CaptionSeparator\LWR@isolate{#2}% \LWR@traceinfo{@makecaption: done}% }% } @@ -8659,19 +8716,19 @@ autopage-\theLWR@currentautosec% \newenvironment*{LWR@figcaption} {% -\LWR@traceinfo{LWR@figcaption env start}% -\LWR@htmlblocktag{figcaption}% -\ifbool{FormatWP}{% -\begin{BlockClass}[font-style:italic]{italic} -\LWR@print@vspace*{\baselineskip} -}{}% -\LWR@traceinfo{LWR@figcaption env start: done}% + \LWR@traceinfo{LWR@figcaption env start}% + \LWR@htmlblocktag{figcaption}% + \ifbool{FormatWP}{% + \begin{BlockClass}[font-style:italic]{italic} + \LWR@print@vspace*{\baselineskip} + }{}% + \LWR@traceinfo{LWR@figcaption env start: done}% } {% -\LWR@traceinfo{LWR@figcaption env end}% -\ifbool{FormatWP}{\end{BlockClass}}{}% -\LWR@htmlblocktag{/figcaption}% -\LWR@traceinfo{LWR@figcaption env end: done}% + \LWR@traceinfo{LWR@figcaption env end}% + \ifbool{FormatWP}{\end{BlockClass}}{}% + \LWR@htmlblocktag{/figcaption}% + \LWR@traceinfo{LWR@figcaption env end: done}% } \newcommand*{\LWR@HTML@caption@begin}[1] { @@ -8923,8 +8980,12 @@ autopage-\theLWR@currentautosec% \DeclareDocumentCommand{\l@part}{m m}{\hypertoc{-1}{part}{#1}{#2}} +\@ifundefined{chapter} +{} +{ \DeclareDocumentCommand{\l@chapter}{m m} {\hypertoc{0}{chapter}{#1}{#2}} +} \renewcommand{\l@section}[2]{\hypertoc{1}{section}{#1}{#2}} @@ -9010,15 +9071,15 @@ autopage-\theLWR@currentautosec% } \newcommand{\LWR@hyperindexrefnullified}{% -\renewrobustcmd{\emph}[1]{\LWR@HTMLemph{\LWR@doindexentry{##1}}}% -\renewrobustcmd{\textbf}[1]{\LWR@HTMLtextbf{\LWR@doindexentry{##1}}}% -\renewrobustcmd{\textrm}[1]{\LWR@HTMLtextrm{\LWR@doindexentry{##1}}}% -\renewrobustcmd{\textsf}[1]{\LWR@HTMLtextsf{\LWR@doindexentry{##1}}}% -\renewrobustcmd{\texttt}[1]{\LWR@HTMLtexttt{\LWR@doindexentry{##1}}}% -\renewrobustcmd{\textup}[1]{\LWR@HTMLtextup{\LWR@doindexentry{##1}}}% -\renewrobustcmd{\textsc}[1]{\LWR@HTMLtextsc{\LWR@doindexentry{##1}}}% -\renewrobustcmd{\textit}[1]{\LWR@HTMLtextit{\LWR@doindexentry{##1}}}% -\renewrobustcmd{\textsl}[1]{\LWR@HTMLtextsl{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\emph}[1]{\LWR@HTML@emph{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textbf}[1]{\LWR@HTML@textbf{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textrm}[1]{\LWR@HTML@textrm{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textsf}[1]{\LWR@HTML@textsf{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\texttt}[1]{\LWR@HTML@texttt{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textup}[1]{\LWR@HTML@textup{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textsc}[1]{\LWR@HTML@textsc{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textit}[1]{\LWR@HTML@textit{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textsl}[1]{\LWR@HTML@textsl{\LWR@doindexentry{##1}}}% } \newcommand{\hyperindexref}[1]{% @@ -9092,17 +9153,6 @@ autopage-\theLWR@currentautosec% \let\textellipsis\LWR@origtextellipsis% \let\textless\LWR@origtextless% \let\textgreater\LWR@origtextgreater% -\LetLtxMacro\textrm\LWR@origtextrm% -\LetLtxMacro\textsf\LWR@origtextsf% -\LetLtxMacro\texttt\LWR@origtexttt% -\LetLtxMacro\textbf\LWR@origtextbf% -\LetLtxMacro\textmd\LWR@origtextmd% -\LetLtxMacro\textit\LWR@origtextit% -\LetLtxMacro\textsl\LWR@origtextsl% -\LetLtxMacro\textsc\LWR@origtextsc% -\LetLtxMacro\textup\LWR@origtextup% -\LetLtxMacro\textnormal\LWR@origtextnormal% -\LetLtxMacro\emph\LWR@origemph% \LetLtxMacro\rmfamily\LWR@origrmfamily% \LetLtxMacro\sffamily\LWR@origsffamily% \LetLtxMacro\ttfamily\LWR@origttfamily% @@ -10044,12 +10094,17 @@ autopage-\theLWR@currentautosec% \end{warpHTML} \begin{warpHTML} -\@ifpackageloaded{textcomp}{\LWR@origRequirePackage{lwarp-textcomp}}{} +\newcommand*{\LWR@PreloadedPackage}[1]{% +\@ifpackageloaded{#1}{\LWR@origRequirePackage{lwarp-#1}}{} +} +\LWR@PreloadedPackage{textcomp} + +\LWR@PreloadedPackage{xunicode} -\@ifpackageloaded{xunicode}{\LWR@origRequirePackage{lwarp-xunicode}}{} +\LWR@PreloadedPackage{graphics} +\LWR@PreloadedPackage{graphicx} -\@ifpackageloaded{graphics}{\LWR@origRequirePackage{lwarp-graphics}}{} -\@ifpackageloaded{graphicx}{\LWR@origRequirePackage{lwarp-graphicx}}{} +\LWR@PreloadedPackage{ulem} \end{warpHTML} @@ -10107,7 +10162,7 @@ autopage-\theLWR@currentautosec% \begin{lrbox}{\LWR@colorminipagebox}% #5% \end{lrbox}% -\ifthenelse{\equal{#4}{none}}% +\ifstrequal{#4}{none}% {% #4 none \LWR@traceinfo{background is none}% {% scope the \colorlet @@ -10152,7 +10207,7 @@ autopage-\theLWR@currentautosec% \end{minipage}% \end{lrbox}% \LWR@traceinfo{*** starting end fcolorminipage #1 #2 #3 #4 #8}% -\ifthenelse{\equal{#4}{none}}% +\ifstrequal{#4}{none}% {% #4 none {% scope the \colorlet \colorlet{LWR@currentcolor}{.}% @@ -10537,7 +10592,8 @@ padding:\LWR@printlength{\fboxsep}% \endminipage% } -\newenvironment{fminipage}{\LWR@print@fminipage}{\endLWR@print@fminipage} +\LetLtxMacro\fminipage\LWR@print@fminipage +\LetLtxMacro\endfminipage\endLWR@print@fminipage \end{warpall} @@ -10549,6 +10605,7 @@ padding:\LWR@printlength{\fboxsep}% \LWR@forceminwidth{\fboxrule}% \setlength{\LWR@tempwidth}{#4}% \IfValueT{#2}{\setlength{\LWR@tempheight}{#2}}% +\LWR@stoppars% \begin{BlockClass}[% \LWR@blackborderpadding ; % \IfValueT{#2}{height:\LWR@printlength{\LWR@tempheight} ; }% @@ -10557,6 +10614,7 @@ width:\LWR@printlength{\LWR@tempwidth}% } {% \end{BlockClass}% +\global\booltrue{LWR@minipagethispar}% \LWR@traceinfo{fminipage done}% } @@ -10576,125 +10634,161 @@ width:\LWR@printlength{\LWR@tempwidth}% \begin{warpHTML} -\DeclareRobustCommand{\LWR@HTMLtextstyle}[3]{% -\ifbool{FormatWP}% -{\LWR@htmlspanclass[#1]{#2}{#3}}% -{\LWR@htmlspanclass{#2}{#3}}% +\DeclareRobustCommand{\LWR@HTML@emph}[1]{% + {% + \itshape% + \LWR@htmlspan{em}{#1}% + }% } +\LWR@formatted{emph} -\DeclareRobustCommand{\LWR@HTMLemph}[1]{\LWR@htmlspan{em}{#1}} -\DeclareRobustCommand{\LWR@nullemph}[1]{#1} -\LetLtxMacro\emph\LWR@HTMLemph +\DeclareRobustCommand{\LWR@null@emph}[1]{#1} -\DeclareRobustCommand{\LWR@HTMLtextmd}[1]{% -\LWR@HTMLtextstyle{font-weight:normal}{textmd}{#1}% +\DeclareRobustCommand{\LWR@HTML@textmd}[1]{% + {% + \mdseries% + \InlineClass(font-weight:normal){textmd}{#1}% + }% } -\DeclareRobustCommand{\LWR@nulltextmd}[1]{#1} - -\LetLtxMacro\textmd\LWR@HTMLtextmd +\LWR@formatted{textmd} -\DeclareRobustCommand{\LWR@HTMLtextbf}[1]{\LWR@htmlspan{b}{#1}} -\DeclareRobustCommand{\LWR@nulltextbf}[1]{#1} -\LetLtxMacro\textbf\LWR@HTMLtextbf +\DeclareRobustCommand{\LWR@null@textmd}[1]{#1} -\DeclareRobustCommand{\LWR@HTMLtextrm}[1]{% -\LWR@HTMLtextstyle{font-family:serif}{textrm}{#1}% +\DeclareRobustCommand{\LWR@HTML@textbf}[1]{% + {% + \bfseries% + \LWR@htmlspan{b}{#1}% + }% } +\LWR@formatted{textbf} -\DeclareRobustCommand{\LWR@nulltextrm}[1]{#1} +\DeclareRobustCommand{\LWR@null@textbf}[1]{#1} -\LetLtxMacro\textrm\LWR@HTMLtextrm +\DeclareRobustCommand{\LWR@HTML@textrm}[1]{% + {% + \rmfamily% + \InlineClass(font-family:serif){textrm}{#1}% + }% +} +\LWR@formatted{textrm} -\DeclareRobustCommand{\LWR@HTMLtextsf}[1]{% -\LWR@HTMLtextstyle{font-family:sans}{textsf}{#1}% +\DeclareRobustCommand{\LWR@null@textrm}[1]{#1} + +\DeclareRobustCommand{\LWR@HTML@textsf}[1]{% + {% + \sffamily% + \InlineClass(font-family:sans){textsf}{#1}% + }% } -\DeclareRobustCommand{\LWR@nulltextsf}[1]{#1} -\LetLtxMacro\textsf\LWR@HTMLtextsf +\LWR@formatted{textsf} -\DeclareRobustCommand{\LWR@HTMLtexttt}[1]{\LWR@htmlspan{kbd}{#1}} -\DeclareRobustCommand{\LWR@nulltexttt}[1]{#1} -\LetLtxMacro\texttt\LWR@HTMLtexttt +\DeclareRobustCommand{\LWR@null@textsf}[1]{#1} -\DeclareRobustCommand{\LWR@HTMLtextup}[1]{% -\LWR@HTMLtextstyle{font-variant:normal}{textup}{#1}% +\DeclareRobustCommand{\LWR@HTML@texttt}[1]{% + {% + \ttfamily% + \LWR@htmlspan{kbd}{#1}% + }% } +\LWR@formatted{texttt} -\DeclareRobustCommand{\LWR@nulltextup}[1]{#1} +\DeclareRobustCommand{\LWR@null@texttt}[1]{#1} -\LetLtxMacro\textup\LWR@HTMLtextup +\DeclareRobustCommand{\LWR@HTML@textup}[1]{% + {% + \upshape% + \InlineClass(font-style:normal){textup}{#1}% + }% +} +\LWR@formatted{textup} -\DeclareRobustCommand{\LWR@HTMLtextit}[1]{\LWR@htmlspan{i}{#1}} -\DeclareRobustCommand{\LWR@nulltextit}[1]{#1} -\LetLtxMacro\textit\LWR@HTMLtextit +\DeclareRobustCommand{\LWR@null@textup}[1]{#1} -\DeclareRobustCommand{\LWR@HTMLtextsc}[1]{% -\LWR@HTMLtextstyle{font-variant:small-caps}{textsc}{#1}% +\DeclareRobustCommand{\LWR@HTML@textit}[1]{% + {% + \itshape% + \LWR@htmlspan{i}{#1}% + }% } +\LWR@formatted{textit} + +\DeclareRobustCommand{\LWR@null@textit}[1]{#1} -\DeclareRobustCommand{\LWR@nulltextsc}[1]{#1} +\DeclareRobustCommand{\LWR@HTML@textsc}[1]{% + {% + \scshape% + \InlineClass( + font-variant: small-caps ; + font-variant-numeric: oldstyle-nums ; + ){textsc}{#1}% + }% +} +\LWR@formatted{textsc} -\LetLtxMacro\textsc\LWR@HTMLtextsc +\DeclareRobustCommand{\LWR@null@textsc}[1]{#1} -\DeclareRobustCommand{\LWR@HTMLtextsl}[1]{% -\LWR@HTMLtextstyle{font-style:oblique}{textsl}{#1}% +\DeclareRobustCommand{\LWR@HTML@textsl}[1]{% + {% + \slshape% + \InlineClass(font-style:oblique){textsl}{#1}% + }% } +\LWR@formatted{textsl} -\DeclareRobustCommand{\LWR@nulltextsl}[1]{#1} +\DeclareRobustCommand{\LWR@null@textsl}[1]{#1} -\LetLtxMacro\textsl\LWR@HTMLtextsl +\DeclareRobustCommand{\LWR@HTML@textnormal}[1]{\textmd{\textrm{\textup{#1}}}} +\LWR@formatted{textnormal} -\DeclareRobustCommand{\LWR@HTMLtextnormal}[1]{\textmd{\textrm{\textup{#1}}}} -\DeclareRobustCommand{\LWR@nulltextnormal}[1]{#1} -\LetLtxMacro\textnormal\LWR@HTMLtextnormal +\DeclareRobustCommand{\LWR@null@textnormal}[1]{#1} -\DeclareRobustCommand{\LWR@nullrmfamily}{} -\DeclareRobustCommand{\LWR@nullsffamily}{} -\DeclareRobustCommand{\LWR@nullttfamily}{} -\DeclareRobustCommand{\LWR@nullbfseries}{} -\DeclareRobustCommand{\LWR@nullmdseries}{} -\DeclareRobustCommand{\LWR@nullupshape}{} -\DeclareRobustCommand{\LWR@nullslshape}{} -\DeclareRobustCommand{\LWR@nullscshape}{} -\DeclareRobustCommand{\LWR@nullitshape}{} -\DeclareRobustCommand{\LWR@nullem}[1]{} -\DeclareRobustCommand{\LWR@nullnormalfont}{} +\DeclareRobustCommand{\LWR@null@rmfamily}{} +\DeclareRobustCommand{\LWR@null@sffamily}{} +\DeclareRobustCommand{\LWR@null@ttfamily}{} +\DeclareRobustCommand{\LWR@null@bfseries}{} +\DeclareRobustCommand{\LWR@null@mdseries}{} +\DeclareRobustCommand{\LWR@null@upshape}{} +\DeclareRobustCommand{\LWR@null@slshape}{} +\DeclareRobustCommand{\LWR@null@scshape}{} +\DeclareRobustCommand{\LWR@null@itshape}{} +\DeclareRobustCommand{\LWR@null@normalfont}{} +\DeclareRobustCommand{\LWR@null@em}{} \newcommand*{\LWR@nullfonts}{% -\LetLtxMacro\emph\LWR@nullemph% -\LetLtxMacro\textmd\LWR@nulltextmd% -\LetLtxMacro\textbf\LWR@nulltextbf% -\LetLtxMacro\textrm\LWR@nulltextrm% -\LetLtxMacro\textsf\LWR@nulltextsf% -\LetLtxMacro\texttt\LWR@nulltexttt% -\LetLtxMacro\textup\LWR@nulltextup% -\LetLtxMacro\textit\LWR@nulltextit% -\LetLtxMacro\textsc\LWR@nulltextsc% -\LetLtxMacro\textsl\LWR@nulltextsl% -\LetLtxMacro\textnormal\LWR@nulltextnormal% -\LetLtxMacro\rmfamily\LWR@nullrmfamily% -\LetLtxMacro\sffamily\LWR@nullsffamily% -\LetLtxMacro\ttfamily\LWR@nullttfamily% -\LetLtxMacro\bfseries\LWR@nullbfseries% -\LetLtxMacro\mdseries\LWR@nullmdseries% -\LetLtxMacro\upshape\LWR@nullupshape% -\LetLtxMacro\slshape\LWR@nullslshape% -\LetLtxMacro\scshape\LWR@nullscshape% -\LetLtxMacro\itshape\LWR@nullitshape% -\LetLtxMacro\em\LWR@nullem% -\LetLtxMacro\normalfont\LWR@nullnormalfont% +\LetLtxMacro\emph\LWR@null@emph% +\LetLtxMacro\textmd\LWR@null@textmd% +\LetLtxMacro\textbf\LWR@null@textbf% +\LetLtxMacro\textrm\LWR@null@textrm% +\LetLtxMacro\textsf\LWR@null@textsf% +\LetLtxMacro\texttt\LWR@null@texttt% +\LetLtxMacro\textup\LWR@null@textup% +\LetLtxMacro\textit\LWR@null@textit% +\LetLtxMacro\textsc\LWR@null@textsc% +\LetLtxMacro\textsl\LWR@null@textsl% +\LetLtxMacro\textnormal\LWR@null@textnormal% +\LetLtxMacro\rmfamily\LWR@null@rmfamily% +\LetLtxMacro\sffamily\LWR@null@sffamily% +\LetLtxMacro\ttfamily\LWR@null@ttfamily% +\LetLtxMacro\bfseries\LWR@null@bfseries% +\LetLtxMacro\mdseries\LWR@null@mdseries% +\LetLtxMacro\upshape\LWR@null@upshape% +\LetLtxMacro\slshape\LWR@null@slshape% +\LetLtxMacro\scshape\LWR@null@scshape% +\LetLtxMacro\itshape\LWR@null@itshape% +\LetLtxMacro\normalfont\LWR@null@normalfont% +\LetLtxMacro\em\LWR@null@em% \renewcommand*{\,}{-}% \renewcommand*{~}{-}% \renewcommand*{\newline}{ }% \renewcommand*{\textellipsis}{-}% -\renewcommand*{\HTMLunicode}[1]{-}% -\renewcommand*{\HTMLentity}[1]{-}% +\renewcommand*{\HTMLunicode}[1]{}% +\renewcommand*{\HTMLentity}[1]{}% \renewcommand*{\&}{and}% \renewcommand{\textsuperscript}[1]{##1}% \renewcommand{\textsubscript}[1]{##1}% \renewcommand{\underline}[1]{##1}% \RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}% -\DeclareExpandableDocumentCommand{\InlineClass}{+o +m +m}{##3}% -\DeclareRobustCommand{\LWR@HTMLtextstyle}[3]{##3}% +\DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}% \def\(##1\){}% \def\[##1\]{}% \RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{}% @@ -10707,13 +10801,26 @@ width:\LWR@printlength{\LWR@tempwidth}% \newcommand*{\LWR@f@series}{md} \newcommand*{\LWR@f@shape}{up} +\newcounter{LWR@textcurrentfontdepth} +\setcounter{LWR@textcurrentfontdepth}{0} + \newcommand*{\LWR@textcurrentfont}[1]{% -\InlineClass{% - text\LWR@f@family\LWR@origtilde{}% - text\LWR@f@series\LWR@origtilde{}% - text\LWR@f@shape% - }% - {#1}% + \ifnumcomp{\value{LWR@textcurrentfontdepth}}{>}{0}% + {% + \addtocounter{LWR@textcurrentfontdepth}{1}% + #1% + \addtocounter{LWR@textcurrentfontdepth}{-1}% + }% + {% + \addtocounter{LWR@textcurrentfontdepth}{1}% + \InlineClass{% + text\LWR@f@family\LWR@origtilde{}% + text\LWR@f@series\LWR@origtilde{}% + text\LWR@f@shape% + }% + {#1}% + \addtocounter{LWR@textcurrentfontdepth}{-1}% + }% } \newenvironment*{LWR@blocktextcurrentfont}{% @@ -10740,6 +10847,8 @@ width:\LWR@printlength{\LWR@tempwidth}% \renewrobustcmd*{\scshape}{\renewcommand*{\LWR@f@shape}{sc}} +\renewrobustcmd*{\slshape}{\renewcommand*{\LWR@f@shape}{sl}} + \renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape} @@ -10765,15 +10874,15 @@ width:\LWR@printlength{\LWR@tempwidth}% \AtBeginDocument{\let\fup\textsuperscript} \renewcommand{\underline}[1]{% -\LWR@HTMLtextstyle% - {text-decoration:underline; text-decoration-skip: auto}% - {underline}{#1}% + \InlineClass% + (text-decoration:underline; text-decoration-skip: auto)% + {underline}{#1}% } \newcommand{\LWR@overline}[1]{% -\LWR@HTMLtextstyle% - {text-decoration:overline; text-decoration-skip: auto}% - {overline}{#1}% + \InlineClass% + (text-decoration:overline; text-decoration-skip: auto)% + {overline}{#1}% } \newcommand*{\LWR@currenttextcolor}{black} @@ -10789,6 +10898,14 @@ width:\LWR@printlength{\LWR@tempwidth}% \end{warpHTML} +\begin{warpprint} + +\newcommand*{\LWR@textcurrentfont}[1]{#1} + +\newenvironment*{LWR@blocktextcurrentfont}{}{} + +\end{warpprint} + \begin{warpHTML} \AtBeginDocument{ @@ -10852,9 +10969,11 @@ width:\LWR@printlength{\LWR@tempwidth}% \LetLtxMacro\newline\LWR@newlinebr \LetLtxMacro\LWR@origendofline\\ -\NewDocumentCommand{\LWR@endofline}{s o} +\NewDocumentCommand{\LWR@endofline}{s O{0pt}} {% \newline% +\setlength{\LWR@templengthone}{#2}% +\ifdimgreater{\LWR@templengthone}{0pt}{\newline}{}% } \newcommand*{\LWR@minipagestartpars}{% @@ -11009,70 +11128,111 @@ width:\LWR@printlength{\LWR@tempwidth}% \begin{warpHTML} -\let\LWR@origTeX\TeX +\LetLtxMacro\LWR@origTeX\TeX -\newcommand*{\LWR@TeX} +\newrobustcmd*{\LWR@TeX} {% \InlineClass{latexlogofont}% {% - \LWR@HTMLtextstyle% - {text-transform:uppercase}% - {latexlogo}% - {T\textsubscript{e}X}% + \InlineClass{latexlogo}% + {% + T% + \InlineClass{latexlogosub}{e}% + X% + }% }% } -\let\LWR@origLaTeX\LaTeX +\LetLtxMacro\LWR@origLaTeX\LaTeX -\newcommand*{\LWR@LaTeX} +\newrobustcmd*{\LWR@LaTeX} {% \InlineClass{latexlogofont}% {% - \LWR@HTMLtextstyle% - {text-transform:uppercase}% - {latexlogo}% - {L\textsuperscript{a}T\textsubscript{e}X}% + \InlineClass{latexlogo}% + {% + L% + \InlineClass{latexlogosup}{a}% + T% + \InlineClass{latexlogosub}{e}% + X% + }% + }% +} + +\LetLtxMacro\LWR@origLaTeXe\LaTeXe + +\renewrobustcmd*{\LaTeXe} +{% + \LaTeX% + \InlineClass{latexlogofont}{% + \InlineClass{latexlogotwoe}{% + 2% + \InlineClass{latexlogotwoesub}{\HTMLunicode{03B5}}% + }% }% } +\newrobustcmd*{\LWR@LuaTeX}{\InlineClass{latexlogofont}{Lua}\TeX} +\newrobustcmd*{\LWR@LuaLaTeX}{\InlineClass{latexlogofont}{Lua}\LaTeX} +\newrobustcmd*{\Xe} + {% + X% + \InlineClass{xelatexlogosub}{\HTMLunicode{18e}}% + } -\let\LWR@origLaTeXe\LaTeXe +\newrobustcmd*{\LWR@XeTeX}{\InlineClass{xelatexlogo}{\Xe}\TeX} -\renewcommand*{\LaTeXe} -{\LaTeX\InlineClass{latexlogofont}% -{\,2\textsubscript{\textit{\HTMLunicode{3B5}}}}} -\newcommand*{\LWR@LuaTeX}{\InlineClass{latexlogofont}{Lua}\TeX} -\newcommand*{\LWR@LuaLaTeX}{\InlineClass{latexlogofont}{Lua}\LaTeX} -\newcommand*{\Xe} - {X\textsubscript{\HTMLunicode{18e}}} -\newcommand*{\LWR@XeTeX}{\InlineClass{xetexlogo}{\Xe}\TeX} -\newcommand*{\LWR@XeLaTeX}{\InlineClass{xelatexlogo}{\Xe}\LaTeX} -\newcommand*{\LWR@ConTeXt} +\newrobustcmd*{\LWR@XeLaTeX}{\InlineClass{xelatexlogo}{\Xe}\LaTeX} +\newrobustcmd*{\LWR@ConTeXt} {\InlineClass{latexlogofont}{Con}\TeX{}% \InlineClass{latexlogofont}{t}} -\providecommand*{\BibTeX} +\providerobustcmd*{\BibTeX} {\InlineClass{latexlogofont}{B\textsc{ib}}\TeX} -\newcommand*{\MakeIndex} +\newrobustcmd*{\MakeIndex} {\InlineClass{latexlogofont}{\textit{MakeIndex}}} -\AtBeginDocument{\DeclareDocumentCommand{\AmS}{} -{\InlineClass{amslogo}{\textit{A\textsubscript{M}S}}}} -\newcommand*{\MiKTeX}{\InlineClass{latexlogofont}{MiK}\TeX} -\newcommand*{\LyX}{\InlineClass{lyxlogo}{LyX}} +\AtBeginDocument{% +\DeclareDocumentCommand{\AmS}{} +{% + \InlineClass{amslogo}{% + \textit{% + A% + \InlineClass{latexlogosub}{M}% + S% + }% + }% +}% +} +\newrobustcmd*{\MiKTeX}{\InlineClass{latexlogofont}{MiK}\TeX} +\newrobustcmd*{\LyX}{\InlineClass{lyxlogo}{LyX}} \end{warpHTML} \begin{warpprint} -\newcommand*{\XeTeXrevE} - {\hspace{-.1667em}\raisebox{-.5ex}{\reflectbox{E}}\hspace{-.125em}} -\providecommand*{\XeTeX}{\mbox{X\XeTeXrevE\TeX}} -\providecommand*{\XeLaTeX}{\mbox{X\XeTeXrevE\LaTeX}} -\providecommand*{\AmS}{% -\leavevmode\hbox{$\mathcal A\kern-.2em\lower.376ex% -\hbox{$\mathcal M$}\kern-.2em\mathcal S$}} -\newcommand*{\LyX}{\textsf{LyX}} -\providecommand*{\LuaTeX}{\mbox{Lua\TeX}} -\providecommand*{\LuaLaTeX}{\mbox{Lua\LaTeX}} -\providecommand*{\BibTeX}{\mbox{B\textsc{ib}\TeX}} -\providecommand*{\MakeIndex}{\mbox{\textit{MakeIndex}}} -\providecommand*{\ConTeXt}{\mbox{Con\TeX{}t}} -\providecommand*{\MiKTeX}{\mbox{MiK\TeX}} + +\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} @@ -11093,7 +11253,23 @@ width:\LWR@printlength{\LWR@tempwidth}% \@ifclassloaded{memoir}{\RequirePackage{lwarp-patch-memoir}}{} \end{warpHTML} +\begin{warpHTML} +\AtBeginDocument{ + \@ifpackageloaded{ctexpatch}{% + \def\@partcntformat#1{% + \LWR@isolate{\CTEX@partname}~% + \CTEX@part@aftername% + }% + + \def\@partnameformat{} + \def\@chapcntformat#1{% + \LWR@isolate{\CTEX@chaptername}~% + \CTEX@chapter@aftername% + }% + }{} +} +\end{warpHTML} \endinput %% %% End of file `lwarp.sty'. |