diff options
author | Karl Berry <karl@freefriends.org> | 2020-07-19 21:27:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-07-19 21:27:08 +0000 |
commit | 9be6d4cf0be6243c0865902d6c3773cc71cd2e84 (patch) | |
tree | c58b1cebb63873431e2feb70ef1d29615c07e2c8 /Master/texmf-dist/tex | |
parent | d1db3fa487f34051ad216f6261b36f0086a729f2 (diff) |
lwarp (19jul20)
git-svn-id: svn://tug.org/texlive/trunk@55880 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
28 files changed, 1195 insertions, 207 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty index 21d8f7bee09..7d747e3ac96 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty @@ -16,6 +16,8 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{amsmath}[2017/09/02] +\newcommand*{\LWR@HTML@dotso}{\textellipsis\ } +\LWR@formatted{dotso} \def\maketag@@@#1{\text{#1}} \def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip)}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty index 27e2398db3e..681b48fb836 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty @@ -31,8 +31,8 @@ } } {} +\RequirePackage{amsmath} \LWR@ProvidesPackagePass{amsthm}[2017/10/31] - \newcommand{\LWR@newtheoremstyle}{plain} \renewcommand{\theoremstyle}[1]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty index 4696791a82b..cd95de1ffd0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty @@ -130,6 +130,15 @@ #2% } +\caption@AtBeginDocument{ +\@ifpackageloaded{lwarp-scrextend}{ + \LetLtxMacro\captionbelow\caption + \LetLtxMacro\captionabove\caption + \LetLtxMacro\captionofbelow\captionof + \LetLtxMacro\captionofabove\captionof +}{} +} + \endinput %% %% End of file `lwarp-caption.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty new file mode 100644 index 00000000000..4bab8b37616 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty @@ -0,0 +1,132 @@ +%% +%% This is file `lwarp-cleveref.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `cleveref') +%% This is a generated file. +%% Copyright 2016-2020 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{cleveref}[2018/03/27] +\def\LWR@orig@@@setcref#1#2{\cref@getlabel{#2}{\@templabel}#1{\@templabel}{}{}}% + +\ifdefequal{\@@setcref}{\LWR@orig@@@setcref}{% before v0.21 + \renewcommand*{\@@setcref}[2]{#1{\ref{#2}}{}{}} +}{ + \ifdefequal{\@@@setcref}{\LWR@orig@@@setcref}{% as of v0.21 + \renewcommand*{\@@@setcref}[2]{% + #1{\ref{#2}}{}{}} + }{ + \PackageWarningNoLine{lwarp-cleveref}{ + Unknown version of cleveref. + \protect\cref\space will fail. + }% + } +} + +\def\LWR@orig@@@setcrefrange#1#2#3{% + \cref@getlabel{#2}{\@labela}% + \cref@getlabel{#3}{\@labelb}% + #1{\@labela}{\@labelb}{}{}{}{}}% + +\ifdefequal{\@@setcrefrange}{\LWR@orig@@@setcrefrange}{ + \renewcommand{\@@setcrefrange}[3]{% + #1{\ref{#2}}{\ref{#3}}{}{}{}{}% + } +}{ + \ifdefequal{\@@@setcrefrange}{\LWR@orig@@@setcrefrange}{ + \renewcommand{\@@@setcrefrange}[3]{% + #1{\ref{#2}}{\ref{#3}}{}{}{}{}% + } + }{ + \PackageWarningNoLine{lwarp-cleveref}{ + Unknown version of cleveref. + \protect\crefrange\space will fail. + } + } +} + + +\newcommand*{\cpagerefFor}{for} + +\def\LWR@orig@@setcpageref#1#2{% before v0.21 + \cref@getpageref{#2}{\@temppage}#1{\@temppage}{}{}}% + +\def\LWR@orig@@@setcpageref#1#2{% as of v0.21 + \cpageref@getlabel{#2}{\@temppage}#1{\@temppage}{}{}}% + +\ifdefequal{\@@setcpageref}{\LWR@orig@@setcpageref}{ + \renewcommand*{\@@setcpageref}[2]{% + #1{\cpagerefFor\ \cref{#2}}{}{}% + } +}{ + \ifdefequal{\@@@setcpageref}{\LWR@orig@@@setcpageref}{ + \renewcommand*{\@@@setcpageref}[2]{% + #1{\cpagerefFor\ \cref{#2}}{}{}% + } + } + { + \PackageWarningNoLine{lwarp-cleveref}{ + Unknown version of cleveref. + \protect\cpageref\space will fail. + } + } +} + + +\def\LWR@orig@@setcpagerefrange#1#2#3{% before v0.21 + \cref@getpageref{#2}{\@pagea}% + \cref@getpageref{#3}{\@pageb}% + #1{\@pagea}{\@pageb}{}{}{}{}}% + +\def\LWR@orig@@@setcpagerefrange#1#2#3{% as of v0.21 + \cpageref@getlabel{#2}{\@pagea}% + \cpageref@getlabel{#3}{\@pageb}% + #1{\@pagea}{\@pageb}{}{}{}{}}% + +\ifdefequal{\@@setcpagerefrange}{\LWR@orig@@setcpagerefrange}{ + \renewcommand*{\@@setcpagerefrange}[3]{% + #1{\cpagerefFor\ \cref{#2}}{\cref{#3}}{}{}{}{}% + } +}{ + \ifdefequal{\@@@setcpagerefrange}{\LWR@orig@@@setcpagerefrange}{ + \renewcommand*{\@@@setcpagerefrange}[3]{% + #1{\cpagerefFor\ \cref{#2}}{\cref{#3}}{}{}{}{}% + } + } + { + \PackageWarningNoLine{lwarp-cleveref}{ + Unknown version of cleveref. + \protect\cpagerefrange\space will fail. + } + } +} +\LWR@absorbstar{cref} +\LWR@absorbstar{Cref} +\LWR@absorbstar{crefrange} +\LWR@absorbstar{Crefrange} +\LWR@absorbstar{cpageref} +\LWR@absorbstar{Cpageref} +\LWR@absorbstar{cpagerefrange} +\LWR@absorbstar{Cpagerefrange} +\LWR@absorbstar{labelcref} +\LWR@absorbstar{labelcpageref} +\@ifpackageloaded{varioref}{ + \LWR@absorbstar{vref} + \LWR@absorbstar{Vref} + \LWR@absorbstar{vrefrange} + \LWR@absorbstar{Vrefrange} + \LWR@absorbstar{fullref} + \LWR@absorbstar{Fullref} +}{}% varioref +\endinput +%% +%% End of file `lwarp-cleveref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-errata.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-errata.sty index 82f56ada638..5826f377623 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-errata.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-errata.sty @@ -56,7 +56,7 @@ {} {\LWR@patcherror{erratum}{eReplace}} -\preto\PrintErrata{\LWR@orignewpage} +\preto\PrintErrata{\LWR@maybe@orignewpage} \StopDefiningMath diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty index aafcd3043af..f8b3d3ebcaa 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty @@ -22,31 +22,6 @@ {}{ \renewcommand*{\fancyrefhook}[1]{#1}% } - -\renewcommand*{\@f@ref}[4]{% - \@ifundefined{#1r@#2@#3}{% - \PackageError{lwarp-fancyref}{% - \backslashchar#1ref\space format ``#2'' - undefined\MessageBreak - for label type ``#3''% - }{% - The format ``#2'' was not defined for the label type - ``#3''\MessageBreak - and the \backslashchar#1ref\space command. Perhaps - you have only misspelled its name.\MessageBreak - Otherwise you will have to define it with - \protect\new#1refformat\MessageBreak - prior to using it.% - }% - }{% - \fancyrefhook{% - \@nameuse{#1r@#2@#3}% - {\ref{#3\fancyrefargdelim#4}}% - {}% lwarp - {}% lwarp - }% - }% -}% \endinput %% %% End of file `lwarp-fancyref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fbox.sty new file mode 100644 index 00000000000..f1a49c4f319 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fbox.sty @@ -0,0 +1,102 @@ +%% +%% This is file `lwarp-fbox.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fbox') +%% This is a generated file. +%% Copyright 2016-2020 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{fbox}[2020/06/22] +\LetLtxMacro\LWR@HTML@fbox\fbox +\renewcommand*{\orig@fbox}{\FBox@i[tblr]} +\newcommand*{\LWR@fboxpkg@border}[2]{% + \appto\LWR@tempone{% + border-#1: % space + \LWR@printlength{\LWR@atleastonept} % space + solid \LWR@origpound\LWR@tempcolor ;\LWR@indentHTML + }% + \ifblank{#2}{}{% + \appto\LWR@tempone{% + padding-#1: \LWR@printlength{#2} ;\LWR@indentHTML + }% + }% +} +\newbool{LWR@fboxpkg@ispar} +\boolfalse{LWR@fboxpkg@ispar} +\newcommand{\LWR@fboxpkg@lrpadding}[1]{% + \csuse{if@fbox@space@#1}% + \appto\LWR@tempone{% + padding-#1: \LWR@printlength{\fbox@@sep};\LWR@indentHTML + } + \else% + \appto\LWR@tempone{% + padding-#1: 0pt;\LWR@indentHTML + } + \fi% +} +\newcommand{\LWR@HTML@FBox@iii}[1]{% + \LWR@forceminwidth{\fbox@@rule}% + \LWR@findcurrenttextcolor% + \def\LWR@tempone{% + color: \LWR@origpound\LWR@tempcolor ; \LWR@indentHTML + margin: 1ex ; \LWR@indentHTML + }% + \LWR@fboxpkg@lrpadding{left}% + \LWR@fboxpkg@lrpadding{right}% + \ifnum\the\@tempcntb>8\relax + \advance\@tempcntb by -8 + \LWR@fboxpkg@border{top}{\fbox@@sep}% + \fi + \ifnum\@tempcntb>3 + \advance\@tempcntb by -4 + \LWR@fboxpkg@border{left}{}% + \fi + \ifnum\@tempcntb>1 + \LWR@fboxpkg@border{right}{}% + \fi + \ifodd\@tempcntb + \LWR@fboxpkg@border{bottom}{\fbox@@sep}% + \fi + \color@begingroup + \ifbool{LWR@fboxpkg@ispar}% + {% + \begin{BlockClass}[\LWR@tempone]{fboxpkg}% + #1% + \end{BlockClass}% + }% + {% + \InlineClass[\LWR@tempone]{fboxpkg}{% + #1% + }% + }% + \color@endgroup + \boolfalse{LWR@fboxpkg@ispar}% globally +} +\LWR@formatted{FBox@iii} +\long\def\LWR@HTML@FParBox@i[#1]#2{% + \booltrue{LWR@fboxpkg@ispar}% + \FBox@i[#1]{#2} +} +\LWR@formatted{FParBox@i} + +\long\def\LWR@HTML@FParBox@ii#1{% + \booltrue{LWR@fboxpkg@ispar}% + \FBox@i[tblr]{#1}% +} +\LWR@formatted{FParBox@ii} +\CustomizeMathJax{\let\LWRorigfbox\fbox} +\CustomizeMathJax{\newcommand{\LWRfboxpkgtwo}[2][]{\LWRorigfbox{#2}}} +\CustomizeMathJax{\renewcommand{\fbox}{\ifstar\LWRfboxpkgtwo\LWRfboxpkgtwo}} +\CustomizeMathJax{\newcommand{\fparbox}{\fbox}} +\endinput +%% +%% End of file `lwarp-fbox.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-gindex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-gindex.sty new file mode 100644 index 00000000000..6f494067420 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-gindex.sty @@ -0,0 +1,42 @@ +%% +%% This is file `lwarp-gindex.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `gindex') +%% This is a generated file. +%% Copyright 2016-2020 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{gindex}[2019/10/07] +\AtBeginDocument{ + \robustify{\indexpagessep} + \robustify{\indexrangesep} + \renewcommand*{\IndexPageSeparator}{\indexpagessep} + \renewcommand*{\IndexRangeSeparator}{\indexrangesep} +} +\def\addindexitem#1#2{% + \indexflushitem + \gix@getspecial#1\indexspecial\indexspecial\@@\indexitem{\hyperindexref{#2}}} + +\def\addindexsubitem#1#2{% + \stepcounter{indexsubitems}% + \gix@getspecial#1\indexspecial\indexspecial\@@\indexsubitem{\hyperindexref{#2}}} + +\def\addindexsubsubitem#1#2{% + \gix@getspecial#1\indexspecial\indexspecial\@@\indexsubsubitem{\hyperindexref{#2}}} +\renewcommand\indexheading[1]{% + \begin{BlockClass}{indexheading} + \MakeUppercase{#1}% + \end{BlockClass} +} +\endinput +%% +%% End of file `lwarp-gindex.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index f27dbd173ed..a6db2a750bf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -67,8 +67,8 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \newcommand{\LWR@hyperreffinish}[1]{% \begingroup% - \RenewDocumentCommand{\ref}{}{\LWR@ref@ignorestar}% - #1% + \RenewDocumentCommand{\ref}{s m}{\LWR@print@ref{##2}}% + #1% \endgroup% \LWR@htmltag{/a}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty index d2ba0005137..822806b6238 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty @@ -20,7 +20,7 @@ \AtBeginDocument{ \preto\printindex{ - \LWR@orignewpage + \LWR@maybe@orignewpage \LWR@startpars \LWR@indexprenote diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty index 05a77eef4a9..177dd6be3f9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty @@ -22,7 +22,7 @@ \catcode`\_=12% \renewcommand*{\printindex}[1][\imki@jobname]{% -\LWR@orignewpage% +\LWR@maybe@orignewpage% \LWR@startpars% \ifstrequal{#1}{\imki@jobname}{% \@ifundefined{#1@idxfile}{% @@ -80,14 +80,14 @@ } \renewcommand\imki@wrindexentrysplit[3]{% \addtocounter{LWR@autoindex}{1}% -\LWR@new@label{LWRindex-\arabic{LWR@autoindex}}% +\label{LWRindex-\arabic{LWR@autoindex}}% \expandafter\protected@write\csname#1@idxfile\endcsname{}% {\string\indexentry{#2}{\arabic{LWR@autoindex}}}% } \renewcommand\imki@wrindexentryunique[3]{% \addtocounter{LWR@autoindex}{1}% -\LWR@new@label{LWRindex-\arabic{LWR@autoindex}}% +\label{LWRindex-\arabic{LWR@autoindex}}% \protected@write\@indexfile{}% {\string\indexentry[#1]{#2}{\arabic{LWR@autoindex}}}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty index f95a32084c3..f957c4fe6ef 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty @@ -37,7 +37,7 @@ {\begingroup} {% \addtocounter{LWR@autoindex}{1}% lwarp - \LWR@new@label{LWRindex-\arabic{LWR@autoindex}}% lwarp + \label{LWRindex-\arabic{LWR@autoindex}}% lwarp \begingroup% } {} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index 22e63e76955..8ad53c7c637 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -55,7 +55,7 @@ \LWR@traceinfo{About to create verbatim.}% \let\lsthk@EveryPar\relax% \LWR@forcenewpage% - \LWR@atbeginverbatim{2}{programlisting}% + \LWR@atbeginverbatim{1.5}{programlisting}% \let\lsthk@EveryPar\LWR@origlsthkEveryPar% \else% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty index 3bd0be0bbdc..42ae1f78c51 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty @@ -23,7 +23,7 @@ \renewcommand*{\ly@compilescore}[1]{% \begingroup% - \LWR@orignewpage% + \LWR@maybe@orignewpage% \LWR@origloadgeometry{LWR@usergeometry}% \LWR@print@normalsize% \renewcommand{\includegraphics}[2][]{% @@ -53,7 +53,7 @@ tex.print{[[\string\end{BlockClass}]]} end }% - \LWR@orignewpage% + \LWR@maybe@orignewpage% \LWR@origrestoregeometry% \endgroup% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty index a710aa3513c..8638a472dd0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{makeidx}[2014/09/29] \preto\printindex{% - \LWR@orignewpage% + \LWR@maybe@orignewpage% \LWR@startpars% } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty index 4b3e87aff54..4b488dc7e44 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty @@ -53,6 +53,7 @@ \renewcommand{\chapter@preamble}{#3}% } } +\renewcommand*{\LWR@printchaptername}{} \AtBeginDocument{ \AtBeginDocument{ \LetLtxMacro\captionbelow\caption 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 fb45e2de613..4667530912d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -978,14 +978,14 @@ \def\@@wrindexhyp#1||\\{% \addtocounter{LWR@autoindex}{1}% - \LWR@new@label{LWRindex-\arabic{LWR@autoindex}}% + \label{LWRindex-\arabic{LWR@autoindex}}% \protected@write\@auxout{}% {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% \endgroup \@esphack}% \def\@@wrspindexhyp#1||\\{% \addtocounter{LWR@autoindex}{1}% - \LWR@new@label{LWRindex-\arabic{LWR@autoindex}}% + \label{LWRindex-\arabic{LWR@autoindex}}% \protected@write\@auxout{}% {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% \endgroup diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty index 7fff474e1a4..8afb89f7d78 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty @@ -15,9 +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{pdfrender}[2016/05/17] -\newcommand*{\pdfrender}[1]{} -\newcommand{\textpdfrender}[2]{#2} +\LWR@ProvidesPackagePass{pdfrender}[2019/12/29] \endinput %% %% End of file `lwarp-pdfrender.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-shadethm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-shadethm.sty new file mode 100644 index 00000000000..0c4c0a19b97 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-shadethm.sty @@ -0,0 +1,32 @@ +%% +%% This is file `lwarp-shadethm.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `shadethm') +%% This is a generated file. +%% Copyright 2016-2020 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{shadethm}[1999/11/23] +\newenvironment{LWR@HTML@shadebox} +{% + \convertcolorspec{named}{shadethmcolor}{HTML}\LWR@tempcolor% + \convertcolorspec{named}{shaderulecolor}{HTML}\LWR@tempcolortwo% + \begin{BlockClass}[% + background: \LWR@origpound\LWR@tempcolor ; + border: 1px solid \LWR@origpound\LWR@tempcolortwo ; + ]{shadebox} +}% +{\end{BlockClass}} +\LWR@formattedenv{shadebox} +\endinput +%% +%% End of file `lwarp-shadethm.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty index 868968930c0..a453ce36557 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty @@ -36,7 +36,7 @@ \def\@tempa{#2}% \csname index@#1@hook\endcsname \addtocounter{LWR@autoindex}{1}% lwarp - \LWR@new@label{LWRindex-\arabic{LWR@autoindex}}% lwarp + \label{LWRindex-\arabic{LWR@autoindex}}% lwarp \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR@autoindex}}}% \endgroup \@esphack diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty new file mode 100644 index 00000000000..3cf73947475 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty @@ -0,0 +1,252 @@ +%% +%% This is file `lwarp-tcolorbox.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tcolorbox') +%% This is a generated file. +%% Copyright 2016-2020 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{tcolorbox}[2020/04/28] +\newbool{LWR@havetcblower} +\boolfalse{LWR@havetcblower} +\newcommand{\LWR@tcolorbox@findcolors}{% + \convertcolorspec{named}{tcbcolback}{HTML}\LWR@tcbcolback + \convertcolorspec{named}{tcbcolframe}{HTML}\LWR@tcbcolframe + \iftcb@titlefilled% + \convertcolorspec{named}{tcbcolbacktitle}{HTML}\LWR@tcbcolbacktitle + \else + \convertcolorspec{named}{tcbcolframe}{HTML}\LWR@tcbcolbacktitle + \fi + \convertcolorspec{named}{tcbcoltitle}{HTML}\LWR@tcbcoltitle + \convertcolorspec{named}{tcbcolupper}{HTML}\LWR@tcbcolupper + \convertcolorspec{named}{tcbcollower}{HTML}\LWR@tcbcollower +} + +\newcommand*{\LWR@tcolorbox@titlecolorstyles}{% + border-top: 1px solid \LWR@origpound\LWR@tcbcolframe ; + border-bottom: 1px solid \LWR@origpound\LWR@tcbcolframe ; + background: \LWR@origpound\LWR@tcbcolbacktitle ; + color: \LWR@origpound\LWR@tcbcoltitle ; +} +\newcommand*{\LWR@showtitle@}[1]{% + \begin{BlockClass}[ + \LWR@tcolorbox@titlecolorstyles + ]{tcolorboxtitle} + \kvtcb@before@title#1\kvtcb@after@title + \end{BlockClass} +} +\newcommand*{\LWR@showtitle}[1]{% + \iftcb@titlevisible + \LWR@showtitle@{#1} + \else + \LWR@showtitle@{~} + \fi +} + +\newcommand*{\LWR@tcolorbox@dophantom}{% + \kvtcb@phantom + \let\kvtcb@phantom\@empty% +} +\newcommand*{\LWR@tcolorboxstart}[1]{ + \LWR@tcolorbox@findcolors + \begin{BlockClass}[ + border: 1px solid \LWR@origpound\LWR@tcbcolframe ; + background: \LWR@origpound\LWR@tcbcolback ; + ]{#1} + \LWR@tcolorbox@dophantom% + \ifdefvoid{\kvtcb@title} + {} + { + \LWR@showtitle{\kvtcb@title} + } + \begin{BlockClass}[ + color: \LWR@origpound\LWR@tcbcolupper ; + ]{tcolorboxupper} +} +\newcommand*{\LWR@tcolorbox@dostartfloat}{% + \ifx\kvtcb@float\@empty% + \else% + \tcb@float@env@begin{tcbfloat}[\kvtcb@float] + \noexpand\kvtcb@everyfloat + \fi% +} + +\newcommand*{\LWR@tcolorbox@doendfloat}{% + \ifx\kvtcb@float\@empty% + \else% + \tcb@float@env@end% + \fi% +} +\renewenvironment{tcolorbox}[1][] + { + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + { + \PackageError{lwarp} + {% + Lwarp cannot process a tcolorbox inside a lateximage\MessageBreak + or SVG math.\MessageBreak + Enter 'H' for possible solutions% + } + {% + Use \protect\tcbox, \protect\tcboxmath, or + \protect\tcbhighmath\space instead.\MessageBreak% + (Inside math, you probably want to use these anyhow.)% + } + }{} + \LWR@printpendingfootnotes + \tcb@layer@inc + \tcb@apply@box@options{#1} + \LWR@tcolorbox@dostartfloat% + \boolfalse{LWR@havetcblower} + \LWR@tcolorboxstart{tcolorbox} + \tcb@insert@before@upper% + } + { + \ifbool{LWR@havetcblower}{% + \tcb@insert@after@lower% + }{% + \tcb@insert@after@upper% + }% + \end{BlockClass} + \LWR@printpendingfootnotes + \tcb@layer@dec + \end{BlockClass} + \LWR@tcolorbox@doendfloat% + } +\newcommand{\tcblower}{ + \tcb@insert@after@upper% + \end{BlockClass} + \begin{BlockClass}[% + border-top: 1px dashed \LWR@origpound\LWR@tcbcolframe ; + color: \LWR@origpound\LWR@tcbcollower ; + ]{tcolorboxlower} + \tcb@insert@before@lower% +} +\AtBeginDocument{ +\ifdef{\tcbline}{ + \newcommand*{\LWR@sub@tcbline}{% + \begin{BlockClass}{hrule} + \end{BlockClass} + } + \newcommand{\LWR@HTML@tcbline}{\@ifstar\LWR@sub@tcbline\LWR@sub@tcbline} + \LWR@formatted{tcbline} +}{} +} + +\newcommand{\LWR@HTML@tcbox}[2][]{ + \LWR@printpendingfootnotes + \LWR@tcolorbox@dostartfloat% + \begingroup + \tcb@layer@inc + \tcb@apply@box@options{#1} + \boolfalse{LWR@havetcblower} + \LWR@tcolorboxstart{tcolorbox inlineminipage} + \tcb@insert@before@upper% + #2 + \ifbool{LWR@havetcblower}{% + \tcb@insert@after@lower% + }{% + \tcb@insert@after@upper% + }% + \end{BlockClass} + \LWR@printpendingfootnotes + \end{BlockClass} + \tcb@layer@dec% + \endgroup% + \LWR@tcolorbox@dostartfloat% + \global\booltrue{LWR@minipagethispar}% +} +\LWR@formatted{tcbox} + +\appto\LWR@restoreMathJaxformatting{% + \renewcommand{\tcbox}[2][]{#2}% +} +\xpatchcmd{\tcbsubtitle} + {\begingroup} + {\begingroup\let\kvtcb@title\relax\begin{BlockClass}{tcolorboxsubtitle}} + {} + {\LWR@patcherror{tcolorbox}{tcbsubtitle}} + +\xpatchcmd{\tcbsubtitle} + {\endgroup} + {\end{BlockClass}\endgroup} + {} + {\LWR@patcherror{tcolorbox}{tcbsubtitleB}} +\AtBeginDocument{ + \ifdef{\tcboxfit}{% + \let\LWR@HTML@tcboxfit\tcbox% + \LWR@formatted{tcboxfit} + }{} +} +\LetLtxMacro\LWR@HTML@tcbtitle\tcbtitle +\xpatchcmd{\LWR@HTML@tcbtitle} + {\kvtcb@before@title\tcbtitletext} + {\kvtcb@before@title\LWR@textcurrentfont{\LWR@textcurrentcolor{\tcbtitletext}}} + {} + {\LWR@patcherror{tcolorbox}{LWR@HTML@tcbtitle}} +\LWR@formatted{tcbtitle} +\renewcommand*\l@tcolorbox[2]{\hypertocfloat{1}{tcolorbox}{lof}{#1}{#2}} +\AtBeginDocument{ +\pgfkeysifdefined{/tcb/libload/theorems}{ + + \def\LWR@HTML@tcb@hack@amsmath{% + \PackageError{lwarp} + {% + tcolorbox ``math'', ``ams equation'', and related\MessageBreak + are not supported.\MessageBreak + \protect\tcboxmath\space and + \protect\tcbhighmath\space are emulated.\MessageBreak + Enter 'H' for possible solutions% + } + {% + Remove tcolorbox math-related options, and instead\MessageBreak + use the usual math environments inside each tcolorbox.% + } + } + \LWR@formatted{tcb@hack@amsmath} + + % Cause an error if using math: + \tcbset{% + math upper/.style={before upper*=\tcb@hack@amsmath,after upper*=$},% + math lower/.style={before lower*=\tcb@hack@amsmath,after lower*=$},% + } + + \appto\LWR@restoreorigformatting{% + \tcbset{% + math upper/.style={before upper*=$\displaystyle,after upper*=$},% + math lower/.style={before lower*=$\displaystyle,after lower*=$},% + }% + } + + \newcommand{\LWR@HTML@tcboxmath}[2][]{#2} + \LWR@formatted{tcboxmath} + \newcommand{\LWR@HTML@tcbhighmath}[2][]{#2} + \LWR@formatted{tcbhighmath} + \appto\LWR@restoreMathJaxformatting{% + \renewcommand{\tcboxmath}[2][]{#2}% + \renewcommand{\tcbhighmath}[2][]{#2}% + } +}{}% theorems loaded +}% AtBeginDocument +\CustomizeMathJax{\newcommand{\tcbset}[1]{}} +\CustomizeMathJax{\newcommand{\tcbsetforeverylayer}[1]{}} +\CustomizeMathJax{\newcommand{\tcbox}[2][]{\boxed{\text{#2}}}} +\CustomizeMathJax{\newcommand{\tcboxfit}[2][]{\boxed{#2}}} +\CustomizeMathJax{\newcommand{\tcblower}{}} +\CustomizeMathJax{\newcommand{\tcbline}{}} +\CustomizeMathJax{\newcommand{\tcbtitle}{}} +\CustomizeMathJax{\newcommand{\tcbsubtitle[2][]{\mathrm{#2}}}} +\CustomizeMathJax{\newcommand{\tcboxmath}[2][]{\boxed{#2}}} +\CustomizeMathJax{\newcommand{\tcbhighmath}[2][]{\boxed{#2}}} +\endinput +%% +%% End of file `lwarp-tcolorbox.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-termcal.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-termcal.sty new file mode 100644 index 00000000000..c66ac91df67 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-termcal.sty @@ -0,0 +1,44 @@ +%% +%% This is file `lwarp-termcal.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `termcal') +%% This is a generated file. +%% Copyright 2016-2020 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{termcal}% questionable date in the .sty file +\xpatchcmd{\endcalendar} + {@{}} + {} + {} + {\LWR@patcherror{termcal}{endcalendar}} +\xpatchcmd{\ca@doaday} + {\hbox to \hsize{\calprintdate\hfill\ifclassday\calprintclass\fi}} + {% + \calprintdate\hfill\ifclassday\calprintclass\fi% + } + {} + {\LWR@patcherror{termcal}{ca@doaday}} +\xpatchcmd{\calday} + {&} + {\LWR@tabularampersand} + {} + {\LWR@patcherror{termcal}{calday}} + +\xpatchcmd{\calday} + {&} + {\LWR@tabularampersand} + {} + {\LWR@patcherror{termcal}{calday B}} +\endinput +%% +%% End of file `lwarp-termcal.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-thm-listof.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-thm-listof.sty new file mode 100644 index 00000000000..1dd54ad38d9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-thm-listof.sty @@ -0,0 +1,44 @@ +%% +%% This is file `lwarp-thm-listof.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `thm-listof') +%% This is a generated file. +%% Copyright 2016-2020 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{thm-listof}[2019/12/22] +\xpatchcmd{\listoftheorems} + {% + \@xa\protected@edef\csname l@\thmt@envname\endcsname{% + \@nx\@dottedtocline{1}{1.5em}{\@nx\thmt@listnumwidth}% + }% + } + {% + \csdef{l@\thmt@envname}##1##2{\hypertocfloat{1}{figure}{lof}{##1}{##2}}% + } + {} + {\LWR@patcherror{thm-listof}{listoftheorems}} + +\xpatchcmd{\thmt@mklistcmd} + {% + \@xa\protected@edef\csname l@\thmt@envname\endcsname{% + \@nx\@dottedtocline{1}{1.5em}{\@nx\thmt@listnumwidth}% + }% + } + {% + \csdef{l@\thmt@envname}##1##2{\hypertocfloat{1}{figure}{lof}{##1}{##2}}% + } + {} + {\LWR@patcherror{thm-listof}{thmt@mklistcmd}} +\endinput +%% +%% End of file `lwarp-thm-listof.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-thm-restate.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-thm-restate.sty new file mode 100644 index 00000000000..69efc90981a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-thm-restate.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-thm-restate.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `thm-restate') +%% This is a generated file. +%% Copyright 2016-2020 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{thm-restate}[2019/12/22] +\xpatchcmd{\thmt@restatable} + {\@ifstar} + {\edef\LWR@thisthmstyle{#2}\@ifstar} + {} + {\LWR@patcherror{thm-restate}{thmt@restatable}} +\endinput +%% +%% End of file `lwarp-thm-restate.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-thmbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-thmbox.sty new file mode 100644 index 00000000000..a8c8069a75f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-thmbox.sty @@ -0,0 +1,50 @@ +%% +%% This is file `lwarp-thmbox.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `thmbox') +%% This is a generated file. +%% Copyright 2016-2020 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{thmbox}[2005/04/24] +\renewenvironment{thmbox}[2][]% + {% + \begin{BlockClass}{thmbox} + \begin{BlockClass}{thmboxtitle} + #2 + \end{BlockClass} + } + {\end{BlockClass}} + +\renewenvironment{proof}[1][] + {% + \begin{BlockClass}{thmboxproof}% + \InlineClass{thmboxproofname}{\proofname\ #1\unskip\,:} + } + {% + \qquad\HTMLunicode{220E}% end of proof symbol + \end{BlockClass} + } + +\renewenvironment{example}[1][\examplename]% + {% + \begin{BlockClass}{thmboxexample}% + \InlineClass{thmboxexamplename}{#1\,:} + } + {\end{BlockClass}} + +\renewenvironment{leftbar}[1][]% + {\begin{BlockClass}{thmboxleftbar}} + {\end{BlockClass}} +\endinput +%% +%% End of file `lwarp-thmbox.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-varioref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-varioref.sty new file mode 100644 index 00000000000..37a38b8331e --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-varioref.sty @@ -0,0 +1,28 @@ +%% +%% This is file `lwarp-varioref.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `varioref') +%% This is a generated file. +%% Copyright 2016-2020 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{varioref}[2020/01/23] +\def\reftextfaceafter {\unskip}% +\def\reftextfacebefore{\unskip}% +\def\reftextafter {\unskip}% +\def\reftextbefore {\unskip}% +\def\reftextcurrent {\unskip}% +\def\reftextfaraway#1{\unskip}% +\def\reftextpagerange#1#2{\unskip}% +\endinput +%% +%% End of file `lwarp-varioref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfakebold.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfakebold.sty index e5cec3ffaa4..64ca7a92dbc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfakebold.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfakebold.sty @@ -15,14 +15,15 @@ %% 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{xfakebold}[2018/07/25] -\let\LWR@orig@setBold\setBold -\let\LWR@orig@unsetBold\unsetBold -\renewcommand*{\setBold}{\booltrue{LWR@xfakebold}} -\renewcommand*{\unsetBold}{\boolfalse{LWR@xfakebold}} +\LWR@ProvidesPackagePass{xfakebold}[2020/06/24] +\newcommand*{\LWR@HTML@setBold}{\booltrue{LWR@xfakebold}} +\LWR@formatted{setBold} + +\newcommand*{\LWR@HTML@unsetBold}{\boolfalse{LWR@xfakebold}} +\LWR@formatted{unsetBold} \renewcommand*{\LWR@applyxfakebold}{% - \ifbool{LWR@xfakebold}{\LWR@orig@setBold}{\LWR@orig@unsetBold}% + \ifbool{LWR@xfakebold}{\LWR@print@setBold}{\LWR@print@unsetBold}% } \begin{warpMathJax} \CustomizeMathJax{\newcommand{\setBold}[1][]{}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index bfb4dcebee8..7075d0e3d28 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,8 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2020/06/03 v0.87 Allows LaTeX to directly produce HTML5 output.] + [2020/07/19 v0.88 Allows LaTeX to directly produce HTML5 output.] + @@ -106,7 +107,9 @@ {% Package #1 is not supported\MessageBreak by lwarp's HTML conversion.\MessageBreak - Package(s) #2 may be useful instead% + Package(s)\MessageBreak + \space\space#2\MessageBreak + may be useful instead% } {% Package #1 might conflict with lwarp in some way,\MessageBreak @@ -167,7 +170,6 @@ \LWR@earlyloadnever{picinpar}{floatflt, wrapfig} \LWR@earlyloadnever{picins}{floatflt, wrapfig} \LWR@earlyloadnever{rplain}{fancyhdr} -\LWR@earlyloadnever{shadethm}{mdframed} \LWR@earlyloadnever{si}{siunitx} \LWR@earlyloadnever{sistyle}{siunitx} \LWR@earlyloadnever{slashbox}{diagbox} @@ -260,6 +262,7 @@ \LWR@notmemoirloadafter{chngpage} \LWR@loadafter{cite} \LWR@loadafter{citeref} +\LWR@loadafter{cleveref} \LWR@loadafter{cmdtrack} \LWR@loadafter{colonequals} \LWR@loadafter{color} @@ -315,6 +318,7 @@ \LWR@loadafter{fancyref} \LWR@loadafter{fancytabs} \LWR@loadafter{fancyvrb} +\LWR@loadafter{fbox} \LWR@loadafter{fewerfloatpages} \LWR@loadafter{figcaps} \LWR@loadafter{figsize} @@ -356,6 +360,7 @@ \LWR@loadafter{gensymb} \LWR@loadafter{gentombow} \LWR@loadafter{ghsystem} +\LWR@loadafter{gindex} \LWR@loadafter{glossaries} \LWR@loadafter{gmeometric} \LWR@loadafter{gloss} @@ -580,13 +585,18 @@ \LWR@loadafter{tablefootnote} \LWR@notmemoirloadafter{tabularx} \LWR@loadafter{tabulary} -\LWR@loadafter{tascmac} \LWR@loadafter{tagpdf} +\LWR@loadafter{tascmac} +\LWR@loadafter{tcolorbox} +\LWR@loadafter{termcal} \LWR@loadafter{textarea} \LWR@loadafter{textfit} \LWR@loadafter{textpos} \LWR@loadafter{theorem} \LWR@loadafter{thinsp} +\LWR@loadafter{thm-listof} +\LWR@loadafter{thm-restate} +\LWR@loadafter{thmbox} \LWR@loadafter{threadcol} \LWR@loadafter{threeparttable} \LWR@loadafter{threeparttablex} @@ -621,7 +631,7 @@ \LWR@loadafter{upref} \LWR@loadafter{url} \LWR@loadafter{uspace} -\LWR@loadafter{varioref}% no lwarp package provided +\LWR@loadafter{varioref} \LWR@notmemoirloadafter{verse} \LWR@loadafter{versonotes} \LWR@loadafter{vertbars} @@ -784,6 +794,11 @@ \long\def\LWR@secondoffour#1#2#3#4{#2} \long\def\LWR@thirdoffour#1#2#3#4{#3} \long\def\LWR@fourthoffour#1#2#3#4{#4} +\newcounter{LWR@texboxdepth} +\setcounter{LWR@texboxdepth}{0} +\newcommand*{\LWR@maybe@orignewpage}{% + \ifnumgreater{\value{LWR@texboxdepth}}{0}{}{\LWR@orignewpage}% +} \DeclareRobustCommand\LWR@gsavebox[1]{% \@ifnextchar(%) {\LWR@@gsavepicbox#1}{\@ifnextchar[{\LWR@@gsavebox#1}{\LWR@gsbox#1}}}% @@ -817,6 +832,15 @@ \fi #1% } +\newcommand*{\LWR@LetLtxMacrocs}[2]{% + \expandafter\LetLtxMacro\csname #1\expandafter\endcsname% + \csname#2\endcsname% +} +\newcommand*{\LWR@absorbstar}[1]{% + \LWR@LetLtxMacrocs{LWR@origns@#1}{#1}% + \csdef{#1}{\@ifstar{\csuse{LWR@origns@#1}}{\csuse{LWR@origns@#1}}} + \expandafter\robustify\csname #1\endcsname +} \let\LWRpercent\@percentchar \catcode`\$=12 \def\LWRdollar{$} @@ -876,26 +900,26 @@ \boolfalse{warpingHTML}% \boolfalse{mathjax}% \DeclareVoidOption{warpprint}{% -\PackageInfo{lwarp}{Using option 'warpprint'} -\booltrue{warpingprint}% -\boolfalse{warpingHTML}% + \PackageInfo{lwarp}{Using option 'warpprint'} + \booltrue{warpingprint}% + \boolfalse{warpingHTML}% } \DeclareVoidOption{warpHTML}{% -\PackageInfo{lwarp}{Using option 'warpHTML'}% -\booltrue{warpingHTML}% -\boolfalse{warpingprint}% + \PackageInfo{lwarp}{Using option 'warpHTML'}% + \booltrue{warpingHTML}% + \boolfalse{warpingprint}% } \DeclareVoidOption{mathsvg}{% -\PackageInfo{lwarp}{Using option 'mathsvg'} -\boolfalse{mathjax}% -\boolfalse{LWR@origmathjax}% + \PackageInfo{lwarp}{Using option 'mathsvg'} + \boolfalse{mathjax}% + \boolfalse{LWR@origmathjax}% } \DeclareVoidOption{mathjax}{% -\PackageInfo{lwarp}{Using option 'mathjax'} -\booltrue{mathjax}% -\booltrue{LWR@origmathjax}% + \PackageInfo{lwarp}{Using option 'mathjax'} + \booltrue{mathjax}% + \booltrue{LWR@origmathjax}% } @@ -913,19 +937,22 @@ \DeclareStringOption[utf8]{xindyCodepage} + +\DeclareStringOption[]{xindexConfig} + \DeclareStringOption[UTF-8]{pdftotextEnc} \newbool{LWR@creatinglwarpmk} \boolfalse{LWR@creatinglwarpmk} \DeclareVoidOption{lwarpmk}{ -\PackageInfo{lwarp}{Using option 'lwarpmk'} -\booltrue{LWR@creatinglwarpmk} + \PackageInfo{lwarp}{Using option 'lwarpmk'} + \booltrue{LWR@creatinglwarpmk} } \DeclareVoidOption{OSWindows}{ -\PackageInfo{lwarp}{Using option 'OSWindows'} -\LWR@setOSWindows + \PackageInfo{lwarp}{Using option 'OSWindows'} + \LWR@setOSWindows } \DeclareStringOption[]{HomeHTMLFilename} @@ -946,6 +973,10 @@ \DeclareBoolOption[false]{xindy} +\DeclareBoolOption[false]{xindex} + +\DeclareStringOption[cref]{IndexRef} + \DeclareStringOption[makeglossaries]{GlossaryCmd} \DeclareBoolOption[false]{latexmk} @@ -996,6 +1027,20 @@ \jobname.idx% } }{} + \ifbool{LWR@xindex}{ + \ifdefvoid{\LWR@xindexConfig}{ + \renewcommand{\LWR@PrintIndexCmd}{% + xindex + \jobname.idx% + } + }{ + \renewcommand{\LWR@PrintIndexCmd}{% + xindex + -c \LWR@xindexConfig \space + \jobname.idx% + } + } + }{} }{} \ifdefempty{\LWR@HTMLIndexCmd}{ @@ -1011,6 +1056,20 @@ \jobname_html.idx% } }{} + \ifbool{LWR@xindex}{ + \ifdefvoid{\LWR@xindexConfig}{ + \renewcommand{\LWR@HTMLIndexCmd}{% + xindex + \jobname_html.idx% + } + }{ + \renewcommand{\LWR@HTMLIndexCmd}{% + xindex + -c \LWR@xindexConfig \space + \jobname_html.idx% + } + } + }{} }{} \ifdefempty{\LWR@LatexmkIndexCmd}{ @@ -1025,6 +1084,18 @@ -C \LWR@xindyCodepage% } }{} + \ifbool{LWR@xindex}{ + \ifdefvoid{\LWR@xindexConfig}{ + \renewcommand{\LWR@LatexmkIndexCmd}{% + xindex + } + }{ + \renewcommand{\LWR@LatexmkIndexCmd}{% + xindex + -c \LWR@xindexConfig + } + } + }{} }{} \newcommand{\warpprintonly}[1]{\ifbool{warpingprint}{#1}{}} \newcommand{\warpHTMLonly}[1]{\ifbool{warpingHTML}{#1}{}} @@ -1292,7 +1363,6 @@ \LWR@checkloadnever{#1}{picinpar}{floatflt, wrapfig} \LWR@checkloadnever{#1}{picins}{floatflt, wrapfig} \LWR@checkloadnever{#1}{rplain}{fancyhdr} -\LWR@checkloadnever{#1}{shadethm}{mdframed} \LWR@checkloadnever{#1}{si}{siunitx} \LWR@checkloadnever{#1}{sistyle}{siunitx} \LWR@checkloadnever{#1}{slashbox}{diagbox} @@ -1471,7 +1541,7 @@ \immediate\openout\LWR@quickfile #1_html_inc.tex% lwarp \immediate\write\LWR@quickfile{\string\input{#1.tex}}% lwarp \immediate\closeout\LWR@quickfile% lwarp -\LWR@orignewpage% changed from clearpage +\LWR@maybe@orignewpage% changed from clearpage \if@filesw \immediate\write\@mainaux{\string\@input{#1_html_inc.aux}}% changed \fi @@ -1489,7 +1559,7 @@ \immediate\write\@partaux{\relax}% \fi \@input@{#1_html_inc.tex}% changed - \LWR@orignewpage% changed from clearpage + \LWR@maybe@orignewpage% changed from clearpage \@writeckpt{#1}% \if@filesw \immediate\closeout\@partaux @@ -1733,6 +1803,7 @@ \let\LWR@origbigskip\bigskip \let\LWR@origtextellipsis\textellipsis +\let\LWR@origvdots\vdots \let\LWR@orig@textquotedbl\textquotedbl \LetLtxMacro\LWR@origttfamily\ttfamily @@ -1907,7 +1978,7 @@ \newcommand*{\LWR@latexmkcmd}[1]{% latexmk \space \LWR@shellescapecmd \space #1 \space -recorder \space - \LWR@latexmkvar{makeindex}{\LWR@LatexmkIndexCmd} + \LWR@latexmkvar{makeindex}{\LWR@LatexmkIndexCmd}% } \newcommand*{\LWR@latexmkdvipdfm}[1]{% -pdfdvi \space @@ -2131,6 +2202,7 @@ span.sectionnumber { margin-right: 0em } span.indexitem {margin-left: 0em} span.indexsubitem {margin-left: 2em} span.indexsubsubitem {margin-left: 4em} +div.indexheading {margin-top: 2ex ; font-weight: bold} div.hidden, span.hidden { display: none ; } @@ -2233,6 +2305,8 @@ span.overline { text-decoration-skip: auto ; } +div.hrule { border-top: 1px solid silver } + /* for vertical text: */ div.verticalrl { writing-mode: vertical-rl } div.horizontaltb { writing-mode: horizontal-tb } @@ -2552,7 +2626,7 @@ div.bodywithoutsidetoc div.bodycontainer { } section.textbody div.footnotes{ - margin: 3ex 2em 0ex 2em ; + margin: 3ex 2em .5ex 2em ; border-bottom: 2px solid silver ; } @@ -2794,20 +2868,33 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;} display: inline-block ; } -.mdframed { +/* mdframed, tcolorbox packages */ +.mdframed, .tcolorbox { padding: 0ex ; margin: 2ex 0em 2ex 0em ; + border: 1px solid black ; +} + +.tcolorbox { + border-radius: 10pt ; + margin: 2ex 1em 2ex 1em ; } -.mdframed p { padding: 0ex .5em 0ex .5em ; } +.mdframed p, .tcolorbox p { padding: 0ex .5em 0ex .5em ; } -.mdframed dl { padding: 1ex .5em 0ex .5em ; } +.mdframed dl, .tcolorbox dl { padding: 1ex .5em 0ex .5em ; } -.mdframedtitle { +.mdframedtitle, .tcolorboxtitle { padding: .5ex 0pt 0pt 0pt ; border-radius: 10pt 10pt 0pt 0pt ; display: block ; margin-bottom: 1ex ; + border-bottom: 1px solid silver ; +} + +.tcolorboxsubtitle .tcolorbox { + margin: 2ex 0em 2ex 0em ; + border-radius: 0pt ; } .mdframedsubtitle { @@ -3426,8 +3513,13 @@ nav .authorartist{ display:inline; } /* Native LaTeX theorems: */ -.theoremcontents { font-style: italic; margin-top: 3ex ; margin-bottom: 3ex ; } -.theoremlabel { font-style: normal; font-weight: bold ; margin-right: .5em ; } +.theoremcontents { + font-style: italic; margin-top: 3ex ; margin-bottom: 3ex ; +} + +.theoremlabel { + font-style: normal; font-weight: bold ; margin-right: .5em ; +} /* theorem, amsthm, and ntheorem packages */ @@ -3496,6 +3588,33 @@ div.amsthmproof span.amsthmnoteremark {} +/* thmbox */ + +.thmbox { + font-style: italic; margin-top: 3ex ; margin-bottom: 3ex ; + border: 1px solid gray ; + padding: 1ex ; +} + +.thmboxtitle { + font-style: normal; font-weight: bold ; margin-right: .5em ; + border-bottom: 1px solid gray ; +} + +span.thmboxproofname, span.thmboxexamplename { + font-weight: bold ; +} + +div.thmboxproof, div.thmboxexample { + font-size: 0.85em ; + margin: 2ex ; +} + +div.thmboxleftbar { + border-left: 2px solid black ; + padding-left: 1em ; +} + /* For the backnaur package: */ div.backnaur { display: block ; @@ -4333,7 +4452,7 @@ MathJax = { -- Copyright 2016-2020 Brian Dunn -printversion = "v0.87" +printversion = "v0.88" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -4367,6 +4486,7 @@ lwarpmk clean [-p project]: Remove *.aux, *.toc, *.lof/t, *_html.pdf, *_html.html, *_html.sidetoc lwarpmk cleanall [-p project]: Remove auxiliary files, project.pdf, *.html lwarpmk cleanlimages: Removes all images from the "lateximages" directory. +lwarpmk -v: Print the version number. lwarpmk -h: Print this help message. lwarpmk --help: Print this help message. @@ -5222,6 +5342,12 @@ print ("lwarpmk: Done.") elseif (arg[1] == nil) then printhelp () +-- lwarpmk -v: + +elseif (arg[1] == "-v" ) then +-- The version number has already been printed +-- by the lwarpmk intro. + -- lwarpmk -h or lwarpmk --help : elseif (arg[1] == "-h" ) or (arg[1] == "--help") then @@ -5661,7 +5787,7 @@ end -- not --version \newcommand{\LWR@forcenewpage}{% \LWR@traceinfo{LWR@forcenewpage}% \ifinner\else% -\LWR@stoppars\LWR@orignewpage\LWR@startpars% +\LWR@stoppars\LWR@maybe@orignewpage\LWR@startpars% \fi% } \renewcommand*{\pagestyle}[1]{} @@ -6877,7 +7003,7 @@ end -- not --version \LWR@htmltag{/body}\LWR@orignewline \LWR@htmltag{/html}\LWR@orignewline \LWR@traceinfo{LWR@newhtmlfile: about to LWR@orignewpage} -\LWR@orignewpage +\LWR@maybe@orignewpage \addtocounter{LWR@htmlfilenumber}{1}% \addtocounter{LWR@htmlseqfilenumber}{1}% \ifbool{FileSectionNames}% @@ -7019,6 +7145,9 @@ end -- not --version \let\@chapcntformat\@seccntformat \let\@partcntformat\@seccntformat \newcommand*{\@partnameformat}{\LWR@isolate{\partname}~}% +\newcommand*{\LWR@printchaptername}{% + \ifdefvoid{\chaptername}{}{\chaptername~}% +} \newcounter{LWR@currentautosec} \setcounter{LWR@currentautosec}{1} \DeclareDocumentCommand{\LWR@section}{m m m m}{% @@ -7061,7 +7190,7 @@ end -- not --version }% new file {% not new file \LWR@traceinfo{LWR@section: not a new HTML file, about to LWR@orignewpage}% - \LWR@orignewpage% + \LWR@maybe@orignewpage% }% not new file \IfValueT{#3}{% @@ -7154,7 +7283,10 @@ end -- not --version {\protect\LWR@sectionnumber{\@partcntformat{#4}}}% {% \ifstrequal{#4}{chapter}% - {\protect\LWR@sectionnumber{\@chapcntformat{#4}}}% + {% + \LWR@printchaptername% + \protect\LWR@sectionnumber{\@chapcntformat{#4}}% + }% {\protect\LWR@sectionnumber{\@seccntformat{#4}}}% }% }% @@ -7507,7 +7639,7 @@ end -- not --version \LWR@stoppars% final stop of all paragraphs \LWR@htmltag{/body}\LWR@orignewline \LWR@htmltag{/html}\LWR@orignewline -\LWR@orignewpage +\LWR@maybe@orignewpage } \xpatchcmd{\enddocument} @@ -10077,6 +10209,7 @@ end -- not --version \LWR@htmltag{/a}% } +\LWR@absorbstar{ref}% \NewDocumentCommand{\LWR@HTML@ref}{s m}{% \LWR@traceinfo{LWR@HTML@ref !#2!}% \IfBooleanTF{#1}% @@ -10085,10 +10218,8 @@ end -- not --version } \LWR@formatted{ref} -\NewDocumentCommand{\LWR@ref@ignorestar}{s m}{% - \LWR@print@ref{#2}% -} - +\CustomizeMathJax{\let\LWRref\ref} +\CustomizeMathJax{\renewcommand{\ref}{\ifstar\LWRref\LWRref}} \newcommand*{\pagerefPageFor}{see } \NewDocumentCommand{\LWR@new@pageref}{s m}{% \IfBooleanTF{#1}% @@ -10304,10 +10435,17 @@ end -- not --version \newcommand*{\LWR@forcenewautoidanchor}{% \addtocounter{LWR@thisautoid}{1}% - \LWR@stoppars% - \LWR@htmltag{a id="\LWR@print@mbox{autoid-\arabic{LWR@thisautoid}}"}% - \LWR@htmltag{/a}% - \LWR@startpars% + \ifbool{LWR@doingapar}% + {% + \LWR@htmltag{a id="\LWR@print@mbox{autoid-\arabic{LWR@thisautoid}}" }% + \LWR@htmltag{/a }% + }% + {% + \LWR@stoppars% + \LWR@htmltag{a id="\LWR@print@mbox{autoid-\arabic{LWR@thisautoid}}" }% + \LWR@htmltag{/a }% + \LWR@startpars% + }% } \newcommand*{\LWR@newautoidanchor}{% @@ -10713,6 +10851,9 @@ end -- not --version \newcounter{LWR@autoglossary} \setcounter{LWR@autoglossary}{0} +\newcommand*{\IndexPageSeparator}{, } +\newcommand*{\IndexRangeSeparator}{--} + \@ifundefined{chapter} {\newcommand*{\LWR@indexsection}[1]{\section*{#1}}} {\newcommand*{\LWR@indexsection}[1]{\chapter*{#1}}} @@ -10743,11 +10884,50 @@ end -- not --version \InlineClass{indexsubsubitem}{\LWR@htmlcomment{}}% } +\NewDocumentCommand{\LWR@xindex@modifyentry}{>{\SplitArgument{1}{|}}m} + {\LWR@xindex@modifyentrysub#1} +\newcommand*{\LWR@xindex@modifyentrysub}[2]{% + \edef\LWR@tempone{#1}% + \edef\LWR@temptwo{#2}% + \IfValueTF{#2}{% + \ifx#2(% + \appto\LWR@tempone{|(}% + \else% + \ifx#2)% + \appto\LWR@tempone{|)}% + \else% + \appto\LWR@tempone{% + |hyperindexformat\LWRleftbrace% + \LWRbackslash#2% + \LWRrightbrace% + }% + \fi% + \fi% + }% + {}% +} + +\newbool{LWR@xindex@tricked} +\boolfalse{LWR@xindex@tricked} + \def\LWR@wrindex#1{% + \ifbool{LWR@xindex}{% + \ifbool{LWR@xindex@tricked}{}{% + \protected@write\@indexfile{}% + {% + \LWRpercent\space hyperpage\LWRrightbrace% + \LWRpercent\space trick xindex to assume hyperref% + }% + \global\booltrue{LWR@xindex@tricked}% + }% + \LWR@xindex@modifyentry{#1}% + }{% + \def\LWR@tempone{#1}% + }% \addtocounter{LWR@autoindex}{1}% - \LWR@new@label{LWRindex-\arabic{LWR@autoindex}}% + \label{LWRindex-\arabic{LWR@autoindex}}% \protected@write\@indexfile{}% - {\string\indexentry{#1}{\arabic{LWR@autoindex}}}% + {\string\indexentry{\LWR@tempone}{\arabic{LWR@autoindex}}}% \endgroup% \@esphack% } @@ -10765,12 +10945,117 @@ end -- not --version \@esphack% } -\newcommand*{\LWR@indexnameref}[1]{\nameref{LWRindex-#1}} +\newcommand*{\LWR@indexnameref@anonref}[1]{% + \LWR@startref{LWRindex-#1}% + (*)% + \LWR@htmltag{/a}% +} + +\newcommand*{\LWR@indexnameref@ref}[1]{% + \edef\LWR@thisref{\csuse{r@LWRindex-#1}}% + \ifdefvoid{\LWR@thisref}{}{% + \edef\LWR@thisref{\expandafter\@firstoftwo\LWR@thisref}% + \ifdefvoid{\LWR@thisref}% + {\LWR@indexnameref@anonref{#1}}% + {\ref{LWRindex-#1}}% + }% +} + +\newcommand*{\LWR@indexnameref@refnameref}[1]{% + \edef\LWR@thisref{\csuse{r@LWRindex-#1}}% + \ifdefvoid{\LWR@thisref}{}{% + \edef\LWR@thisref{\expandafter\@firstoftwo\LWR@thisref}% + \ifdefvoid{\LWR@thisref}{}{% + \ifdefstring{\LWR@thisref}{(*)}% + {}% + {\ref{LWRindex-#1} }% space + }% + }% + \nameref{LWRindex-#1}% +} -\newrobustcmd{\LWR@doindexentry}[1]{% +\newcommand*{\LWR@indexnameref@cref}[1]{% + \edef\LWR@thisref{\csuse{r@LWRindex-#1}}% + \ifdefvoid{\LWR@thisref}{% + \nameref{LWRindex-#1}% + }{% + \edef\LWR@thisref{\expandafter\@firstoftwo\LWR@thisref}% + \ifdefvoid{\LWR@thisref}{% + \nameref{LWRindex-#1}% + }{% + \ifdefstring{\LWR@thisref}{(*)}{% + \LWR@indexnameref@anonref{#1}% + }{% + \cref{LWRindex-#1}% + }% + }% + }% +} + +\newcommand*{\LWR@indexnameref@crefnameref}[1]{% + \edef\LWR@thisref{\csuse{r@LWRindex-#1}}% + \ifdefvoid{\LWR@thisref}% + {}% + {% + \edef\LWR@thisref{\expandafter\@firstoftwo\LWR@thisref}% + \ifdefvoid{\LWR@thisref}% + {}% + {% + \ifdefstring{\LWR@thisref}{(*)}% + {}% + {\cref{LWRindex-#1}} % space + }% + }% + \nameref{LWRindex-#1}% +} + +\newcommand*{\LWR@indexnameref}[1]{% + {% group + \ifdef{\caption@xref}{% + \renewcommand*{\caption@xref}[2]{(*)}% + }{}% + \ifdefstring{\LWR@IndexRef}{ref}{% + \LWR@indexnameref@ref{#1}% + }{% + \ifdefstring{\LWR@IndexRef}{nameref}{% + \nameref{LWRindex-#1}% + }{% + \ifdefstring{\LWR@IndexRef}{refnameref}{% + \LWR@indexnameref@refnameref{#1}% + }{% + \ifdefstring{\LWR@IndexRef}{cref}{% + \LWR@indexnameref@cref{#1}% + }{% + \ifdefstring{\LWR@IndexRef}{crefnameref}{% + \LWR@indexnameref@crefnameref{#1}% + }{% + \ifdefstring{\LWR@IndexRef}{autoref}{% + \LWR@indexnameref@cref{#1}% + }{% text string + \LWR@startref{LWRindex-#1}% + \LWR@IndexRef% + \LWR@htmltag{/a}% + }}}}}}% + }% group +} + +\newrobustcmd{\LWR@doindexentrysubsub}[2]{% \IfInteger{#1}% {\LWR@indexnameref{#1}}% {#1}% + \IfValueT{#2}{% + \IndexRangeSeparator% + \IfInteger{#2}% + {\LWR@indexnameref{#2}}% + {#2}% + }% +} +\NewDocumentCommand{\LWR@doindexentrysub}{m >{\SplitArgument{1}{#1}}m} + {\LWR@doindexentrysubsub#2} + +\newcommand*{\LWR@doindexentry}[1]{% + \relax% required + \expandafter\LWR@doindexentrysub\expandafter{\IndexRangeSeparator}{#1}% } \newcommand{\LWR@hyperindexrefnullified}{% @@ -10789,8 +11074,36 @@ end -- not --version \renewrobustcmd{\textsl}[1]{\LWR@HTML@textsl{\LWR@doindexentry{##1}}}% } -\newcommand{\hyperindexref}[1]{% - \def\LWR@tempone{#1}% +\newcommand*{\hyperindexref}[1]{% + \relax% required + \expandafter\LWR@hyperindexref@comma\expandafter{\IndexPageSeparator}{#1}% +} +\NewDocumentCommand{\LWR@hyperindexref@comma} + {m >{\SplitList{#1}} m} + {% + \def\LWR@hyperindexref@thiscomma{}% + \def\LWR@hyperindexref@nextcomma{#1}% + \ProcessList{#2}\LWR@hyperindexref@@comma% + } +\newcommand*{\LWR@hyperindexref@@comma}[1]{% + \LWR@hyperindexref@thiscomma% + \renewcommand{\LWR@hyperindexref@thiscomma}{\LWR@hyperindexref@nextcomma}% + \expandafter\LWR@hyperindexref@range\expandafter{\IndexRangeSeparator}{#1}% +} +\NewDocumentCommand{\LWR@hyperindexref@range} + {m >{\SplitArgument{1}{#1}} m} + {\LWR@hyperindexrefsub#2} + +\newcommand*{\LWR@hyperindexrefsub}[2]{% + \LWR@hyperindexrefsubtwo{#1}% + \IfValueT{#2}{% + \IndexRangeSeparator% + \LWR@hyperindexrefsubtwo{#2}% + }% +} + +\newcommand*{\LWR@hyperindexrefsubtwo}[1]{% + \edef\LWR@tempone{#1}% \IfBeginWith{\LWR@tempone}{ }{% \StrGobbleLeft{\LWR@tempone}{1}[\LWR@tempone]% }{}% @@ -10804,6 +11117,14 @@ end -- not --version }% } +\LetLtxMacro\hyperpage\hyperindexref + +\def\nohyperpage#1{} + +\def\hyperindexformat#1#2{% + #1{\hyperpage{#2}}% +}% + \end{warpHTML} \begin{warpprint} @@ -10840,8 +11161,8 @@ end -- not --version \end{warpHTML} - \begin{warpHTML} +\newcommand*{\LWR@restoreMathJaxformatting}{} \newcommand*{\LWR@restoreorigformatting}{% \LWR@traceinfo{LWR@restoreorigformatting}% @@ -10858,6 +11179,7 @@ end -- not --version \let\thinspace\LWR@origthinspace% disable HTML short unbreakable space \let\negthinspace\LWR@orignegthinspace% disable HTML negative short unbreakable space \let\textellipsis\LWR@origtextellipsis% + \let\vdots\LWR@origvdots% \let\textless\LWR@origtextless% \let\textgreater\LWR@origtextgreater% \let\&\LWR@origampersand% @@ -10884,6 +11206,9 @@ end -- not --version \LWR@restoreorigaccents% \LWR@restoreoriglists% \LWR@FBcancel% + \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% + {\LWR@restoreMathJaxformatting}% + {}% } \end{warpHTML} \begin{warpHTML} @@ -11925,7 +12250,7 @@ end -- not --version \LWR@htmlopencomment% \addtocounter{LWR@lateximagedepth}{1}% \LWR@traceinfo{lateximage: about to create a new page}% - \LWR@orignewpage% + \LWR@maybe@orignewpage% \LWR@traceinfo{lateximage: about to create minipage}% \ifdimless{\linewidth}{6in}{% \LWR@print@minipage{\linewidth}% @@ -11972,7 +12297,7 @@ end -- not --version {% end of outer-most lateximage \LWR@traceinfo{lateximage: ending outer-most lateximage}% \endLWR@print@minipage% - \LWR@orignewpage% + \LWR@maybe@orignewpage% \LWR@print@vspace*{.5\baselineskip}% \LWR@htmlclosecomment% \LWR@traceinfo{lateximage: The page after the image is \arabic{page}}% @@ -12261,117 +12586,21 @@ end -- not --version \end{warpprint} - - - \begin{warpHTML} + \AtEndPreamble{ \RequirePackage{cleveref} } -\AfterEndPreamble{ -\LWR@traceinfo{Patching cleveref.} - -\def\LWR@orig@@@setcref#1#2{\cref@getlabel{#2}{\@templabel}#1{\@templabel}{}{}}% - -\ifdefequal{\@@setcref}{\LWR@orig@@@setcref}{% before v0.21 - \renewcommand*{\@@setcref}[2]{#1{\ref{#2}}{}{}} -}{ - \ifdefequal{\@@@setcref}{\LWR@orig@@@setcref}{% as of v0.21 - \renewcommand*{\@@@setcref}[2]{% - #1{\ref{#2}}{}{}} - }{ - \PackageWarning{lwarp-cleveref}{ - Unknown version of cleveref. - \protect\cref\space will fail. - }% - } -} - -\def\LWR@orig@@@setcrefrange#1#2#3{% - \cref@getlabel{#2}{\@labela}% - \cref@getlabel{#3}{\@labelb}% - #1{\@labela}{\@labelb}{}{}{}{}}% - -\ifdefequal{\@@setcrefrange}{\LWR@orig@@@setcrefrange}{ - \renewcommand{\@@setcrefrange}[3]{% - #1{\ref{#2}}{\ref{#3}}{}{}{}{}% - } -}{ - \ifdefequal{\@@@setcrefrange}{\LWR@orig@@@setcrefrange}{ - \renewcommand{\@@@setcrefrange}[3]{% - #1{\ref{#2}}{\ref{#3}}{}{}{}{}% - } - }{ - \PackageWarning{lwarp-cleveref}{ - Unknown version of cleveref. - \protect\crefrange\space will fail. - } - } -} - - -\newcommand*{\cpagerefFor}{for} - -\def\LWR@orig@@setcpageref#1#2{% before v0.21 - \cref@getpageref{#2}{\@temppage}#1{\@temppage}{}{}}% - -\def\LWR@orig@@@setcpageref#1#2{% as of v0.21 - \cpageref@getlabel{#2}{\@temppage}#1{\@temppage}{}{}}% - -\ifdefequal{\@@setcpageref}{\LWR@orig@@setcpageref}{ - \renewcommand*{\@@setcpageref}[2]{% - #1{\cpagerefFor\ \cref{#2}}{}{}% - } -}{ - \ifdefequal{\@@@setcpageref}{\LWR@orig@@@setcpageref}{ - \renewcommand*{\@@@setcpageref}[2]{% - #1{\cpagerefFor\ \cref{#2}}{}{}% - } - } - { - \PackageWarning{lwarp-cleveref}{ - Unknown version of cleveref. - \protect\cpageref\space will fail. - } - } -} - -\def\LWR@orig@@setcpagerefrange#1#2#3{% before v0.21 - \cref@getpageref{#2}{\@pagea}% - \cref@getpageref{#3}{\@pageb}% - #1{\@pagea}{\@pageb}{}{}{}{}}% - -\def\LWR@orig@@@setcpagerefrange#1#2#3{% as of v0.21 - \cpageref@getlabel{#2}{\@pagea}% - \cpageref@getlabel{#3}{\@pageb}% - #1{\@pagea}{\@pageb}{}{}{}{}}% - -\ifdefequal{\@@setcpagerefrange}{\LWR@orig@@setcpagerefrange}{ - \renewcommand*{\@@setcpagerefrange}[3]{% - #1{\cpagerefFor\ \cref{#2}}{\cref{#3}}{}{}{}{}% - } -}{ - \ifdefequal{\@@@setcpagerefrange}{\LWR@orig@@@setcpagerefrange}{ - \renewcommand*{\@@@setcpagerefrange}[3]{% - #1{\cpagerefFor\ \cref{#2}}{\cref{#3}}{}{}{}{}% - } - } - { - \PackageWarning{lwarp-cleveref}{ - Unknown version of cleveref. - \protect\cpagerefrange\space will fail. - } - } -} - -}% AfterEndPreamble +\end{warpHTML} +\begin{warpHTML} \LetLtxMacro\LWR@orig@label\label% includes memoir, before cleveref \LetLtxMacro\label\LWR@new@label \LetLtxMacro\LWR@orig@pageref\pageref \LetLtxMacro\pageref\LWR@new@pageref + \end{warpHTML} @@ -12392,7 +12621,7 @@ end -- not --version \setcounter{LWR@virtualpagedepth}{0} \NewDocumentEnvironment{LWR@setvirtualpage}{s O{1}}{% \ifnumequal{\value{LWR@virtualpagedepth}}{0}{% - \IfBooleanT{#1}{\LWR@orignewpage}% + \IfBooleanT{#1}{\LWR@maybe@orignewpage}% \setlength{\linewidth}{6in/#2}% \setlength{\textwidth}{6in}% \setlength{\textheight}{9in}% @@ -13082,6 +13311,7 @@ color:\LWR@origpound\LWR@tempcolor% \renewrobustcmd*{\negthinspace}{\HTMLunicode{202f}} % HTML thin non-breakable space \renewrobustcmd*{~}{\HTMLentity{nbsp}} \renewrobustcmd*{\textellipsis}{\HTMLunicode{2026}} +\renewrobustcmd*{\vdots}{\HTMLunicode{22EE}} } \newcommand*{\LWR@font@size}{normalsize} @@ -13125,7 +13355,24 @@ color:\LWR@origpound\LWR@tempcolor% \newcommand*{\LWR@HTML@hfill}{\qquad} \LWR@formatted{hfill} -\newcommand*{\LWR@HTML@hrulefill}{\rule{1in}{1pt}} +\newcommand*{\LWR@HTML@hrulefill}{% + \ifbool{LWR@doingapar}% + {\rule{1in}{1pt}}% + {% + \LWR@findcurrenttextcolor% + \ifdefstring{\LWR@tempcolor}{000000}% + {% + \begin{BlockClass}{hrule}% + \end{BlockClass}% + }% + {% + \begin{BlockClass}[% + border-top: 1px solid \LWR@origpound\LWR@tempcolor % space + ]{hrule}% + \end{BlockClass}% + }% + }% +}% \LWR@formatted{hrulefill} \newcommand*{\LWR@HTML@dotfill}{\dots} @@ -13473,6 +13720,7 @@ color:\LWR@origpound\LWR@tempcolor% \quad% } } + \renewcommand*{\LWR@printchaptername}{} \renewcommand{\thepart}{\@Roman\c@part} \@ifundefined{chapter}{ \renewcommand{\thesection}{\@arabic\c@section} @@ -13531,6 +13779,8 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@isolate{\CTEX@chaptername}~% \CTEX@chapter@aftername% }% + + \renewcommand*{\LWR@printchaptername}{} }{} } \end{warpHTML} |