summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-07-16 21:14:36 +0000
committerKarl Berry <karl@freefriends.org>2019-07-16 21:14:36 +0000
commitcf12bb505e9a4455ac9fb495f04cf7a2d079186c (patch)
treeeeb96649fd30bc3ac8752f78005b52d8efc47d57 /Master/texmf-dist/tex
parentd2055c0169cf583fb9af2de4061319e5b31a4303 (diff)
lwarp (16jul19)
git-svn-id: svn://tug.org/texlive/trunk@51653 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty5
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty36
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty17
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty27
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty1
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty78
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty1
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty45
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty133
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty10
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty11
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty12
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty10
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty83
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty14
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty3
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty3
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty29
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty37
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty216
27 files changed, 569 insertions, 226 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
index 03df09ab716..ee80af4ad0c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
@@ -43,6 +43,7 @@
\LWR@applyxfakebold%
}
\newcommand*{\LWR@amsmathenv@before}[1]{%
+ \LWR@stoppars%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
{
\LWR@syncmathjax
@@ -52,11 +53,11 @@
\LWR@beginhideamsmath
}
{
- \LWR@amsmathenv@@before{multline}
+ \LWR@amsmathenv@@before{#1}
}
}
\newcommand*{\LWR@amsmathenv@@after}{%
- \end{lateximage}\end{BlockClass}
+ \end{lateximage}\end{BlockClass}\LWR@startpars%
}
\newcommand*{\LWR@amsmathenv@after}[1]{%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty
index 3b9ab2f58c9..e6fec10cc14 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty
@@ -15,39 +15,9 @@
%% 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{backnaur}[2019/04/14]
-\renewenvironment*{bnf}{%
- \BlockClass{backnaur}%
- \LWR@stoppars%
-}{\endBlockClass}
-
-\renewenvironment*{bnf*}{%
- \BlockClass{backnaur}%
- \LWR@stoppars%
-}{\endBlockClass}
-
-\renewcommand{\bnfpn}[1]{\HTMLunicode{27e8}#1\HTMLunicode{27e9}}% \langle, rangle
-\renewcommand{\bnfor}{ \HTMLunicode{7c} }% \mid
-\renewcommand{\bnfsp}{ }
-\renewcommand{\bnfes}{\HTMLunicode{3bb}}% \lambda
-\renewcommand{\bnftd}[1]{\textnormal{\textit{#1}}}
-\renewcommand{\bnfsk}{\HTMLunicode{2026} }% \dots, ellipsis
-\renewcommand{\bnfpo}{\HTMLunicode{22a8}}% \models
-
-\renewcommand{\bnfprod}[2]{%
- \begin{BlockClass}{backnaurprod}\bnfpn{#1} \bnfpo \end{BlockClass}%
- \begin{BlockClass}{backnaurdesc}#2\end{BlockClass}%
- \LWR@stoppars%
-}%
-
-\renewcommand{\bnfmore}[1]{%
- \begin{BlockClass}{backnaurprod}\end{BlockClass}
- \begin{BlockClass}{backnaurdesc}#1\end{BlockClass}
- \LWR@stoppars%
-}
-
-\@ifpackagewith{backnaur}{perp}{\renewcommand{\bnfes}{\HTMLunicode{27c2}}}{}% \perp
-\@ifpackagewith{backnaur}{epsilon}{\renewcommand{\bnfes}{\HTMLunicode{3f5}}}{}% \epsilon
+\LWR@ProvidesPackagePass{backnaur}[2019/06/18]
+\renewenvironment{bnf}{\eqnarray}{\endeqnarray}
+\renewenvironment{bnf*}{\csuse{eqnarray*}}{\csuse{endeqnarray*}}
\endinput
%%
%% End of file `lwarp-backnaur.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
index 88c9931767d..4a448dc4341 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
@@ -20,12 +20,14 @@
\LWR@ProvidesPackagePass{boxedminipage2e}[2015/03/09]
\newenvironment{LWR@HTML@boxedminipage}{%
+ \LWR@stoppars%
\begin{BlockClass}{framebox}%
\minipage%
}
{%
\endminipage%
\end{BlockClass}%
+ \LWR@startpars%
}
\LWR@formattedenv{boxedminipage}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
index 186fab5ffc4..9e0808fb78f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
@@ -51,19 +51,10 @@
\LWR@traceinfo{caption@iiibox: done}%
}
-\def\caption@caption{%
- \caption@iftype
- {%
- \caption@checkgrouplevel\@empty\caption
- \caption@star
- {\caption@refstepcounter\@captype}%
- {\caption@dblarg{\@caption\@captype}}}%
- {\caption@Error{\noexpand\caption outside float}%
- \caption@gobble}%
-}
\long\def\caption@@caption#1[#2]#3{%
- \ifcaption@star \else
+ \ifcaption@star
+ \else
\caption@prepareanchor{#1}{#2}%
\memcaptioninfo{#1}{\csname the#1\endcsname}{#2}{#3}%
\@nameuse{nag@hascaptiontrue}%
@@ -78,9 +69,11 @@
\caption@normalsize
\ifcaption@star
\let\caption@makeanchor\@firstofone
- \fi
+ #3% lwarp
+ \else% lwarp
\@makecaption{\csname fnum@#1\endcsname}%
{\ignorespaces\caption@makeanchor{#3}}%
+ \fi% lwarp
\caption@if@minipage\@minipagetrue\@minipagefalse}%
\caption@end%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty
index b6cea33596c..c57d58df19c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty
@@ -47,12 +47,18 @@
\newcommand*{\LWR@multimedia@fileAV}[4]{%
\filename@parse{#2}%
\IfFileExists{#2}{%
- \begin{BlockClass}[\LWR@multimedia@printsize\ margin:auto]{AVviewport}
+ \ifstrequal{#3}{audio}{%
+ \begin{BlockClass}{AVviewport}
+ }{%
+ \begin{BlockClass}[\LWR@multimedia@printsize\ margin:auto]{AVviewport}
+ }
\LWR@stoppars
\LWR@htmltag{%
#3\ % space
- width=\textquotedbl{}100\%\textquotedbl\ % space
- height=\textquotedbl{}100\%\textquotedbl\ % space
+ \ifstrequal{#3}{audio}{}{%
+ width=\textquotedbl{}100\%\textquotedbl\ % space
+ height=\textquotedbl{}100\%\textquotedbl\ % space
+ }%
controls%
}\LWR@orignewline
\LWR@htmltag{%
@@ -72,12 +78,19 @@
}%
}
\newcommand*{\LWR@multimedia@httpAV}[4]{%
- \begin{BlockClass}[\LWR@multimedia@printsize\ margin:auto]{AVviewport}
+ \ifstrequal{#3}{audio}{%
+ \begin{BlockClass}{AVviewport}
+ }{%
+ \begin{BlockClass}[\LWR@multimedia@printsize\ margin:auto]{AVviewport}
+ }
\LWR@stoppars
\LWR@htmltag{%
#3\ % space
- width=\textquotedbl{}100\%\textquotedbl\ % space
- height=\textquotedbl{}100\%\textquotedbl\ controls}\LWR@orignewline
+ \ifstrequal{#3}{audio}{}{%
+ width=\textquotedbl{}100\%\textquotedbl\ % space
+ height=\textquotedbl{}100\%\textquotedbl\ controls%
+ }%
+ }\LWR@orignewline
\LWR@htmltag{%
source % space
src=\textquotedbl#2\textquotedbl\ % space
@@ -122,6 +135,7 @@
\if#1\@percentchar\LWR@multimedia@percenterror\fi%
\if#2\@percentchar\LWR@multimedia@percenterror\fi%
\if#3\@percentchar\LWR@multimedia@percenterror\fi%
+ \LWR@stoppars%
\setlength{\LWR@multimedia@width}{0pt}%
\setlength{\LWR@multimedia@height}{0pt}%
\setkeys*{LWR@multimedia}{#1}%
@@ -135,6 +149,7 @@
\IfBeginWith{#3}{FTP}{\LWR@multimedia@embed{#2}{#3}{}}{%
\href{#3}{#2}% unknown format
}}}}}}}}%
+ \LWR@startpars%
\endgroup%
}
\newrobustcmd*{\LWR@multimedia}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
index 17eab164f34..ffd683ee9da 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
@@ -24,6 +24,7 @@
{
\begin{BlockClass}{qitem}
#1
+\LWR@stoppars%
\ifbool{FormatWP}
{\begin{BlockClass}[border-top:1px solid gray]{epigraphsource}}
{\begin{BlockClass}{epigraphsource}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
index 1067f2b630e..a65b6095ac1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
@@ -81,12 +81,14 @@
}
\RenewDocumentEnvironment{Btrivlist}{m o}
{%
+ \LWR@stoppars%
\begin{BlockClass}{Btrivlist}%
\tabular{#1}%
}
{%
\endtabular%
\end{BlockClass}%
+ \LWR@startpars%
}
\AtBeginEnvironment{LWR@nestspan}{%
\RenewDocumentEnvironment{Btrivlist}{m o}{}{}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
index 541ca0ad1fc..c003418243d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
@@ -65,7 +65,7 @@
\renewcommand*{\FV@SingleFrameSep}{}
\def\FV@BUseVerbatim#1{%
- \LWR@atbeginverbatim[\LWR@FVstyle]{0}{verbatim}%
+ \LWR@atbeginverbatim{0}{verbatim}%
\FV@BVerbatimBegin#1\FV@BVerbatimEnd%
\LWR@afterendverbatim{0}%
}
@@ -73,12 +73,38 @@
\newcommand*{\LWR@FVstyle}{}
\newcommand*{\LWR@fvstartnone}{%
\LWR@traceinfo{fvstartnone}%
-\LWR@atbeginverbatim[\LWR@FVstyle]{0}{verbatim}%
+\BlockClass[\LWR@FVstyle]{fancyvrb}
+\LWR@stoppars
+\ifx\FV@LabelPositionTopLine\relax\else
+ \ifx\FV@LabelBegin\relax\else
+ \FancyVerbRuleColor{\LWR@FVfindbordercolor}
+ \LWR@htmltagc{%
+ div class="fancyvrblabel" % extra space
+ style="color: \LWR@origpound\LWR@tempcolor"%
+ }
+ \LWR@print@textrm{\FV@LabelBegin}% \textrm preserves emdash
+ \LWR@htmltagc{/div}\LWR@orignewline%
+ \fi
+\fi
+\LWR@atbeginverbatim{0}{verbatim}%
}
\newcommand*{\LWR@fvendnone}{%
\LWR@traceinfo{fvendnone}%
\LWR@afterendverbatim{0}%
+\LWR@stoppars%
+\ifx\FV@LabelPositionBottomLine\relax\else
+ \ifx\FV@LabelEnd\relax\else
+ \FancyVerbRuleColor{\LWR@FVfindbordercolor}
+ \LWR@htmltagc{%
+ div class="fancyvrblabel" % extra space
+ style="color: \LWR@origpound\LWR@tempcolor"%
+ }
+ \LWR@print@textrm{\FV@LabelEnd}
+ \LWR@htmltagc{/div}\LWR@orignewline%
+ \fi
+\fi
+\endBlockClass
}
\newcommand*{\LWR@fvstartsingle}{%
@@ -111,10 +137,10 @@
}
\newcommand*{\LWR@FVborderstyle}[1]{%
-padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; %
-\LWR@FVfindbordercolor %
-border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt %
-solid \LWR@origpound\LWR@tempcolor ; %
+padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; % space
+\LWR@FVfindbordercolor\LWR@indentHTMLtwo%
+border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt % space
+solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
}
\def\FV@Frame@none{%
@@ -127,7 +153,10 @@ solid \LWR@origpound\LWR@tempcolor ; %
\FV@Frame@none% default values
\def\FV@Frame@single{%
-\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{}}%
+\renewcommand*{\LWR@FVstyle}{%
+ \LWR@currenttextcolorstyle\LWR@indentHTMLtwo%
+ \LWR@FVborderstyle{}%
+}%
\let\FV@BeginListFrame\LWR@fvstartsingle%
\let\FV@LeftListFrame\FV@LeftListFrame@Single%
\let\FV@RightListFrame\FV@RightListFrame@Single%
@@ -135,7 +164,10 @@ solid \LWR@origpound\LWR@tempcolor ; %
\def\FV@Frame@lines{%
\renewcommand*{\LWR@FVstyle}{%
- \LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}%
+ \LWR@currenttextcolorstyle\LWR@indentHTMLtwo%
+ \LWR@FVborderstyle{-top}%
+ \LWR@indentHTMLtwo%
+ \LWR@FVborderstyle{-bottom}%
}%
\let\FV@BeginListFrame\LWR@fvstartline%
\let\FV@LeftListFrame\relax%
@@ -143,21 +175,30 @@ solid \LWR@origpound\LWR@tempcolor ; %
\let\FV@EndListFrame\LWR@fvendline}
\def\FV@Frame@topline{%
-\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}}%
+\renewcommand*{\LWR@FVstyle}{%
+ \LWR@currenttextcolorstyle\LWR@indentHTMLtwo%
+ \LWR@FVborderstyle{-top}%
+}%
\let\FV@BeginListFrame\LWR@fvstartline%
\let\FV@LeftListFrame\relax%
\let\FV@RightListFrame\relax%
\let\FV@EndListFrame\LWR@fvendnone}
\def\FV@Frame@bottomline{%
-\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-bottom}}%
+\renewcommand*{\LWR@FVstyle}{%
+ \LWR@currenttextcolorstyle\LWR@indentHTMLtwo%
+ \LWR@FVborderstyle{-bottom}%
+}%
\let\FV@BeginListFrame\LWR@fvstartnone%
\let\FV@LeftListFrame\relax%
\let\FV@RightListFrame\relax%
\let\FV@EndListFrame\LWR@fvendline}
\def\FV@Frame@leftline{%
-\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-left}}%
+\renewcommand*{\LWR@FVstyle}{%
+ \LWR@currenttextcolorstyle\LWR@indentHTMLtwo%
+ \LWR@FVborderstyle{-left}%
+}%
\ifx\FancyVerbFillColor\relax%
\let\FV@FrameFillLine\relax%
\else%
@@ -182,25 +223,10 @@ solid \LWR@origpound\LWR@tempcolor ; %
\ifnum#1=\z@
\ifx\FV@LabelPositionTopLine\relax
\else
- \LWR@FVfindbordercolor
- \LWR@htmltagc{%
- div class="fancyvrblabel" % extra space
- style="color: \LWR@origpound\LWR@tempcolor"%
- }
- \LWR@print@textrm{\FV@LabelBegin}% \textrm preserves emdash
- \LWR@htmltagc{/div}
\fi
\else
\ifx\FV@LabelPositionBottomLine\relax
\else
- \LWR@FVfindbordercolor
-
- \LWR@htmltagc{%
- div class="fancyvrblabel" % extra space
- style="color: \LWR@origpound\LWR@tempcolor"%
- }
- \LWR@print@textrm{\FV@LabelEnd}
- \LWR@htmltagc{/div}
\fi
\fi
\fi
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
index 35edb0737b7..bf5c343043d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
@@ -27,13 +27,11 @@
\def\fn@startfntext{%
\setbox\z@\vbox\bgroup%
\fn@startnote%
- \fn@prefntext%
\ignorespaces%
}
\def\fn@endfntext{%
\LWR@htmltagc{/\LWR@tagregularparagraph}%
\LWR@orignewline%
- \fn@postfntext%
\egroup%
\begingroup%
\let\@makefntext\@empty%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty
index 21ad41ada43..ca380407735 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty
@@ -15,9 +15,9 @@
%% 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{intopdf}[2018/03/15]
-\NewDocumentCommand{\attachandlink}{m o m m}{%
- \href{#1}{#4}%
+\LWR@ProvidesPackageDrop{intopdf}[2019/05/28]
+\NewDocumentCommand{\attachandlink}{o m o m m}{%
+ \href{#2}{#5}%
}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
index 5478dcbdb6c..f523cd76d40 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
@@ -107,6 +107,7 @@
{\begingroup
\LWR@traceinfo{at the selected position}%
\ifx\lst@title\@empty
+ \LWR@stoppars%
\lst@makecaption\fnum@lstlisting{\ignorespaces \lst@caption}
\else
\LWR@traceinfo{Making title: \lst@title}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty
new file mode 100644
index 00000000000..d77574e1597
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty
@@ -0,0 +1,45 @@
+%%
+%% This is file `lwarp-lyluatex.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `lyluatex')
+%% This is a generated file.
+%% Copyright 2016-2019 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{lyluatex}[2019/05/27]
+\newcommand*{\lyluateximagename}{(-lilypond-~\packagediagramname)}
+\LetLtxMacro\LWR@orig@ly@compilescore\ly@compilescore
+
+\renewcommand*{\ly@compilescore}[1]{%
+ \begin{lateximage}[\lyluateximagename]%
+ \LWR@orig@ly@compilescore{#1}%
+ \end{lateximage}%
+}
+
+\AtBeginDocument{
+ \lysetoption{paperwidth}{6in}
+ \lysetoption{paperheight}{9in}
+ \lysetoption{line-width}{5.5in}
+ \lysetoption{twoside}{false}
+ \lysetoption{fullpagestyle}{empty}
+ \lysetoption{fullpagealign}{crop}
+ \lysetoption{print-page-number}{false}
+ \lysetoption{insert}{systems}
+ \lysetoption{extra-top-margin}{0}
+ \lysetoption{extra-bottom-margin}{0}
+ \lysetoption{valign}{center}
+ \lysetoption{staffsize}{20}
+ \lysetoption{inline-staffsize}{14}
+}
+\endinput
+%%
+%% End of file `lwarp-lyluatex.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty
index dca86fc472d..12143adac48 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty
@@ -15,79 +15,154 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{musicography}[2018/05/21]
-\RenewDocumentCommand{\musSymbol}{ O{\musFont} m m m m }{%
+\LWR@ProvidesPackagePass{musicography}[2019/05/28]
+\NewDocumentCommand{\LWR@HTML@musSymbol}{ O{\musFont} m m m m }{%
\begin{lateximage}%
{#1\kern#2\raisebox{#3}{#5}\kern#4}%
\end{lateximage}%
}
-\RenewDocumentCommand{\musStemmedNote}{ m }{%
+\LWR@formatted{musSymbol}
+
+\NewDocumentCommand{\LWR@HTML@musStemmedNote}{ m }{%
\begin{lateximage}%
\musSymbol{0.05em}{0.5ex}{0.2em}{#1\musStem}%
\end{lateximage}%
}
-\RenewDocumentCommand{\musFlaggedNote}{ m m }{%
+\LWR@formatted{musStemmedNote}
+
+\NewDocumentCommand{\LWR@HTML@musFlaggedNote}{ m m }{%
\begin{lateximage}%
\musSymbol{0.05em}{0.5ex}{0pt}{#1\musStem}%
\musSymbol{0pt}{0pt}{0.9em}{#2}%
\end{lateximage}%
}
-\RenewDocumentCommand{\musDottedNote}{ m }{%
+\LWR@formatted{musFlaggedNote}
+
+\NewDocumentCommand{\LWR@HTML@musDottedNote}{ m }{%
\begin{lateximage}%
#1\musDot%
\end{lateximage}%
}
-\RenewDocumentCommand{\musMeter}{ m m }{%
+\LWR@formatted{musDottedNote}
+
+\NewDocumentCommand{\LWR@HTML@musMeter}{ m m }{%
\begin{lateximage}*[#1/#2][#1#2]%
-\musStack{#1}{#2}\kern0.05em%
+\musStack{#1 #2}\kern0.05em%
\end{lateximage}%
}
-\RenewDocumentCommand{\meterCplus}{ m }{%
+\LWR@formatted{musMeter}
+
+\NewDocumentCommand{\LWR@HTML@meterCplus}{ m }{%
\begin{lateximage}*[C#1]%
\meterC{}\kern-0.7pt#1%
\end{lateximage}%
}
-\RenewDocumentCommand{\meterC}{}{%
+\LWR@formatted{meterCplus}
+
+\NewDocumentCommand{\LWR@HTML@meterC}{}{%
\begin{lateximage}*[C]%
\musSymbolMeter{\symbol{83}}%
\end{lateximage}%
}
-\RenewDocumentCommand{\meterCutC}{}{%
+\LWR@formatted{meterC}
+
+\NewDocumentCommand{\LWR@HTML@meterCutC}{}{%
\begin{lateximage}*[C|]%
\musSymbolMeter{\symbol{82}}%
\end{lateximage}%
}
-\RenewDocumentCommand{\meterCThreeTwo}{}{%
+\LWR@formatted{meterCutC}
+
+\NewDocumentCommand{\LWR@HTML@meterCThreeTwo}{}{%
\begin{lateximage}*[C3/2]%
-\meterCplus{\musStack{3}{2}}%
+\meterCplus{\musStack{3 2}}%
\end{lateximage}%
}
-\RenewDocumentCommand{\musFlat} {}{\HTMLunicode{266D}}
-\RenewDocumentCommand{\musDoubleFlat} {}{\HTMLunicode{1D12B}}
-\RenewDocumentCommand{\musSharp} {}{\HTMLunicode{266F}}
-\RenewDocumentCommand{\musDoubleSharp}{}{\HTMLunicode{1D12A}}
-\RenewDocumentCommand{\musNatural} {}{\HTMLunicode{266E}}
-
-\RenewDocumentCommand{\musWhole}{}{\HTMLunicode{1D15D}}
-\RenewDocumentCommand{\musHalf}{}{\HTMLunicode{1D15E}}
-\RenewDocumentCommand{\musQuarter}{}{\HTMLunicode{1D15F}}
-\RenewDocumentCommand{\musEighth}{}{\HTMLunicode{1D160}}
-\RenewDocumentCommand{\musSixteenth}{}{\HTMLunicode{1D161}}
-
-\RenewDocumentCommand{\musWholeDotted}{}{\HTMLunicode{1D15D}\HTMLunicode{1D16D}}
-\RenewDocumentCommand{\musHalfDotted}{}{\HTMLunicode{1D15E}\HTMLunicode{1D16D}}
-\RenewDocumentCommand{\musQuarterDotted}{}{\HTMLunicode{1D15F}\HTMLunicode{1D16D}}
-\RenewDocumentCommand{\musEighthDotted}{}{\HTMLunicode{1D160}\HTMLunicode{1D16D}}
-\RenewDocumentCommand{\musSixteenthDotted}{}{\HTMLunicode{1D161}\HTMLunicode{1D16D}}
+\LWR@formatted{meterCThreeTwo}
+
+\NewDocumentCommand{\LWR@HTML@meterO}{}{\HTMLunicode{25EF}}
+
+\LWR@formatted{meterO}
+
+\newcommand{\LWR@null@noFig}[1][]{}%
+
+\NewDocumentCommand{\LWR@HTML@musFig}{ m }{%
+\begin{lateximage}*[%
+ {% ALT text for copy/paste
+ \LetLtxMacro\noFig\LWR@null@noFig%
+ \LetLtxMacro\musSharp\LWR@HTML@musSharp%
+ \LetLtxMacro\musDoubleSharp\LWR@HTML@musDoubleSharp%
+ \LetLtxMacro\musFlat\LWR@HTML@musFlat%
+ \LetLtxMacro\musDoubleFlat\LWR@HTML@musDoubleFlat%
+ \LetLtxMacro\musNatural\LWR@HTML@musNatural%
+ ({#1})% braces here because \noFig uses []
+ }%
+]%
+ \musStack[\musFigFont]{#1}%
+\end{lateximage}%
+}
+
+\LWR@formatted{musFig}
+
+\NewDocumentCommand{\LWR@HTML@musFlat} {}{\HTMLunicode{266D}}
+\NewDocumentCommand{\LWR@HTML@musDoubleFlat} {}{\HTMLunicode{1D12B}}
+\NewDocumentCommand{\LWR@HTML@musSharp} {}{\HTMLunicode{266F}}
+\NewDocumentCommand{\LWR@HTML@musDoubleSharp}{}{\HTMLunicode{1D12A}}
+\NewDocumentCommand{\LWR@HTML@musNatural} {}{\HTMLunicode{266E}}
+
+\LWR@formatted{musFlat}
+\LWR@formatted{musDoubleFlat}
+\LWR@formatted{musSharp}
+\LWR@formatted{musDoubleSharp}
+\LWR@formatted{musNatural}
+
+\NewDocumentCommand{\LWR@HTML@musWhole} {}{\HTMLunicode{1D15D}}
+\NewDocumentCommand{\LWR@HTML@musHalf} {}{\HTMLunicode{1D15E}}
+\NewDocumentCommand{\LWR@HTML@musQuarter} {}{\HTMLunicode{1D15F}}
+\NewDocumentCommand{\LWR@HTML@musEighth} {}{\HTMLunicode{1D160}}
+\NewDocumentCommand{\LWR@HTML@musSixteenth} {}{\HTMLunicode{1D161}}
+\NewDocumentCommand{\LWR@HTML@musThirtySecond} {}{\HTMLunicode{1D162}}
+\NewDocumentCommand{\LWR@HTML@musSixtyFourth} {}{\HTMLunicode{1D163}}
+
+\LWR@formatted{musWhole}
+\LWR@formatted{musHalf}
+\LWR@formatted{musQuarter}
+\LWR@formatted{musEighth}
+\LWR@formatted{musSixteenth}
+\LWR@formatted{musThirtySecond}
+\LWR@formatted{musSixtyFourth}
+
+\NewDocumentCommand{\LWR@HTML@musWholeDotted}{}
+ {\HTMLunicode{1D15D}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR@HTML@musHalfDotted}{}
+ {\HTMLunicode{1D15E}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR@HTML@musQuarterDotted}{}
+ {\HTMLunicode{1D15F}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR@HTML@musEighthDotted}{}
+ {\HTMLunicode{1D160}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR@HTML@musSixteenthDotted}{}
+ {\HTMLunicode{1D161}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR@HTML@musThirtySecondDotted}{}
+ {\HTMLunicode{1D162}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR@HTML@musSixtyFourthDotted}{}
+ {\HTMLunicode{1D163}\HTMLunicode{1D16D}}
+
+\LWR@formatted{musWholeDotted}
+\LWR@formatted{musHalfDotted}
+\LWR@formatted{musQuarterDotted}
+\LWR@formatted{musEighthDotted}
+\LWR@formatted{musSixteenthDotted}
+\LWR@formatted{musThirtySecondDotted}
+\LWR@formatted{musSixtyFourthDotted}
\endinput
%%
%% End of file `lwarp-musicography.sty'.
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 dd06b49ac3f..fd375bea782 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
@@ -53,11 +53,13 @@
\renewcommand{\chapter@preamble}{#3}%
}
}
-\LetLtxMacro\captionbelow\caption
-\LetLtxMacro\captionabove\caption
+\AtBeginDocument{
+ \LetLtxMacro\captionbelow\caption
+ \LetLtxMacro\captionabove\caption
-\LetLtxMacro\captionofbelow\captionof
-\LetLtxMacro\captionofabove\captionof
+ \LetLtxMacro\captionofbelow\captionof
+ \LetLtxMacro\captionofabove\captionof
+}
\RenewDocumentEnvironment{captionbeside}{o m o o o s}
{}
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 c24ad4c098b..511dc188501 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
@@ -221,6 +221,9 @@
\renewcommand*{\abstractintoc}{}
\renewcommand*{\abstractnum}{}
\renewcommand*{\abstractrunin}{}
+\DeclareDocumentCommand{\book}{s d() o o d() m}{%
+ \LWR@section{#1}{#3}{#6}{book}%
+}
\def\@apppage{%
\part*{\appendixpagename}
@@ -231,9 +234,13 @@
\def\@sapppage{%
\part*{\appendixpagename}
}
+\DeclareDocumentCommand{\mainmatter}{s}{%
+ \booltrue{LWR@mainmatter}%
+}
-\csletcs{frontmatter*}{frontmatter}
-\csletcs{mainmatter*}{mainmatter}
+\DeclareDocumentCommand{\frontmatter}{s}{%
+\boolfalse{LWR@mainmatter}%
+}
\renewcommand*{\raggedbottomsection}{}
\renewcommand*{\normalbottomsection}{}
\renewcommand*{\bottomsectionskip}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
index 4ce744ef978..9a92243919b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{quotchap}[2012/10/20]
+\LWR@ProvidesPackageDrop{quotchap}[2019/07/09]
\newcommand{\@quotchap}{}
\newlength{\LWR@quotchapwidth}
@@ -34,8 +34,16 @@
\global\let\@quotchap\BODY
\global\let\@printcites\@iprintcites%
}
-\newcommand{\qauthor}[1]{\begin{BlockClass}{qauthor}{#1}\end{BlockClass}}
+\newcommand{\qauthor}[1]{%
+ \LWR@stoppars%
+ \begin{BlockClass}{qauthor}%
+ {#1}%
+ \end{BlockClass}%
+ \LWR@startpars%
+}
\newcommand{\qsetcnfont}[1]{}
+\providecommand*{\quotefont}{}
+\providecommand*{\qauthorfont}{}
\endinput
%%
%% End of file `lwarp-quotchap.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty
index 088eff09790..3f59ee57203 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty
@@ -24,7 +24,7 @@
{\LWR@patcherror{quoting}{quoting}}
\xpatchcmd{\endquoting}{\quo@endtext}
- {\quo@endtext\end{LWR@blocktextcurrentfont}}
+ {\quo@endtext\end{LWR@blocktextcurrentfont}\LWR@stoppars}
{}
{\LWR@patcherror{imakeidx}{endquoting}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
index 09f0d9c0cea..9db031a5442 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
@@ -28,8 +28,8 @@
\DeclareDocumentCommand{\useshapeofkomafont}{m}{}
\AtBeginDocument{
-\let\LWR@maketitle\maketitle
-\DeclareDocumentCommand{\maketitle}{o}{\LWR@maketitle}
+ \let\LWR@koma@orig@maketitle\maketitle
+ \DeclareDocumentCommand{\maketitle}{o}{\LWR@koma@orig@maketitle}
}
\DeclareDocumentCommand{\extratitle}{m}{}
@@ -76,12 +76,12 @@
\DeclareDocumentCommand{\deffootnotemark}{m}{}
\DeclareDocumentCommand{\setfootnoterule}{o m}{}
\DeclareDocumentCommand{\raggedfootnote}{}{}
-
\DeclareDocumentCommand{\dictum}{o m}{
\begin{LWR@BlockClassWP}{\LWR@print@mbox{text-align:right}}{}{dictum}
#2
\IfValueT{#1}
{
+ \LWR@stoppars%
\ifbool{FormatWP}
{\begin{BlockClass}[\LWR@print@mbox{border-top:} 1px solid gray]{dictumauthor}}
{\begin{BlockClass}{dictumauthor}}
@@ -116,9 +116,9 @@
\let\endaddmargin\relax
\cslet{addmargin*}{\relax}
\cslet{endaddmargin*}{\relax}
-
\NewDocumentEnvironment{addmargin}{s O{} m}
{
+\LWR@stoppars%
\setlength{\LWR@templengthtwo}{#3}
\ifblank{#2}
{
@@ -135,7 +135,7 @@
]{addmargin}
}
}
-{\end{BlockClass}}
+{\end{BlockClass}\LWR@startpars}
\ExplSyntaxOn
\cs_new:cpn {addmargin*} {\addmargin*}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty
new file mode 100644
index 00000000000..55112e993f9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty
@@ -0,0 +1,83 @@
+%%
+%% This is file `lwarp-stackengine.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `stackengine')
+%% This is a generated file.
+%% Copyright 2016-2019 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{stackengine}[2017/02/13]
+\LetLtxMacro\LWR@orig@stackengine\stackengine
+\renewcommand*{\stackengine}[8]{%
+ \ifstrequal{#4}{O}%
+ {\begin{lateximage}}%
+ {\begin{lateximage}[][][vertical-align:top]}%
+ \LWR@orig@stackengine{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}%
+ \end{lateximage}%
+}
+\LetLtxMacro\LWR@orig@@stack\@stack
+
+\xpatchcmd{\LWR@orig@@stack}{\stackengine}{\LWR@orig@stackengine}
+ {}
+ {\LWR@patcherror{stackengine}{LWR@orig@@stack}}
+
+\renewcommand*{\@stack}[4]{%
+ \ifstrequal{#3}{O}%
+ {\begin{lateximage}}%
+ {\begin{lateximage}[][][vertical-align:top]}%
+ \LWR@orig@@stack{#1}{#2}{#3}{#4}%
+ \end{lateximage}%
+}
+\newcommand*\LWR@HTML@@stacklap[4]{#3}
+\LWR@formatted{@stacklap}
+\xpatchcmd{\stackanchor}{\stackengine}{\LWR@orig@stackengine}
+ {}
+ {\LWR@patcherror{stackengine}{stackanchor patch 1}}
+
+\xpatchcmd{\stackanchor}{\stackengine}{\LWR@orig@stackengine}
+ {}
+ {\LWR@patcherror{stackengine}{stackanchor patch 2}}
+
+\xpretocmd{\stackanchor}{\begin{lateximage}[][][vertical-align:middle]}
+ {}
+ {\LWR@patcherror{stackengine}{stackanchor pre}}
+
+\xapptocmd{\stackanchor}{\end{lateximage}}
+ {}
+ {\LWR@patcherror{stackengine}{stackanchor app}}
+\xpretocmd{\Centerstack}{\begin{lateximage}[][][vertical-align:middle]}
+ {}
+ {\LWR@patcherror{stackengine}{Centerstack pre}}
+
+\xapptocmd{\Centerstack}{\end{lateximage}}
+ {}
+ {\LWR@patcherror{stackengine}{Centerstack app}}
+\renewcommand*\savestack[2]{%
+ \xdef\sv@name{\stack@macro@name{#1}}%
+ \@ifundefined{\sv@name content}{%
+ \expandafter\newsavebox\expandafter{\csname\sv@name content\endcsname}%
+ }{}%
+ \begingroup% lwarp
+ \LWR@restoreorigformatting% lwarp
+ \RenewDocumentEnvironment{lateximage}{s o o o}{}{}% lwarp: inside group
+ \expandafter\LWR@gsavebox\csname\sv@name content\endcsname{#2}%
+ \expandafter\gdef\expandafter#1\expandafter{%
+ \expandafter\begin\expandafter{lateximage\expandafter}% lwarp
+ \expandafter\usebox\expandafter%
+ {\csname\sv@name content\endcsname}%
+ \expandafter\end\expandafter{lateximage\expandafter}% lwarp
+ }%
+ \endgroup% lwarp
+}
+\endinput
+%%
+%% End of file `lwarp-stackengine.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
index 32ecc91967b..5bfd85a1359 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
@@ -37,6 +37,10 @@
}
\newcommand{\tnote}[1]{\LWR@htmlspan{sup}{#1}}
+\newenvironment*{measuredfigure}[1][t]
+ {\def\@captype{figure}}
+ {}
+
\endinput
%%
%% End of file `lwarp-threeparttable.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
index 22ebc54b835..04ae5aaa84e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
@@ -67,7 +67,7 @@
\@bsmarkseries
\LWR@maketitlesetup
\@maketitle
-\@thanks
+\LWR@stoppars\@thanks\LWR@startpars
\end{titlepage}
\@bscontmark
}
@@ -99,11 +99,11 @@
\maketitlehookd
}
\renewcommand*{\LWR@titlingmaketitle}{%
-\@thanks
+\LWR@stoppars\@thanks\LWR@startpars
\@bsmarkseries
\LWR@maketitlesetup
\@maketitle
-\@thanks
+\LWR@stoppars\@thanks\LWR@startpars
\@bscontmark
}
\renewcommand{\thanksmarkseries}[1]{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty
index 481789d69a2..cdae740bda5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty
@@ -15,20 +15,18 @@
%% 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{tocdata}[2019/03/21]
+\LWR@ProvidesPackagePass{tocdata}[2019/07/06]
\renewcommand*{\LWR@maybetocdata}{%
\ifdefempty{\TD@thistocdata}{}{%
- \qquad --- \InlineClass{authorartist}{\TD@thistocdata}%
+ \qquad \InlineClass{authorartist}{\tocdataformat{\TD@thistocdata}}%
\def\TD@thistocdata{}
}
}
-
\renewrobustcmd{\tocdatapartprint}[4]
{%
- \LWR@htmltagc{br /}%
\InlineClass{authorartist}{%
\qquad --- %
- \TD@optionalname{#1}\TD@optionalname{#2}#3#4%
+ \TDoptionalnameprint{#1}\TDoptionalnameprint{#2}#3#4%
}%
}
@@ -51,10 +49,10 @@
{}%
}
-\renewcommand{\TD@artistauthorprint}[5]{%
+\renewcommand{\TDartistauthorprint}[5]{%
\LWR@TD@settextalign{#1}%
\begin{BlockClass}[text-align:\LWR@TD@textalign]{floatnotes}%
- \InlineClass{authorartist}{\TD@optionalname{#2}\TD@optionalname{#3}#4#5}%
+ \InlineClass{authorartist}{\TDoptionalnameprint{#2}\TDoptionalnameprint{#3}#4#5}%
\end{BlockClass}%
}
@@ -71,7 +69,7 @@
{}%
}
-\renewcommand{\TD@artistauthortextprint}[2]{%
+\renewcommand{\TDartistauthortextprint}[2]{%
\LWR@TD@setnamealign{#1}%
\begin{BlockClass}[text-align:\LWR@TD@textalign]{floatnotes}%
#2%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
index 8ccf58b72fe..abbbfa9a2ff 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
@@ -15,11 +15,12 @@
%% 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{versonotes}[2015/12/08]
+\LWR@ProvidesPackageDrop{versonotes}[2019/07/06]
\newcommand{\versonote}[1]{\marginpar{#1}}
\newdimen\versotextwidth
\newdimen\versoleftmargin
\newcommand*{\versolayout}{}
+\setcounter{page}{1}
\endinput
%%
%% End of file `lwarp-versonotes.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
index d9406455044..f2529f9272a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
@@ -30,7 +30,7 @@
}%
}
\renewenvironment*{vwcol}[1][]{%
-\par\noindent%
+\LWR@stoppars%
\vwcolsetup{#1}%
\newcommand*{\LWR@vwcolstyle}{}
\if@vwcol@presep
@@ -81,6 +81,7 @@
}
{
\endBlockClass
+\LWR@startpars
}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
index 68f61f6cced..e4e85161186 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
@@ -66,27 +66,28 @@
border:\LWR@printlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; %
padding:\LWR@printlength{\fboxsep}%
}
+\NewDocumentCommand{\LWR@HTML@color}{o m}{%
+\IfValueTF{#1}{%
+ \LWR@print@color[#1]{#2}%
+ \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor%
+}{%
+ \LWR@print@color{#2}%
+ \convertcolorspec{named}{#2}{HTML}\LWR@tempcolor%
+}%
+\edef\LWR@currenttextcolor{\LWR@origpound\LWR@tempcolor}%
+}
+
+\LWR@formatted{color}
\NewDocumentCommand{\LWR@HTML@textcolor}{o m m}{%
\begingroup%
\IfValueTF{#1}{%
\color[#1]{#2}%
}{%
\color{#2}%
-}%
-\LWR@FBcancel%
-\IfValueTF{#1}{%
-\InlineClass[color:\LWR@colorstyle{#1}{#2}]{textcolor}{%
-\renewcommand*{\LWR@currenttextcolor}{\LWR@origpound\LWR@tempcolor}%
-#3%
-}%
-}{%
-\InlineClass[color:\LWR@colorstyle{named}{#2}]{textcolor}{%
-\renewcommand*{\LWR@currenttextcolor}{\LWR@origpound\LWR@tempcolor}%
-#3%
-}%
-}%
-\endgroup%
}
+\InlineClass[color:\LWR@currenttextcolor]{textcolor}{#3}%
+\endgroup%
+}%
\LWR@formatted{textcolor}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
index e05e1c64217..8266fe1df15 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
@@ -20,30 +20,39 @@
\AtBeginDocument{
-\preto{\xy}{\begin{lateximage}[(-xy-~\packagediagramname)]}
-\appto{\endxy}{\end{lateximage}}
-
-\@ifundefined{xymatrix}{}{
-\LetLtxMacro\LWR@origxymatrix\xymatrix
+\LetLtxMacro\LWR@orig@xy\xy
+\LetLtxMacro\LWR@orig@endxy\endxy
+\renewcommand*{\xy}{%
+ \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
+ {\addtocounter{LWR@lateximagedepth}{1}}%
+ {\begin{lateximage}[(-xy-~\packagediagramname)]}%
+ \LWR@orig@xy%
+}
-\renewcommand{\xymatrix}[1]{%
-\begin{lateximage}[(-xy- xymatrix \packagediagramname)]
-\LWR@origxymatrix{#1}
-\end{lateximage}
+\renewcommand*{\endxy}{%
+ \LWR@orig@endxy%
+ \ifnumcomp{\value{LWR@lateximagedepth}}{>}{1}%
+ {\addtocounter{LWR@lateximagedepth}{-1}}%
+ {\end{lateximage}}%
}
+\def\xybox#1{%
+ \LWR@orig@xy#1\LWR@orig@endxy%
+ \Edge@c={\rectangleEdge}\computeLeftUpness@%
}
\@ifundefined{xygraph}{}{
+
\LetLtxMacro\LWR@origxygraph\xygraph
\renewcommand{\xygraph}[1]{%
-\begin{lateximage}[(-xy- xygraph \packagediagramname)]
-\LWR@origxygraph{#1}
-\end{lateximage}
-}
+ \begin{lateximage}[(-xy- xygraph \packagediagramname)]
+ \LWR@origxygraph{#1}
+ \end{lateximage}
}
-}
+}% xygraph defined
+
+}% AtBeginDocument
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index e9e738fd8a2..dcd7ad4fa11 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2019/06/08 v0.72 Allows LaTeX to directly produce HTML5 output.]
+ [2019/07/11 v0.73 Allows LaTeX to directly produce HTML5 output.]
@@ -383,6 +383,7 @@
\LWR@loadafter{lua-visual-debug}
\LWR@loadafter{luacolor}
\LWR@loadafter{luatodonotes}
+\LWR@loadafter{lyluatex}
\LWR@loadafter{magaz}
\LWR@notmemoirloadafter{makeidx}
\LWR@loadafter{manyfoot}
@@ -515,6 +516,7 @@
\LWR@loadafter{srcltx}
\LWR@loadafter{srctex}
\LWR@loadafter{stabular}
+\LWR@loadafter{stackengine}
\LWR@notltjloadafter{stfloats}
\LWR@loadafter{struktex}
\LWR@loadafter{subcaption}
@@ -687,6 +689,7 @@
\arabic{LWR@tempcountone}%
}
+
\newcommand*{\LWR@patcherror}[2]{%
\PackageError{lwarp}
{Unable to patch package #1, macro #2}
@@ -701,10 +704,41 @@
\@ifpackageloaded{xeCJK}{
\renewcommand{\LWR@isolate}[1]{\null#1\null}%
}{}
+\newcommand*{\LWR@forceemptyline}{%
+ \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}
+\DeclareRobustCommand\LWR@gsavebox[1]{%
+ \@ifnextchar(%)
+ {\LWR@@gsavepicbox#1}{\@ifnextchar[{\LWR@@gsavebox#1}{\LWR@gsbox#1}}}%
+\long\def\LWR@gsbox#1#2{\global\setbox#1\hbox{%
+ \color@setgroup#2\color@endgroup}}
+\def\LWR@@gsavebox#1[#2]{%
+ \@ifnextchar [{\LWR@@igsavebox#1[#2]}{\LWR@@igsavebox#1[#2][c]}}
+\long\def\LWR@@igsavebox#1[#2][#3]#4{%
+ \LWR@gsbox#1{\@imakebox[#2][#3]{#4}}}
+\def\LWR@@gsavepicbox#1(#2,#3){%
+ \@ifnextchar[%]
+ {\LWR@@igsavepicbox#1(#2,#3)}{\LWR@@igsavepicbox#1(#2,#3)[]}}
+\long\def\LWR@@igsavepicbox#1(#2,#3)[#4]#5{%
+ \LWR@gsbox#1{\@imakepicbox(#2,#3)[#4]{#5}}}
+
+\def\LWR@glrbox#1{%
+ \edef\reserved@a{%
+ \endgroup
+ \global\setbox#1\hbox{%
+ \begingroup\aftergroup}%
+ \def\noexpand\@currenvir{\@currenvir}%
+ \def\noexpand\@currenvline{\on@line}}%
+ \reserved@a
+ \@endpefalse
+ \color@setgroup
+ \ignorespaces}
+\let\LWR@endglrbox\LWR@endlrbox
\let\LWRpercent\@percentchar
\catcode`\$=12
\def\LWRdollar{$}
@@ -1264,7 +1298,7 @@
\immediate\openout\LWR@quickfile #1_html_inc.tex% lwarp
\immediate\write\LWR@quickfile{\string\input{#1.tex}}% lwarp
\immediate\closeout\LWR@quickfile% lwarp
-\LWR@origclearpage% \changed
+\LWR@orignewpage% changed from clearpage
\if@filesw
\immediate\write\@mainaux{\string\@input{#1_html_inc.aux}}% changed
\fi
@@ -1282,7 +1316,7 @@
\immediate\write\@partaux{\relax}%
\fi
\@input@{#1_html_inc.tex}% changed
- \LWR@origclearpage% changed
+ \LWR@orignewpage% changed from clearpage
\@writeckpt{#1}%
\if@filesw
\immediate\closeout\@partaux
@@ -1577,8 +1611,6 @@
\LetLtxMacro\LWR@origfootnote\footnote
\let\LWR@orig@mpfootnotetext\@mpfootnotetext
-\let\LWR@origclearpage\clearpage
-
\AtBeginDocument{% in case packages change definition
\LetLtxMacro\LWR@orighline\hline%
\LetLtxMacro\LWR@origcline\cline%
@@ -1867,6 +1899,8 @@ A:visited {color:#800000 ; }
A:hover {color:#000080 ; text-decoration: underline ;}
A:active {color:#800000 ; }
+a.tocbook {display: inline-block ; margin-left: 0em ;
+ font-weight: bold ; margin-top: 1ex ; margin-bottom: 1ex ; }
a.tocpart {display: inline-block ; margin-left: 0em ;
font-weight: bold ;}
a.tocchapter {display: inline-block ; margin-left: 0em ;
@@ -2156,7 +2190,7 @@ body div {
margin: 0ex;
}
-h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph
+div.book, h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph
{
font-family: "Linux Libertine O", "Hoefler Text", "Garamond",
"Bembo", "Janson", "TeX Gyre Pagella", "Palatino",
@@ -2172,6 +2206,13 @@ h1 { /* title of the entire website, used on each page */
font-size: 2.5em ;
padding: .4ex 0em 0ex 0em ;
}
+
+div.book {
+ text-align: center ;
+ font-size: 2.325em ;
+ padding: .4ex 0em 0ex 0em ;
+}
+
h2 { font-size: 2.25em }
h3 { font-size: 2em }
h4 { font-size: 1.75em }
@@ -2435,8 +2476,11 @@ span.abstractrunintitle{
}
.fancyvrblabel {
- font-weight:bold;
+ font-size: .85em ;
text-align: center ;
+ font-weight: bold ;
+ margin-top: 1ex ;
+ margin-bottom: 1ex ;
}
.verse {
@@ -3112,10 +3156,13 @@ span.floatright { float: right ; }
}
.authorartist{
+ display:block ;
font-size:.70em ;
font-style: italic;
}
+nav .authorartist{ display:inline; }
+
/* Native LaTeX theorems: */
.theoremcontents { font-style: italic; margin-top: 3ex ; margin-bottom: 3ex ; }
@@ -3370,7 +3417,7 @@ A:visited {color:#705030 ; text-shadow:1px 1px 2px #a0a0a0;}
A:hover {color:#006000 ; text-decoration: underline ; text-shadow:0px 0px 2px #a0a0a0;}
A:active {color:#00C000 ; text-shadow:1px 1px 2px #a0a0a0;}
-h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph
+div.book, h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph
{
font-family: "URW Classico", Optima, "Linux Biolinum O",
"Linux Libertine O", "Liberation Serif",
@@ -3622,7 +3669,7 @@ span.textsf {
Geneva, Verdana, sans-serif ;
}
-h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph
+div.book, h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph
{
font-family: "Linux Libertine O", "Hoefler Text", "Garamond",
"Bembo", "Janson", "TeX Gyre Pagella", "Palatino",
@@ -3986,7 +4033,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.72"
+printversion = "v0.73"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -4854,6 +4901,7 @@ end -- not --version
\newcommand*{\LWR@depthnone}{-5}
\newcommand*{\LWR@depthfinished}{-4}
+\newcommand*{\LWR@depthbook}{-2}
\newcommand*{\LWR@depthpart}{-1}
\newcommand*{\LWR@depthchapter}{0}
\newcommand*{\LWR@depthsection}{1}
@@ -5221,9 +5269,10 @@ end -- not --version
\begin{warpHTML}
-
\newcommand*{\LWR@tagtitle}{h1}
\newcommand*{\LWR@tagtitleend}{/h1}
+\newcommand*{\LWR@tagbook}{div class="book"}
+\newcommand*{\LWR@tagbookend}{/div}
\newcommand*{\LWR@tagpart}{h2}
\newcommand*{\LWR@tagpartend}{/h2}
\newcommand*{\LWR@tagchapter}{h3}
@@ -5293,6 +5342,10 @@ end -- not --version
\LWR@orignewline\LWR@origrule{2em}{0pt}%
}
+\newcommand*{\LWR@indentHTMLtwo}{%
+ \LWR@orignewline\LWR@origrule{4em}{0pt}%
+}
+
\newcommand*{\LWR@htmltagc}[1]{%
\LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}%
@@ -5330,6 +5383,8 @@ end -- not --version
\let\item\LWR@nestspanitem%
}%
\renewcommand{\LWR@listend}{\LWR@htmltagc{br /}\LWR@htmltagc{br /}}%
+ \renewenvironment{quote}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}%
+ \renewenvironment{quotation}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}%
}% not in a lateximage
\LWR@traceinfo{LWR@nestspan starting: done}%
}% starting env
@@ -5427,6 +5482,7 @@ end -- not --version
\NewDocumentCommand{\LWR@htmlelementclass}{m o m}{%
\LWR@stoppars%
+\LWR@forceemptyline%
\LWR@subhtmlelementclass{#1}[#2]{#3}%
\LWR@startpars%
}
@@ -5452,6 +5508,7 @@ end -- not --version
\NewDocumentCommand{\LWR@htmlelementclassline}{m o m +m}{%
\LWR@stoppars
+\LWR@forceemptyline%
\LWR@subhtmlelementclass{#1}[#2]{#3}%
#4%
\LWR@htmltag{/#1}
@@ -5479,7 +5536,6 @@ end -- not --version
\NewDocumentEnvironment{LWR@print@BlockClass}{o m}{}{}%
\NewDocumentEnvironment{LWR@HTML@BlockClass}{o m}%
{%
- \LWR@origpar%
\LWR@htmldivclass[#1]{#2}%
}
{\LWR@htmldivclassend{#2}}
@@ -5491,7 +5547,6 @@ end -- not --version
\end{warpall}
\begin{warpHTML}
\newcommand{\LWR@HTML@BlockClassSingle}[2]{%
-\LWR@origpar%
\LWR@htmlelementclassline{div}{#1}{#2}%
}
@@ -5550,6 +5605,8 @@ end -- not --version
\begin{warpHTML}
+\newcommand*{\LWR@printclosebook}
+ {\ifbool{HTMLDebugComments}{\LWR@htmlcomment{Closing book}}{}}
\newcommand*{\LWR@printclosepart}
{\ifbool{HTMLDebugComments}{\LWR@htmlcomment{Closing part}}{}}
\newcommand*{\LWR@printclosechapter}
@@ -5785,7 +5842,7 @@ end -- not --version
}
\end{warpHTML}
\begin{warpall}
-\providecommand{\thetitle}{}
+\providecommand{\thetitle}{\BaseJobname}
\newcommand{\theHTMLTitle}{\thetitle}
@@ -5943,17 +6000,18 @@ end -- not --version
}%
}
\newcommand{\marginparBlock}[2][]{%
+\LWR@stoppars%
\ifbool{FormatWP}%
{%
-\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
-#2
-\end{LWR@BlockClassWP}
-}%
-{%
-\begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock}
-#2
-\end{BlockClass}
+ \begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
+ #2
+ \end{LWR@BlockClassWP}
+}{%
+ \begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock}
+ #2
+ \end{BlockClass}
}%
+\LWR@startpars%
}
\renewcommand*{\reversemarginpar}{}
\renewcommand*{\normalmarginpar}{}
@@ -6170,11 +6228,13 @@ end -- not --version
\ifbool{FormatEPUB}
{}
{
- \LWR@htmlelement{footer}
+ \ifdefempty{\LWR@pagebottom}{}{%
+ \LWR@htmlelement{footer}
- \LWR@pagebottom
+ \LWR@pagebottom
- \LWR@htmlelementend{footer}
+ \LWR@htmlelementend{footer}
+ }
}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
{}
@@ -6233,11 +6293,13 @@ end -- not --version
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
{}
{
- \LWR@htmlelement{header}
+ \ifdefempty{\LWR@pagetop}{}{
+ \LWR@htmlelement{header}
- \LWR@pagetop
+ \LWR@pagetop
- \LWR@htmlelementend{header}
+ \LWR@htmlelementend{header}
+ }
}
\LWR@htmlelementclass{div}{bodyandsidetoc}
@@ -6495,6 +6557,9 @@ end -- not --version
}
+\providecommand*{\prebookname}{}
+\providecommand*{\postbookname}{}
+
\providecommand*{\prepartname}{}
\providecommand*{\postpartname}{}
@@ -6727,11 +6792,13 @@ end -- not --version
\LWR@traceinfo{LWR@lwarpStart: Starting new file.}
\LWR@filestart
\LWR@traceinfo{LWR@lwarpStart: Generating first header.}
-\LWR@htmltag{header}\LWR@orignewline
-\LWR@startpars
-\LWR@firstpagetop
-\LWR@stoppars
-\LWR@htmltag{/header}\LWR@orignewline
+\ifdefempty{\LWR@firstpagetop}{}{%
+ \LWR@htmltag{header}\LWR@orignewline
+ \LWR@startpars
+ \LWR@firstpagetop
+ \LWR@stoppars
+ \LWR@htmltag{/header}\LWR@orignewline
+}%
\LWR@htmlelementclass{div}{bodywithoutsidetoc}
\LWR@htmlelementclass{div}{bodycontainer}
\LWR@traceinfo{LWR@lwarpStart: Generating textbody.}
@@ -6771,11 +6838,13 @@ end -- not --version
\LWR@htmlelementclassend{div}{bodycontainer}
\LWR@htmlelementclassend{div}{bodyandsidetoc}
\LWR@printpendingfootnotes
-\LWR@htmlelement{footer}
+\ifdefempty{\LWR@pagebottom}{}{%
+ \LWR@htmlelement{footer}
-\LWR@pagebottom
+ \LWR@pagebottom
-\LWR@htmlelementend{footer}
+ \LWR@htmlelementend{footer}
+}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
{}
@@ -6855,7 +6924,7 @@ end -- not --version
}
\end{warpHTML}
\begin{warpall}
-\newcommand*{\printthanks}{\@thanks}
+\newcommand*{\printthanks}{\LWR@stoppars\@thanks\LWR@startpars}
\end{warpall}
\begin{warpHTML}
@@ -6940,7 +7009,7 @@ end -- not --version
\begin{titlepage}
\LWR@maketitlesetup
\@maketitle
-\@thanks
+\LWR@stoppars\@thanks\LWR@startpars
\end{titlepage}
\setcounter{footnote}{0}%
\global\let\thanks\relax
@@ -6956,9 +7025,11 @@ end -- not --version
\global\let\and\relax
}
\DeclareDocumentCommand{\@maketitle}{}{%
- \LWR@stoppars\LWR@htmltag{\LWR@tagtitle}%
+ \LWR@stoppars%
+ \LWR@htmltag{\LWR@tagtitle}%
\@title%
- \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars%
+ \LWR@htmltag{\LWR@tagtitleend}%
+ \LWR@startpars%
\begin{BlockClass}{author}%
\renewcommand*{\cr}{}%
\renewcommand*{\crcr}{}%
@@ -6977,10 +7048,10 @@ end -- not --version
}
\newcommand*{\LWR@titlingmaketitle}{%
-\@thanks
+\LWR@stoppars\@thanks\LWR@startpars
\LWR@maketitlesetup
\@maketitle
-\@thanks
+\LWR@stoppars\@thanks\LWR@startpars
}
\end{warpHTML}
\begin{warpall}
@@ -7039,9 +7110,11 @@ end -- not --version
\begin{warpHTML}
\newcommand{\attribution}[1]{%
+ \LWR@stoppars%
\begin{BlockClass}{attribution}
#1
\end{BlockClass}
+ \LWR@startpars%
}
\end{warpHTML}
\begin{warpprint}
@@ -7310,10 +7383,16 @@ end -- not --version
\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[]%
-\LWR@select@html@hspace%
-\LWR@htmltag{dt}#1\LWR@htmltag{/dt}%
+\LWR@origitem[#1]%
+\endgroup%
\LWR@orignewline%
\LWR@htmltag{dd}%
\LWR@startpars%
@@ -8947,6 +9026,16 @@ rowspan="#2" %
\NewDocumentCommand{\LWR@HTML@@tabular}{d<> o m}
{%
\LWR@traceinfo{LWR@HTML@@tabular started}%
+\ifnumcomp{\value{LWR@spandepth}}{>}{0}{%
+ \PackageWarning{lwarp}{%
+ A tabular is being used inside a span such as\MessageBreak
+ a minipage. Some formatting may not be correct\MessageBreak
+ in the tabular.\MessageBreak
+ It is recommended to use \protect\warpprintonly\space or the\MessageBreak
+ warpprint environment to isolate the span to\MessageBreak
+ print-only,%
+ }
+}{}%
\addtocounter{LWR@tabulardepth}{1}%
\global\boolfalse{LWR@startedrow}%
\setcounter{LWR@hlines}{0}%
@@ -9549,7 +9638,7 @@ autopage-\theLWR@currentautosec%
\let\LWR@origcaptionof\captionof
\renewcommand*{\captionof}{%
-\LWR@stoppars
+\LWR@stoppars%
\LWR@origcaptionof%
}
}
@@ -9747,6 +9836,8 @@ autopage-\theLWR@currentautosec%
{}%
}
+\DeclareDocumentCommand{\l@book}{m m}{\hypertoc{-2}{book}{#1}{#2}}
+
\DeclareDocumentCommand{\l@part}{m m}{\hypertoc{-1}{part}{#1}{#2}}
\@ifundefined{chapter}
@@ -9798,17 +9889,17 @@ autopage-\theLWR@currentautosec%
\newcommand{\LWR@indexitem}[1][\@empty]{
-\InlineClass{indexitem}{}#1%
+\InlineClass{indexitem}{\LWR@htmlcomment{}}#1%
}
\newcommand{\LWR@indexsubitem}{
-\InlineClass{indexsubitem}{}
+\InlineClass{indexsubitem}{\LWR@htmlcomment{}}
}
\newcommand{\LWR@indexsubsubitem}{
-\InlineClass{indexsubsubitem}{}
+\InlineClass{indexsubsubitem}{\LWR@htmlcomment{}}
}
\def\LWR@wrindex#1{%
@@ -9984,7 +10075,7 @@ autopage-\theLWR@currentautosec%
\renewcommand*{\$}{%
\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
{\LWR@origtextdollar}%
-{\HTMLentity{dollar}}%
+{\HTMLunicode{00024}}%
}
\AtBeginDocument{
@@ -10012,13 +10103,16 @@ autopage-\theLWR@currentautosec%
}
}{
\PackageWarningNoLine{lwarp}{Load graphicx or graphics
- for improved SVG math baselines,}
+ for improved\MessageBreak
+ SVG math baselines%
+ }
\newcommand*{\LWR@addbaselinemarker}{}
}
}
}{% lwarp_baseline_marker.png or .eps is not present
- \PackageWarningNoLine{lwarp}{File \LWR@baselinename\space is not installed alongside
- the lwarp-*.sty files, so SVG math baselines may not be accurate,}
+ \PackageWarningNoLine{lwarp}{File \LWR@baselinename\space is not installed\MessageBreak
+ alongside the lwarp-*.sty files,\MessageBreak
+ so SVG math baselines may not be accurate}
\newcommand*{\LWR@addbaselinemarker}{}
}
@@ -11261,7 +11355,7 @@ autopage-\theLWR@currentautosec%
\ifbool{LWR@forceminipagefullwidth}%
{}%
{%
- \ifthenelse{\lengthtest{#4}=\linewidth}%
+ \ifdimequal{#4}{\linewidth}%
{}%
{width:\LWR@printlength{\LWR@minipagewidth} ; }%
}%
@@ -11425,11 +11519,13 @@ color:\LWR@origpound\LWR@tempcolor%
\begin{warpHTML}
\newcommand{\LWR@HTML@fboxBlock}[1]{%
\LWR@forceminwidth{\fboxrule}%
+\LWR@stoppars%
\begin{BlockClass}[%
\LWR@fboxstyle%
]{fboxBlock}
#1
\end{BlockClass}
+\LWR@startpars%
}
\LWR@formatted{fboxBlock}
@@ -11481,7 +11577,7 @@ color:\LWR@origpound\LWR@tempcolor%
\ifbool{LWR@forceminipagefullwidth}%
{}%
{%
- \ifthenelse{\lengthtest{\LWR@tempwidth}=\linewidth}%
+ \ifdimequal{\LWR@tempwidth}{\linewidth}%
{}%
{width:\LWR@printlength{\LWR@tempwidth} ; }%
}%
@@ -11804,6 +11900,7 @@ color:\LWR@origpound\LWR@tempcolor%
\renewcommand{\textsuperscript}[1]{##1}%
\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}%
\def\(##1\){}%
@@ -11861,13 +11958,14 @@ color:\LWR@origpound\LWR@tempcolor%
}
\newenvironment*{LWR@blocktextcurrentfont}{%
+\LWR@stoppars%
\BlockClass{%
text\LWR@f@family\LWR@origtilde{}%
text\LWR@f@series\LWR@origtilde{}%
text\LWR@f@shape\LWR@origtilde{}%
text\LWR@f@shapecaps%
}%
-}{\endBlockClass}
+}{\endBlockClass\LWR@startpars}
\newrobustcmd*{\LWR@HTML@mdseries}{\renewcommand*{\LWR@f@series}{md}}
\LWR@formatted{mdseries}
@@ -12095,7 +12193,8 @@ color:\LWR@origpound\LWR@tempcolor%
\quad%
\addtolength{\LWR@templengthone}{-1em}%
}%
- }{}%
+ }%
+ {\LWR@htmlcomment{}}%
\LWR@htmltagc{/span}%
}%
\LWR@minipagestartpars%
@@ -12176,7 +12275,8 @@ color:\LWR@origpound\LWR@tempcolor%
\_{}%
\addtolength{\LWR@templengthone}{-1em}%
}%
- }{}%
+ }%
+ {\LWR@htmlcomment{}}%
\LWR@htmltagc{/span}%
\LWR@minipagestartpars%
}% non-zero width