summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-10-01 22:03:56 +0000
committerKarl Berry <karl@freefriends.org>2021-10-01 22:03:56 +0000
commitac30e0b02398c0a270515692d6a03e594b287ff0 (patch)
tree58adadc9c1f7ca91f62d6575f7a804f2a93aead1 /Master/texmf-dist/tex/latex/lwarp
parent4af946c33a1598291b1859381a7ab77c5fe268ab (diff)
lwarp (2oct21)
git-svn-id: svn://tug.org/texlive/trunk@60674 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty44
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-beamerarticle.sty124
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty14
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty28
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty50
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty1
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty1
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty12
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-luatexko.sty16
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-multimedia.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty3
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty3
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-sympytex.sty41
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf.sty200
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty5
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko.sty18
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty390
25 files changed, 642 insertions, 344 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty
index 740665cc7a8..5b6cda0091a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty
@@ -32,15 +32,13 @@
\ifdefstring{\algocf@style}{plain}{%
\renewcommand*{\LWR@floatstyle@algocf}{plain}
}{}
-\newbool{LWR@algocf@dopars}
-\booltrue{LWR@algocf@dopars}
-
\renewcommand{\algocf@everypar}{%
\ifbool{LWR@algocf@dopars}{%
\ifbool{LWR@doingstartpars}{%
\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
{}%
{%
+ \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline%
\algocf@everyparnl\algocf@everyparhanging%
}%
}{}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
index f49848661fb..e9acd1f1b6b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
@@ -59,9 +59,9 @@
\else % numbered theorem, need to check for optional arg
\def\@tempa{\@oparg{\@ynthm{#2}}[]}%
\fi
- \AtBeginEnvironment{#2}{%
- \edef\LWR@thisthmstyle{\@nameuse{LWR@thmstyle#2}}%
- }% lwarp
+ \AtBeginEnvironment{#2}{% lwarp
+ \edef\LWR@thisthmstyle{\@nameuse{LWR@thmstyle#2}}% lwarp
+ }% lwarp
}%
\@tempa%
}
@@ -107,36 +107,6 @@
\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
@@ -205,6 +175,12 @@
}% appto
}{}% @ifundefined
}% AtBeginDocument
+\DeclareRobustCommand{\qed}{%
+ \ifmmode \mathqed
+ \else
+ \InlineClass{theoremendmark}{\qedsymbol}% lwarp
+ \fi
+}
\renewenvironment{proof}[1][\proofname]{\par
\LWR@forcenewpage% lwarp
\LWR@printpendingfootnotes% lwarp
@@ -216,7 +192,7 @@
\item[
\InlineClass{amsthmproofname}{#1\@addpunct{.}}]\ignorespaces% changes
}{%
- \InlineClass{theoremendmark}{\popQED}\endtrivlist%
+ \popQED\endtrivlist%
\LWR@printpendingfootnotes% lwarp
\endBlockClass% lwarp
\@endpefalse
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-beamerarticle.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-beamerarticle.sty
new file mode 100644
index 00000000000..a4f42d5a88e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-beamerarticle.sty
@@ -0,0 +1,124 @@
+%%
+%% This is file `lwarp-beamerarticle.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `beamerarticle')
+%% 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{beamerarticle}[2021/05/26]
+\renewcommand<>{\textcolor}{\only#1{\beameroriginal{\textcolor}}}
+
+\AtBeginDocument{
+
+\renewcommand<>{\LWR@listitem}{%
+ \only#1{%
+ \beameroriginal{\LWR@listitem}%
+ }%
+}
+
+\renewcommand<>{\LWR@itemizeitem}{%
+ \only#1{%
+ \beameroriginal{\LWR@itemizeitem}%
+ }%
+}
+
+\renewcommand<>{\LWR@descitem}{%
+ \only#1{%
+ \beameroriginal{\LWR@descitem}%
+ }%
+}
+
+\renewcommand<>{\abstract}{%
+ \only#1{%
+ \beameroriginal{\abstract}%
+ }%
+}
+
+\renewcommand<>{\LWR@includegraphicsb}{%
+ \only#1{%
+ \beameroriginal{\LWR@includegraphicsb}%
+ }%
+}
+
+\xpretocmd\frame
+ {
+ \LWR@forcenewpage
+ \BlockClass{beamerframe}%
+ }
+ {}
+ {\LWR@patcherror{beamerarticle}{frame}}
+
+\xapptocmd\beamer@endframe
+ {\endBlockClass}
+ {}
+ {\LWR@patcherror{beamerarticle}{beamer@endframe}}
+
+\xpretocmd\beamer@article@startframe
+ {\LWR@nulllistfills}
+ {}
+ {\LWR@patcherror{beamerarticle}{beamer@article@startframe}}
+
+}% AtBeginDocument
+
+\let\beamer@@tmpop@frametitle@default\relax
+\defbeamertemplate<article>*{frametitle}{default}{%
+ \paragraph*{\insertframetitle}\ \par%
+ \ifdefempty{\insertframesubtitle}{}{%
+ \noindent\emph{\insertframesubtitle}\par%
+ }%
+}
+
+\NewDocumentCommand{\LWR@beamer@itemize}{o}{%
+ \LWR@itemizestart\LWR@origitemize%
+}%
+\NewDocumentCommand{\LWR@beamer@description}{o o}{%
+ \LWR@descriptionstart\LWR@origdescription%
+}%
+
+\xapptocmd{\LWR@patchlists}
+ {%
+ \LetLtxMacro\itemize\LWR@beamer@itemize%
+ \LetLtxMacro\description\LWR@beamer@description%
+ }
+ {}
+ {\LWR@patcherror{beamerarticle}{LWR@patchlists}}
+
+\LetLtxMacro\maketitle\LWR@maketitle
+
+\renewcommand{\subtitle}[2][]{
+ \gdef\@subtitle{#2}
+ \def\insertsubtitle{#2}
+}
+
+\xpatchcmd{\@maketitle}
+ {%
+ \LWR@htmltag{\LWR@tagtitleend}%
+ \LWR@startpars%
+ }%
+ {%
+ \LWR@htmltag{\LWR@tagtitleend}%
+ \ifdefvoid{\@subtitle}{}{%
+ \begin{BlockClass}{subtitle}%
+ \@subtitle%
+ \end{BlockClass}%
+ }%
+ \LWR@startpars%
+ }%
+ {}
+ {\LWR@patcherror{beamerarticle}{@maketitle}}
+
+\RequirePackage{fancyvrb}
+\DefineVerbatimEnvironment{semiverbatim}{Verbatim}{commandchars=\\\{\}}
+\endinput
+%%
+%% End of file `lwarp-beamerarticle.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
index 75a4f41a1ea..203d04dc6a0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
@@ -31,18 +31,18 @@
\csname p@footnote\endcsname\@thefnmark%
}% @currentlabel
\renewrobustcmd{\textsuperscript}[1]{\LWR@htmlspan{sup}{##1}}%
- \ifthenelse{%
- \boolean{LWR@doingstartpars} \AND%
- \cnttest{\value{LWR@lateximagedepth}}{=}{0}%
- }%
- {}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
+ \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline%
\@makefntext{}%
\bgroup%
- \aftergroup{\V@@@footnotetext}%
+ \aftergroup\V@@@footnotetext%
\let\LWR@newautopagelabel\LWR@null@newautopagelabel%
\ignorespaces%
}%
+\def\V@@@footnotetext{%
+ \LWR@origtilde\LWR@orignewline%
+ \LWR@htmltagc{/\LWR@tagregularparagraph}\LWR@orignewline%
+ \strut\egroup%
+}
}% AfterEndPreamble
\renewcommand*{\@shadowbox}[1]{%
\ifbool{FormatWP}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
index 5e95182994a..5992825dbf1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
@@ -22,31 +22,31 @@
\AfterEndPreamble{
\LWR@traceinfo{Patching fancyvrb.}
\def\VerbatimFootnotes{%
-\let\@footnotetext\V@footnotetext%
-\let\footnote\V@footnote%
-\let\LWR@footnotetext\V@footnotetext% lwarp
+ \let\@footnotetext\V@footnotetext%
+ \let\footnote\V@footnote%
+ \let\LWR@footnotetext\V@footnotetext% lwarp
}
\def\V@@footnotetext{%
\LWR@traceinfo{V@footnotetext}%
-\LWR@newautopagelabel{page}%
-\global\setbox\LWR@footnotebox=\vbox\bgroup%
+ \LWR@newautopagelabel{page}%
+ \global\setbox\LWR@footnotebox=\vbox\bgroup%
\unvbox\LWR@footnotebox%
\protected@edef\@currentlabel{%
\csname p@footnote\endcsname\@thefnmark%
}% @currentlabel
\renewrobustcmd{\textsuperscript}[1]{\LWR@htmlspan{sup}{##1}}%
- \ifthenelse{%
- \boolean{LWR@doingstartpars} \AND%
- \cnttest{\value{LWR@lateximagedepth}}{=}{0}%
- }%
- {}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
+ \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline%
\@makefntext{}%
- \bgroup%
- \aftergroup{\V@@@footnotetext}%
+ \bgroup%
+ \aftergroup\V@@@footnotetext%
\let\LWR@newautopagelabel\LWR@null@newautopagelabel%
- \ignorespaces%
+ \ignorespaces%
}%
+\def\V@@@footnotetext{%
+ \LWR@origtilde\LWR@orignewline%
+ \LWR@htmltagc{/\LWR@tagregularparagraph}\LWR@orignewline%
+ \strut\egroup%
+}
\preto\FVB@Verbatim{\LWR@forcenewpage}
\preto\FVB@LVerbatim{\LWR@forcenewpage}
\def\FV@BeginListFrame@Single{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
index d5d80fc6caf..676e0700ace 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
@@ -15,21 +15,66 @@
%% 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.
+\long\def\@makefntext#1{\textsuperscript{\@thefnmark}~#1}
+
\LWR@ProvidesPackagePass{footnote}[1997/01/28]
+
+\long\def\@makefntext#1{\textsuperscript{\@thefnmark}~{#1}}
+
+\def\spewnotes{%
+ \endgroup%
+ \if@savingnotes\else\ifvoid\fn@notes\else\begingroup%
+ \let\@makefntext\@empty%
+ \let\@finalstrut\@gobble%
+ \let\rule\@gobbletwo%
+ \booltrue{LWR@spewingnotes}% lwarp
+ \@footnotetext{\unvbox\fn@notes}%
+ \endgroup\fi\fi%
+}
+\let\endsavenotes\spewnotes
+
+\def\fn@fntext#1{%
+ \ifx\ifmeasuring@\@@undefined%
+ \expandafter\@secondoftwo\else\expandafter\@iden%
+ \fi%
+ {\ifmeasuring@\expandafter\@gobble\else\expandafter\@iden\fi}%
+ {%
+ \global\setbox\fn@notes\vbox{%
+ \unvbox\fn@notes%
+ \LWR@htmltagc{\LWR@tagregularparagraph}% lwarp
+ \LWR@orignewline% lwarp
+ \fn@startnote%
+ \@makefntext{%
+ \rule\z@\footnotesep%
+ \ignorespaces%
+ #1%
+ \@finalstrut\strutbox%
+ }%
+ \fn@endnote%
+ }%
+ }%
+}
\def\fn@startnote{%
\protected@edef\@currentlabel{\csname p@\@mpfn\endcsname\@thefnmark}%
}
\def\fn@endnote{%
-\LWR@htmltagc{/\LWR@tagregularparagraph}%
-\LWR@orignewline%
+ \LWR@origtilde\LWR@orignewline%
+ \LWR@htmltagc{/\LWR@tagregularparagraph}\LWR@orignewline%
+ \LWR@origtilde\LWR@orignewline%
}
\def\fn@startfntext{%
\setbox\z@\vbox\bgroup%
+ \LWR@htmltagc{\LWR@tagregularparagraph}% lwarp
+ \LWR@orignewline% lwarp
\fn@startnote%
+ \fn@prefntext% Req'd for numbering.
\ignorespaces%
}
+
\def\fn@endfntext{%
+ \fn@postfntext%
+ \LWR@origtilde\LWR@orignewline%
\LWR@htmltagc{/\LWR@tagregularparagraph}%
\LWR@orignewline%
\egroup%
@@ -37,6 +82,7 @@
\let\@makefntext\@empty%
\let\@finalstrut\@gobble%
\LetLtxMacro\rule\@gobbletwo% *8* also the optional argument?
+ \booltrue{LWR@spewingnotes}% lwarp
\@footnotetext{\unvbox\z@}%
\endgroup%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
index b374a391108..1843a0f46f2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
@@ -18,6 +18,7 @@
\RequirePackage{footnote}
+
\LWR@ProvidesPackageDrop{footnotehyper}[2018/01/23]
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
index bf5e0657c28..f80b6cb9502 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
@@ -310,7 +310,7 @@
\LWR@origtilde \LWR@orignewline%
\begin{LWR@setvirtualpage}%
\large%
- \hbadness=10000\relax%
+ \hbadness=10000\relax%
\setlength{\LWR@igwidth}{0pt}%
\setlength{\LWR@igheight}{0pt}%
\renewcommand*{\LWR@igwidthstyle}{}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
index e2b0af67705..bf9a9f1f43e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
@@ -52,7 +52,7 @@
}%
\textquotedbl%
}%
- \let\item\LWR@itemizeitem%
+ \LetLtxMacro\item\LWR@itemizeitem%
\list{}{}%
}
{\endlist}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
index a688e1cf76e..cbb402fda8e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
@@ -359,6 +359,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
}
\newcommand*{\hypertarget}{%
+ \LWR@ensuredoingapar%
\begingroup%
\LWR@linkcatcodes%
\LWR@hypertargetb%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty
index 177dd6be3f9..6ab8703674d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty
@@ -74,9 +74,9 @@
\catcode`\_=8%
\appto\theindex{%
- \let\item\LWR@indexitem%
- \let\subitem\LWR@indexsubitem%
- \let\subsubitem\LWR@indexsubsubitem%
+ \LetLtxMacro\item\LWR@indexitem%
+ \LetLtxMacro\subitem\LWR@indexsubitem%
+ \LetLtxMacro\subsubitem\LWR@indexsubsubitem%
}
\renewcommand\imki@wrindexentrysplit[3]{%
\addtocounter{LWR@autoindex}{1}%
@@ -136,9 +136,9 @@
\renewenvironment*{theindex}{%
\imki@maybeaddtotoc
\imki@indexlevel{\indexname}
- \let\item\LWR@indexitem%
- \let\subitem\LWR@indexsubitem%
- \let\subsubitem\LWR@indexsubsubitem%
+ \LetLtxMacro\item\LWR@indexitem%
+ \LetLtxMacro\subitem\LWR@indexsubitem%
+ \LetLtxMacro\subsubitem\LWR@indexsubsubitem%
}{}
}% AtBeginDocument
\imki@resetdefaults
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty
index f957c4fe6ef..3231f7a8d61 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty
@@ -54,9 +54,9 @@
\index@prologue
\bigskip
\fi
- \let\item\LWR@indexitem%
- \let\subitem\LWR@indexsubitem%
- \let\subsubitem\LWR@indexsubsubitem%
+ \LetLtxMacro\item\LWR@indexitem%
+ \LetLtxMacro\subitem\LWR@indexsubitem%
+ \LetLtxMacro\subsubitem\LWR@indexsubsubitem%
}{}
}% AtBeginDocument
\def\@showidx#1{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatexko.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatexko.sty
index 2082a6320d9..d6a2b6edcad 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatexko.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatexko.sty
@@ -15,7 +15,19 @@
%% 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{luatexko}[2020/03/20]
+\LWR@ProvidesPackagePass{luatexko}[2021/07/10]
+\protected\def\typesetvertical{}
+\protected\def\typesethorizontal{}
+
+\def\verticaltypesetting{\BlockClass{verticalrl}}
+\def\beginverticaltypesetting{\BlockClass{verticalrl}}
+\def\endverticaltypesetting{\endBlockClass}
+
+\protected\def\vertical#1{\BlockClass{verticalrl}}
+\protected\def\endvertical{\endBlockClass}
+\protected\def\horizontal#1{\BlockClass{horizontaltb}}
+\protected\def\endhorizontal{\endBlockClass}
+\DeclareDocumentCommand{\vertlatin}{m}{#1}
\newcommand{\LWR@HTML@dotemph}[1]{%
\InlineClass[text-emphasis-style: dot]{dotemph}{#1}%
}
@@ -23,7 +35,7 @@
\newcommand{\LWR@HTML@ruby}[2]{%
\LWR@htmltagc{ruby}%
- \LWR@htmltagc{rb}#1\LWR@htmltagc{/rb}%
+ #1%
\LWR@htmltagc{rp}(\LWR@htmltagc{/rp}%
\LWR@htmltagc{rt}#2\LWR@htmltagc{/rt}%
\LWR@htmltagc{rp})\LWR@htmltagc{/rp}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multimedia.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multimedia.sty
index 69d0117fd6b..179b2598d45 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multimedia.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multimedia.sty
@@ -22,6 +22,10 @@
\LetLtxMacro\sound\LWR@multimedia
\newcommand{\hyperlinkmovie}[3][]{}
+
+\newcommand{\hyperlinksound}[3][]{}
+
+\newcommand{\hyperlinkmute}
\endinput
%%
%% End of file `lwarp-multimedia.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty
index c667021089a..02bf57768d4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{parnotes}[2016/08/15]
+\LWR@ProvidesPackagePass{parnotes}[2019/07/23]
\long\def\PN@parnote@real#1#2{%
\parnotemark{#1}%
% Unless this is the first parnote in \PN@text, add a separator first
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 4b488dc7e44..d2c743eeaf2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
@@ -28,9 +28,9 @@
\renewenvironment{theindex}{%
\idx@heading%
\index@preamble\par\nobreak
- \let\item\LWR@indexitem%
- \let\subitem\LWR@indexsubitem%
- \let\subsubitem\LWR@indexsubsubitem%
+ \LetLtxMacro\item\LWR@indexitem%
+ \LetLtxMacro\subitem\LWR@indexsubitem%
+ \LetLtxMacro\subsubitem\LWR@indexsubsubitem%
}
{}
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 6907679f15d..058789202e0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
@@ -63,7 +63,6 @@
\@esphack
}
}
-
\setstocksize{190in}{20in}
\setlrmarginsandblock{2in}{2in}{*}
\setulmarginsandblock{1in}{1in}{*}
@@ -439,7 +438,7 @@
\renewcommand*{\raggedyright}[1][]{}
\renewcommand{\sourceatright}[2][]{\attribution{#2}}
\let\memorigdbs\LWR@endofline
-\let\memorigpar\par
+\renewcommand*{\memorigpar}{\par}
\let\atcentercr\LWR@endofline
\renewcommand*{\linenottooshort}[1][]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
index d1baaa3444b..fe4c33deb84 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
@@ -37,7 +37,8 @@
\DeclareDocumentCommand{\maketitle}{o}{\LWR@koma@orig@maketitle}
}
-\DeclareDocumentCommand{\@maketitle}{}{%
+\providecommand*{\@maketitle}{}
+\renewrobustcmd{\@maketitle}{%
\ifdefvoid{\@titlehead}{}{%
\begin{BlockClass}{titlehead}%
\@titlehead%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sympytex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sympytex.sty
new file mode 100644
index 00000000000..c501951013e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sympytex.sty
@@ -0,0 +1,41 @@
+%%
+%% This is file `lwarp-sympytex.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `sympytex')
+%% 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{sympytex}[2014/05/16]
+\AfterEndPreamble{
+
+\AtBeginEnvironment{sympyblock}{%
+ \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
+ {}%
+ {%
+ \LWR@forcenewpage%
+ \LWR@atbeginverbatim{verbatim}%
+ }%
+}
+
+\AfterEndEnvironment{sympyblock}{%
+ \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
+ {}%
+ {%
+ \LWR@afterendverbatim%
+ }%
+}
+
+}
+\endinput
+%%
+%% End of file `lwarp-sympytex.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf.sty
index 7bb2b74d0ec..c80ea851320 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf.sty
@@ -15,58 +15,115 @@
%% 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{tagpdf}[2019/07/02]
+\LWR@ProvidesPackageDrop{tagpdf}[2021-08-27]
\ExplSyntaxOn
\tl_new:N \l__uftag_mc_key_label_tl
-\keys_define:nn { uftag / mc }
+\keys_define:nn { __tag / mc }
+ {
+ stash .bool_set:N = \l__tag_mc_key_stash_bool,
+ __artifact-bool .bool_set:N = \l__tag_mc_artifact_bool,
+ __artifact-type .choice:,
+ __artifact-type / pagination .code:n =
+ {},
+ __artifact-type / pagination/header .code:n =
+ {},
+ __artifact-type / pagination/footer .code:n =
+ {},
+ __artifact-type / layout .code:n =
+ {},
+ __artifact-type / page .code:n =
+ {},
+ __artifact-type / background .code:n =
+ {},
+ __artifact-type / notype .code:n =
+ {},
+ __artifact-type / .code:n =
+ {},
+ }
+
+\keys_define:nn { __tag / mc }
+ {
+ tag .code:n = % the name (H,P,Span) etc
+ {},
+ raw .code:n =
+ {},
+ alttext .code:n = % Alt property
+ {
+ \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}%
+ },
+ actualtext .code:n = % ActualText property
+ {},
+ label .tl_set:N = \l__tag_mc_key_label_tl,
+ artifact .code:n =
+ {},
+ artifact .default:n = {notype}
+ }
+
+\keys_define:nn { __tag / struct }
+ {
+ label .tl_set:N = \l__tag_struct_key_label_tl,
+ stash .bool_set:N = \l__tag_struct_elem_stash_bool,
+ tag .code:n = % S property
+ {},
+ title .code:n = % T property
+ {},
+ title-o .code:n = % T property
+ {},
+ alttext .code:n = % Alt property
+ {
+ \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}%
+ },
+ actualtext .code:n = % ActualText property
+ {},
+ lang .code:n = % Lang property
+ {},
+ ref .code:n = % Lang property
+ {},
+ E .code:n = % E property
+ {},
+ }
+
+\keys_define:nn { __tag / struct }
{
- tag .code:n = % the name (H,P,Span etc
- {},
- raw .code:n =
- {}
- ,
- alttext .code:n = % Alt property
- {
- \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}%
- },
- alttext-o .code:n = % Alt property
- {
- \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}%
- },
- actualtext .code:n = % ActualText property
- {},
- actualtext-o .code:n = % ActualText property
- {},
- label .tl_set:N = \l__uftag_mc_key_label_tl,
- artifact .code:n = {},
- artifact .default:n = {notype}
+ AF .code:n = % AF property
+ {},
+ ,AFinline .code:n =
+ {}
+ ,AFinline-o .code:n =
+ {}
}
-\keys_define:nn { uftag / struct }
- {
- label .tl_set:N = \l__uftag_struct_key_label_tl,
- stash .bool_set:N = \l__uftag_struct_elem_stash_bool,
- tag .code:n = % S property
- {},
- title .code:n = % T property
- {},
- title-o .code:n = % T property
- {},
- alttext .code:n = % Alt property
- {
- \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}%
- },
- alttext-o .code:n = % Alt property
- {
- \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}%
- },
- actualtext .code:n = % ActualText property
- {},
- actualtext-o .code:n = % ActualText property
- {},
-}
+\keys_define:nn { __tag / struct }
+ {
+ attribute-class .code:n =
+ {}
+ }
+
+\keys_define:nn { __tag / struct }
+ {
+ attribute .code:n = % A property (attribute, value currently a dictionary)
+ {},
+ }
+
+\cs_new_protected:Npn \__tag_ref_label:nn #1 #2 %#1 label, #2 name of list mc or struct
+ {
+ \@bsphack
+ \ref_label:nv {#1}{c__tag_ref#2_clist}
+ \@esphack
+ }
+\cs_generate_variant:Nn \__tag_ref_label:nn {en}
+
+\cs_new:Npn \__tag_ref_value:nnn #1 #2 #3 %#1 label, #2 attribute, #3 default
+ {
+ \ref_value:nnn {#1}{#2}{#3}
+ }
+\cs_generate_variant:Nn \__tag_ref_value:nnn {enn}
+\cs_new:Npn \__tag_ref_value_lastpage:nn #1 #2
+ {
+ \ref_value:nnn {__tag_LastPage}{#1}{#2}
+ }
\NewDocumentCommand \tagpdfsetup { m }{}
@@ -78,49 +135,56 @@
\NewDocumentCommand \tagmcifinTF { m m }{}
-\NewDocumentCommand \tagmcbegin { m }{\uftag_mc_begin:n {#1}\ignorespaces}
-\cs_new_protected:Nn \uftag_mc_begin:n {
- \group_begin:
- \keys_set:nn { uftag / mc } {#1}
- \group_end:
+\NewDocumentCommand \tagmcbegin { m }{%
+ \tag_mc_begin:n {#1}%\ignorespaces
}
-\NewDocumentCommand \tagmcend {}{\ThisAltText{}}
+\cs_new_protected:Npn \tag_mc_begin:n #1 %#1 keyval
+ {
+ \keys_set:nn { __tag / mc } {#1}
+ }
-\cs_new_protected:Nn \uftag_mc_end: {\ThisAltText{}}
+\NewDocumentCommand \tagmcend {}{\ThisAltText{}}
\NewDocumentCommand \tagmcuse { m }{}
\cs_new_protected:Nn \uftag_mc_use:n {}
-\NewDocumentCommand \tagstructbegin { m }{
- \uftag_struct_begin:n {#1}
-}
+\NewDocumentCommand \tagstructbegin { m }
+ {
+ \tag_struct_begin:n {#1}
+ }
-\cs_new_protected:Nn \uftag_struct_begin:n
-{
- \group_begin:
- \keys_set:nn {uftag / struct} { #1 }
- \group_end:
-}
+\cs_new_protected:Npn \tag_struct_begin:n #1 %#1 key-val
+ {
+ \keys_set:nn { __tag / struct} { #1 }
+ }
-\NewDocumentCommand \tagstructend { }{\ThisAltText{}}
+\NewDocumentCommand \tagstructend { }
+ {
+ \tag_struct_end:
+ }
-\cs_new_protected:Nn \uftag_struct_end: {\ThisAltText{}}
+\cs_new_protected:Nn \tag_struct_end:
+ {\ThisAltText{}}
\NewDocumentCommand \tagstructuse { m }{}
-
-\NewDocumentCommand\showtagpdfattributes { }{}
+\NewDocumentCommand\ShowTagging { m }
+ {}
\sys_if_engine_luatex:T
{
\NewDocumentCommand\pdffakespace { }
- {
- \__uftag_fakespace:
- }
+ {}
}
+\newcommand\tagpdfparaOn {}
+
+\newcommand\tagpdfparaOff{}
+
+\NewDocumentCommand\tagpdfsuppressmarks{m}{}
+
\ExplSyntaxOff
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
index d888bb88030..18b9724d20c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
@@ -55,7 +55,7 @@
\def\@makefnmark{\textsuperscript{\@thefnmark}}%
\long\def\@makefntext##1{%
\makethanksmark~%
- ##1%
+ {##1}%
}% \@makefntext
}
\renewcommand{\thanksfootmark}{%
@@ -72,7 +72,8 @@
\end{titlepage}
\@bscontmark
}
-\DeclareDocumentCommand{\@maketitle}{}{%
+\providecommand*{\@maketitle}{}
+\renewrobustcmd{\@maketitle}{%
\maketitlehooka
{
\LWR@stoppars\LWR@htmltag{\LWR@tagtitle}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
index d27a96ae6df..dccecab2c61 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
@@ -45,9 +45,9 @@
\fi
\fi
\fi
-\let\item\LWR@indexitem%
-\let\subitem\LWR@indexsubitem%
-\let\subsubitem\LWR@indexsubsubitem%
+\LetLtxMacro\item\LWR@indexitem%
+\LetLtxMacro\subitem\LWR@indexsubitem%
+\LetLtxMacro\subsubitem\LWR@indexsubsubitem%
}{}
\DeclareDocumentCommand{\simplechapter}{O{\@empty}}{%
\def\@chapcntformat##1{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko.sty
index a86b8185016..60361db1f23 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko.sty
@@ -17,11 +17,19 @@
%% version 2005/12/01 or later.
\LWR@loadbefore{xetexko}
-\LWR@ProvidesPackagePass{xetexko}[2021/03/22]
-\renewcommand{\verticaltypesetting}{}
-\renewenvironment{vertical}[1]{\BlockClass{verticalrl}}{\endBlockClass}
-\renewenvironment{horizontal}[1]{\BlockClass{horizontaltb}}{\endBlockClass}
-\renewcommand{\vertlatin}[1]{#1}
+\LWR@ProvidesPackagePass{xetexko}[2021/09/06]
+\protected\def\typesetvertical{}
+\protected\def\typesethorizontal{}
+
+\def\verticaltypesetting{\BlockClass{verticalrl}}
+\def\beginverticaltypesetting{\BlockClass{verticalrl}}
+\def\endverticaltypesetting{\endBlockClass}
+
+\protected\def\vertical#1{\BlockClass{verticalrl}}
+\protected\def\endvertical{\endBlockClass}
+\protected\def\horizontal#1{\BlockClass{horizontaltb}}
+\protected\def\endhorizontal{\endBlockClass}
+\DeclareDocumentCommand{\vertlatin}{m}{#1}
\endinput
%%
%% End of file `lwarp-xetexko.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty
index b51db884d00..ffe569ef2b5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty
@@ -37,9 +37,7 @@
{
\__xpinyin_leavevmode:
\LWR@htmltagc{ruby}
- \LWR@htmltagc{rb}
\__xpinyin_save_CJKsymbol:n {#2}\null% \null removes extra space
- \LWR@htmltagc{/rb\space}
\LWR@htmltagc{rp}(\LWR@htmltagc{/rp\space}
\LWR@htmltagc{rt}
\__xpinyin_make_pinyin_box:nnn {#1} {#2} { \use:c { c__xpinyin_ #1 _tl } }
@@ -53,9 +51,7 @@
{
\__xpinyin_leavevmode:
\LWR@htmltagc{ruby}
- \LWR@htmltagc{rb}
\__xpinyin_save_CJKsymbol:n {#1}\null% \null removes extra space
- \LWR@htmltagc{/rb\space}
\LWR@htmltagc{rp}(\LWR@htmltagc{/rp\space}
\LWR@htmltagc{rt}
\__xpinyin_make_pinyin_box:xnn
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index cbda8bad396..b04b62b8cba 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}
- [2021/08/27 v0.901 Allows LaTeX to directly produce HTML5 output.]
+ [2021/10/01 v0.902 Allows LaTeX to directly produce HTML5 output.]
+
@@ -142,7 +143,7 @@
by lwarp's HTML conversion%
\ifblank{#2}{}{%
.\MessageBreak
- Class(es) #2 may be useful instead%
+ #2 may be useful instead%
}%
}
{%
@@ -150,7 +151,7 @@
or is superceded by another class.%
\ifblank{#2}{}{%
\MessageBreak
- For a possible alternative, see class(es) #2.%
+ For a possible alternative, see #2.%
}%
}
}{\relax}%
@@ -190,7 +191,6 @@
\LWR@checkloadnever{auto-pst-pdf-lua}{}
\LWR@checkloadnever{algorithms}{}
\LWR@checkloadnever{arraycols}{}
-\LWR@checkloadnever{beamer}{}
\LWR@checkloadnever{bidi}{}
\LWR@checkloadnever{cals}{}
\LWR@checkloadnever{cellspace}{}
@@ -268,6 +268,7 @@
\LWR@checkloadnever{CJK}{ctex, xeCJK}
\LWR@checkloadnever{CJKutf8}{ctex, xeCJK}
}
+\LWR@earlyclassloadnever{beamer}{beamerarticle}
\LWR@earlyclassloadnever{jarticle}{ujarticle}
\LWR@earlyclassloadnever{jbook}{ujbook}
\LWR@earlyclassloadnever{jreport}{ujreport}
@@ -316,6 +317,7 @@
\LWR@loadafter{backref}
\LWR@loadafter{balance}
\LWR@loadafter{bbding}
+\LWR@loadafter{beamerarticle}
\LWR@loadafter{bigdelim}
\LWR@loadafter{bigfoot}
\LWR@loadafter{bigstrut}
@@ -718,6 +720,7 @@
\LWR@loadafter{supertabular}
\LWR@loadafter{svg}
\LWR@loadafter{swfigure}
+\LWR@loadafter{sympytex}
\LWR@loadafter{syntonly}
\LWR@loadafter{t1inc}
\LWR@loadafter{tabfigures}
@@ -1519,12 +1522,6 @@
\end{warpHTML}
-\begin{warpprint}
-
-\RequirePackage{varwidth}
-
-\end{warpprint}
-
\begin{warpall}
\LetLtxMacro\LWR@origRequirePackage\RequirePackage
\LetLtxMacro\LWR@origRequirePackageWithOptions\RequirePackageWithOptions
@@ -2480,6 +2477,15 @@ span.textit, div.textit, table td.tditshape { font-style: italic; }
table td.tdbfit { font-weight: bold ; font-style:italic }
+span.textnormal, div.textnormal {
+ font-weight: normal;
+ font-style: normal;
+ font-variant: normal;
+ font-variant-numeric: normal ;
+ font-family: "DejaVu Serif", "Bitstream Vera Serif",
+ "Lucida Bright", Georgia, serif;
+}
+
span.textmd, div.textmd { font-weight: normal; }
span.textup, div.textup {
@@ -3094,7 +3100,7 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;}
.fcolorbox .minipage, .fcolorboxBlock .minipage
{border: none ; background: none;}
-.fbox, .fboxBlock { border: 1px solid black ; }
+.fbox, .fboxBlock { border: 1px solid black ; padding: 4pt }
.fbox, .fboxBlock, .fcolorbox, .fcolorboxBlock, .colorbox, .colorboxBlock,
.fminipage, .fcolorminipage
@@ -3243,6 +3249,15 @@ div.generalframe {
border: 6px groove black ;
}
+/* For beamerarticle: */
+div.beamerframe {
+ margin: 3ex 1em 3ex 1em ;
+ border: 1px solid gray;
+ border-radius: 0px ;
+ padding: .3ex 1em 0ex 1em ;
+ display: block ;
+}
+
dl {
margin: 1ex 2em 1ex 0em;
line-height: 1.3;
@@ -3618,6 +3633,7 @@ div.subtitle p { margin: 1ex ; }
div.author
{
+ text-align: center ;
font-variant: normal ;
font-style: normal ;
font-size: 1em ;
@@ -3773,7 +3789,7 @@ div.alg2enoline{
span.alg2elinenumber{
margin-right: .5em ;
- font-size: 50% ;
+ font-size: 60% ;
color: red ;
}
@@ -4823,7 +4839,7 @@ MathJax = {
-- Copyright 2016-2021 Brian Dunn
-printversion = "v0.901"
+printversion = "v0.902"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -6195,7 +6211,7 @@ end -- not --version
\LWR@popclose
}
-\newcommand*{\LWR@closeprevious}[1]{
+\newcommand*{\LWR@closeprevious}[1]{%
\LWR@traceinfo{%
LWR@closeprevious to depth \csuse{LWR@depth#1}, %
depths are \LWR@subprintstack%
@@ -6333,14 +6349,14 @@ end -- not --version
\newcommand*{\LWR@htmltagc}[1]{%
-\LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}%
-\begingroup%
-\LWR@hook@processingtags%
-\ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi%
-\protect\LWR@origtextless%
-\LWR@isolate{#1}%
-\protect\LWR@origtextgreater%
-\endgroup%
+ \LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}%
+ \begingroup%
+ \LWR@hook@processingtags%
+ \ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi%
+ \protect\LWR@origtextless%
+ \LWR@isolate{#1}%
+ \protect\LWR@origtextgreater%
+ \endgroup%
}
\newcommand*{\LWR@spanwarnformat}[1]{%
@@ -6362,8 +6378,8 @@ end -- not --version
}
\newcommand*{\LWR@nestspanitem}{%
-\if@newlist\else{\LWR@htmltagc{br /}}\fi%
-\LWR@origitem%
+ \if@newlist\else{\LWR@htmltagc{br /}}\fi%
+ \LWR@origitem%
}
\newenvironment*{LWR@nestspan}
@@ -6391,7 +6407,7 @@ end -- not --version
}%
\renewcommand{\LWR@forcenewpage}{}%
\renewcommand{\LWR@liststart}{%
- \let\item\LWR@nestspanitem%
+ \LetLtxMacro\item\LWR@nestspanitem%
}%
\renewcommand{\LWR@listend}{\LWR@htmltagc{br /}\LWR@htmltagc{br /}}%
\renewenvironment{quote}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}%
@@ -6678,11 +6694,8 @@ end -- not --version
\newbool{LWR@doingapar}
\global\boolfalse{LWR@doingapar}
-\newcommand*{\LWR@ensuredoingapar}{%
-\ifbool{LWR@doingstartpars}%
-{\global\booltrue{LWR@doingapar}}%
-{}%
-}
+\newbool{LWR@algocf@dopars}
+\boolfalse{LWR@algocf@dopars}
\def\PN@parnotes@auto{}%
@@ -6696,15 +6709,21 @@ end -- not --version
}% nested par tags?
{}% no nested par tags
{% yes nest par tags
- \PN@parnotes@auto%
- \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline%
- \global\booltrue{LWR@doingapar}%
+ \ifbool{LWR@doingapar}{}{%
+ \PN@parnotes@auto%
+ \global\booltrue{LWR@doingapar}%
+ \ifbool{LWR@algocf@dopars}{}{%
+ \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline%
+ }%
+ }%
\let\par\LWR@closeparagraph%
}% end of yes nest par tags
}% end of handling pars
{}% not handling pars
}
+\let\LWR@ensuredoingapar\LWR@openparagraph
+
\newcommand*{\LWR@closeparagraph@br}
{%
\ifboolexpr{
@@ -6712,7 +6731,9 @@ end -- not --version
test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}} and
not bool {LWR@intabularmetadata}
}%
- {\unskip\LWR@htmltagc{br /}}%
+ {%
+ \unskip\LWR@htmltagc{br /}%
+ }%
{}%
}
@@ -6731,9 +6752,10 @@ end -- not --version
\@hspacer{\fill}% \hspace*{\fill}
\leavevmode\LWR@orignewline%
\LWR@htmltagc{/\LWR@tagregularparagraph}%
- \global\boolfalse{LWR@doingapar}%
+ \global\boolfalse{LWR@doingapar}% keep
\global\boolfalse{LWR@minipagethispar}%
\PN@parnotes@auto%
+ \global\boolfalse{LWR@doingapar}%
}% end of yes nest par tags
}% end of handling pars
{% not handling pars
@@ -6772,6 +6794,7 @@ end -- not --version
\ifbool{LWR@doingstartpars}%
{}%
{%
+ \ClearPreHook{par}%
\PushPreHook{par}{\LWR@openparagraph}%
\let\par\LWR@closeparagraph
@@ -6913,14 +6936,21 @@ end -- not --version
\begin{warpHTML}
+\AtBeginDocument{
+\robustify{\footnote}
+\robustify{\footnotemark}
+}
+
\newbox\LWR@footnotebox
-\long\def\@makefntext#1{\textsuperscript{\@thefnmark}~#1}
+\newbool{LWR@spewingnotes}% For the footnote package.
+\long\def\@makefntext#1{\textsuperscript{\@thefnmark}~{#1}}
\def\@makefnmark{%
\textsuperscript{\@thefnmark}%
}
\long\def\LWR@@footnotetext#1#2{%
\LWR@traceinfo{LWR@footnotetext}%
\LWR@newautopagelabel{page}%
+\LWR@ensuredoingapar%
\begingroup%
\let\LWR@newautopagelabel\LWR@null@newautopagelabel%
\global\setbox\csname #2\endcsname=\vbox{%
@@ -6931,26 +6961,18 @@ end -- not --version
\color@begingroup%
\LWR@disablepinyin%
\renewrobustcmd{\textsuperscript}[1]{\LWR@htmlspan{sup}{##1}}%
- \ifthenelse{%
- \boolean{LWR@doingstartpars} \AND%
- \cnttest{\value{LWR@lateximagedepth}}{=}{0}%
+ \ifbool{LWR@spewingnotes}{}{%
+ \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline%
}%
- {}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
\@makefntext{#1}%
- \ifthenelse{%
- \boolean{LWR@doingstartpars} \AND%
- \cnttest{\value{LWR@lateximagedepth}}{=}{0}%
+ \ifbool{LWR@spewingnotes}{}{%
+ \LWR@origtilde\LWR@orignewline%
+ \LWR@htmltagc{/\LWR@tagregularparagraph}%
+ \LWR@orignewline%
}%
- {\par}%
- {%
- \LWR@htmltagc{/\LWR@tagregularparagraph}%
- \LWR@orignewline%
- }%
\color@endgroup%
}% vbox
\endgroup%
-\LWR@ensuredoingapar%
}%
\long\def\LWR@footnotetext#1{\LWR@@footnotetext{#1}{LWR@footnotebox}}%
@@ -6958,6 +6980,7 @@ end -- not --version
\newbox\LWR@mpfootnotes
\long\def\@mpfootnotetext#1{%
\LWR@traceinfo{@mpfootnotetext}%
+\LWR@ensuredoingapar%
\global\setbox\LWR@mpfootnotes\vbox{%
\unvbox\LWR@mpfootnotes%
\reset@font\footnotesize%
@@ -6966,22 +6989,12 @@ end -- not --version
\protected@edef\@currentlabel%
{\csname p@mpfootnote\endcsname\@thefnmark}%
\color@begingroup%
- \ifthenelse{%
- \boolean{LWR@doingstartpars} \AND%
- \cnttest{\value{LWR@lateximagedepth}}{=}{0}%
- }%
- {}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
+ \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline%
\@makefntext{%
\ignorespaces#1%
}%
- \ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}%
- {}%
- {%
- \leavevmode\LWR@orignewline%
- \LWR@htmltagc{/\LWR@tagregularparagraph}%
- \LWR@origpar%
- }%
+ \leavevmode\LWR@orignewline%
+ \LWR@htmltagc{/\LWR@tagregularparagraph}%
\color@endgroup%
}% vbox
\LWR@ensuredoingapar%
@@ -7434,6 +7447,23 @@ end -- not --version
\CustomizeMathJax{\def\mathcode#1={\mathchar}}
\CustomizeMathJax{\let\delcode\mathcode}
\CustomizeMathJax{\let\delimiter\mathchar}
+\CustomizeMathJax{\def\oe{\unicode{x0153}}}
+\CustomizeMathJax{\def\OE{\unicode{x0152}}}
+\CustomizeMathJax{\def\ae{\unicode{x00E6}}}
+\CustomizeMathJax{\def\AE{\unicode{x00C6}}}
+\CustomizeMathJax{\def\aa{\unicode{x00E5}}}
+\CustomizeMathJax{\def\AA{\unicode{x00C5}}}
+\CustomizeMathJax{\def\o{\unicode{x00F8}}}
+\CustomizeMathJax{\def\O{\unicode{x00D8}}}
+\CustomizeMathJax{\def\l{\unicode{x0142}}}
+\CustomizeMathJax{\def\L{\unicode{x0141}}}
+\CustomizeMathJax{\def\ss{\unicode{x00DF}}}
+\CustomizeMathJax{\def\SS{\unicode{x1E9E}}}
+\CustomizeMathJax{\def\dag{\unicode{x2020}}}
+\CustomizeMathJax{\def\ddag{\unicode{x2021}}}
+\CustomizeMathJax{\def\P{\unicode{x00B6}}}
+\CustomizeMathJax{\def\copyright{\unicode{x00A9}}}
+\CustomizeMathJax{\def\pounds{\unicode{x00A3}}}
\end{warpMathJax}
\begin{warpHTML}% due to warpMathJax
@@ -8149,7 +8179,7 @@ end -- not --version
\LWR@stoppars
\LWR@closeprevious{finished}
\LWR@printpendingfootnotes
-\label{\BaseJobname-autofile-last}
+\label{\BaseJobname-autofile-last}\LWR@origtilde\LWR@orignewline
\LWR@htmlelementclassend{section}{textbody}
\LWR@htmlelementclassend{main}{bodycontainer}
\LWR@htmlelementclassend{div}{bodyandsidetoc}
@@ -8251,15 +8281,15 @@ end -- not --version
\end{warpprint}
\begin{warpHTML}
\DeclareDocumentEnvironment{titlepage}{}
-{
-\renewrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{##1}}
-\LWR@printpendingfootnotes
-\LWR@forcenewpage
-\BlockClass{titlepage}
+{%
+ \renewrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{##1}}%
+ \LWR@printpendingfootnotes
+ \LWR@forcenewpage
+ \BlockClass{titlepage}
}
{
-\endBlockClass
-\LWR@printpendingfootnotes
+ \endBlockClass
+ \LWR@printpendingfootnotes
}
\end{warpHTML}
\begin{warpprint}
@@ -8342,7 +8372,7 @@ end -- not --version
}
\long\def\@makefntext##1{%
\textsuperscript{\@thefnmark}~%
-##1%
+{##1}%
}%
}
@@ -8359,7 +8389,7 @@ end -- not --version
\@ctrerr\fi%
}
\LWR@formatted{@fnsymbol}
-\renewcommand*{\maketitle}{%
+\newcommand*{\LWR@maketitle}{%
\begin{titlepage}
\LWR@maketitlesetup
\@maketitle
@@ -8378,7 +8408,10 @@ end -- not --version
\global\let\date\relax
\global\let\and\relax
}
-\DeclareDocumentCommand{\@maketitle}{}{%
+
+\LetLtxMacro\maketitle\LWR@maketitle
+\providecommand*{\@maketitle}{}
+\renewrobustcmd{\@maketitle}{%
\LWR@stoppars%
\LWR@htmltag{\LWR@tagtitle}%
\@title%
@@ -8713,132 +8746,100 @@ end -- not --version
}
\newcommand*{\LWR@listitem}{%
-\LWR@stoppars%
-\LWR@startnewdepth{listitem}%
-\LWR@htmltag{li}%
-\LWR@startpars%
-\LWR@origitem%
+ \LWR@stoppars%
+ \LWR@startnewdepth{listitem}%
+ \LWR@htmltag{li}%
+ \LWR@startpars%
+ \LWR@origitem%
}
\newcommand*{\LWR@nulllistfills}{%
-\renewcommand*{\hss}{}%
-\renewcommand*{\llap}[1]{##1}%
-\renewcommand*{\rlap}[1]{##1}%
-\renewcommand*{\hfil}{}%
-\renewcommand*{\hfilneg}{}%
-\renewcommand*{\hfill}{}%
+ \renewcommand*{\hss}{}%
+ \renewcommand*{\llap}[1]{##1}%
+ \renewcommand*{\rlap}[1]{##1}%
+ \renewcommand*{\hfil}{}%
+ \renewcommand*{\hfilneg}{}%
+ \renewcommand*{\hfill}{}%
}
\newcommand*{\LWR@liststart}{%
-\LWR@traceinfo{LWR@liststart}%
-\LWR@stoppars%
-\LWR@pushoneclose{list}%
-\LWR@htmltag{\LWR@printopenlist}\LWR@orignewline%
-\LWR@startpars%
-\setlength{\topsep}{0pt}%
-\setlength{\partopsep}{0pt}%
-\setlength{\itemsep}{0pt}%
-\setlength{\parsep}{0pt}%
-\setlength{\leftmargin}{0pt}%
-\setlength{\rightmargin}{0pt}%
-\setlength{\listparindent}{0pt}%
-\setlength{\itemindent}{0pt}%
-\setlength{\labelsep}{1em}%
-\LWR@nulllistfills%
+ \LWR@traceinfo{LWR@liststart}%
+ \LWR@stoppars%
+ \LWR@pushoneclose{list}%
+ \LWR@htmltag{\LWR@printopenlist}\LWR@orignewline%
+ \LWR@startpars%
+ \setlength{\topsep}{0pt}%
+ \setlength{\partopsep}{0pt}%
+ \setlength{\itemsep}{0pt}%
+ \setlength{\parsep}{0pt}%
+ \setlength{\leftmargin}{0pt}%
+ \setlength{\rightmargin}{0pt}%
+ \setlength{\listparindent}{0pt}%
+ \setlength{\itemindent}{0pt}%
+ \setlength{\labelsep}{1em}%
+ \LWR@nulllistfills%
}
\newcommand*{\LWR@listend}{%
-\LWR@traceinfo{LWR@listend}%
-\LWR@stoppars%
-\LWR@closeprevious{list}%
-\LWR@startpars%
+ \LWR@traceinfo{LWR@listend}%
+ \LWR@stoppars%
+ \LWR@closeprevious{list}%
+ \LWR@startpars%
}
\newcommand*{\LWR@itemizeitem}{%
-\LWR@stoppars%
-\LWR@startnewdepth{listitem}%
-\LWR@htmltag{li}%
-\LWR@startpars%
-\LWR@origitem%
+ \LWR@stoppars%
+ \LWR@startnewdepth{listitem}%
+ \LWR@htmltag{li}%
+ \LWR@startpars%
+ \LWR@origitem%
}
\newcommand*{\LWR@itemizestart}{%
-\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
-\renewcommand*{\LWR@printopenlist}{%
- ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}%
-}
-\let\item\LWR@itemizeitem%
-\LWR@nulllistfills%
+ \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}%
+ \renewcommand*{\LWR@printopenlist}{%
+ ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}%
+ }%
+ \LetLtxMacro\item\LWR@itemizeitem%
+ \LWR@nulllistfills%
}
\newcommand*{\LWR@enumeratestart}{%
-\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
-\renewcommand*{\LWR@printopenlist}{%
- ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}%
-}
-\let\item\LWR@itemizeitem%
-\LWR@nulllistfills%
+ \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}%
+ \renewcommand*{\LWR@printopenlist}{%
+ ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}%
+ }%
+ \LetLtxMacro\item\LWR@itemizeitem%
+ \LWR@nulllistfills%
}
-\newcommand*{\LWR@descitem}[1][]%
-{%
-\LWR@stoppars%
-\LWR@setlatestname{#1}%
-\LWR@startnewdepth{descitem}%
-\begingroup%
-\let\LWR@orig@desc@makelabel\makelabel
-\renewcommand*{\makelabel}[1]{%
- \LWR@htmltag{dt}%
- \LWR@orig@desc@makelabel{#1}%
- \LWR@htmltag{/dt}%
-}
-\LWR@select@html@nohspace%
-\LWR@origitem[#1]%
-\endgroup%
-\LWR@orignewline%
-\LWR@htmltag{dd}%
-\LWR@startpars%
+\newcommand*{\LWR@descitem}[1][]{%
+ \LWR@stoppars%
+ \LWR@setlatestname{#1}%
+ \LWR@startnewdepth{descitem}%
+ \begingroup%
+ \let\LWR@orig@desc@makelabel\makelabel
+ \renewcommand*{\makelabel}[1]{%
+ \LWR@htmltag{dt}%
+ \LWR@orig@desc@makelabel{#1}%
+ \LWR@htmltag{/dt}%
+ }
+ \LWR@select@html@nohspace%
+ \LWR@origitem[#1]%
+ \endgroup%
+ \LWR@orignewline%
+ \LWR@htmltag{dd}%
+ \LWR@startpars%
}
\newcommand*{\LWR@descriptionstart}{%
\renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription}
\renewcommand*{\LWR@printopenlist}{dl}
- \let\item\LWR@descitem%
+ \LetLtxMacro\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%
- }%
- }%
}
@@ -10692,7 +10693,11 @@ end -- not --version
\expandafter#2#1%
\fi}
\newcommand*{\LWR@nameref}[1]{%
+ \begingroup%
+ \renewcommand{\footnote}[2][]{}%
+ \renewcommand{\footnotemark}[1][]{}%
\expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffive{#1}%
+ \endgroup%
}
\newcommand*{\LWR@currentautosecpageref}[1]{%
\expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@secondoffive{#1}%
@@ -11270,7 +11275,6 @@ end -- not --version
\newcommand*{\LWR@myshorttoc}[1]{%
\LWR@traceinfo{LWR@myshorttoc: #1}%
- \LWR@ensuredoingapar%
\IfFileExists{\jobname.#1}{%
\LWR@traceinfo{LWR@myshorttoc: loading}%
\begingroup%
@@ -11516,9 +11520,9 @@ end -- not --version
\renewenvironment*{theindex}{%
\LWR@indexsection{\indexname}%
- \let\item\LWR@indexitem%
- \let\subitem\LWR@indexsubitem%
- \let\subsubitem\LWR@indexsubsubitem%
+ \LetLtxMacro\item\LWR@indexitem%
+ \LetLtxMacro\subitem\LWR@indexsubitem%
+ \LetLtxMacro\subsubitem\LWR@indexsubsubitem%
}{}
}% AtBeginDocument
@@ -11859,6 +11863,7 @@ end -- not --version
\let\enddisplaymath\LWR@orig@enddisplaymath%
\LWR@restoreorigaccents%
\LWR@restoreoriglists%
+ \let\@mpfootnotetext\LWR@orig@mpfootnotetext%
\LWR@hook@processingtags%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
{\LWR@restoreMathJaxformatting}%
@@ -12889,7 +12894,7 @@ end -- not --version
\LWR@traceinfo{lateximage: LWR@lateximagenumber is \arabic{LWR@lateximagenumber}}%
\boolfalse{mathjax}%
\LWR@ensuredoingapar%
- \hbadness=10000\relax%
+ \hbadness=10000\relax%
\addtocounter{LWR@externalfilecnt}{1}%
\LWR@traceinfo{lateximage: LWR@externalfilecnt is \arabic{LWR@externalfilecnt}}%
\setcounterpageref{LWR@LIpage}{%
@@ -12937,17 +12942,25 @@ end -- not --version
\LWR@traceinfo{lateximage: about to create a new page}%
\LWR@maybe@orignewpage%
\LWR@traceinfo{lateximage: about to create minipage}%
+ \setcounter{LWR@mpfootnote@store}{\value{mpfootnote}}
\ifdimless{\linewidth}{6in}{%
\LWR@print@minipage{\linewidth}%
}{%
\LWR@print@minipage{6in}%
}%
+ \ifnumgreater{\value{LWR@minipage@depth}}{0}%
+ {\setcounter{mpfootnote}{\value{LWR@mpfootnote@store}}}%
+ {}%
\@nameuse{LWR@print@\LateximageFontSizeName}%
\LWR@traceinfo{lateximage: about to temporarily restore formatting}%
\LWR@restoreorigformatting%
- \def\@mpfn{footnote}%
- \def\thempfn{\thefootnote}%
- \LetLtxMacro\@footnotetext\LWR@footnotetext%
+ \ifnumgreater{\value{LWR@minipage@depth}}{0}%
+ {}%
+ {%
+ \def\@mpfn{footnote}%
+ \def\thempfn{\thefootnote}%
+ \LetLtxMacro\@footnotetext\LWR@footnotetext%
+ }%
\LWR@traceinfo{lateximage: about to create label}%
\LWR@orig@label{LWRlateximage-\BaseJobname-\arabic{LWR@lateximagenumber}}%
\LWR@traceinfo{lateximage: finished creating the label}%
@@ -13010,8 +13023,7 @@ end -- not --version
\begin{warpprint}
\NewDocumentEnvironment{lateximage}{s o s o o d()}
- {\begin{varwidth}[b]{\linewidth}}
- {\end{varwidth}}
+ {}{}
\end{warpprint}
@@ -13352,6 +13364,11 @@ end -- not --version
\begin{warpHTML}
\newbool{LWR@minipagethispar}
\boolfalse{LWR@minipagethispar}
+
+\newcounter{LWR@minipage@depth}
+\setcounter{LWR@minipage@depth}{0}
+\newcounter{LWR@mpfootnote@store}
+
\NewDocumentEnvironment{LWR@HTML@sub@minipage}{m m m m}
{%
\LWR@traceinfo{minipage}%
@@ -13411,6 +13428,7 @@ end -- not --version
\def\@mpfn{mpfootnote}%
\def\thempfn{\thempfootnote}\c@mpfootnote\z@%
\let\@footnotetext\@mpfootnotetext%
+\addtocounter{LWR@minipage@depth}{1}%
\LWR@startpars%
\ifboolexpr{bool{FormatWP} and bool{WPMarkMinipages}}{%
@@ -13433,6 +13451,7 @@ end -- not --version
\LWR@htmlelementend{div}%
}{}%
+\addtocounter{LWR@minipage@depth}{-1}%
\LWR@htmldivclassend{minipage}%
\end{LWR@setvirtualpage}%
@@ -13795,7 +13814,14 @@ color:\LWR@origpound\LWR@tempcolor%
\newrobustcmd{\LWR@HTML@textssc}[1]{\textsc{#1}}
\LWR@formatted{textssc}
-\DeclareRobustCommand{\LWR@HTML@textnormal}[1]{\textmd{\textrm{\textup{#1}}}}
+\DeclareRobustCommand{\LWR@HTML@textnormal}[1]{%
+ \LWR@HTML@mdseries%
+ \LWR@HTML@rmfamily%
+ \LWR@HTML@upshape%
+ \InlineClass(%
+ font-weight:normal; font-family:serif; font-style:normal
+ ){textnormal}{#1}%
+}
\LWR@formatted{textnormal}