diff options
| author | Karl Berry <karl@freefriends.org> | 2021-04-11 21:33:43 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-04-11 21:33:43 +0000 |
| commit | 86662024018682cdc86b1bd94ae021b0b39a23f8 (patch) | |
| tree | 323a6697b8ce7367197edc4e2fe4feaffcb45469 /Master/texmf-dist/tex/latex/lwarp | |
| parent | 0305002960075b3f60f4125ed15d4dae571f55c3 (diff) | |
lwarp
git-svn-id: svn://tug.org/texlive/trunk@58837 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
38 files changed, 964 insertions, 302 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty index b568a300ebc..f49848661fb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty @@ -63,7 +63,7 @@ \edef\LWR@thisthmstyle{\@nameuse{LWR@thmstyle#2}}% }% lwarp }% - \@tempa + \@tempa% } \newcommand{\LWR@haveamsthmname}{ @@ -90,21 +90,53 @@ \def\@begintheorem#1#2[#3]{% \GetTitleString{#3}% lwarp \let\@currentlabelname\GetTitleStringResult% lwarp - \item[ + \item[% + \LWR@newautopagelabel{page}% \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% lwarp \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% lwarp \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% lwarp \thm@swap\swappedhead\thmhead{#1}{#2}{#3}% - \the\thm@headpunct~ + \the\thm@headpunct % space \thmheadnl % possibly a newline. \hskip\thm@headsep - ] + ]% \ignorespaces} \def\@thm#1#2#3{% \ifhmode\unskip\unskip\par\fi \normalfont \LWR@forcenewpage% lwarp + \LWR@printpendingfootnotes% lwarp \BlockClass{amsthmbody\LWR@thisthmstyle}% lwarp + \renewcommand{\footnote}[1][]{% + \ifblank{##1}% + {% + \stepcounter\@mpfn + \protected@xdef\@thefnmark{\thempfn}% + \@footnotemark\@footnotetext + }% + {% + \begingroup + \csname c@\@mpfn\endcsname ##1\relax + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup + \@footnotemark\@footnotetext + }% + }% + \renewcommand{\footnotemark}[1][]{% + \ifblank{##1}% + {% + \stepcounter{footnote}% + \protected@xdef\@thefnmark{\thefootnote}% + \@footnotemark% + }% + {% + \begingroup% + \c@footnote ##1\relax% + \unrestored@protected@xdef\@thefnmark{\thefootnote}% + \endgroup% + \@footnotemark% + }% + }% \trivlist \let\thmheadnl\relax \let\thm@swap\@gobble @@ -121,13 +153,14 @@ \refstepcounter{#2}% \def\@tempa{\@oparg{\@begintheorem{#3}{\csname the#2\endcsname}}[]}% \fi - \@tempa + \@tempa% } \AtBeginDocument{% \def\cref@thmoptarg[#1]#2#3#4{% \ifhmode\unskip\unskip\par\fi% \normalfont% \LWR@forcenewpage% lwarp + \LWR@printpendingfootnotes% lwarp \BlockClass{amsthmbody\LWR@thisthmstyle}% lwarp \trivlist% \let\thmheadnl\relax% @@ -149,7 +182,12 @@ }% }% AtBeginDocument -\def\@endtheorem{\endtrivlist\endBlockClass\@endpefalse } +\def\@endtheorem{% + \endtrivlist% + \LWR@printpendingfootnotes% lwarp + \endBlockClass% + \@endpefalse% +} \AtBeginDocument{ \@ifundefined{LWR@orig@openbox}{ \LetLtxMacro\LWR@orig@openbox\openbox @@ -168,8 +206,10 @@ }{}% @ifundefined }% AtBeginDocument \renewenvironment{proof}[1][\proofname]{\par -\LWR@forcenewpage% lwarp + \LWR@forcenewpage% lwarp + \LWR@printpendingfootnotes% lwarp \BlockClass{amsthmproof}% lwarp + \LWR@newautopagelabel{page}% \pushQED{\qed}% \normalfont \topsep6\p@\@plus6\p@\relax \trivlist @@ -177,6 +217,7 @@ \InlineClass{amsthmproofname}{#1\@addpunct{.}}]\ignorespaces% changes }{% \InlineClass{theoremendmark}{\popQED}\endtrivlist% + \LWR@printpendingfootnotes% lwarp \endBlockClass% lwarp \@endpefalse } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty index 5bdeea8bf83..c469b1b6659 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty @@ -21,7 +21,7 @@ \def\backref{} \long\def\hyper@section@backref#1#2#3{% - \ref{#3}% + \LWR@refwithsection{#3}% } \let\backrefxxx\hyper@section@backref diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty index 760358810f1..1559610660a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty @@ -54,12 +54,27 @@ } \let\blx@imc@ifhyperref\@firstoftwo +\xpretocmd{\blx@citecmdinit} + {\LWR@newautopagelabel{page}}% + {} + {\LWR@patcherror{biblatex}{blx@citecmdinit}} +\xpatchcmd{\blx@addbackref@i} + {\thepage} + {\theLWR@previousautopagelabel}% ref to the most recent object + {} + {\LWR@patcherror{biblatex}{blx@addbackref@i A}} + +\xpatchcmd{\blx@addbackref@i} + {\c@page} + {\c@LWR@previousautopagelabel}% refto the most recent object + {} + {\LWR@patcherror{biblatex}{blx@addbackref@i B}} \DeclareListFormat{pageref}{% \ifnumless{\abx@pagerefstyle}{0} {\usebibmacro{list:plain}% \ifhyperref {% - \ref{\BaseJobname-autopage-#1}% lwarp + \LWR@refwithsection{\BaseJobname-autopage-#1}% lwarp } {#1}} {\ifnumequal{\value{listcount}}{1} @@ -96,7 +111,7 @@ {\printdelim{multilistdelim}} {}% \ifhyperref - {\ref{\BaseJobname-autopage-#1}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-#1}}% lwarp {#1}}% \edef\abx@range@prev{\abx@range@num}} {\usebibmacro{pageref:dump}% @@ -104,7 +119,7 @@ {\printdelim{multilistdelim}} {}% \ifhyperref - {\ref{\BaseJobname-autopage-#1}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-#1}}% lwarp {#1}% \def\abx@range@prev{-1}}% \edef\abx@range@last{\abx@range@this}} @@ -114,49 +129,49 @@ {\ifcase\abx@pagerefstyle\relax % two \bibrangedash \ifhyperref - {\ref{\BaseJobname-autopage-\abx@range@hold}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}% lwarp {\abx@range@hold}% \or % three \ifnumless{\abx@range@diff}{2} {\printdelim{multilistdelim}} {\bibrangedash}% \ifhyperref - {\ref{\BaseJobname-autopage-\abx@range@hold}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}% lwarp {\abx@range@hold}% \or % two+ \ifnumless{\abx@range@diff}{2} {\sqspace \ifhyperref - {\ref{\BaseJobname-autopage-\abx@range@hold}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}% lwarp {\bibstring{sequens}}} {\bibrangedash \ifhyperref - {\ref{\BaseJobname-autopage-\abx@range@hold}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}% lwarp {\abx@range@hold}}% \or % three+ \ifnumless{\abx@range@diff}{2} {\sqspace \ifhyperref - {\ref{\BaseJobname-autopage-\abx@range@hold}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}% lwarp {\bibstring{sequens}}} {\ifnumless{\abx@range@diff}{3} {\sqspace \ifhyperref - {\ref{\BaseJobname-autopage-\abx@range@hold}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}% lwarp {\bibstring{sequentes}}} {\bibrangedash \ifhyperref - {\ref{\BaseJobname-autopage-\abx@range@hold}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}% lwarp {\abx@range@hold}}}% \else % all+ \ifnumless{\abx@range@diff}{2} {\sqspace \ifhyperref - {\ref{\BaseJobname-autopage-\abx@range@hold}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}% lwarp {\bibstring{sequens}}} {\sqspace \ifhyperref - {\ref{\BaseJobname-autopage-\abx@range@hold}}% lwarp + {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}% lwarp {\bibstring{sequentes}}}% \fi \def\abx@range@diff{0}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty index a9d81119200..579bfd6b582 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty @@ -17,26 +17,28 @@ %% version 2005/12/01 or later. \let\ldelim\relax \let\rdelim\relax -\LWR@ProvidesPackagePass{bigdelim}[2018/08/03] -\NewDocumentCommand{\LWR@HTML@ldelim}{m m m O{}}{% +\LWR@ProvidesPackagePass{bigdelim}[2021/03/15] +\NewDocumentCommand{\LWR@HTML@ldelim}{m m o m O{}}{% \renewcommand{\LWR@multirowborder}{right}% -\multirow{#2}{#3}{#4 \InlineClass{ldelim}{#1}}% +\multirow{#2}{#4}{#5 \InlineClass{ldelim}{#1}}% } \LWR@formatted{ldelim} -\NewDocumentCommand{\LWR@HTML@rdelim}{m m m O{}}{% +\NewDocumentCommand{\LWR@HTML@rdelim}{m m o m O{}}{% \renewcommand{\LWR@multirowborder}{left}% -\multirow{#2}{#3}{\InlineClass{rdelim}{#1} #4}% +\multirow{#2}{#4}{\InlineClass{rdelim}{#1} #5}% } \LWR@formatted{rdelim} \begin{warpMathJax} -\CustomizeMathJax{\newcommand{\LWRldelim}[1][]{\text{#1}~\LWRbigdelim}} -\CustomizeMathJax{\def\ldelim#1#2#3{\def\LWRbigdelim{#1}\LWRldelim}} -\CustomizeMathJax{\newcommand{\LWRrdelim}[1][]{\LWRbigdelim~\text{#1}}} -\CustomizeMathJax{\def\rdelim#1#2#3{\def\LWRbigdelim{#1}\LWRrdelim}} +\CustomizeMathJax{\newcommand{\LWRldelimtwo}[1][]{\text{#1}~\LWRbigdelim}} +\CustomizeMathJax{\newcommand{\LWRldelimone}[2][]{\LWRldelimtwo}} +\CustomizeMathJax{\def\ldelim#1#2{\def\LWRbigdelim{#1}\LWRldelimone}} +\CustomizeMathJax{\newcommand{\LWRrdelimtwo}[1][]{\LWRbigdelim~\text{#1}}} +\CustomizeMathJax{\newcommand{\LWRrdelimone}[2][]{\LWRrdelimtwo}} +\CustomizeMathJax{\def\rdelim#1#2{\def\LWRbigdelim{#1}\LWRrdelimone}} \end{warpMathJax} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ccicons.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ccicons.sty new file mode 100644 index 00000000000..30ec81a02cb --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ccicons.sty @@ -0,0 +1,38 @@ +%% +%% This is file `lwarp-ccicons.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ccicons') +%% 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{ccicons}[2017/10/30] +\newcommand{\LWR@ccicons}[2]{% + {\begin{lateximage}*[#1]\ccicons@font\char#2\end{lateximage}} +} +\renewcommand{\ccicons@logo}{\LWR@ccicons{ccLogo}{0}} +\renewcommand{\ccicons@by}{\LWR@ccicons{ccAttribution}{1}} +\renewcommand{\ccicons@sa}{\LWR@ccicons{ccShareAlike}{2}} +\renewcommand{\ccicons@nd}{\LWR@ccicons{ccNoDerivatives}{3}} +\renewcommand{\ccicons@nc}{\LWR@ccicons{ccNonCommercial}{4}} +\renewcommand{\ccicons@nceu}{\LWR@ccicons{ccNonCommercialEU}{5}} +\renewcommand{\ccicons@ncjp}{\LWR@ccicons{ccNonCommercialJP}{6}} +\renewcommand{\ccicons@pd}{\LWR@ccicons{ccPublicDomain}{7}} +\renewcommand{\ccicons@zero}{\LWR@ccicons{ccZero}{8}} +\renewcommand{\ccicons@sampling}{\LWR@ccicons{ccSampling}{9}} +\renewcommand{\ccicons@share}{\LWR@ccicons{ccShare}{10}} +\renewcommand{\ccicons@remix}{\LWR@ccicons{ccRemix}{11}} +\renewcommand{\ccicons@copy}{\LWR@ccicons{ccCopy}{12}} +\renewcommand{\ccicons@pdalt}{\LWR@ccicons{ccPublicDomainAlt}{13}} +\endinput +%% +%% End of file `lwarp-ccicons.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty index 124bef6fac1..03505e42403 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty @@ -16,8 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{chemfig}[2020/03/05] - +\LWR@ProvidesPackagePass{chemfig}[2021/02/28] \catcode`\_=11 @@ -33,14 +32,14 @@ \@ifpackagelater{chemfig}{2019/04/18}% {% 2019/04/18 or newer - - \LetLtxMacro\LWR@chemfig@origchemfig\chemfig - - \renewcommand*{\chemfig}[2][]{% - \begin{lateximage}[-chemfig-~\PackageDiagramAltText]% - \LWR@chemfig@origchemfig[#1]{#2}% - \end{lateximage}% - } + \xpretocmd{\CF_chemfiga} + {\begin{lateximage}[-chemfig-~\PackageDiagramAltText]} + {}{\LWR@patcherror{chemfig}{CF_chemfiga}} + + \xpatchcmd{\CF_chemfigb} + {\let\CF_flipstate\CF_zero} + {\end{lateximage}\let\CF_flipstate\CF_zero} + {}{\LWR@patcherror{chemfig}{CF_chemfigb}} \GlobalLetLtxMacro\LWR@chemfig@origCF_lewisc\CF_lewisc \gdef\CF_lewisc#1,#2\_nil{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-citeref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-citeref.sty index 1487f48a0e0..ccce64732ab 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-citeref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-citeref.sty @@ -16,7 +16,9 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{citeref}[1999/27/05] -\def\@cprwrite#1={\write\@auxout{\string\citepageref{#1}{\theLWR@currentautosec}}} +\def\@cprwrite#1={% + \write\@auxout{\string\citepageref{#1}{\theLWR@previousautopagelabel}}% +} \def\citepageref#1#2{% \xdef\cpr@testa{\@nameuse{cpr@last@#1}}%letzte Zitatstelle @@ -26,8 +28,11 @@ \else% \@namexdef{cpr@last@#1}{#2}% \@ifundefined{cpr@#1}% - {\@namexdef{cpr@#1}{\ref{\BaseJobname-autopage-#2}}}% lwarp - {\@namexdef{cpr@#1}{\@nameuse{cpr@#1}, \ref{\BaseJobname-autopage-#2}}}% lwarp + {\@namexdef{cpr@#1}{\LWR@refwithsection{\BaseJobname-autopage-#2}}}% lwarp + {% lwarp + \@namexdef{cpr@#1}{\@nameuse{cpr@#1}, % space + \LWR@refwithsection{\BaseJobname-autopage-#2}}% + }% \fi } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-classicthesis.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-classicthesis.sty new file mode 100644 index 00000000000..a530b835696 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-classicthesis.sty @@ -0,0 +1,40 @@ +%% +%% This is file `lwarp-classicthesis.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `classicthesis') +%% 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@ProvidesPackageDrop{classicthesis}[2018/06/03] +\RequirePackage{scrlayer-scrpage} % provides headers and footers (KOMA Script) +\RequirePackage{scrtime} % time access +\PassOptionsToPackage{titles}{tocloft} +\RequirePackage{textcase} % for \MakeTextUppercase +\RequirePackage[newparttoc]{titlesec} % newparttoc to write \part to .toc with \numberline +\RequirePackage{tocloft} +\PassOptionsToPackage{headinclude,footinclude}{typearea} % for classes other than KOMA +\RequirePackage{typearea} +\PassOptionsToPackage{marginal}{footmisc}% marginal flushmargin +\RequirePackage{footmisc}% +\RequirePackage{prelim2e} +\RequirePackage{remreset}% + +\DeclareRobustCommand{\spacedallcaps}[1]{\textsc{\MakeTextUppercase{#1}}} +\DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textsc{\MakeTextLowercase{#1}}} +\newcommand{\ctparttext}[1]{} +\newcommand{\tocEntry}[1]{} +\DeclareRobustCommand*{\deactivateaddvspace}{}% +\newlength{\beforebibskip} +\endinput +%% +%% End of file `lwarp-classicthesis.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty index 4bab8b37616..dad79523ff0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty @@ -127,6 +127,21 @@ \LWR@absorbstar{fullref} \LWR@absorbstar{Fullref} }{}% varioref +\@ifclassloaded{memoir}{ +\AtBeginDocument{ +\def\sf@memsub@label(#1)#2{% + \protected@edef\mem@currentlabelname{#1}% + \sf@@memsub@label{#2}} +} +}{} +\@ifpackageloaded{subfig}{ +\def\sf@sub@label(#1)#2{% + \ifhyperrefloaded + \protected@edef\@currentlabelname{% + \expandafter\strip@period #1\relax.\relax\@@@}% + \fi + \sf@@sub@label{#2}} +}{} \endinput %% %% End of file `lwarp-cleveref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enotez.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enotez.sty new file mode 100644 index 00000000000..4a9692384b9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enotez.sty @@ -0,0 +1,112 @@ +%% +%% This is file `lwarp-enotez.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `enotez') +%% 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{enotez}[2020/12/13] +\ExplSyntaxOn +\AtBeginDocument{ + \bool_set_true:N \l__enotez_hyperref_bool + \bool_set_true:N \l__enotez_hyperfootnotes_bool +} +\cs_gset_protected:Npn \enotez_write_mark:nn #1#2 + { + \bool_if:NTF \l__enotez_hyperfootnotes_bool + { + \enotezwritemark { \hyperlink {enz.#1} { \enmarkstyle #2 } } + \bool_if:NT \l__enotez_hyperbackref_bool + { + \hypertarget {enz.#1.backref} { } + } + } + { \enotezwritemark { \enmarkstyle #2 } } + } +\cs_generate_variant:Nn \enotez_write_mark:nn {x} +\cs_gset_protected:Npn \enotez_write_list_number:n #1 + { + \bool_if:NT \l__enotez_hyperfootnotes_bool + { + \hypertarget {enz.#1} { } + } + \tl_use:N \l__enotez_list_number_format_tl + \tl_if_eq:nxTF {a} { \prop_item:Nn \g__enotez_endnote_man_prop {#1} } + { + \bool_if:nTF + { \l__enotez_hyperfootnotes_bool && \l__enotez_hyperbackref_bool } + { + \exp_args:Nnx + \hyperlink {enz.#1.backref} + { \exp_not:V \l__enotez_endnote_mark_tl } + } + { \prop_item:Nn \g__enotez_endnote_mark_prop {#1} } + } + { + \bool_if:nTF + { \l__enotez_hyperfootnotes_bool && \l__enotez_hyperbackref_bool } + { + \exp_args:Nnx + \hyperlink {enz.#1.backref} + { \exp_not:V \l__enotez_endnote_mark_tl } + } + { \tl_use:N \l__enotez_endnote_mark_tl } + } + } +\DeclareTemplateCode {enotez-list} {paragraph} {1} + { + heading = \enotez_list_heading:n , + format = \l__enotez_list_format_tl , + number = \enotez_list_number:n , + number-format = \l__enotez_list_number_format_tl , + notes-sep = \l__enotez_list_notes_sep_dim + } + { + \AssignTemplateKeys + \enotez_set_totoc: + \enotez_list_heading:n { \l__enotez_list_name_tl } + \enotez_list_preamble: + \enotez_build_print_list:nnnn {#1} + {} + { + \par\noindent + \group_begin: + \tl_use:N \l__enotez_list_format_tl + \enotez_list_number:n + { \enotez_write_list_number:n {##1} } + \tl_use:N \c_space_tl + % \cs_set:cpn {@currentlabel} + % { \p@endnote \l__enotez_endnote_mark_tl } + \tl_use:N \g__enotez_endnote_text_tl + \par + \dim_compare:nT { \l__enotez_list_notes_sep_dim != 0pt } + { \addvspace { \l__enotez_list_notes_sep_dim } } + \group_end: + } + {} + \enotez_list_postamble: + } + +\ExplSyntaxOff +\begin{warpMathJax} +\def\endnotename{endnote} +\appto\LWR@syncnotenumbers{\LWR@synconenotenumber{LWRendnote}{\theendnote}} +\appto\LWR@syncnotenames{\LWR@synconenotename{LWRendnote}{\endnotename}} +\CustomizeMathJax{\def\LWRendnote{1}} +\CustomizeMathJax{\newcommand{\endnote}[2][\LWRendnote]{{}^{\mathrm{#1}}}} +\CustomizeMathJax{\newcommand{\endnotemark}[1][\LWRendnote]{{}^{\mathrm{#1}}}} +\end{warpMathJax} + +\endinput +%% +%% End of file `lwarp-enotez.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty index b6b39e759e1..ecee54e99e8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty @@ -36,14 +36,14 @@ \DeclareDocumentCommand{\LWR@HTML@epigraph}{m m} {% - \begin{LWR@BlockClassWP}{\LWR@print@mbox{text-align:right}}{}{epigraph}% + \begin{LWR@BlockClassWP}{\LWR@print@mbox{text-align:right}}{}(note){epigraph}% \qitem{#1}{#2}% \end{LWR@BlockClassWP}% } \LWR@formatted{epigraph} \DeclareDocumentEnvironment{LWR@HTML@epigraphs}{} - {\LWR@BlockClassWP{\LWR@print@mbox{text-align:right}}{}{epigraph}} + {\LWR@BlockClassWP{\LWR@print@mbox{text-align:right}}{}(note){epigraph}}% {\endLWR@BlockClassWP} \LWR@formattedenv{epigraphs} \renewcommand{\epigraphhead}[2][0]{#2} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty index c89fa8c9971..75a4f41a1ea 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty @@ -24,6 +24,7 @@ } \def\V@@footnotetext{% \LWR@traceinfo{V@footnotetext}% +\LWR@newautopagelabel{page}% \global\setbox\LWR@footnotebox=\vbox\bgroup% \unvbox\LWR@footnotebox% \protected@edef\@currentlabel{% @@ -39,6 +40,7 @@ \@makefntext{}% \bgroup% \aftergroup{\V@@@footnotetext}% + \let\LWR@newautopagelabel\LWR@null@newautopagelabel% \ignorespaces% }% }% AfterEndPreamble diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty index a3fab94f2c6..5e95182994a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -28,6 +28,7 @@ } \def\V@@footnotetext{% \LWR@traceinfo{V@footnotetext}% +\LWR@newautopagelabel{page}% \global\setbox\LWR@footnotebox=\vbox\bgroup% \unvbox\LWR@footnotebox% \protected@edef\@currentlabel{% @@ -43,6 +44,7 @@ \@makefntext{}% \bgroup% \aftergroup{\V@@@footnotetext}% + \let\LWR@newautopagelabel\LWR@null@newautopagelabel% \ignorespaces% }% \preto\FVB@Verbatim{\LWR@forcenewpage} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty index ebf5393ee4a..bc50d1db38f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty @@ -22,7 +22,7 @@ \renewcommand{\l@fixme}[2]{% \hypertocfloat{1}{fixme}{lox}% - {\LWR@nameref{\BaseJobname-autopage-\arabic{LWR@nextautopage}} --- #1} + {\LWR@nameref{\BaseJobname-autopage-\arabic{LWR@nextautopage}} --- #1}% {#2} } \def\FXFaceInlineHTMLStyle{font-weight:bold} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty index 2679d8592c1..914e5a1689b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty @@ -25,6 +25,7 @@ width: 1.5in; % reasonable dummy width for word processor margin:10pt% }{}% + (note)% {marginblock}% }{% \setlength{\LWR@templengthone}{#3}% @@ -35,6 +36,7 @@ }{% width:\LWR@printlength{\LWR@templengthone}% }% + (note)% {marginblock}% }% \renewcommand*{\@captype}{#2}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index 8c6b91c105b..a688e1cf76e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -365,7 +365,9 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} } \DeclareDocumentCommand{\LWR@hyperlinkb}{m}{% - \LWR@hyperrefcb[LWR-ht-#1]% + \ifbool{LWR@insidemathcomment}% + {\endgroup}% + {\LWR@hyperrefcb[LWR-ht-#1]}% } \DeclareDocumentCommand{\hyperlink}{}{% @@ -382,6 +384,23 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \IfBooleanTF{#1}{\cpageref{#2}}{\cref{#2}}% } +\def\equationautorefname{Equation}% +\def\footnoteautorefname{footnote}% +\def\itemautorefname{item}% +\def\figureautorefname{Figure}% +\def\tableautorefname{Table}% +\def\partautorefname{Part}% +\def\appendixautorefname{Appendix}% +\def\chapterautorefname{chapter}% +\def\sectionautorefname{section}% +\def\subsectionautorefname{subsection}% +\def\subsubsectionautorefname{subsubsection}% +\def\paragraphautorefname{paragraph}% +\def\subparagraphautorefname{subparagraph}% +\def\FancyVerbLineautorefname{line}% +\def\theoremautorefname{Theorem}% +\def\pageautorefname{page}% + \newcommand{\pdfstringdef}[2]{} \newcommand{\pdfbookmark}[3][]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty index 8adab149ded..b522d1c30c5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty @@ -16,6 +16,52 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{hyperxmp}[2018/11/27] + +\define@key{LWR@hyperref}{pdfdate}[]{} +\define@key{LWR@hyperref}{pdfmetadate}[]{} +\define@key{LWR@hyperref}{pdfcopyright}[]{} +\define@key{LWR@hyperref}{pdftype}[]{} +\define@key{LWR@hyperref}{pdflicenseurl}[]{} +\define@key{LWR@hyperref}{pdfauthortitle}[]{} +\define@key{LWR@hyperref}{pdfcaptionwriter}[]{} +\define@key{LWR@hyperref}{pdfmetalang}[]{} +\define@key{LWR@hyperref}{pdfapart}[]{} +\define@key{LWR@hyperref}{pdfaconformance}[]{} +\define@key{LWR@hyperref}{pdfuapart}[]{} +\define@key{LWR@hyperref}{pdfxstandard}[]{} +\define@key{LWR@hyperref}{pdfsource}[]{} +\define@key{LWR@hyperref}{pdfdocumentid}[]{} +\define@key{LWR@hyperref}{pdfinstanceid}[]{} +\define@key{LWR@hyperref}{pdfversionid}[]{} +\define@key{LWR@hyperref}{pdfrendition}[]{} +\define@key{LWR@hyperref}{pdfpublication}[]{} +\define@key{LWR@hyperref}{pdfpubtype}[]{} +\define@key{LWR@hyperref}{pdfbytes}[]{} +\define@key{LWR@hyperref}{pdfnumpages}[]{} +\define@key{LWR@hyperref}{pdfissn}[]{} +\define@key{LWR@hyperref}{pdfeissn}[]{} +\define@key{LWR@hyperref}{pdfisbn}[]{} +\define@key{LWR@hyperref}{pdfbookedition}[]{} +\define@key{LWR@hyperref}{pdfpublisher}[]{} +\define@key{LWR@hyperref}{pdfvolumenum}[]{} +\define@key{LWR@hyperref}{pdfissuenum}[]{} +\define@key{LWR@hyperref}{pdfpagerange}[]{} +\define@key{LWR@hyperref}{pdfdoi}[]{} +\define@key{LWR@hyperref}{pdfurl}[]{} +\define@key{LWR@hyperref}{pdfidentifier}[]{} +\define@key{LWR@hyperref}{pdfsubtitle}[]{} +\define@key{LWR@hyperref}{pdfpubstatus}[]{} +\define@key{LWR@hyperref}{pdfcontactaddress}[]{} +\define@key{LWR@hyperref}{pdfcontactcity}[]{} +\define@key{LWR@hyperref}{pdfcontactregion}[]{} +\define@key{LWR@hyperref}{pdfcontactpostcode}[]{} +\define@key{LWR@hyperref}{pdfcontactcountry}[]{} +\define@key{LWR@hyperref}{pdfcontactphone}[]{} +\define@key{LWR@hyperref}{pdfcontactemail}[]{} +\define@key{LWR@hyperref}{pdfcontacturl}[]{} +\define@key{LWR@hyperref}{keeppdfinfo}[]{} +\define@key{LWR@hyperref}{pdfauthor}[]{} +\define@key{LWR@hyperref}{pdfkeywords}[]{} \endinput %% %% End of file `lwarp-hyperxmp.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index 849e434c704..0e7fdfb75bf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -210,6 +210,7 @@ \LWR@BlockClassWP% {float:right; width:2in; margin:10pt}% {}% + (note)% {marginblock}% \renewcommand*{\@captype}{#2}% \minipage{\LWR@usersmarginparwidth}% @@ -238,6 +239,7 @@ margin:10pt% }% {}% + (note)% {marginblock}% \setlength{\linewidth}{.95\LWR@templengthone}% \booltrue{KFLT@keywrap}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index 50ac55f4648..0c0d68f97d4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -38,37 +38,102 @@ } \renewcommand{\lst@Init}[1]{% \LWR@traceinfo{lst@Init}% -\lst@ifdisplaystyle% - \LWR@forcenewpage% -\fi% -\renewcommand*{\@captype}{lstlisting}% -\let\lst@aboveskip\z@\let\lst@belowskip\z@% -\gdef\lst@boxpos{t}% -\let\lst@frame\@empty - \let\lst@frametshape\@empty - \let\lst@framershape\@empty - \let\lst@framebshape\@empty - \let\lst@framelshape\@empty -\lstframe@\lst@frameround ffff\relax% -\lst@multicols\@empty% -\LWR@origlst@Init{#1}\relax% -\def\lst@framelr{}% -\LWR@traceinfo{finished origlst@Init}% -\lst@ifdisplaystyle% - \LWR@traceinfo{About to create verbatim.}% - \let\lsthk@EveryPar\relax% - \LWR@atbeginverbatim{programlisting}% +\lst@ifdisplaystyle% lwarp + \LWR@forcenewpage% lwarp +\fi% lwarp +\let\lst@ifmathescape\iffalse% lwarp +\let\lst@DefEsc\relax% lwarp +\def\lst@escapebegin{}% lwarp +\def\lst@escapeend{}% lwarp +\renewcommand*{\@captype}{lstlisting}% lwarp + \let\lst@aboveskip\z@\let\lst@belowskip\z@% lwarp + \gdef\lst@boxpos{t}% lwarp + \let\lst@frame\@empty% lwarp + \let\lst@frametshape\@empty% lwarp + \let\lst@framershape\@empty% lwarp + \let\lst@framebshape\@empty% lwarp + \let\lst@framelshape\@empty% lwarp + \lstframe@\lst@frameround ffff\relax% lwarp + \lst@multicols\@empty% lwarp + \begingroup% + \ifx\lst@float\relax\else% + \edef\@tempa{\noexpand\lst@beginfloat{lstlisting}[\lst@float]}% + \expandafter\@tempa% + \fi% + \ifx\lst@multicols\@empty\else% + \edef\lst@next{\noexpand\multicols{\lst@multicols}}% + \expandafter\lst@next% + \fi% + \ifhmode\ifinner \lst@boxtrue \fi\fi% + \lst@ifbox% + \lsthk@BoxUnsafe% + \hbox to\z@\bgroup% + $\if t\lst@boxpos \vtop% + \else \if b\lst@boxpos \vbox% + \else \vcenter \fi\fi% + \bgroup \par\noindent% + \else% + \lst@ifdisplaystyle% + \lst@EveryDisplay% + \par\penalty-50\relax% + \vspace\lst@aboveskip% + \fi% + \fi% + \normalbaselines% + \abovecaptionskip\lst@abovecaption\relax% + \belowcaptionskip\lst@belowcaption\relax% + \lst@MakeCaption t% +\LWR@traceinfo{lst@Init: defining current label !\@currentlabel!}% + \let\LWR@listings@currentlabel\@currentlabel% lwarp +\LWR@traceinfo{lst@Init: defining current label !\cref@currentlabel!}% + \let\LWR@listings@cref@currentlabel\cref@currentlabel% lwarp +\LWR@traceinfo{lst@Init: preinit and init}% + \lsthk@PreInit \lsthk@Init% + \let\@currentlabel\LWR@listings@currentlabel% lwarp + \let\cref@currentlabel\LWR@listings@cref@currentlabel% lwarp +\LWR@traceinfo{lst@Init: M}% + \lst@ifdisplaystyle + \global\let\lst@ltxlabel\@empty + \if@inlabel + \lst@ifresetmargins + \leavevmode + \else + \xdef\lst@ltxlabel{\the\everypar}% + \lst@AddTo\lst@ltxlabel{% + \global\let\lst@ltxlabel\@empty + \everypar{\lsthk@EveryLine\lsthk@EveryPar}}% + \fi + \fi + \everypar\expandafter{\lst@ltxlabel + \lsthk@EveryLine\lsthk@EveryPar}% + \else + \everypar{} + \let\lst@NewLine\@empty + \fi +\LWR@traceinfo{lst@Init: P}% + \lsthk@InitVars \lsthk@InitVarsBOL + \lst@Let{13}\lst@MProcessListing + \let\lst@Backslash#1% + \lst@EnterMode{\lst@Pmode}{\lst@SelectCharTable}% + \lst@InitFinalize% +\LWR@traceinfo{lst@Init: S}% +\def\lst@framelr{}% lwarp +\LWR@traceinfo{lst@Init: finished origlst@Init}% +\lst@ifdisplaystyle% lwarp + \LWR@traceinfo{lst@Init: About to create verbatim.}% lwarp + \let\lsthk@EveryPar\relax% lwarp + \LWR@atbeginverbatim{programlisting}% lwarp - \let\lsthk@EveryPar\LWR@origlsthkEveryPar% -\else% - \ifbool{LWR@verbtags}{\LWR@htmltag{% - span class=\textquotedbl{}inlineprogramlisting\textquotedbl% - }}{}% -\fi% -\LWR@traceinfo{lst@Init done}% + \let\lsthk@EveryPar\LWR@origlsthkEveryPar% lwarp +\else% lwarp + \ifbool{LWR@verbtags}{\LWR@htmltag{% lwarp + span class=\textquotedbl{}inlineprogramlisting\textquotedbl% lwarp + }}{}% lwarp +\fi% lwarp +\LWR@traceinfo{lst@Init: done}% } - \renewcommand*{\lst@DeInit}{% +\LWR@traceinfo{lst@DeInit}% \lst@ifdisplaystyle% \let\lsthk@EveryPar\relax% \LWR@afterendverbatim% @@ -76,19 +141,44 @@ \else% \ifbool{LWR@verbtags}{\noindent\LWR@htmltag{/span}}{}% \fi% -\LWR@origlst@DeInit% + \lst@XPrintToken \lst@EOLUpdate + \global\advance\lst@newlines\m@ne + \lst@ifshowlines + \lst@DoNewLines + \else + \setbox\@tempboxa\vbox{\lst@DoNewLines}% + \fi + \lst@ifdisplaystyle \par\removelastskip \fi + \lsthk@ExitVars\everypar{}\lsthk@DeInit\normalbaselines\normalcolor + \lst@MakeCaption b% + \lst@ifbox + \egroup $\hss \egroup + \vrule\@width\lst@maxwidth\@height\z@\@depth\z@ + \else + \lst@ifdisplaystyle + \par\penalty-50\vspace\lst@belowskip + \fi + \fi + \ifx\lst@multicols\@empty\else + \def\lst@next{\global\let\@checkend\@gobble + \endmulticols + \global\let\@checkend\lst@@checkend} + \expandafter\lst@next + \fi + \ifx\lst@float\relax\else + \expandafter\lst@endfloat + \fi + \endgroup +\LWR@traceinfo{lst@DeInit done}% } - \def\lst@MakeCaption#1{% -\LWR@traceinfo{MAKING CAPTION at #1}% +\LWR@traceinfo{lst@MakeCaption at #1}% \lst@ifdisplaystyle -\LWR@traceinfo{making a listings display caption}% +\LWR@traceinfo{lst@MakeCaption: making a listings display caption}% \ifx #1t% \ifx\lst@@caption\@empty\expandafter\lst@HRefStepCounter \else \expandafter\refstepcounter \fi {lstlisting}% -\LWR@traceinfo{About to assign label: !\lst@label!}% -\LWR@traceinfo{Finished assigning the label.}% \let\lst@arg\lst@intname \lst@ReplaceIn\lst@arg\lst@filenamerpl \global\let\lst@name\lst@arg \global\let\lstname\lst@name \lst@ifnolol\else @@ -98,12 +188,12 @@ \else \def\lst@temp{ }% \ifx\lst@intname\lst@temp \else -\LWR@traceinfo{addcontents lst@name: -\lst@name-}% +\LWR@traceinfo{lst@MakeCaption: addcontents lst@name: -\lst@name-}% \fi \fi \fi \else -\LWR@traceinfo{addcontents lst@@caption: -\lst@@caption-}% +\LWR@traceinfo{lst@MakeCaption: addcontents lst@@caption: -\lst@@caption-}% \addcontentsline{lol}{lstlisting}% {\protect\numberline{\thelstlisting}% {\protect\ignorespaces \LWR@isolate{\lst@@caption} \protect\relax}}% @@ -111,34 +201,34 @@ \fi \fi \ifx\lst@caption\@empty\else -\LWR@traceinfo{lst@caption not empty-}% +\LWR@traceinfo{lst@MakeCaption: lst@caption not empty-}% \lst@IfSubstring #1\lst@captionpos {\begingroup -\LWR@traceinfo{at the selected position}% +\LWR@traceinfo{lst@MakeCaption: at the selected position}% \ifx\lst@title\@empty - \LWR@stoppars% + \LWR@stoppars% lwarp \lst@makecaption\fnum@lstlisting{\ignorespaces \lst@caption} \else -\LWR@traceinfo{Making title: \lst@title}% +\LWR@traceinfo{lst@MakeCaption: Making title: \lst@title}% \begin{BlockClass}{lstlistingtitle}% lwarp \lst@maketitle\lst@title% lwarp \end{BlockClass}% lwarp - \fi -\LWR@traceinfo{About to assign label: !\lst@label!}% - \ifx\lst@label\@empty\else + \fi% +\LWR@traceinfo{lst@MakeCaption: About to assign label: !\lst@label!}% + \ifx\lst@label\@empty\else% \leavevmode% gets rid of bad space factor error \GetTitleStringExpand{\lst@caption}% \edef\LWR@lntemp{\GetTitleStringResult}% \edef\@currentlabelname{\detokenize\expandafter{\LWR@lntemp}}% -\label{\lst@label}\fi -\LWR@traceinfo{Finished assigning the label.}% +\label{\lst@label}\fi% +\LWR@traceinfo{lst@MakeCaption: Finished assigning the label.}% \endgroup}{}% \fi -\LWR@traceinfo{end of making a listings display caption}% +\LWR@traceinfo{lst@MakeCaption: end of making a listings display caption}% \else -\LWR@traceinfo{INLINE}% +\LWR@traceinfo{lst@MakeCaption: INLINE}% \fi -\LWR@traceinfo{DONE WITH CAPTION at #1}% +\LWR@traceinfo{lst@MakeCaption: done at #1}% } \renewcommand{\lst@maketitle}[1]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty index 97e5d4aad5e..6b4723383fd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty @@ -59,25 +59,26 @@ \newcommand*{\LWR@longtable@headerror}{% \PackageError{lwarp-longtable} {For longtable:\MessageBreak - 1: Keep either one of an \protect\endhead\space or - \protect\endfirsthead\space\MessageBreak - \space phrase as-is, to be used by both print and HTML.\MessageBreak + 1: Keep either one of an \protect\endhead\space or\MessageBreak + \space\protect\endfirsthead\space phrase as-is,\MessageBreak + \space to be used by both print and HTML.\MessageBreak 2: Place any other \protect\end... phrases inside a\MessageBreak \space\protect\warpprintonly\space macro, to be ignored by HTML.\MessageBreak - 3: Add a final footer for HTML at the end of the table\MessageBreak + 3: At the end of the table,\MessageBreak + \space add a final footer for HTML\MessageBreak \space inside a \protect\warpHTMLonly\space macro. This can be\MessageBreak \space a copy of an \protect\endfoot\space or - \protect\endfirstfoot\space phrase,\MessageBreak - \space but without the actual \protect\endfoot\space - or \protect\endfirstfoot\MessageBreak - \space macros. If using threeparttablex, add\MessageBreak + \protect\endfirstfoot\MessageBreak + \space phrase, but without the actual \protect\endfoot\MessageBreak + \space or \protect\endfirstfoot\space macros.\MessageBreak + \space If using threeparttablex, add\MessageBreak \space \protect\insertTableNotes\space here, optionally with\MessageBreak \space \protect\UseMinipageWidths\space in front.\MessageBreak - See the Lwarp documentation regarding longtables\MessageBreak - and threeparttablex} + See the Lwarp documentation regarding\MessageBreak + longtables and threeparttablex} {See the Lwarp documentation regading longtables and threeparttablex.} } \newcommand*{\LWR@longtable@maybeheaderror}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty index 8c00eb4cefb..060f4e4b782 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty @@ -32,7 +32,10 @@ \LWRNB@origsetcitestyle{#1}% \LWRNB@patchnatbibopenclose% } - +\xpretocmd{\NAT@reset@parser} + {\LWR@newautopagelabel{page}}% + {} + {\LWR@patcherror{natbib}{NAT@reset@parser}} \endinput %% %% End of file `lwarp-natbib.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty index 5096a264f66..7febe5f1619 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty @@ -63,6 +63,7 @@ \refstepcounter[#1]{#2}% <<< cleveref modification \theorem@prework \LWR@forcenewpage% lwarp + \LWR@printpendingfootnotes% lwarp \BlockClass{theorembody#1}%\LWR@thisthmstyle% lwarp \trivlist % latex's \trivlist, calling latex's \@trivlist unchanged \ifuse@newframeskips % cf. latex.ltx for topsepadd: \@trivlist @@ -99,6 +100,7 @@ \refstepcounter{#2}% \theorem@prework \LWR@forcenewpage% lwarp + \LWR@printpendingfootnotes% lwarp \BlockClass{theorembody#1}%\LWR@thisthmstyle% lwarp \trivlist % latex's \trivlist, calling latex's \@trivlist unchanged \ifuse@newframeskips % cf. latex.ltx for topsepadd: \@trivlist @@ -469,6 +471,7 @@ }{}% \LWR@origendtheorem% also does \@endtrivlist \ifbool{LWR@ntheoremmarks}{\global\setendmarktrue}{}% + \LWR@printpendingfootnotes% lwarp \endBlockClass% } \gdef\NoEndMark{\global\setendmarkfalse} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-orcidlink.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-orcidlink.sty new file mode 100644 index 00000000000..d227a433da3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-orcidlink.sty @@ -0,0 +1,46 @@ +%% +%% This is file `lwarp-orcidlink.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `orcidlink') +%% 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. +\RequirePackage{lwarp-scalerel} + +\LWR@ProvidesPackagePass{orcidlink}[2020/11/21] +\renewcommand\orcidlink[1]{% + \texorpdfstring% + {% + \href% + {https://orcid.org/#1}% + {% + \begin{lateximage}[orcid #1]% lwarp + \mbox{% + \scalerel*{% + \begin{tikzpicture}[yscale=-1,transform shape] + \pic{orcidlogo}; + \end{tikzpicture} + }{|}% + }% + \end{lateximage}% lwarp + }% + }% + {}% +} + +\begin{warpMathJax} +\CustomizeMathJax{\newcommand{\orcidlink}[1]{}} +\end{warpMathJax} +\endinput +%% +%% End of file `lwarp-orcidlink.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty index a3472dc516e..c667021089a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty @@ -40,10 +40,10 @@ \unless\ifvmode\par\fi % Avoid page breaks between a paragraph and its parnotes \nopagebreak\addvspace{\parnotevskip}% - \LWR@forcenewpage% lwarp - \begin{BlockClass}{footnotes}% lwarp + \LWR@forcenewpage% lwarp + \begin{BlockClass}(note){footnotes}% lwarp {\parnotefmt{\PN@text}\par}% - \end{BlockClass}% lwarp + \end{BlockClass}% lwarp \global\def\PN@text{}% \addvspace{\parnotevskip}% % 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 643e96c138e..54127dc6423 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -47,19 +47,19 @@ \RequirePackage{lwarp-titling}% req'd \RequirePackage{lwarp-tocloft}% req'd \RequirePackage{lwarp-verse}% req'd -\let\LWR@orig@label\@mem@old@label -\let\@mem@old@label\LWR@new@label +\LetLtxMacro\LWR@orig@label\@mem@old@label +\LetLtxMacro\@mem@old@label\LWR@new@label \AtBeginDocument{ \renewcommand*{\sf@@memsub@label}[1]{% \@bsphack \sf@@memsub@label@hook{#1}% - \@memoldlabel{#1}% - \LWR@label@createtag{sub@#1}% + \cref@label{#1}% lwarp + \LWR@label@createtag{sub@#1}% lwarp \protected@write\@auxout{}{% \string\newlabel{sub@#1}% {{\@nameuse{@@thesub\@captype}}% {\thepage}}}% - \LWR@write@lwarplabel{sub@#1}% + \LWR@write@lwarplabel{sub@#1}% lwarp \@esphack } } @@ -701,7 +701,7 @@ \renewcommand{\setfloatadjustment}[2]{} \NewDocumentEnvironment{KFLTmemoir@marginfloat}{O{-1.2ex} m} {% start - \LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}% + \LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}(note){marginblock}% \renewcommand*{\@captype}{#2}% } {% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty index d2d854b95f6..6955240692d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty @@ -15,7 +15,11 @@ %% 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{pdflscape}[2016/05/14] +\LWR@ProvidesPackageDrop{pdflscape}[2019/12/05] +\let\landscape\relax +\let\endlandscape\relax + +\newenvironment*{landscape}{}{} \endinput %% %% End of file `lwarp-pdflscape.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-picinpar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-picinpar.sty index c81ce6ad193..641d91a30cb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-picinpar.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-picinpar.sty @@ -18,9 +18,9 @@ \LWR@ProvidesPackagePass{picinpar}% No date is assigned. \long\def\LWR@HTML@window[#1,#2,#3,#4] {% \if #2r% - \begin{BlockClass}[float:right]{marginblock}% + \begin{BlockClass}[float:right](note){marginblock}% \else% - \begin{BlockClass}[float:left]{marginblock}% + \begin{BlockClass}[float:left](note){marginblock}% \fi% #3\par% #4% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty index 75529d38a29..c71dbf58e2d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty @@ -35,7 +35,12 @@ \NewDocumentCommand{\ofoot}{s o m}{} \NewDocumentCommand{\cfoot}{s o m}{} \NewDocumentCommand{\ifoot}{s o m}{} +\NewDocumentCommand{\automark}{som}{} +\newcommand*{\manualmark}{} \DeclareDocumentCommand{\MakeMarkcase}{m}{#1} +\let\headmark\leftmark +\providecommand{\pnumfont}{\normalfont}% +\DeclareRobustCommand\pagemark{{\pnumfont{\thepage}}}% \newcommand*{\defpairofpagestyles}[3][]{} \newcommand*{\newpairofpagestyles}[3][]{} \newcommand*{\renewpairofpagestyles}[3][]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty index c3422db5fa1..9c12461ba45 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty @@ -23,7 +23,7 @@ \captionsetup{style=sidecaption}% \IfBooleanTF{#1} { % starred - \begin{BlockClass}[border:none ; box-shadow:none]{marginblock} + \begin{BlockClass}[border:none ; box-shadow:none]{marginblock}% \caption*{#4}% \end{BlockClass} } @@ -31,7 +31,7 @@ \IfNoValueOrEmptyTF{#2} {\def\@sidenotes@sidecaption@tof{#4}} {\def\@sidenotes@sidecaption@tof{#2}} - \begin{BlockClass}[border:none ; box-shadow:none]{marginblock} + \begin{BlockClass}[border:none ; box-shadow:none]{marginblock}% \caption[\@sidenotes@sidecaption@tof]{#4} \end{BlockClass} } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty index 68e43c588a4..8fe11c593b7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty @@ -70,7 +70,7 @@ }{}% \begingroup% lwarp \LWR@restoreorigformatting% lwarp - \RenewDocumentEnvironment{lateximage}{s o s o o}{}{}% lwarp: inside group + \RenewDocumentEnvironment{lateximage}{s o s o o d()}{}{}% lwarp: inside group \expandafter\LWR@gsavebox\csname\sv@name content\endcsname{#2}% \expandafter\gdef\expandafter#1\expandafter{% \expandafter\begin\expandafter{lateximage\expandafter}% lwarp diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty index 4bb971d171e..6b2a5ac4849 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty @@ -143,14 +143,10 @@ \LWR@startpars% lwarp } -\def\subfloat@label{% -\LWR@ensuredoingapar% lwarp - \@ifnextchar(% %) match left parenthesis - {\sf@sub@label} - {\sf@sub@label(Sub\@captype\space - \@ifundefined{thechapter}{}{\@nameuse{thechapter}\space}% - \@nameuse{p@sub\@captype}% - \@nameuse{thesub\@captype}.)}} +\xpretocmd{\subfloat@label} + {\LWR@ensuredoingapar} + {} + {\LWR@patcherror{subfig}{subfloat@label}} \renewcommand{\sf@subref}[1]{% \LWR@subnewref{#1}{sub@#1}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty index 7feb78316ad..848d56e810e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty @@ -162,6 +162,7 @@ } \gdef\@thm#1#2{\refstepcounter{#1}% \LWR@forcenewpage% lwarp + \LWR@printpendingfootnotes% lwarp \BlockClass{theorembody\LWR@thisthmstyle}% lwarp \trivlist \@topsep \theorempreskipamount % used by first \item @@ -172,6 +173,7 @@ \gdef\@endtheorem{% \endtrivlist + \LWR@printpendingfootnotes% lwarp \endBlockClass } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty index 0ee5b172bd6..149e9a286bf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty @@ -30,7 +30,8 @@ }% } -\renewcommand\TPTL@tnotex[2]{\tnote{\nameref{#2}}} +\providecommand{\TPTL@tnotex}{} +\renewcommand{\TPTL@tnotex}[2]{\tnote{\nameref{#2}}} \endinput %% %% End of file `lwarp-threeparttablex.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty index c179276d7b0..96e7bc7f004 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty @@ -197,8 +197,8 @@ \DeclareDocumentCommand{\cftsetindents}{m m m}{} -\newcommand{\pagenumbersoff}[1]{} -\newcommand{\pagenumberson}[1]{} +\providecommand{\cftpagenumbersoff}[1]{} +\providecommand{\cftpagenumberson}[1]{} \DeclareDocumentCommand{\newlistentry}{o m m m} {% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty index 8bfd8b4e3d7..b1f4c17acfd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty @@ -37,6 +37,7 @@ {% width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; % }% +(note)% {marginblock}% \setlength{\linewidth}{\LWR@templengthone}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index ff6a7f39f34..1596d07a9e5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -29,8 +29,11 @@ \LWR@formatted{normalcolor} \renewcommand*{\LWR@findcurrenttextcolor}{% +\LWR@traceinfo{LWR@findcurrenttextcolor}% \protect\colorlet{LWR@current@color}{.}% +\LWR@traceinfo{LWR@findcurrenttextcolor B}% \protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor% +\LWR@traceinfo{LWR@findcurrenttextcolor: done}% } \newcommand*{\LWR@currenttextcolorstyle}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko.sty index c584ccf88a0..a86b8185016 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko.sty @@ -1,10 +1,10 @@ %% -%% This is file `lwarp-xetexko-vertical.sty', +%% This is file `lwarp-xetexko.sty', %% generated with the docstrip utility. %% %% The original source files were: %% -%% lwarp.dtx (with options: `xetexko-vertical') +%% lwarp.dtx (with options: `xetexko') %% This is a generated file. %% Copyright 2016-2020 Brian Dunn %% @@ -15,13 +15,13 @@ %% 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@loadbefore{xetexko-vertical} +\LWR@loadbefore{xetexko} -\LWR@ProvidesPackagePass{xetexko-vertical}[2018/04/06] +\LWR@ProvidesPackagePass{xetexko}[2021/03/22] \renewcommand{\verticaltypesetting}{} \renewenvironment{vertical}[1]{\BlockClass{verticalrl}}{\endBlockClass} \renewenvironment{horizontal}[1]{\BlockClass{horizontaltb}}{\endBlockClass} \renewcommand{\vertlatin}[1]{#1} \endinput %% -%% End of file `lwarp-xetexko-vertical.sty'. +%% End of file `lwarp-xetexko.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index ddb31bd5e15..92c34938bbb 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} - [2021/02/18 v0.895 Allows LaTeX to directly produce HTML5 output.] + [2021/04/08 v0.896 Allows LaTeX to directly produce HTML5 output.] @@ -244,6 +244,7 @@ \LWR@loadafter{bussproofs} \LWR@loadafter{bxpapersize} \LWR@loadafter{bytefield} +\LWR@loadafter{ccicons} \LWR@loadafter{cancel} \LWR@loadafter{canoniclayout} \LWR@loadafter{caption} @@ -265,6 +266,7 @@ \LWR@notmemoirloadafter{chngpage} \LWR@loadafter{cite} \LWR@loadafter{citeref} +\LWR@loadafter{classicthesis} \LWR@loadafter{cleveref} \LWR@loadafter{cmdtrack} \LWR@loadafter{colonequals} @@ -300,6 +302,7 @@ \LWR@loadafter{endheads} \LWR@loadafter{endnotes} \LWR@loadafter{engtlc} +\LWR@loadafter{enotez} \LWR@notmemoirloadafter{enumerate} \LWR@loadafter{enumitem} \LWR@notmemoirloadafter{epigraph} @@ -492,6 +495,7 @@ \LWR@loadafter{nowidow} \LWR@loadafter{ntheorem} \LWR@loadafter{octave} +\LWR@loadafter{orcidlink} \LWR@loadafter{overpic} \LWR@loadafter{pagegrid} \LWR@notmemoirloadafter{pagenote} @@ -847,10 +851,11 @@ \LWR@origrule{0pt}{1\baselineskip}% \LWR@orignewline% } -\long\def\LWR@firstoffour#1#2#3#4{#1} -\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} +\long\def\LWR@firstoffive#1#2#3#4#5{#1} +\long\def\LWR@secondoffive#1#2#3#4#5{#2} +\long\def\LWR@thirdoffive#1#2#3#4#5{#3} +\long\def\LWR@fourthoffive#1#2#3#4#5{#4} +\long\def\LWR@fifthoffive#1#2#3#4#5{#5} \newcounter{LWR@texboxdepth} \setcounter{LWR@texboxdepth}{0} \newcommand*{\LWR@maybe@orignewpage}{% @@ -1538,6 +1543,24 @@ \LWR@lookforpackagename{18}% \LWR@lookforpackagename{19}% \LWR@lookforpackagename{20}% +\IfSubStr{\detokenize\expandafter{#1}}{\LWRleftbrace}% + {% + \PackageError{lwarp}{% + You used:\MessageBreak + \protect\requirepackage[#1]{#2}\MessageBreak + Braces in the package options will fail with Lwarp.\MessageBreak + Instead, use:\MessageBreak + \protect\PassOptionsToPackage{#1}{#2}\MessageBreak + \protect\requirepackage{#2}\MessageBreak + near the line number given below.\MessageBreak + Enter 'h' for more info% + }% + {% + See the Lwarp manual troubleshooting index entry for\MessageBreak + ``package, options with braces''% + }% + }% + {}% no brace \IfValueTF{#1}% {% options given \IfValueTF{#3}% version given? @@ -2744,12 +2767,12 @@ div.marginblock br , div.marginparblock br { margin-bottom: 2ex ; } -div.bodycontainer { +main.bodycontainer { float: left ; width: 80% ; } -div.bodywithoutsidetoc div.bodycontainer { +div.bodywithoutsidetoc main.bodycontainer { float: none ; width: 100% ; } @@ -3549,15 +3572,12 @@ img.lateximage{ border: none ; } -/* The -1px right margin compensates for the 1px right border. */ -/* Without this -1px margin, the body container appears below instead */ -/* of floating to the side. */ div.sidetoccontainer { font-family: "DejaVu Serif", "Bitstream Vera Serif", "Lucida Bright", Georgia, serif; float: left ; - width: 20%; - margin: 0pt -1px 3ex 0pt ; + width: 19%; /* room for border-right next to 80% main */ + margin: 0pt 0em 3ex 0pt ; border-right: 1px solid silver; border-bottom: 1px solid silver; background: #FAF7F4 ; @@ -3889,7 +3909,7 @@ span.sidetocthetitle { display: none } span.sidetocthetitle { display: inline } nav.topnavigation { display:block } nav.botnavigation { display:block } - div.bodycontainer { width: 100% } + main.bodycontainer { width: 100% } .marginpar { max-width: 100%; float: none; @@ -3908,21 +3928,21 @@ span.sidetocthetitle { display: none } div.sidetoccontainer { display:none; } nav.topnavigation { display: none; } nav.botnavigation { display: none; } - div.bodycontainer { width: 100% } + main.bodycontainer { width: 100% } } @media handheld { div.sidetoccontainer { display:none; } nav.topnavigation { display:block } nav.botnavigation { display:block } - div.bodycontainer { width: 100% } + main.bodycontainer { width: 100% } } @media projection { div.sidetoccontainer { display:none; } nav.topnavigation { display:block } nav.botnavigation { display:block } - div.bodycontainer { width: 100% } + main.bodycontainer { width: 100% } } \end{filecontents*} \end{LWRwriteconf} @@ -4657,7 +4677,7 @@ MathJax = { -- Copyright 2016-2021 Brian Dunn -printversion = "v0.895" +printversion = "v0.896" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -5574,7 +5594,6 @@ end -- not --version \begin{warpHTML} - \newcommand*{\LWR@depthnone}{-5} \newcommand*{\LWR@depthfinished}{-4} \newcommand*{\LWR@depthbook}{-2} @@ -5602,7 +5621,13 @@ end -- not --version \newcommand*{\LWR@closeten}{} \newcommand*{\LWR@closeeleven}{} \newcommand*{\LWR@closetwelve}{} - +\newcommand*{\LWR@closethirteen}{} +\newcommand*{\LWR@closefourteen}{} +\newcommand*{\LWR@closefifteen}{} +\newcommand*{\LWR@closesixteen}{} +\newcommand*{\LWR@closeseventeen}{} +\newcommand*{\LWR@closeeighteen}{} +\newcommand*{\LWR@closenineteen}{} \newcommand*{\LWR@closedepthone}{\LWR@depthnone}% top of the stack @@ -5617,11 +5642,25 @@ end -- not --version \newcommand*{\LWR@closedepthten}{\LWR@depthnone} \newcommand*{\LWR@closedeptheleven}{\LWR@depthnone} \newcommand*{\LWR@closedepthtwelve}{\LWR@depthnone} +\newcommand*{\LWR@closedepththirteen}{\LWR@depthnone} +\newcommand*{\LWR@closedepthfourteen}{\LWR@depthnone} +\newcommand*{\LWR@closedepthfifteen}{\LWR@depthnone} +\newcommand*{\LWR@closedepthsixteen}{\LWR@depthnone} +\newcommand*{\LWR@closedepthseventeen}{\LWR@depthnone} +\newcommand*{\LWR@closedeptheighteen}{\LWR@depthnone} +\newcommand*{\LWR@closedepthnineteen}{\LWR@depthnone} \NewDocumentCommand{\LWR@pushclose}{m} {% +\global\let\LWR@closenineteen\LWR@closeeighteen% +\global\let\LWR@closeeighteen\LWR@closeseventeen% +\global\let\LWR@closeseventeen\LWR@closesixteen% +\global\let\LWR@closesixteen\LWR@closefifteen% +\global\let\LWR@closefifteen\LWR@closefourteen% +\global\let\LWR@closefourteen\LWR@closethirteen% +\global\let\LWR@closethirteen\LWR@closetwelve% \global\let\LWR@closetwelve\LWR@closeeleven% \global\let\LWR@closeeleven\LWR@closeten% \global\let\LWR@closeten\LWR@closenine% @@ -5634,6 +5673,13 @@ end -- not --version \global\let\LWR@closethree\LWR@closetwo% \global\let\LWR@closetwo\LWR@closeone% \global\csletcs{LWR@closeone}{LWR@printclose#1}% +\global\let\LWR@closedepthnineteen\LWR@closedeptheighteen% +\global\let\LWR@closedeptheighteen\LWR@closedepthseventeen% +\global\let\LWR@closedepthseventeen\LWR@closedepthsixteen% +\global\let\LWR@closedepthsixteen\LWR@closedepthfifteen% +\global\let\LWR@closedepthfifteen\LWR@closedepthfourteen% +\global\let\LWR@closedepthfourteen\LWR@closedepththirteen% +\global\let\LWR@closedepththirteen\LWR@closedepthtwelve% \global\let\LWR@closedepthtwelve\LWR@closedeptheleven% \global\let\LWR@closedeptheleven\LWR@closedepthten% \global\let\LWR@closedepthten\LWR@closedepthnine% @@ -5646,6 +5692,13 @@ end -- not --version \global\let\LWR@closedepththree\LWR@closedepthtwo% \global\let\LWR@closedepthtwo\LWR@closedepthone% \global\csletcs{LWR@closedepthone}{LWR@depth#1}% +\ifdefstring{\LWR@closedepthnineteen}{\LWR@depthnone}% + {}% + {% + \PackageError{lwarp}% + {The document is nested too deeply for Lwarp}% + {PLEASE inform the Lwarp maintainer!}% + }% } @@ -5662,6 +5715,13 @@ end -- not --version \global\let\LWR@closenine\LWR@closeten% \global\let\LWR@closeten\LWR@closeeleven% \global\let\LWR@closeeleven\LWR@closetwelve% +\global\let\LWR@closetwelve\LWR@closethirteen% +\global\let\LWR@closethirteen\LWR@closefourteen% +\global\let\LWR@closefourteen\LWR@closefifteen% +\global\let\LWR@closefifteen\LWR@closesixteen% +\global\let\LWR@closesixteen\LWR@closeseventeen% +\global\let\LWR@closeseventeen\LWR@closeeighteen% +\global\let\LWR@closeeighteen\LWR@closenineteen% \global\let\LWR@closedepthone\LWR@closedepthtwo% \global\let\LWR@closedepthtwo\LWR@closedepththree% \global\let\LWR@closedepththree\LWR@closedepthfour% @@ -5673,6 +5733,13 @@ end -- not --version \global\let\LWR@closedepthnine\LWR@closedepthten% \global\let\LWR@closedepthten\LWR@closedeptheleven% \global\let\LWR@closedeptheleven\LWR@closedepthtwelve% +\global\let\LWR@closedepthtwelve\LWR@closedepththirteen% +\global\let\LWR@closedepththirteen\LWR@closedepthfourteen% +\global\let\LWR@closedepthfourteen\LWR@closedepthfifteen% +\global\let\LWR@closedepthfifteen\LWR@closedepthsixteen% +\global\let\LWR@closedepthsixteen\LWR@closedepthseventeen% +\global\let\LWR@closedepthseventeen\LWR@closedeptheighteen% +\global\let\LWR@closedeptheighteen\LWR@closedepthnineteen% } \end{warpHTML} @@ -5940,6 +6007,9 @@ end -- not --version \LWR@closedepthfour\ \LWR@closedepthfive\ \LWR@closedepthsix\ \LWR@closedepthseven\ \LWR@closedeptheight\ \LWR@closedepthnine\ \LWR@closedepthten\ \LWR@closedeptheleven\ \LWR@closedepthtwelve\ +\LWR@closedepththirteen\ \LWR@closedepthfourteen\ \LWR@closedepthfifteen\ +\LWR@closedepthsixteen\ \LWR@closedepthseventeen\ \LWR@closedeptheighteen\ +\LWR@closedepthnineteen\ } \newcommand*{\LWRPrintStack}{ @@ -6152,6 +6222,9 @@ end -- not --version \RenewDocumentEnvironment{BlockClass}{o m}% {\LWR@spanwarnformat{multi-paragraph object}}% {}% + \RenewDocumentEnvironment{LWR@BlockClassWP}{m m D(){} m}% + {\LWR@spanwarnformat{multi-paragraph object}}% + {}% \renewcommand{\BlockClassSingle}[2]{% {\LWR@spanwarnformat{multi-paragraph object}}% ##2% @@ -6185,15 +6258,17 @@ end -- not --version \end{LWR@nestspan}% } -\NewDocumentCommand{\LWR@htmlspanclass}{o m +m}{% -\LWR@traceinfo{LWR@htmlspanclass |#1|#2|}% -\LWR@ensuredoingapar% -\LWR@subhtmlelementclass{span}[#1]{#2}% -\begin{LWR@nestspan}% -#3% -\LWR@htmltagc{/span}% -\LWR@traceinfo{LWR@htmlspanclass done}% -\end{LWR@nestspan}% +\NewDocumentCommand{\LWR@htmlspanclass}{o D(){} m +m}{% + \LWR@traceinfo{LWR@htmlspanclass |#1|#2|#3|}% + \LWR@ensuredoingapar% + \ifblank{#2}% + {\LWR@subhtmlelementclass{span}[#1]{#3}}% + {\LWR@subhtmlelementclass{span}[#1](#2){#3}}% + \begin{LWR@nestspan}% + #4% + \LWR@htmltagc{/span}% + \LWR@traceinfo{LWR@htmlspanclass done}% + \end{LWR@nestspan}% } @@ -6244,47 +6319,53 @@ end -- not --version } -\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} m}{% -\LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!}% +\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} D(){} m}{% +\LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!#4!}% \ifblank{#2}% {% empty style \LWR@htmltag{% #1% - \ifblank{#3}{}{ class=\textquotedbl#3\textquotedbl\ }% spaces + \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}% spaces + \ifblank{#4}{}{ class=\textquotedbl#4\textquotedbl}% spaces }% }% {% non-empty style \LWR@htmltag{% #1\LWR@indentHTML% - \ifblank{#3}{}{class=\textquotedbl#3\textquotedbl\LWR@indentHTML}% + \ifblank{#3}{}{role=\textquotedbl#3\textquotedbl\LWR@indentHTML}% + \ifblank{#4}{}{class=\textquotedbl#4\textquotedbl\LWR@indentHTML}% style=\textquotedbl#2\textquotedbl\LWR@orignewline% }% }% \LWR@traceinfo{LWR@subhtmlelementclass done}% } -\NewDocumentCommand{\LWR@htmlelementclass}{m o m}{% -\LWR@stoppars% -\LWR@forceemptyline% -\LWR@subhtmlelementclass{#1}[#2]{#3}% -\LWR@startpars% +\NewDocumentCommand{\LWR@htmlelementclass}{m o D(){} m}{% + \LWR@stoppars% + \LWR@forceemptyline% + \ifblank{#3}% + {\LWR@subhtmlelementclass{#1}[#2]{#4}}% + {\LWR@subhtmlelementclass{#1}[#2](#3){#4}}% + \LWR@startpars% } \newcommand*{\LWR@htmlelementclassend}[2]{% -\LWR@stoppars% -\LWR@htmltag{/#1}% -\ifbool{HTMLDebugComments}{% - \LWR@htmlcomment{End of #1 ``#2''}% -}{}% -\LWR@startpars% + \LWR@stoppars% + \LWR@htmltag{/#1}% + \ifbool{HTMLDebugComments}{% + \LWR@htmlcomment{End of #1 ``#2''}% + }{}% + \LWR@startpars% } -\NewDocumentCommand{\LWR@htmldivclass}{o m}{% -\LWR@htmlelementclass{div}[#1]{#2}% +\NewDocumentCommand{\LWR@htmldivclass}{o D(){} m}{% + \ifblank{#2} + {\LWR@htmlelementclass{div}[#1]{#3}}% + {\LWR@htmlelementclass{div}[#1](#2){#3}}% } \newcommand*{\LWR@htmldivclassend}[1]{% -\LWR@htmlelementclassend{div}{#1}% + \LWR@htmlelementclassend{div}{#1}% } @@ -6313,15 +6394,15 @@ end -- not --version \begin{warpprint} -\NewDocumentEnvironment{BlockClass}{o m}{}{}% +\NewDocumentEnvironment{BlockClass}{o D(){} m}{}{} \end{warpprint} \begin{warpHTML} -\NewDocumentEnvironment{LWR@print@BlockClass}{o m}{}{}% +\NewDocumentEnvironment{LWR@print@BlockClass}{o D(){} m}{}{}% -\NewDocumentEnvironment{LWR@HTML@BlockClass}{o m}% - {\LWR@htmldivclass[#1]{#2}} - {\LWR@htmldivclassend{#2}} +\NewDocumentEnvironment{LWR@HTML@BlockClass}{o D(){} m}% + {\LWR@htmldivclass[#1](#2){#3}}% + {\LWR@htmldivclassend{#3}} \LWR@formattedenv{BlockClass} \end{warpHTML} @@ -6343,44 +6424,51 @@ end -- not --version \NewDocumentCommand{\LWR@print@InlineClass}{D{(}{)}{} o m +m}{#4}% \NewDocumentCommand{\LWR@HTML@InlineClass}{D{(}{)}{} o m +m}{% +\LWR@traceinfo{LWR@HTML@InlineClass #3}% \ifbool{FormatWP}{% + \LWR@traceinfo{LWR@HTML@InlineClass: FormatWP}% \LWR@htmlspanclass[#1]{#3}{#4}% }{% + \LWR@traceinfo{LWR@HTML@InlineClass: not FormatWP}% \LWR@htmlspanclass[#2]{#3}{#4}% }% +\LWR@traceinfo{LWR@HTML@InlineClass: done}% } \LWR@formatted{InlineClass} \end{warpHTML} \begin{warpprint} -\NewDocumentEnvironment{LWR@BlockClassWP}{m m m}{}{}% +\NewDocumentEnvironment{LWR@BlockClassWP}{m m D(){} m}{}{} \end{warpprint} \begin{warpHTML} -\NewDocumentEnvironment{LWR@print@LWR@BlockClassWP}{m m m}{}{}% -\NewDocumentEnvironment{LWR@HTML@LWR@BlockClassWP}{m m m}% +\NewDocumentEnvironment{LWR@print@LWR@BlockClassWP}{m m D(){} m}{}{}% + +\NewDocumentEnvironment{LWR@HTML@LWR@BlockClassWP}{m m D(){} m}% {% \LWR@stoppars% \ifbool{FormatWP}% {% \addtocounter{LWR@thisautoidWP}{1}% \LWR@htmltag{% - div class=\textquotedbl#3\textquotedbl\ % space + div class=\textquotedbl#4\textquotedbl\ % space id=\textquotedbl% \LWR@print@mbox{autoidWP-\arabic{LWR@thisautoidWP}}% \textquotedbl% + \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}% \ifblank{#1}{}{ style=\textquotedbl#1\textquotedbl}% }% }% FormatWP {% not FormatWP \LWR@htmltag{% - div class=\textquotedbl#3\textquotedbl% + div class=\textquotedbl#4\textquotedbl% + \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}% \ifblank{#2}{}{ style=\textquotedbl#2\textquotedbl}% }% }% not FormatWP \LWR@startpars% } -{\LWR@htmldivclassend{#3}} +{\LWR@htmldivclassend{#4}} \LWR@formattedenv{LWR@BlockClassWP} \end{warpHTML} @@ -6672,6 +6760,9 @@ end -- not --version } \long\def\LWR@@footnotetext#1#2{% \LWR@traceinfo{LWR@footnotetext}% +\LWR@newautopagelabel{page}% +\begingroup% +\let\LWR@newautopagelabel\LWR@null@newautopagelabel% \global\setbox\csname #2\endcsname=\vbox{% \unvbox\csname #2\endcsname% \protected@edef\@currentlabel{% @@ -6698,10 +6789,11 @@ end -- not --version }% \color@endgroup% }% vbox +\endgroup% \LWR@ensuredoingapar% }% -\long\def\LWR@footnotetext#1{\LWR@@footnotetext{#1}{LWR@footnotebox}} +\long\def\LWR@footnotetext#1{\LWR@@footnotetext{#1}{LWR@footnotebox}}% \LetLtxMacro\@footnotetext\LWR@footnotetext \newbox\LWR@mpfootnotes \long\def\@mpfootnotetext#1{% @@ -6741,7 +6833,8 @@ end -- not --version \newcommand*{\LWR@@printpendingfootnotes}[1]{% \expandafter\ifvoid\csname LWR@#1box\endcsname\else \LWR@forcenewpage - \begin{BlockClass}{footnotes} + \begin{BlockClass}(note){footnotes}% + \LWR@newautopagelabel{page}% \null \unvbox\csuse{LWR@#1box} \setbox\csuse{LWR@#1box}=\vbox{} @@ -6770,7 +6863,7 @@ end -- not --version \newcommand*{\LWR@printpendingmpfootnotes}{% \ifvoid\LWR@mpfootnotes\else \LWR@forcenewpage - \begin{BlockClass}{footnotes} + \begin{BlockClass}(note){footnotes}% \null \unvbox\LWR@mpfootnotes \setbox\LWR@mpfootnotes=\vbox{} @@ -6785,23 +6878,23 @@ end -- not --version \renewcommand{\marginpar}[2][]{% \ifbool{FormatWP}% {% -\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock} +\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}(note){marginblock}% #2 -\end{LWR@BlockClassWP} +\end{LWR@BlockClassWP}% }% {% - \LWR@htmlspanclass{marginpar}{#2}% + \LWR@htmlspanclass(note){marginpar}{#2}% }% } \newcommand{\marginparBlock}[2][]{% \LWR@stoppars% \ifbool{FormatWP}% {% - \begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock} + \begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}(note){marginblock}% #2 \end{LWR@BlockClassWP} }{% - \begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock} + \begin{BlockClass}[width:2in; float:right; margin:10pt](note){marginparblock}% #2 \end{BlockClass} }% @@ -6815,6 +6908,26 @@ end -- not --version \LetLtxMacro\marginparBlock\marginpar \end{warpprint} +\newcounter{LWR@currentautosecpage} +\setcounter{LWR@currentautosecpage}{1} +\newcounter{LWR@currentautosecfloatpage} +\setcounter{LWR@currentautosecfloatpage}{1} +\newcounter{LWR@previousautopagelabel} +\setcounter{LWR@previousautopagelabel}{-1} +\newcommand*{\LWR@newautopagelabel}[1]{% +\ifnumequal{\value{LWR@previousautopagelabel}}{\value{page}}% + {}% + {% + \label{\BaseJobname-autopage-\csuse{the#1}}% + \ifnumequal{\value{#1}}{\value{page}}% + {}% + {\label{\BaseJobname-autopage-\csuse{thepage}}}% + \setcounter{LWR@previousautopagelabel}{\value{page}}% + }% +} + +\newcommand*{\LWR@null@newautopagelabel}[1]{} + \begin{warpall} @@ -6992,18 +7105,6 @@ end -- not --version \LWR@traceinfo{LWR@filenamenoblanks: result is \LWR@thisfilename}% } -\newcounter{LWR@previousautopagelabel} -\setcounter{LWR@previousautopagelabel}{-1} - -\newcommand*{\LWR@newautopagelabel}[1]{% -\ifnumequal{\value{LWR@previousautopagelabel}}{\value{page}}% -{}% no action if this autopage label has already been defined -{% - \label{\BaseJobname-autopage-\arabic{#1}}% - \setcounter{LWR@previousautopagelabel}{\value{page}} -}% -} - \bgroup \catcode`!=3 \catcode`?=3 @@ -7235,7 +7336,7 @@ end -- not --version \newcommand*{\LWR@newhtmlfile}[1]{ \LWR@traceinfo{LWR@newhtmlfile} \LWR@htmlelementclassend{section}{textbody} -\LWR@htmlelementclassend{div}{bodycontainer} +\LWR@htmlelementclassend{main}{bodycontainer} \LWR@htmlelementclassend{div}{bodyandsidetoc} \LWR@printpendingfootnotes @@ -7291,8 +7392,8 @@ end -- not --version \LWR@filestart[#1] -\setcounter{LWR@latestautopage}{\value{page}}% -\LWR@newautopagelabel{LWR@latestautopage}% +\setcounter{LWR@currentautosecfloatpage}{\value{page}}% +\LWR@newautopagelabel{LWR@currentautosecfloatpage}% \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} {} {\LWR@topnavigation} @@ -7314,7 +7415,7 @@ end -- not --version {} {\LWR@sidetoc} -\LWR@htmlelementclass{div}{bodycontainer} +\LWR@htmlelementclass{main}{bodycontainer} \LWR@htmlelementclass{section}{textbody} \boolfalse{LWR@setseqfilelabel} \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}% @@ -7394,8 +7495,6 @@ end -- not --version \newcommand*{\LWR@printchaptername}{% \ifdefvoid{\chaptername}{}{\chaptername~}% } -\newcounter{LWR@currentautosec} -\setcounter{LWR@currentautosec}{1} \DeclareDocumentCommand{\LWR@section}{m m m m}{% \IfValueTF{#2}% {\LWR@traceinfo{LWR@section: starting #4 #2}}% @@ -7462,7 +7561,7 @@ end -- not --version {}% \LWR@traceinfo{LWR@section: about to LWR@createautosec}% \LWR@createautosec{\@nameuse{LWR@tag#4}}% -\setcounter{LWR@currentautosec}{\value{page}}% +\setcounter{LWR@currentautosecpage}{\value{page}}% \IfBooleanTF{#1}% {% \LWR@traceinfo{LWR@section: starred}% @@ -7546,8 +7645,8 @@ end -- not --version \LWR@htmltag{\@nameuse{LWR@tag#4end}}% \LWR@orignewline% \LWR@traceinfo{LWR@section: about to create the LaTeX label}% -\setcounter{LWR@latestautopage}{\value{page}}% -\LWR@newautopagelabel{LWR@currentautosec}\LWR@orignewline% +\setcounter{LWR@currentautosecfloatpage}{\value{page}}% +\LWR@newautopagelabel{LWR@currentautosecpage}\LWR@orignewline% \ifbool{LWR@setseqfilelabel}{}{% \label{\BaseJobname-autofile-\arabic{LWR@htmlseqfilenumber}}% \booltrue{LWR@setseqfilelabel}% @@ -7834,7 +7933,7 @@ end -- not --version \LWR@htmltag{/header}\LWR@orignewline }% \LWR@htmlelementclass{div}{bodywithoutsidetoc} -\LWR@htmlelementclass{div}{bodycontainer} +\LWR@htmlelementclass{main}{bodycontainer} \LWR@traceinfo{LWR@lwarpStart: Generating textbody.} \LWR@htmlelementclass{section}{textbody} \booltrue{LWR@setseqfilelabel}% @@ -7858,8 +7957,8 @@ end -- not --version \typeout{Done.} \typeout{---} }{} -\setcounter{LWR@latestautopage}{\value{page}}% -\LWR@newautopagelabel{LWR@currentautosec}% +\setcounter{LWR@currentautosecfloatpage}{\value{page}}% +\LWR@newautopagelabel{LWR@currentautosecpage}% \LWR@traceinfo{LWR@lwarpStart: done} } \catcode`\$=3% math shift until lwarp starts @@ -7882,12 +7981,11 @@ end -- not --version { \LWR@stoppars \LWR@closeprevious{finished} - +\LWR@printpendingfootnotes \label{\BaseJobname-autofile-last} \LWR@htmlelementclassend{section}{textbody} -\LWR@htmlelementclassend{div}{bodycontainer} +\LWR@htmlelementclassend{main}{bodycontainer} \LWR@htmlelementclassend{div}{bodyandsidetoc} -\LWR@printpendingfootnotes \ifbool{FormatEPUB}{}{\LWR@createfooter} \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} @@ -8072,7 +8170,9 @@ end -- not --version }% not memoir \newcommand*{\LWR@maketitlesetup}{% \LWR@setfootnoteseries% -\def\@makefnmark{\textsuperscript{\thefootnote}} +\def\@makefnmark{% + \textsuperscript{\thefootnote}% +} \long\def\@makefntext##1{% \textsuperscript{\@thefnmark}~% ##1% @@ -8373,6 +8473,7 @@ end -- not --version \begin{warpHTML} \renewcommand{\@begintheorem}[2]{% \LWR@forcenewpage + \LWR@printpendingfootnotes% lwarp \BlockClass{theoremcontents} \trivlist \item[\InlineClass{theoremlabel}{#1\ #2\ }]\itshape @@ -8387,6 +8488,7 @@ end -- not --version } \renewcommand*{\@endtheorem}{% \endtrivlist + \LWR@printpendingfootnotes% lwarp \endBlockClass% theoremcontents } @@ -8410,7 +8512,7 @@ end -- not --version \@noparitemfalse } \def\LWR@HTML@item[#1]{% -\LWR@traceinfo{@item} +\LWR@traceinfo{@item}% \if@noparitem \@donoparitem \else @@ -8534,10 +8636,41 @@ end -- not --version } \newcommand*{\LWR@descriptionstart}{% -\renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription} -\renewcommand*{\LWR@printopenlist}{dl} -\let\item\LWR@descitem% -\LWR@nulllistfills% + \renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription} + \renewcommand*{\LWR@printopenlist}{dl} + \let\item\LWR@descitem% + \LWR@nulllistfills% + \renewcommand{\footnote}[2][]{% + \ifblank{##1}% + {% + \stepcounter\@mpfn + \protected@xdef\@thefnmark{\thempfn}% + \@footnotemark%\@footnotetext + }% + {% + \begingroup + \csname c@\@mpfn\endcsname ##1\relax + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup + \@footnotemark%\@footnotetext + }% + }% + % + \renewcommand{\footnotemark}[1][]{% + \ifblank{##1}% + {% + \stepcounter{footnote}% + \protected@xdef\@thefnmark{\thefootnote}% + \@footnotemark% + }% + {% + \begingroup% + \c@footnote ##1\relax% + \unrestored@protected@xdef\@thefnmark{\thefootnote}% + \endgroup% + \@footnotemark% + }% + }% } @@ -8887,7 +9020,8 @@ end -- not --version \LWR@setexparray{LWR@colatspec}% {\arabic{LWR@tabletotalLaTeXcols}}% {\expandafter\@firstofone\LWR@colparameter}% - \LWR@traceinfo{at \arabic{LWR@tabletotalLaTeXcols}: % + \LWR@traceinfo{at \arabic{LWR@tabletotalLaTeXcols}% + : % space \LWR@getexparray{LWR@colatspec}{\arabic{LWR@tabletotalLaTeXcols}}}% }% \let\LWR@colparameter\relax% @@ -10373,16 +10507,19 @@ end -- not --version \expandafter#2#1% \fi} \newcommand*{\LWR@nameref}[1]{% - \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffour{#1}% + \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffive{#1}% +} +\newcommand*{\LWR@currentautosecpageref}[1]{% + \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@secondoffive{#1}% } \newcommand*{\LWR@htmlfileref}[1]{% - \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@secondoffour{#1}% + \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@thirdoffive{#1}% } \newcommand*{\LWR@lateximagedepthref}[1]{% - \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@thirdoffour{#1}% + \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fourthoffive{#1}% } \newcommand*{\LWR@lateximagenumberref}[1]{% - \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fourthoffour{#1}% + \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fifthoffive{#1}% } \newcommand*{\LWR@write@lwarplabel}[1]{% \LWR@traceinfo{LWR@write@lwarplabel !#1!}% @@ -10392,6 +10529,7 @@ end -- not --version {% \string\newlabel{#1@lwarp}{% {\@currentlabelname}% + {\theLWR@currentautosecpage}% {% \ifbool{FileSectionNames}% {\LWR@thisfilename}% @@ -10454,7 +10592,7 @@ end -- not --version }% not inside HTML math comment }% not lateximage } -\NewDocumentCommand{\LWR@new@label}{m}{% +\newcommand*{\LWR@new@label}[1]{% \LWR@traceinfo{LWR@new@label: starting}% \LWR@traceinfo{LWR@new@label: !#1!}% \LWR@orig@label{#1}% @@ -10530,6 +10668,16 @@ end -- not --version } \LWR@formatted{ref} +\NewDocumentCommand{\LWR@refwithsection}{s m}{% + \LWR@traceinfo{LWR@refwithsection !#2!}% + \IfBooleanTF{#1}% + {\LWR@print@ref{\BaseJobname-autopage-\LWR@currentautosecpageref{#2}}}% + {% + \LWR@startref{#2}% + \LWR@print@ref{\BaseJobname-autopage-\LWR@currentautosecpageref{#2}}% + \LWR@htmltag{/a}% + }% +} \CustomizeMathJax{\let\LWRref\ref} \CustomizeMathJax{\renewcommand{\ref}{\ifstar\LWRref\LWRref}} \newcommand*{\pagerefPageFor}{see } @@ -10555,7 +10703,7 @@ end -- not --version \AtBeginDocument{ - \def\@currentHref{\BaseJobname-autopage-\theLWR@currentautosec} + \def\@currentHref{\BaseJobname-autopage-\theLWR@previousautopagelabel}% } \newcommand*{\LWR@linkcatcodes}{% @@ -10644,12 +10792,16 @@ end -- not --version \LWR@urlb% } -\newcommand*{\LWR@subinlineimage}[5]{% +\newcommand*{\LWR@subinlineimage}[6]{% + \ifblank{#6}% + {\renewcommand*{\LWR@tempone}{}} + {\renewcommand*{\LWR@tempone}{role="#6"\LWR@indentHTML}} \ifblank{#1}% {% \LWR@htmltag{img \LWR@indentHTML src=\textquotedbl#3.#4\textquotedbl \LWR@indentHTML alt=\textquotedbl#3\textquotedbl \LWR@indentHTML + \LWR@tempone style=\textquotedbl#5\textquotedbl \LWR@indentHTML class=\textquotedbl#2\textquotedbl \LWR@orignewline }% @@ -10658,6 +10810,7 @@ end -- not --version \LWR@htmltag{img \LWR@indentHTML src=\textquotedbl#3.#4\textquotedbl \LWR@indentHTML alt=\textquotedbl#1\textquotedbl \LWR@indentHTML + \LWR@tempone style=\textquotedbl#5\textquotedbl \LWR@indentHTML class=\textquotedbl#2\textquotedbl \LWR@orignewline }% @@ -10831,9 +10984,6 @@ end -- not --version \setcounter{LWR@nextautoid}{#2}% } -\newcounter{LWR@latestautopage} -\setcounter{LWR@latestautopage}{1} - \newenvironment*{LWR@figcaption} {% \ifbool{FormatWP}{% @@ -10909,7 +11059,7 @@ end -- not --version \ifcsvoid{ext@#2}{\csdef{ext@#2}{#1}}{}% \addtocontents{\@nameuse{ext@#2}}{% \protect\LWRsetnextfloat% - {\arabic{LWR@latestautopage}}% + {\arabic{LWR@currentautosecfloatpage}}% {\arabic{LWR@thisautoid}}% }% }% not TOC @@ -11637,8 +11787,8 @@ end -- not --version \renewcommand{\textsubscript}[1]{##1}% \renewcommand{\underline}[1]{##1}% \RenewDocumentCommand{\hspace}{s m}{}% - \RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}% - \DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}% + \RenewDocumentCommand{\LWR@htmlspanclass}{o D(){} m +m}{{##4}}% + \DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{{##4}}% \def\(##1\){}% \def\[##1\]{}% \RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{}% @@ -11780,7 +11930,7 @@ end -- not --version \newcommand*{\LWR@singledollarmeasure}[1]{% \begingroup% \LWR@restoreorigformatting% - \RenewDocumentEnvironment{lateximage}{s o s o o}{}{}% inside group + \RenewDocumentEnvironment{lateximage}{s o s o o d()}{}{}% inside group \LWR@print@normalsize% \LWR@setcurrentfont% \global\advance\c@LWR@lateximagedepth 1\relax% @@ -11869,6 +12019,7 @@ end -- not --version [\MathImageAltText]% alt tag []% no add'l hashing [\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS + (math)% ARIA }{% not dynamic math \LWR@traceinfo{subsingledollar: static}% \IfValueTF{#1}{% #1 True @@ -11889,11 +12040,13 @@ end -- not --version FB\LWR@tempone% xfakebold ]% [\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS + (math)% ARIA }{% #1 False \begin{lateximage}% no hashing [#2]% alt []% no add'l hashing [\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS + (math)% ARIA }% }% not dynamic math \LWR@addbaselinemarker% @@ -11961,7 +12114,6 @@ end -- not --version \LetLtxMacro\LWR@origcloseparen\) \LetLtxMacro\LWR@origopenbracket\[ \LetLtxMacro\LWR@origclosebracket\] - \begingroup \catcode`\$=\active% \protected\gdef${\@ifnextchar$\LWR@doubledollar\LWR@singledollar}% @@ -11972,9 +12124,18 @@ end -- not --version \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% { - \textbackslash[% - {\LWR@print@ttfamily\LWR@HTMLsanitize{#1}}% - \textbackslash] + \IfSubStr{\detokenize\expandafter{#1}}{\detokenize{note}}{% + \LWR@hidelatexequation{math}{#1}% + \InlineClass{hidden}{\LWR@syncnotenumbers}% + \textbackslash[% + {\LWR@print@ttfamily\LWR@HTMLsanitize{#1}}% + \textbackslash] + \InlineClass{hidden}{\LWR@syncnotenames}% + }{% + \textbackslash[% + {\LWR@print@ttfamily\LWR@HTMLsanitize{#1}}% + \textbackslash] + }% }% mathjax {% not mathjax @@ -11988,6 +12149,7 @@ end -- not --version \textbackslash{]}% ]% *% do not add open/closing braces + (math)% ARIA \LWR@applyxfakebold% \LWR@origdollar\LWR@origdollar#1\LWR@origdollar\LWR@origdollar% \end{lateximage}% @@ -12060,11 +12222,13 @@ end -- not --version \let\LWR@orig@math\math \let\LWR@orig@endmath\endmath + \let\LWR@orig@displaymath\displaymath \let\LWR@orig@enddisplaymath\enddisplaymath \let\math\relax \let\endmath\relax + \let\displaymath\relax \let\enddisplaymath\relax @@ -12078,8 +12242,7 @@ end -- not --version \begin{BlockClass}{displaymath}% \LWR@newautoidanchor% \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}% - [\MathImageAltText]% + \begin{lateximage}[\MathImageAltText](math)% [alt](ARIA) \LWR@origdollar\LWR@origdollar% } {% @@ -12092,11 +12255,11 @@ end -- not --version \begin{BlockClass}{displaymathnumbered}% \LWR@newautoidanchor% \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\MathImageAltText]% - \LWR@origequation% + \begin{lateximage}[\MathImageAltText](math)% [alt](ARIA) + \LWR@orig@equation% } {% - \LWR@origendequation% + \LWR@orig@endequation% \end{lateximage}% \end{BlockClass}% } @@ -12155,11 +12318,11 @@ end -- not --version \LWR@htmlopencomment \begingroup - \@nameuse{LWR@orig#1} + \@nameuse{LWR@orig@#1} \LWR@restoreorigformatting \booltrue{LWR@insidemathcomment} #2 - \@nameuse{LWR@origend#1} + \@nameuse{LWR@orig@end#1} \endgroup \LWR@htmlclosecomment @@ -12181,10 +12344,10 @@ end -- not --version } \AtBeginDocument{ - \let\LWR@origequation\equation - \let\LWR@origendequation\endequation - \csletcs{LWR@origequation*}{equation*} - \csletcs{LWR@origendequation*}{endequation*} + \let\LWR@orig@equation\equation + \let\LWR@orig@endequation\endequation + \csletcs{LWR@orig@equation*}{equation*} + \csletcs{LWR@orig@endequation*}{endequation*} } \newcommand*{\LWR@doequation}[2]{% @@ -12214,11 +12377,11 @@ end -- not --version \textbackslash{begin\{#2\}} % extra space \LWR@HTMLsanitizeexpand{\detokenize\expandafter{#1}} % extra space \textbackslash{end\{#2\}}% - ]*% alt tag + ]*(math)% alt tag, ARIA \LWR@applyxfakebold% - \@nameuse{LWR@orig#2}% + \@nameuse{LWR@orig@#2}% #1% contents collected by \collect@body - \@nameuse{LWR@origend#2}% + \@nameuse{LWR@orig@end#2}% \end{lateximage}% \end{BlockClass}% }% not mathjax @@ -12249,7 +12412,7 @@ end -- not --version \newcommand*{\LWR@synconenotename}[2]{% \textbackslash( - \textbackslash{}def\textbackslash{}#1\{#2\} + \textbackslash{}def\textbackslash{}#1name\{#2\} \textbackslash) } @@ -12374,7 +12537,7 @@ end -- not --version \LWR@newautoidanchor% \booltrue{LWR@indisplaymathimage}% \begin{lateximage}[(\LWR@startingequationtag\textendash\LWR@equationtag)% - \LWR@addmathjax{eqnarray}{\BODY}]*% + \LWR@addmathjax{eqnarray}{\BODY}]*(math)% \LWR@applyxfakebold% \LWR@origeqnarray% \BODY% @@ -12386,7 +12549,7 @@ end -- not --version \begin{BlockClass}{displaymath}% \LWR@newautoidanchor% \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}[\LWR@addmathjax{eqnarray*}{\BODY}]*% + \begin{lateximage}[\LWR@addmathjax{eqnarray*}{\BODY}]*(math)% \LWR@applyxfakebold% \def\@eqncr{\nonumber\@seqncr} \csuse{LWR@origeqnarray}% @@ -12484,35 +12647,35 @@ end -- not --version } -\newcommand{\LWR@lateximage@oneimageb}[3]{% +\newcommand{\LWR@lateximage@oneimageb}[4]{% \LWR@subinlineimage{#1}{lateximage}% {% \LWR@print@mbox{% \LWR@ImagesDirectory\OSPathSymbol% #2% }% - }{svg}{#3}% + }{svg}{#3}{#4}% } -\newcommand{\LWR@lateximage@oneimage}[4]{% +\newcommand{\LWR@lateximage@oneimage}[5]{% \ifdefvoid{\LWR@ThisAltText}{% \IfBooleanTF{#4}{% - \LWR@lateximage@oneimageb{#1}{#2}{#3}% + \LWR@lateximage@oneimageb{#1}{#2}{#3}{#5}% }{% \LWR@lateximage@oneimageb% {\AltTextOpen#1\AltTextClose}% - {#2}{#3}% + {#2}{#3}{#5}% }% }{% \LWR@lateximage@oneimageb% {\AltTextOpen\LWR@ThisAltText\AltTextClose}% - {#2}{#3}% + {#2}{#3}{#5}% }% } \catcode`\$=\active% -\NewDocumentEnvironment{lateximage}{s O{\ImageAltText} s O{} O{}} +\NewDocumentEnvironment{lateximage}{s O{\ImageAltText} s O{} O{} D(){}}% {% \LWR@traceinfo{lateximage: starting on \jobname.pdf page \arabic{page}}% \LWR@traceinfo{lateximage: entering depth is \arabic{LWR@lateximagedepth}}% @@ -12602,10 +12765,10 @@ end -- not --version \ifbool{LWR@indisplaymathimage}{}{% not in display math \LetLtxMacro\[\LWR@origopenbracket% \LetLtxMacro\]\LWR@origclosebracket% - \let\equation\LWR@origequation% - \let\endequation\LWR@origendequation% - \csletcs{equation*}{LWR@origequation*}% - \csletcs{endequation*}{LWR@origendequation*}% + \let\equation\LWR@orig@equation% + \let\endequation\LWR@orig@endequation% + \csletcs{equation*}{LWR@orig@equation*}% + \csletcs{endequation*}{LWR@orig@endequation*}% }% not in display math \LetLtxMacro\LWR@newsingledollar$% \LetLtxMacro\LWR@newsingledollar$% syntax highlighting @@ -12629,10 +12792,10 @@ end -- not --version \LWR@traceinfo{lateximage: The page after the image is \arabic{page}}% \IfBooleanTF{#1}% starred {% hash - \LWR@lateximage@oneimage{#2}{\LWR@hashedname}{#5}{#3}% + \LWR@lateximage@oneimage{#2}{\LWR@hashedname}{#5}{#3}{#6}% }% hash {% no hash - \LWR@lateximage@oneimage{#2}{\LWR@ImagesName\theLWR@externalfilecnt}{#5}{#3}% + \LWR@lateximage@oneimage{#2}{\LWR@ImagesName\theLWR@externalfilecnt}{#5}{#3}{#6}% }% no hash \LWR@ensuredoingapar% \LWR@htmltag{/span}% @@ -12650,7 +12813,7 @@ end -- not --version \begin{warpprint} -\NewDocumentEnvironment{lateximage}{s o s o o} +\NewDocumentEnvironment{lateximage}{s o s o o d()} {\begin{varwidth}[b]{\linewidth}} {\end{varwidth}} @@ -12660,33 +12823,33 @@ end -- not --version \begin{warpHTML} \newenvironment*{LWR@HTML@center} -{ - \LWR@forcenewpage - \ifbool{FormatWP} - {\BlockClass[\LWR@print@mbox{text-align:center}]{center}} - {\BlockClass{center}} +{% + \LWR@forcenewpage% + \ifbool{FormatWP}% + {\BlockClass[\LWR@print@mbox{text-align:center}]{center}}% + {\BlockClass{center}}% } {\endBlockClass} \LWR@formattedenv{center} \newenvironment*{LWR@HTML@flushright} -{ - \LWR@forcenewpage - \ifbool{FormatWP} - {\BlockClass[\LWR@print@mbox{text-align:right}]{flushright}} - {\BlockClass{flushright}} +{% + \LWR@forcenewpage% + \ifbool{FormatWP}% + {\BlockClass[\LWR@print@mbox{text-align:right}]{flushright}}% + {\BlockClass{flushright}}% } {\endBlockClass} \LWR@formattedenv{flushright} \newenvironment*{LWR@HTML@flushleft} -{ - \LWR@forcenewpage - \ifbool{FormatWP} - {\BlockClass[\LWR@print@mbox{text-align:left}]{flushleft}} - {\BlockClass{flushleft}} +{% + \LWR@forcenewpage% + \ifbool{FormatWP}% + {\BlockClass[\LWR@print@mbox{text-align:left}]{flushleft}}% + {\BlockClass{flushleft}}% } {\endBlockClass} @@ -12764,7 +12927,7 @@ end -- not --version \LWR@PreloadedPackage{ulem} -\LWR@PreloadedPackage{xetexko-vertical} +\LWR@PreloadedPackage{xetexko} \LWR@PreloadedPackage{geometry} @@ -13042,6 +13205,7 @@ end -- not --version }{}% \setlength{\linewidth}{\LWR@minipagewidth}% \LWR@print@raggedright% + \LWR@newautopagelabel{page}% \def\@mpfn{mpfootnote}% \def\thempfn{\thempfootnote}\c@mpfootnote\z@% \let\@footnotetext\@mpfootnotetext% @@ -13090,7 +13254,7 @@ end -- not --version } \LWR@formatted{parbox} -\newcommand*{\LWR@HTML@mbox}[1]{#1} +\newcommand*{\LWR@HTML@mbox}[1]{{#1}} \LWR@formatted{mbox} \NewDocumentCommand{\LWR@@makebox@paren}{m m}{% @@ -13171,6 +13335,7 @@ end -- not --version \newcommand*{\LWR@fboxstyle}{% \LWR@findcurrenttextcolor% +\LWR@traceinfo{LWR@fboxstyle B}% border:\LWR@printlength{\LWR@atleastonept} solid \LWR@origpound\LWR@tempcolor ; % padding:\LWR@printlength{\fboxsep} ; % color:\LWR@origpound\LWR@tempcolor% @@ -13178,10 +13343,12 @@ color:\LWR@origpound\LWR@tempcolor% \newcommand{\LWR@HTML@fbox}[1]{% \LWR@traceinfo{HTML fbox}% \LWR@forceminwidth{\fboxrule}% +\LWR@traceinfo{HTML fbox B}% \InlineClass[% \LWR@print@mbox{display:inline-block} ; % \LWR@fboxstyle% ]{fbox}{#1}% +\LWR@traceinfo{HTML fbox: done}% } \AtBeginDocument{\LWR@formatted{fbox}} \end{warpHTML} @@ -13629,7 +13796,7 @@ color:\LWR@origpound\LWR@tempcolor% \newcommand*{\LWR@tempcolor}{} \newcommand*{\LWR@tempcolortwo}{} \newcommand*{\LWR@findcurrenttextcolor}{% -\renewcommand{\LWR@tempcolor}{000000}% + \renewcommand{\LWR@tempcolor}{000000}% } \NewDocumentCommand{\LWR@textcurrentcolor}{m}{% \renewcommand*{\LWR@currenttextcolor}{black}% |