texlive[51653] trunk: lwarp (16jul19)
commits+karl at tug.org
commits+karl at tug.org
Tue Jul 16 23:14:36 CEST 2019
Revision: 51653
http://tug.org/svn/texlive?view=revision&revision=51653
Author: karl
Date: 2019-07-16 23:14:36 +0200 (Tue, 16 Jul 2019)
Log Message:
-----------
lwarp (16jul19)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2019-07-16 21:14:36 UTC (rev 51653)
@@ -2,7 +2,7 @@
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.72"
+printversion = "v0.73"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2019-07-16 21:14:36 UTC (rev 51653)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.72 README.txt
+LaTeX lwarp package v0.73 README.txt
Files included are:
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2019-07-16 21:14:36 UTC (rev 51653)
@@ -2,7 +2,7 @@
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.72"
+printversion = "v0.73"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2019-07-16 21:14:36 UTC (rev 51653)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2019/06/08 v0.72 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2019/07/11 v0.73 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -25,9 +25,9 @@
% \usepackage{libertine}
\usepackage[space]{erewhon}
\usepackage[varqu,varl]{inconsolata} % typewriter
-\usepackage{roboto}
+% \usepackage{roboto}% conflicts with \textsc inside a float
% \usepackage{sourcesanspro}
-% \usepackage{cabin}
+\usepackage{cabin}
% \usepackage[tabular,semibold]{sourcesanspro}
%
@@ -204,7 +204,7 @@
\pagestyle{pageheadfoot}
-\usepackage{dtxdescribe}[2019/01/11]
+\usepackage{dtxdescribe}[2019/07/16]
\usepackage{splitidx}
@@ -1872,6 +1872,12 @@
for \HTML\ output, without the extra braces, such as: \\
\hspace*{.375in} \cs{warpprintonly}\{\texttt{1 \& 2 \& \textred{\{}\cs{multirow}\{2\}\{2cm\}\{Text\}\textred{\}} \& 3 \textbackslash\textbackslash\}} \\
\hspace*{.375in} \cs{warpHTMLonly}\{\texttt{1 \& 2 \& \cs{multirow}\{2\}\{2cm\}\{Text\} \& 3 \textbackslash\textbackslash\}}
+ \item In \LaTeX, a \env{tabular} may be placed inside a \env{minipage},
+ \watchout[\env{tabular} inside a \element{span}]
+ but in \HTML\ a \element{table} may not be inside a \element{span}.
+ If this situation is detected, a warning is printed instructing the user
+ to isolate the \element{span} using \cs{warpprintonly} or the \env{warpprint}
+ environment.
\end{itemize}
\end{description}
}
@@ -2640,7 +2646,7 @@
%<*package>
% \fi
%
-% \CheckSum{32736}
+% \CheckSum{33109}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -2755,6 +2761,7 @@
% \changes{v0.70}{2019/04/03}{\ 2019/04/03}
% \changes{v0.71}{2019/04/29}{\ 2019/04/29}
% \changes{v0.72}{2019/06/08}{\ 2019/06/08}
+% \changes{v0.73}{2019/07/11}{\ 2019/07/11}
@@ -2975,6 +2982,35 @@
%
% \begin{description}
% \needspace{2\baselineskip}
+% \item[v0.73:] \cs{include}, \pkg{memoir}, \pkg{koma-script}, \pkg{caption},
+% \pkg{xy}, \pkg{datatool}, music scores.
+% \begin{itemize}
+% \item Fix for \cs{include}.
+% \item Warning for a \env{tabular} inside a \element{span}.
+% \item \cs{color}: Added \HTML\ support for rules and frames,
+% but not inline text. Use \cs{textcolor} if possible.
+% \item Improved many \HTML\ tags, reducing \prog{tidy} warnings. See Change History.
+% \item \pkg{memoir}: Fixes for \cs{frontmatter*} and \cs{mainmatter*}.
+% Added \cs{book}.
+% \margintag{packages}
+% \item \pkg{koma-script}: Fix for starred captions in the \TOC.
+% \item \pkg{caption}: Fix for starred captions.
+% \item \pkg{datatool}: Added pie, bar, and plot charts.
+% \item \pkg{threeparttable}: Added \env{measuredfigure}.
+% \item \pkg{intopdf}: Updated to v0.2.1.
+% \item \pkg{tocdata}: Updated to v2.03.
+% \item \pkg{quotchap}: Updated to v1.2.
+% \item \pkg{versonotes}: Updated to v0.4.
+% \item \pkg{backnaur}: Now uses \SVG\ images. Updated to v3.1.
+% \item \pkg{xy}: Fix for \cs{xybox}, improved \env{xy}, also now compatible with \pkg{qcircuit}.
+% \item \pkg{fancyvrb}: Fix for label \HTML\ tags.
+% \item Added \pkg{stackengine}.
+% \item Added \pkg{lyluatex}. (Music scores.)
+% \margintag{music}
+% \item \pkg{musicography}: Updated to 2019/05/28.
+% Added support for \env{lateximage}s.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.72:] Font control, \cs{multicolumn}, \pkg{xr} and \pkg{xr-hyper}.
% \begin{itemize}
% \item Due to internal changes, images for inline \SVG\ math and \env{lateximage}s
@@ -4749,7 +4785,8 @@
% \epkg{rotating} is emulated but all objects are unrotated.
% \env{picture}, \mpkg{tikz}, and \mpkg{xy} are converted to an \SVG\ image.
%
-% \mpkg{asymptote}, \spkg{curves}, \spkg{eepic}, \epkg{epsfig}, \spkg{epstopdf},
+% \mpkg{asymptote}, \spkg{curves}, \spkg{datatool},
+% \spkg{eepic}, \epkg{epsfig}, \spkg{epstopdf},
% \epkg{figsize}, \ipkg{fitbox},
% \spkg{grffile}, \epkg{media9}, \epkg{movie15}, \epkg{multimedia}, \mpkg{overpic},
% \mpkg{psfrag}, \mpkg{psfragx}, \mpkg{pst-eps}, \mpkg{pstool}, \mpkg{pstricks},
@@ -4803,7 +4840,7 @@
% \ipkg{hyphenat}, \epkg{lettrine}, \epkg{lips},
% \ipkg{lua-check-hyphen}, \ipkg{luacolor},
% \epkg{magaz}, \ipkg{pdfrender}, \epkg{realscripts}, \mpkg{relsize},
-% \ipkg{scalefnt}, \epkg{soul}, \epkg{soulpos}, \epkg{soulutf8},
+% \ipkg{scalefnt}, \epkg{soul}, \epkg{soulpos}, \epkg{soulutf8}, \mpkg{stackengine},
% \epkg{textfit}, \epkg{thinsp}, \ipkg{trimclip}, \ipkg{truncate},
% \mpkg{ulem}, \mpkg{umoline}, \ipkg{underscore}, \ipkg{uspace},
% \mpkg{xellipsis}. \\
@@ -4861,13 +4898,14 @@
% \spkg{circuitikz}, \spkg{elements}, \spkg{engtlc}, \spkg{fast-diagram},
% \spkg{hepnicenames}, \spkg{heppennames}, \spkg{karnaughmap}, \mpkg{karnaugh-map},
% \mpkg{listings}, \spkg{linop}, \mpkg{mhchem}, \spkg{pgfgantt},
-% \mpkg{phfqit}, \spkg{physics}, \mpkg{register}, \spkg{simpler-wick},
+% \mpkg{phfqit}, \spkg{physics}, \spkg{qcircuit}, \mpkg{register}, \spkg{simpler-wick},
% \spkg{slashed}, \spkg{structmech}, \mpkg{struktex}.
% \spkg{tikz-karnaugh}, \spkg{tikzcodeblocks} \\
%
% \midrule
%
-% Arts and humanities: & \mpkg{foreign}, \mpkg{forest}, \mpkg{musicography},
+% Arts and humanities: & \mpkg{foreign}, \mpkg{forest},
+% \mpkg{lyluatex}, \mpkg{musicography},
% \mpkg{nameauth}, \mpkg{octave}, \spkg{phonrule}, \spkg{piano},
% \mpkg{schemata}, \mpkg{semantic-markup}, \spkg{tikz-dependency},
% \mpkg{vowel}, \mpkg{xpiano} \\
@@ -9601,12 +9639,13 @@
% Section & |true| & |false| & |true| & |false| \\
% \midrule
% Title & \element{h1} & plain & \element{h1} & plain \\
+% \cs{book} & \element{div} & \element{div} & \element{div} & \element{div} \\
% \cs{part} & \element{h2} & \element{h1} & \element{h2} & \element{h1} \\
% \cs{chapter} & \element{h3} & \element{h2} & --- & --- \\
% \cs{section} & \element{h4} & \element{h3} & \element{h3} & \element{h2} \\
% \cs{subsection} & \element{h5} & \element{h4} & \element{h4} & \element{h3} \\
% \cs{paragraph} & \element{h6} & \element{h5} & \element{h5} & \element{h4} \\
-% \cs{subparagraph} & span & \element{h6} & \element{h6} & \element{h5} \\
+% \cs{subparagraph} & \element{span} & \element{h6} & \element{h6} & \element{h5} \\
% \bottomrule
% \end{tabular}
% \begin{tablenotes}
@@ -10570,9 +10609,9 @@
% Section & \parbox[b]{.35in}{\centering\LaTeX\ depth} &
% \HTML\ headings \tnote{\textasteriskcentered} \\
% \midrule
-% title of the entire website & & \element{h1} \\
-% none & -5 & new for this package \\
-% book & -2 & \textbf{not yet used} \\
+% Title of the entire website & & \element{h1} \\
+% (none) & -5 & new for this package \\
+% book & -2 & \element{div class = "book"} \\
% part & -1 & \element{h2} \\
% chapter & 0 & \element{h3} \\
% section & 1 & \element{h4} \\
@@ -11205,6 +11244,7 @@
\LWR at loadafter{lua-visual-debug}
\LWR at loadafter{luacolor}
\LWR at loadafter{luatodonotes}
+\LWR at loadafter{lyluatex}
\LWR at loadafter{magaz}
\LWR at notmemoirloadafter{makeidx}
\LWR at loadafter{manyfoot}
@@ -11344,6 +11384,7 @@
\LWR at loadafter{srcltx}
\LWR at loadafter{srctex}
\LWR at loadafter{stabular}
+\LWR at loadafter{stackengine}
\LWR at notltjloadafter{stfloats}
\LWR at loadafter{struktex}
\LWR at loadafter{subcaption}
@@ -11610,6 +11651,7 @@
%
% \section{Miscellaneous tools}
%
+% \subsection{Lengths and units}
%
% \begin{macro}{\LWR at providelength} \marg{\cs{lengthname}}
% Provides the length if it isn't defined yet.
@@ -11647,6 +11689,8 @@
% \end{macro}
+% \subsection{Patching}
+
% \begin{macro}{\LWR at patcherror} \marg{packagename} \marg{macroname}
%
% Prints an error if could not patch a macro.
@@ -11660,6 +11704,7 @@
% \end{macro}
%
%
+% \subsection{Chinese text isolation}
%
% \begin{macro}{\LWR at isolate} \marg{text}
% Isolates Chinese characters from the surrounding text.
@@ -11683,6 +11728,22 @@
% \end{macro}
%
%
+% \subsection{Inserting vertical space}
+%
+% \begin{macro}{\LWR at forceemptyline} Extra vertical space in the \HTML\ output.
+% Use after \cs{LWR at stoppars}.
+% \changes{v0.73}{2019/06/26}{Added.}
+% \begin{macrocode}
+\newcommand*{\LWR at forceemptyline}{%
+ \LWR at origrule{0pt}{1\baselineskip}%
+ \LWR at orignewline%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{Argument selection}
+%
% \begin{macro}{\LWR at firstoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
% \changes{v0.63}{2019/01/25}{Added.}
% \begin{macro}{\LWR at secondoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
@@ -11704,6 +11765,54 @@
% \end{macro}
%
%
+%
+% \subsection{Global boxes}
+%
+% \begin{macro}{\LWR at gsavebox} \marg{macroname} \marg{contents}
+%
+% From
+% \href{https://tex.stackexchange.com/questions/288702/savebox-forgets-its-content-across-columns-inside-align}
+% {https://tex.stackexchange.com/questions/288702/ \\ \fqquad\ savebox-forgets-its-content-across-columns-inside-align}
+%
+% \changes{v0.73}{2019/06/11}{Added global save boxes.}
+%
+% \begin{macrocode}
+\DeclareRobustCommand\LWR at gsavebox[1]{%
+ \@ifnextchar(%)
+ {\LWR@@gsavepicbox#1}{\@ifnextchar[{\LWR@@gsavebox#1}{\LWR at gsbox#1}}}%
+\long\def\LWR at gsbox#1#2{\global\setbox#1\hbox{%
+ \color at setgroup#2\color at 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 at 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 at gsbox#1{\@imakepicbox(#2,#3)[#4]{#5}}}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{environment}{LWR at glrbox} \marg{macroname}
+% \begin{macrocode}
+\def\LWR at glrbox#1{%
+ \edef\reserved at a{%
+ \endgroup
+ \global\setbox#1\hbox{%
+ \begingroup\aftergroup}%
+ \def\noexpand\@currenvir{\@currenvir}%
+ \def\noexpand\@currenvline{\on at line}}%
+ \reserved at a
+ \@endpefalse
+ \color at setgroup
+ \ignorespaces}
+\let\LWR at endglrbox\LWR at endlrbox
+% \end{macrocode}
+% \end{environment}
+%
+%
+%
% \section{Operating-System portability}
% \label{sec:OSportability}
% \changes{v0.11}{2016/03/11}{Added section: Operating-System portability.}
@@ -13394,17 +13503,18 @@
\begin{warpHTML}
% \end{macrocode}
-% \begin{macro}{\include} \marg{filename}
+% \begin{macro}{\@include} \marg{filename} Modified to load |_html_inc| files.
%
+% (Below, \cs{clearpage} caused missing text, and was changed to \cs{newpage}.)
+%
% \changes{v0.37}{2017/08/19}{Maintains independent \filenm{aux} files for \protect\HTML.}
-%
-% \begin{macro}{\@include} \marg{filename} Modified to load |_html_inc| files.
+% \changes{v0.73}{2019/06/20}{Fix: \cs{newpage} instead of \cs{clearpage}.}
% \begin{macrocode}
\def\@include#1 {%
\immediate\openout\LWR at quickfile #1_html_inc.tex% lwarp
\immediate\write\LWR at quickfile{\string\input{#1.tex}}% lwarp
\immediate\closeout\LWR at quickfile% lwarp
-\LWR at origclearpage% \changed
+\LWR at orignewpage% changed from clearpage
\if at filesw
\immediate\write\@mainaux{\string\@input{#1_html_inc.aux}}% changed
\fi
@@ -13422,7 +13532,7 @@
\immediate\write\@partaux{\relax}%
\fi
\@input@{#1_html_inc.tex}% changed
- \LWR at origclearpage% changed
+ \LWR at orignewpage% changed from clearpage
\@writeckpt{#1}%
\if at filesw
\immediate\closeout\@partaux
@@ -13435,7 +13545,6 @@
}
% \end{macrocode}
% \end{macro}
-% \end{macro}
% \begin{macrocode}
\end{warpHTML}
@@ -14142,9 +14251,7 @@
\LetLtxMacro\LWR at origfootnote\footnote
\let\LWR at orig@mpfootnotetext\@mpfootnotetext
-\let\LWR at origclearpage\clearpage
-
\AtBeginDocument{% in case packages change definition
\LetLtxMacro\LWR at orighline\hline%
\LetLtxMacro\LWR at origcline\cline%
@@ -14781,6 +14888,8 @@
% \changes{v0.66}{2019/02/28}{\filenm{lwarp.css}: Added \pkg{niceframe}.}
% \changes{v0.72}{2019/05/24}{\filenm{lwarp.css}: Added \pkg{backnaur}.}
% \changes{v0.72}{2019/05/26}{\filenm{lwarp.css}: Removed unneeded support for \cs{sishape}, \cs{textsi}.}
+% \changes{v0.73}{2019/06/21}{\filenm{lwarp.css}: Added \cs{book} for \pkg{memoir}.}
+% \changes{v0.73}{2019/06/30}{\filenm{lwarp_.css}: Improved pkg{tocdata} formatting.}
%
% ^^A *lwarp.css
%
@@ -14804,6 +14913,8 @@
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 ;
@@ -15104,7 +15215,7 @@
}
-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",
@@ -15120,6 +15231,13 @@
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 }
@@ -15390,8 +15508,11 @@
}
.fancyvrblabel {
- font-weight:bold;
+ font-size: .85em ;
text-align: center ;
+ font-weight: bold ;
+ margin-top: 1ex ;
+ margin-bottom: 1ex ;
}
@@ -16110,12 +16231,15 @@
}
.authorartist{
+ display:block ;
font-size:.70em ;
- font-style: italic;
+ font-style: italic;
}
+nav .authorartist{ display:inline; }
+
/* Native LaTeX theorems: */
.theoremcontents { font-style: italic; margin-top: 3ex ; margin-bottom: 3ex ; }
@@ -16383,6 +16507,7 @@
% and also when distributing the \HTML\ files.
%
% \changes{v0.65}{2018/12/09}{\filenm{lwarp_sagebrush.css}: Side\TOC to left for improved \cs{marginpar}s.}
+% \changes{v0.73}{2019/06/21}{\filenm{lwarp_formal.css}: Added \cs{book} for \pkg{memoir}.}
%
% ^^A *lwarp_sagebrush.css
%
@@ -16400,7 +16525,7 @@
-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",
@@ -16653,6 +16778,7 @@
% \changes{v0.62}{2018/11/10}{\filenm{lwarp_formal.css}: Fix: Font for verse.}
% \changes{v0.65}{2018/12/09}{\filenm{lwarp_formal.css}: Side\TOC to left for improved \cs{marginpar}s.}
% \changes{v0.66}{2019/01/02}{\filenm{lwarp_formal.css}: Improved \CSS\ for table notes.}
+% \changes{v0.73}{2019/06/21}{\filenm{lwarp_formal.css}: Added \cs{book} for \pkg{memoir}.}
%
% ^^A *lwarp_formal.css
%
@@ -16692,7 +16818,7 @@
-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",
@@ -17317,7 +17443,7 @@
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.72"
+printversion = "v0.73"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -18267,9 +18393,11 @@
% \begin{macrocode}
\newcommand*{\LWR at depthnone}{-5}
% \end{macrocode}
-% all sectioning depths are deeper than |LWR at depthfinished|:
+% All sectioning depths are deeper than |LWR at depthfinished|:
+% \changes{v0.73}{2019/06/21}{Added \cs{book} for \pkg{memoir}.}
% \begin{macrocode}
\newcommand*{\LWR at depthfinished}{-4}
+\newcommand*{\LWR at depthbook}{-2}
\newcommand*{\LWR at depthpart}{-1}
\newcommand*{\LWR at depthchapter}{0}
\newcommand*{\LWR at depthsection}{1}
@@ -19190,10 +19318,13 @@
% \subsection{Mapping \LaTeX\ sections to \HTML\ sections}
-
+%
+% \changes{v0.73}{2019/06/21}{Added \cs{book} for \pkg{memoir}.}
% \begin{macrocode}
\newcommand*{\LWR at tagtitle}{h1}
\newcommand*{\LWR at tagtitleend}{/h1}
+\newcommand*{\LWR at tagbook}{div class="book"}
+\newcommand*{\LWR at tagbookend}{/div}
\newcommand*{\LWR at tagpart}{h2}
\newcommand*{\LWR at tagpartend}{/h2}
\newcommand*{\LWR at tagchapter}{h3}
@@ -19294,7 +19425,16 @@
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\LWR at indentHTMLtwo} Newline and indent the output \HTML\ code.
+% \changes{v0.73}{2019/06/26}{Added.}
+% \begin{macrocode}
+\newcommand*{\LWR at indentHTMLtwo}{%
+ \LWR at orignewline\LWR at origrule{4em}{0pt}%
+}
+% \end{macrocode}
+% \end{macro}
+
% \subsection{\HTML\ tags}
% \begin{macro}{\LWR at htmltagc} \marg{tag}
@@ -19332,6 +19472,7 @@
% \changes{v0.34}{2017/07/29}{Fix: Minipages, BlocksClass, and lists inside a span.}
% \changes{v0.44}{2017/11/15}{Added \env{list} and \env{trivlist}.}
% \changes{v0.70}{2019/04/02}{Improved \env{minipage}, \cs{parbox} inside a span.}
+% \changes{v0.73}{2019/06/23}{Fix: \env{quote}, \env{quotation} inside a span.}
%
% \begin{macrocode}
\newcommand*{\LWR at nestspanitem}{%
@@ -19359,6 +19500,8 @@
\let\item\LWR at nestspanitem%
}%
\renewcommand{\LWR at listend}{\LWR at htmltagc{br /}\LWR at htmltagc{br /}}%
+ \renewenvironment{quote}{\LWR at htmltagc{br /}}{\LWR at htmltagc{br /}}%
+ \renewenvironment{quotation}{\LWR at htmltagc{br /}}{\LWR at htmltagc{br /}}%
}% not in a lateximage
\LWR at traceinfo{LWR at nestspan starting: done}%
}% starting env
@@ -19539,10 +19682,11 @@
%
% \changes{v0.20}{2017/01/17}{Added optional style.}
% \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.}
-%
+% \changes{v0.73}{2019/06/26}{Vertical space.}
% \begin{macrocode}
\NewDocumentCommand{\LWR at htmlelementclass}{m o m}{%
\LWR at stoppars%
+\LWR at forceemptyline%
\LWR at subhtmlelementclass{#1}[#2]{#3}%
\LWR at startpars%
}
@@ -19591,10 +19735,11 @@
% \marg{element} \oarg{style} \marg{class} \marg{text}
%
% \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.}
-%
+% \changes{v0.73}{2019/06/26}{Vertical space.}
% \begin{macrocode}
\NewDocumentCommand{\LWR at htmlelementclassline}{m o m +m}{%
\LWR at stoppars
+\LWR at forceemptyline%
\LWR at subhtmlelementclass{#1}[#2]{#3}%
#4%
\LWR at htmltag{/#1}
@@ -19668,7 +19813,6 @@
\NewDocumentEnvironment{LWR at print@BlockClass}{o m}{}{}%
\NewDocumentEnvironment{LWR at HTML@BlockClass}{o m}%
{%
- \LWR at origpar%
\LWR at htmldivclass[#1]{#2}%
}
{\LWR at htmldivclassend{#2}}
@@ -19696,7 +19840,6 @@
% \begin{macrocode}
\begin{warpHTML}
\newcommand{\LWR at HTML@BlockClassSingle}[2]{%
-\LWR at origpar%
\LWR at htmlelementclassline{div}{#1}{#2}%
}
@@ -19812,6 +19955,8 @@
% Sections H1, H2, etc.\ do not need a closing \HTML\ tag, but we add a comment for readability:
% \begin{macrocode}
+\newcommand*{\LWR at printclosebook}
+ {\ifbool{HTMLDebugComments}{\LWR at htmlcomment{Closing book}}{}}
\newcommand*{\LWR at printclosepart}
{\ifbool{HTMLDebugComments}{\LWR at htmlcomment{Closing part}}{}}
\newcommand*{\LWR at printclosechapter}
@@ -20463,9 +20608,9 @@
% \gindex{meta tag, HTML>title}
%
% \changes{v0.44}{2017/11/18}{Added.}
-%
+% \changes{v0.73}{2019/06/24}{Added default title if none specified.}
% \begin{macrocode}
-\providecommand{\thetitle}{}
+\providecommand{\thetitle}{\BaseJobname}
\newcommand{\theHTMLTitle}{\thetitle}
@@ -20938,20 +21083,22 @@
% \changes{v0.21}{2017/02/11}{Fixed source listing.}
% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} emulate a wrapfig.}
% \changes{v0.44}{2017/11/10}{Added.}
+% \changes{v0.73}{2019/06/25}{Fix: Paragraph tags.}
%
% \begin{macrocode}
\newcommand{\marginparBlock}[2][]{%
+\LWR at stoppars%
\ifbool{FormatWP}%
{%
-\begin{LWR at BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
-#2
-\end{LWR at BlockClassWP}
+ \begin{LWR at BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
+ #2
+ \end{LWR at BlockClassWP}
+}{%
+ \begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock}
+ #2
+ \end{BlockClass}
}%
-{%
-\begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock}
-#2
-\end{BlockClass}
-}%
+\LWR at startpars%
}
% \end{macrocode}
% \end{macro}
@@ -21504,11 +21651,16 @@
\ifbool{FormatEPUB}
{}
{
- \LWR at htmlelement{footer}
+% \end{macrocode}
+% \changes{v0.73}{2019/06/23}{Fix: Empty header/footer.}
+% \begin{macrocode}
+ \ifdefempty{\LWR at pagebottom}{}{%
+ \LWR at htmlelement{footer}
- \LWR at pagebottom
+ \LWR at pagebottom
- \LWR at htmlelementend{footer}
+ \LWR at htmlelementend{footer}
+ }
}
% \end{macrocode}
%
@@ -21645,11 +21797,16 @@
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
{}
{
- \LWR at htmlelement{header}
+% \end{macrocode}
+% \changes{v0.73}{2019/06/23}{Fix: Empty header/footer.}
+% \begin{macrocode}
+ \ifdefempty{\LWR at pagetop}{}{
+ \LWR at htmlelement{header}
- \LWR at pagetop
+ \LWR at pagetop
- \LWR at htmlelementend{header}
+ \LWR at htmlelementend{header}
+ }
}
% \end{macrocode}
@@ -22327,6 +22484,20 @@
% \subsection{Pre- and post- sectioning names}
+
+% \begin{macro}{\prebookname}
+% \begin{macro}{\postbookname}
+%
+% Usually null, but is used by \pkg{uj*} and \pkg{ut*} Japanese classes.
+%
+% \changes{v0.73}{2019/06/21}{Added \cs{book} for \pkg{memoir}.}
+% \begin{macrocode}
+\providecommand*{\prebookname}{}
+\providecommand*{\postbookname}{}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+
% \begin{macro}{\prepartname}
% \begin{macro}{\postpartname}
%
@@ -22901,12 +23072,17 @@
\LWR at traceinfo{LWR at lwarpStart: Starting new file.}
\LWR at filestart
\LWR at traceinfo{LWR at lwarpStart: Generating first header.}
-\LWR at htmltag{header}\LWR at orignewline
-\LWR at startpars
-\LWR at firstpagetop
-\LWR at stoppars
-\LWR at htmltag{/header}\LWR at orignewline
% \end{macrocode}
+% \changes{v0.73}{2019/06/23}{Fix: Empty header/footer.}
+% \begin{macrocode}
+\ifdefempty{\LWR at firstpagetop}{}{%
+ \LWR at htmltag{header}\LWR at orignewline
+ \LWR at startpars
+ \LWR at firstpagetop
+ \LWR at stoppars
+ \LWR at htmltag{/header}\LWR at orignewline
+}%
+% \end{macrocode}
% \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.}
% \begin{macrocode}
\LWR at htmlelementclass{div}{bodywithoutsidetoc}
@@ -23024,13 +23200,18 @@
% \begin{macrocode}
\LWR at printpendingfootnotes
% \end{macrocode}
+%
% Create the footer:
+%
+% \changes{v0.73}{2019/06/23}{Fix: Empty header/footer.}
% \begin{macrocode}
-\LWR at htmlelement{footer}
+\ifdefempty{\LWR at pagebottom}{}{%
+ \LWR at htmlelement{footer}
-\LWR at pagebottom
+ \LWR at pagebottom
-\LWR at htmlelementend{footer}
+ \LWR at htmlelementend{footer}
+}
% \end{macrocode}
% No bottom navigation if are finishing the home page,
@@ -23337,8 +23518,9 @@
%
% This is necessary in a \env{titlingpage} environment
% when \cs{maketitle} was not used.
+% \changes{v0.73}{2019/06/25}{Fix: Paragraph tags.}
% \begin{macrocode}
-\newcommand*{\printthanks}{\@thanks}
+\newcommand*{\printthanks}{\LWR at stoppars\@thanks\LWR at startpars}
% \end{macrocode}
%
%
@@ -23603,8 +23785,9 @@
\@maketitle
% \end{macrocode}
% Immediately generate any \cs{thanks} footnotes:
+% \changes{v0.73}{2019/06/25}{Fix: Paragraph tags.}
% \begin{macrocode}
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
% \end{macrocode}
% Close the \HTML\ titlepage div and cleanup:
% \begin{macrocode}
@@ -23636,9 +23819,11 @@
%
% \begin{macrocode}
\DeclareDocumentCommand{\@maketitle}{}{%
- \LWR at stoppars\LWR at htmltag{\LWR at tagtitle}%
+ \LWR at stoppars%
+ \LWR at htmltag{\LWR at tagtitle}%
\@title%
- \LWR at htmltag{\LWR at tagtitleend}\LWR at startpars%
+ \LWR at htmltag{\LWR at tagtitleend}%
+ \LWR at startpars%
\begin{BlockClass}{author}%
% \end{macrocode}
% For \pkg{IEEEtran} class:
@@ -23672,8 +23857,9 @@
\newcommand*{\LWR at titlingmaketitle}{%
% \end{macrocode}
% Keep pending footnotes out of the title block:
+% \changes{v0.73}{2019/06/25}{\pkg{titling}: Fix: Paragraph tags.}
% \begin{macrocode}
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
% \end{macrocode}
% Set up special patches:
% \begin{macrocode}
@@ -23684,8 +23870,9 @@
\@maketitle
% \end{macrocode}
% Immediately generate any \cs{thanks} footnotes:
+% \changes{v0.73}{2019/06/25}{Fix: Paragraph tags.}
% \begin{macrocode}
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
}
% \end{macrocode}
% \end{macro}
@@ -23835,13 +24022,17 @@
%
% Ex: |"A quotation." \attribution{\textsc{Author Name}\\\textsl{Book Title}}|
%
+% \changes{v0.73}{2019/06/25}{Fix: Paragraph tags.}
+%
% \codehtml
% \begin{macrocode}
\begin{warpHTML}
\newcommand{\attribution}[1]{%
+ \LWR at stoppars%
\begin{BlockClass}{attribution}
#1
\end{BlockClass}
+ \LWR at startpars%
}
\end{warpHTML}
% \end{macrocode}
@@ -24554,23 +24745,20 @@
\LWR at setlatestname{#1}%
\LWR at startnewdepth{descitem}%
% \end{macrocode}
-% Temporarily disable \cs{hspace}, which |article.cls|, etc.\ use per \cs{item}
-% for |description|s only.
-% This causes \pkg{lwarp} to mistakenly place an empty span between
-% \HTML\ list tags.
+% While creating the label, encase it inside tags and disable \cs{hspace},
+% which is used by the standard classes to add space to the labels.
+% \changes{v0.73}{2019/06/23}{Fix: \HTML\ tags.}
% \begin{macrocode}
+\begingroup%
+\let\LWR at orig@desc at makelabel\makelabel
+\renewcommand*{\makelabel}[1]{%
+ \LWR at htmltag{dt}%
+ \LWR at orig@desc at makelabel{#1}%
+ \LWR at htmltag{/dt}%
+}
\LWR at select@html at nohspace%
-% \end{macrocode}
-% Process the original \cs{item} code:
-% \begin{macrocode}
-\LWR at origitem[]%
-% \end{macrocode}
-% Restore \cs{hspace} for use in the item text:
-% \begin{macrocode}
-\LWR at select@html at hspace%
-% \end{macrocode}
-% \begin{macrocode}
-\LWR at htmltag{dt}#1\LWR at htmltag{/dt}%
+\LWR at origitem[#1]%
+\endgroup%
\LWR at orignewline%
\LWR at htmltag{dd}%
\LWR at startpars%
@@ -28300,7 +28488,7 @@
% \changes{v0.36}{2017/08/16}{Fix for \pkg{babel-french}.}
% \changes{v0.65}{2018/12/15}{Added support for \pkg{plext}.}
% \changes{v0.65}{2018/12/16}{Fix: \env{tabular*}.}
-%
+% \changes{v0.73}{2019/06/26}{Fix and warning for \env{tabular} inside a \element{span}.}
% \begin{macrocode}
\StartDefiningTabulars
@@ -28307,6 +28495,32 @@
\NewDocumentCommand{\LWR at HTML@@tabular}{d<> o m}
{%
\LWR at traceinfo{LWR at HTML@@tabular started}%
+% \end{macrocode}
+% In \LaTeX, a \env{tabular} may be placed inside a \env{minipage},
+% \watchout[\element{table} inside \element{span}]
+% but in \HTML\ a \element{table} may not be inside a \element{span}.
+% Since there may be several nested \element{span}s, with an unknown number
+% of other objects between, it is hard to undo all these \element{span}s before the
+% \element{table} then redo them after.
+% The broswer probably compensates for this situation,
+% but formatting may be lost inside the \element{table} because several
+% things are neutralized inside a \element{span}.
+% Furthermore, in the \HTML\ output, the entire \element{table} is placed
+% on a single line of \HTML\ code, since the line breaking commands are
+% neutralized inside a \element{span}. Since this is such a sloppy situation,
+% a warning is issued here instructing the user to please isolate the \element{span}
+% to print-only.
+% \begin{macrocode}
+\ifnumcomp{\value{LWR at 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 at tabulardepth}{1}%
% \end{macrocode}
% Not yet started a table row:
@@ -29842,7 +30056,7 @@
\let\LWR at origcaptionof\captionof
\renewcommand*{\captionof}{%
-\LWR at stoppars
+\LWR at stoppars%
\LWR at origcaptionof%
}
}
@@ -30335,6 +30549,16 @@
% \end{macro}
% Automatically called by \cs{contentsline}:
+%
+% \begin{macro}{\l at book} \marg{name} \marg{page}
+%
+% Uses \cs{DeclareDocumentCommand} in case the class does not happen to have a \cs{book}.
+% \changes{v0.73}{2019/06/21}{Added \cs{book} for \pkg{memoir}.}
+% \begin{macrocode}
+\DeclareDocumentCommand{\l at book}{m m}{\hypertoc{-2}{book}{#1}{#2}}
+% \end{macrocode}
+% \end{macro}
+
% \begin{macro}{\l at part} \marg{name} \marg{page}
%
% Uses \cs{DeclareDocumentCommand} in case the class does not happen to have a \cs{part}.
@@ -30458,28 +30682,31 @@
% The optional argument is added to support \pkg{repeatindex}.
%
% \changes{v0.58}{2018/06/21}{Accepts optional arg for \pkg{repeatindex}.}
+% \changes{v0.73}{2019/06/24}{Fix: Avoid empty \element{span}.}
% \begin{macrocode}
\newcommand{\LWR at indexitem}[1][\@empty]{
-\InlineClass{indexitem}{}#1%
+\InlineClass{indexitem}{\LWR at htmlcomment{}}#1%
}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\LWR at indexsubitem}
+% \changes{v0.73}{2019/06/24}{Fix: Avoid empty \element{span}.}
% \begin{macrocode}
\newcommand{\LWR at indexsubitem}{
-\InlineClass{indexsubitem}{}
+\InlineClass{indexsubitem}{\LWR at htmlcomment{}}
}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\LWR at indexsubsubitem}
+% \changes{v0.73}{2019/06/24}{Fix: Avoid empty \element{span}.}
% \begin{macrocode}
\newcommand{\LWR at indexsubsubitem}{
-\InlineClass{indexsubsubitem}{}
+\InlineClass{indexsubsubitem}{\LWR at htmlcomment{}}
}
% \end{macrocode}
% \end{macro}
@@ -30957,7 +31184,8 @@
% in which case it will not be seen by \brand{MathJax}.
% \changes{v0.19}{2016/06/08}{Avoids \brand{MathJax}.}
% \changes{v0.26}{2017/03/30}{Dollar span avoided in a lateximage.}
-% \changes{v0.51}{2018/03/23}{\HTML\ entity used for text dollar.}
+% \changes{v0.51}{2018/03/23}{Named \HTML\ entity used for text dollar.}
+% \changes{v0.73}{2019/06/24}{Numbered \HTML\ entity used for text dollar.}
% \begin{macrocode}
\let\LWR at origtextdollar\$
@@ -30964,7 +31192,7 @@
\renewcommand*{\$}{%
\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
{\LWR at origtextdollar}%
-{\HTMLentity{dollar}}%
+{\HTMLunicode{00024}}%
}
% \end{macrocode}
@@ -30998,6 +31226,7 @@
% \changes{v0.52}{2018/03/24}{Warnings if \filenm{lwarp_baseline_marker.png} is not present
% or if graphicx/s not loaded.}
% \changes{v0.59}{2018/09/02}{Uses \filenm{.eps} if \DVI\ \prog{latex}.}
+% \changes{v0.73}{2019/06/30}{Improved warning messages.}
% \begin{macrocode}
\AtBeginDocument{
@@ -31024,13 +31253,16 @@
}
}{
\PackageWarningNoLine{lwarp}{Load graphicx or graphics
- for improved SVG math baselines,}
+ for improved\MessageBreak
+ SVG math baselines%
+ }
\newcommand*{\LWR at addbaselinemarker}{}
}
}
}{% lwarp_baseline_marker.png or .eps is not present
- \PackageWarningNoLine{lwarp}{File \LWR at baselinename\space is not installed alongside
- the lwarp-*.sty files, so SVG math baselines may not be accurate,}
+ \PackageWarningNoLine{lwarp}{File \LWR at baselinename\space is not installed\MessageBreak
+ alongside the lwarp-*.sty files,\MessageBreak
+ so SVG math baselines may not be accurate}
\newcommand*{\LWR at addbaselinemarker}{}
}
@@ -33981,7 +34213,7 @@
\ifbool{LWR at forceminipagefullwidth}%
{}%
{%
- \ifthenelse{\lengthtest{#4}=\linewidth}%
+ \ifdimequal{#4}{\linewidth}%
{}%
{width:\LWR at printlength{\LWR at minipagewidth} ; }%
}%
@@ -34309,15 +34541,18 @@
% Next, an \HTML\ version:
% \changes{v0.34}{2017/07/31}{Added.}
% \changes{v0.57}{2018/05/28}{Improved print/\HTML\ output selection.}
+% \changes{v0.73}{2019/06/24}{Fix: Paragraph tags.}
%
% \begin{macrocode}
\newcommand{\LWR at HTML@fboxBlock}[1]{%
\LWR at forceminwidth{\fboxrule}%
+\LWR at stoppars%
\begin{BlockClass}[%
\LWR at fboxstyle%
]{fboxBlock}
#1
\end{BlockClass}
+\LWR at startpars%
}
\LWR at formatted{fboxBlock}
@@ -34421,7 +34656,7 @@
\ifbool{LWR at forceminipagefullwidth}%
{}%
{%
- \ifthenelse{\lengthtest{\LWR at tempwidth}=\linewidth}%
+ \ifdimequal{\LWR at tempwidth}{\linewidth}%
{}%
{width:\LWR at printlength{\LWR at tempwidth} ; }%
}%
@@ -34901,7 +35136,11 @@
% \begin{macrocode}
\renewcommand{\underline}[1]{##1}%
% \end{macrocode}
+% \changes{v0.73}{2019/06/24}{Fix: \cs{hspace} in sectioning file name.}
% \begin{macrocode}
+\RenewDocumentCommand{\hspace}{s m}{}
+% \end{macrocode}
+% \begin{macrocode}
\RenewDocumentCommand{\LWR at htmlspanclass}{o m +m}{##3}%
\DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}%
% \end{macrocode}
@@ -35007,8 +35246,10 @@
% Prints the contents with the current font choices.
%
% \changes{v0.56}{2018/05/09}{Added \attribute{div.textbf}, etc.}
+% \changes{v0.73}{2019/06/25}{Fix: Paragraph tags.}
% \begin{macrocode}
\newenvironment*{LWR at blocktextcurrentfont}{%
+\LWR at stoppars%
\BlockClass{%
text\LWR at f@family\LWR at origtilde{}%
text\LWR at f@series\LWR at origtilde{}%
@@ -35015,7 +35256,7 @@
text\LWR at f@shape\LWR at origtilde{}%
text\LWR at f@shapecaps%
}%
-}{\endBlockClass}
+}{\endBlockClass\LWR at startpars}
% \end{macrocode}
% \end{environment}
@@ -35624,8 +35865,14 @@
\quad%
\addtolength{\LWR at templengthone}{-1em}%
}%
- }{}%
+ }%
% \end{macrocode}
+% If NOT formatting for a word processor,
+% include an empty comment to avoid an empty span:
+% \changes{v0.73}{2019/06/24}{Fix: Avoid empty \element{span}.}
+% \begin{macrocode}
+ {\LWR at htmlcomment{}}%
+% \end{macrocode}
% Close the span:
% \begin{macrocode}
\LWR at htmltagc{/span}%
@@ -35794,8 +36041,8 @@
span\LWR at indentHTML%
style="%
% \end{macrocode}
-% The background color is used to draw the filled rule.
-% The color may be changed by \cs{textcolor}.
+% The \HTML\ background color is used to draw the filled rule according
+% to the \LaTeX\ foreground color set by \cs{textcolor}.
% \begin{macrocode}
\ifbool{FormatWP}{}{background:\LWR at currenttextcolor ; }%
% \end{macrocode}
@@ -35841,8 +36088,14 @@
\_{}%
\addtolength{\LWR at templengthone}{-1em}%
}%
- }{}%
+ }%
% \end{macrocode}
+% If NOT formatting for a word processor,
+% add a comment to avoid an empty \element{span}:
+% \changes{v0.73}{2019/06/24}{Fix: Avoid empty \element{span}.}
+% \begin{macrocode}
+ {\LWR at htmlcomment{}}%
+% \end{macrocode}
% Close the span:
% \begin{macrocode}
\LWR at htmltagc{/span}%
@@ -37546,8 +37799,9 @@
% \changes{v0.51}{2018/03/11}{AMS environments: Fix: \cs{addcontentsline} inside \SVG\ math. Provides an autoid anchor.}
% \changes{v0.67}{2019/02/17}{AMS environments: Added \pkg{xfakebold} support.}
% \changes{v0.70}{2019/03/29}{AMS environments: Refactored.}
+% \changes{v0.73}{2019/06/25}{AMS environments: Fix: \attribute{alt} tags.}
+% \changes{v0.73}{2019/06/25}{AMS environments: Fix: Paragraph tags.}
%
-%
% \begin{noindmacro}{\LWR at amsmathenv@@before} \marg{environment name}
%
% Embeds the environment inside a \env{lateximage}.
@@ -37568,6 +37822,7 @@
% Embeds the environment with \brand{MathJax} or a \env{lateximage}.
% \begin{macrocode}
\newcommand*{\LWR at amsmathenv@before}[1]{%
+ \LWR at stoppars%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
{
\LWR at syncmathjax
@@ -37576,11 +37831,12 @@
\ifstrequal{#1}{multline*}{\booltrue{LWR at amsmultline}}{}
% \end{macrocode}
% \pkg{autonum}'s ``+'' environments are not supported by \brand{MathJax}.
+% \watchout
% \begin{macrocode}
\LWR at beginhideamsmath
}
{
- \LWR at amsmathenv@@before{multline}
+ \LWR at amsmathenv@@before{#1}
}
}
% \end{macrocode}
@@ -37590,9 +37846,10 @@
% \begin{noindmacro}{\LWR at amsmathenv@@after}
%
% Embeds the environment inside a \env{lateximage}.
+% \changes{v0.73}{2019/06/25}{AMS environments: Fix: Paragraph tags.}
% \begin{macrocode}
\newcommand*{\LWR at amsmathenv@@after}{%
- \end{lateximage}\end{BlockClass}
+ \end{lateximage}\end{BlockClass}\LWR at startpars%
}
% \end{macrocode}
% \end{noindmacro}
@@ -38918,52 +39175,60 @@
% \codehtml
%
% \begin{macrocode}
-\LWR at ProvidesPackagePass{backnaur}[2019/04/14]
+\LWR at ProvidesPackagePass{backnaur}[2019/06/18]
% \end{macrocode}
%
-% A purely \HTML\ text output is generated, without math images.
-%
-% The various instances of \cs{LWR at stoppars} are added because the
-% print version uses the \env{eqnarray} environment
-% with \cs{\textbackslash} between
-% lines. For \HTML, paragraph handling must be turned off so that these
-% \cs{\textbackslash} macros are converted to \element{br} elements
-% without extra paragraph space.
% \begin{macrocode}
-\renewenvironment*{bnf}{%
- \BlockClass{backnaur}%
- \LWR at stoppars%
-}{\endBlockClass}
-
-\renewenvironment*{bnf*}{%
- \BlockClass{backnaur}%
- \LWR at 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 at stoppars%
-}%
-
-\renewcommand{\bnfmore}[1]{%
- \begin{BlockClass}{backnaurprod}\end{BlockClass}
- \begin{BlockClass}{backnaurdesc}#1\end{BlockClass}
- \LWR at stoppars%
-}
-
-\@ifpackagewith{backnaur}{perp}{\renewcommand{\bnfes}{\HTMLunicode{27c2}}}{}% \perp
-\@ifpackagewith{backnaur}{epsilon}{\renewcommand{\bnfes}{\HTMLunicode{3f5}}}{}% \epsilon
+\renewenvironment{bnf}{\eqnarray}{\endeqnarray}
+\renewenvironment{bnf*}{\csuse{eqnarray*}}{\csuse{endeqnarray*}}
% \end{macrocode}
%
+% ^^A % For HTML without SVG images, but also without equation numbering:
+% ^^A %
+% ^^A % A purely \HTML\ text output is generated, without math images.
+% ^^A %
+% ^^A % The various instances of \cs{LWR at stoppars} are added because the
+% ^^A % print version uses the \env{eqnarray} environment
+% ^^A % with \cs{\textbackslash} between
+% ^^A % lines. For \HTML, paragraph handling must be turned off so that these
+% ^^A % \cs{\textbackslash} macros are converted to \element{br} elements
+% ^^A % without extra paragraph space.
+% ^^A %
+% ^^A % \begin{macrocode}
+% ^^A % \renewenvironment*{bnf}{%
+% ^^A % \BlockClass{backnaur}%
+% ^^A % \LWR at stoppars%
+% ^^A % }{\endBlockClass}
+% ^^A %
+% ^^A % \renewenvironment*{bnf*}{%
+% ^^A % \BlockClass{backnaur}%
+% ^^A % \LWR at stoppars%
+% ^^A % }{\endBlockClass}
+% ^^A %
+% ^^A % \renewcommand{\bnfpn}[1]{\HTMLunicode{27e8}#1\HTMLunicode{27e9}}% \langle, rangle
+% ^^A % \renewcommand{\bnfor}{ \HTMLunicode{7c} }% \mid
+% ^^A % \renewcommand{\bnfsp}{ }
+% ^^A % \renewcommand{\bnfes}{\HTMLunicode{3bb}}% \lambda
+% ^^A % \renewcommand{\bnftd}[1]{\textnormal{\textit{#1}}}
+% ^^A % \renewcommand{\bnfsk}{\HTMLunicode{2026} }% \dots, ellipsis
+% ^^A % \renewcommand{\bnfpo}{\HTMLunicode{22a8}}% \models
+% ^^A %
+% ^^A % \RenewDocumentCommand{\bnfprod}{s m m}{%
+% ^^A % \begin{BlockClass}{backnaurprod}\bnfpn{#2} \bnfpo \end{BlockClass}%
+% ^^A % \begin{BlockClass}{backnaurdesc}#3\end{BlockClass}%
+% ^^A % \LWR at stoppars%
+% ^^A % }%
+% ^^A %
+% ^^A % \RenewDocumentCommand{\bnfmore}{s m}{%
+% ^^A % \begin{BlockClass}{backnaurprod}\end{BlockClass}
+% ^^A % \begin{BlockClass}{backnaurdesc}#2\end{BlockClass}
+% ^^A % \LWR at stoppars%
+% ^^A % }
+% ^^A %
+% ^^A % \@ifpackagewith{backnaur}{perp}{\renewcommand{\bnfes}{\HTMLunicode{27c2}}}{}% \perp
+% ^^A % \@ifpackagewith{backnaur}{epsilon}{\renewcommand{\bnfes}{\HTMLunicode{3f5}}}{}% \epsilon
+% ^^A % \end{macrocode}
+%
% \iffalse
%</backnaur>
% \fi
@@ -39892,6 +40157,7 @@
%
% \changes{v0.34}{2017/07/26}{\pkg{boxedminipage2e}: Added.}
% \changes{v0.72}{2019/06/07}{\pkg{boxedminipage2e}: Added support for \env{lateximage}s.}
+% \changes{v0.73}{2019/06/24}{\pkg{boxedminipage2e}: Fix: Paragraph tags.}
%
% \codehtml
%
@@ -39902,6 +40168,7 @@
% \begin{macrocode}
\newenvironment{LWR at HTML@boxedminipage}{%
+ \LWR at stoppars%
\begin{BlockClass}{framebox}%
\minipage%
}
@@ -39908,6 +40175,7 @@
{%
\endminipage%
\end{BlockClass}%
+ \LWR at startpars%
}
\LWR at formattedenv{boxedminipage}
% \end{macrocode}
@@ -40348,21 +40616,22 @@
\LWR at traceinfo{caption at iiibox: done}%
}
-\def\caption at caption{%
- \caption at iftype
- {%
- \caption at checkgrouplevel\@empty\caption
- \caption at star
- {\caption at refstepcounter\@captype}%
- {\caption at dblarg{\@caption\@captype}}}%
- {\caption at Error{\noexpand\caption outside float}%
- \caption at gobble}%
-}
+% \def\caption at caption{%
+% \caption at iftype
+% {%
+% \caption at checkgrouplevel\@empty\caption
+% \caption at star
+% {\caption at refstepcounter\@captype}%
+% {\caption at dblarg{\@caption\@captype}}}%
+% {\caption at Error{\noexpand\caption outside float}%
+% \caption at gobble}%
+% }
\long\def\caption@@caption#1[#2]#3{%
% \end{macrocode}
% \begin{macrocode}
- \ifcaption at star \else
+ \ifcaption at star
+ \else
\caption at prepareanchor{#1}{#2}%
\memcaptioninfo{#1}{\csname the#1\endcsname}{#2}{#3}%
\@nameuse{nag at hascaptiontrue}%
@@ -40377,11 +40646,16 @@
\@setminipage
\fi
\caption at normalsize
+% \end{macrocode}
+% \changes{v0.73}{2019/07/11}{\pkg{caption}: Fix for starred captions.}
+% \begin{macrocode}
\ifcaption at star
\let\caption at makeanchor\@firstofone
- \fi
+ #3% lwarp
+ \else% lwarp
\@makecaption{\csname fnum@#1\endcsname}%
{\ignorespaces\caption at makeanchor{#3}}%
+ \fi% lwarp
% \end{macrocode}
% \changes{v0.70}{2019/03/24}{\pkg{caption}: Fix: Extra par tags.}
% \begin{macrocode}
@@ -40405,6 +40679,9 @@
\let\caption at tfmt\@firstofone
}%
\caption at applyfont
+% \end{macrocode}
+% \cs{caption at fmt} with \optn{plain} format is defined as |{#1#2#3\par}|:
+% \begin{macrocode}
% \caption at fmt
{\ifcaption at star\else
\begingroup
@@ -44239,11 +44516,13 @@
\LWR at ProvidesPackageDrop{epigraph}[2009/09/02]
% \end{macrocode}
+% \changes{v0.73}{2019/06/25}{\pkg{epigraph}: Fix: Paragraph tags.}
% \begin{macrocode}
\DeclareDocumentCommand{\qitem}{m m}
{
\begin{BlockClass}{qitem}
#1
+\LWR at stoppars%
\ifbool{FormatWP}
{\begin{BlockClass}[border-top:1px solid gray]{epigraphsource}}
{\begin{BlockClass}{epigraphsource}}
@@ -44936,7 +45215,7 @@
\renewrobustcmd{\textsuperscript}[1]{\LWR at htmlspan{sup}{##1}}%
% \end{macrocode}
% Use paragraph tags if in a tabular data cell or a \env{lateximage}:
-% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
+% \changes{v0.66}{2019/02/02}{\pkg{fancyvrb}: Improved \HTML\ formatting.}
% \begin{macrocode}
\ifthenelse{%
\boolean{LWR at doingstartpars} \AND%
@@ -45024,9 +45303,11 @@
% This is a tabular, and does not use \cs{item}.
%
% \begin{noindmacro}{Btrivlist} \marg{l/c/r} \oarg{t/c/b}
+% \changes{v0.73}{2019/06/24}{\pkg{fancyvrb}: \env{Btrivlist}: Fixed paragraph tags.}
% \begin{macrocode}
\RenewDocumentEnvironment{Btrivlist}{m o}
{%
+ \LWR at stoppars%
\begin{BlockClass}{Btrivlist}%
\tabular{#1}%
}
@@ -45033,6 +45314,7 @@
{%
\endtabular%
\end{BlockClass}%
+ \LWR at startpars%
}
% \end{macrocode}
% \end{noindmacro}
@@ -45330,6 +45612,12 @@
% \DescribePackage{fancyvrb}
% \pkg{fancyvrb} is supported with some patches.
%
+% The fancy verbatim environment is placed inside
+% \margintag{\HTML\ classes}
+% a \element{div} of class \attribute{fancyvrb}.
+% The label is placed inside a \element{div} of class \attribute{fancyvrblabel}.
+% The verbatim text itself is placed inside a \element{div} of class \attribute{verbatim}.
+%
% \limitsverbatimfootnotes
%
% \changes{v0.34}{2017/07/27}{\pkg{fancyvrb}: Added, no longer required.}
@@ -45444,7 +45732,7 @@
% Adds \HTML\ formatting:
% \begin{macrocode}
\def\FV at BUseVerbatim#1{%
- \LWR at atbeginverbatim[\LWR at FVstyle]{0}{verbatim}%
+ \LWR at atbeginverbatim{0}{verbatim}%
\FV at BVerbatimBegin#1\FV at BVerbatimEnd%
\LWR at afterendverbatim{0}%
}
@@ -45460,11 +45748,25 @@
% The following patches to \env{Verbatim} are executed at the
% start and end of the environment, depending on the choice of |frame|.
% Original code is from the \pkg{fancyvrb} package.
+% \changes{v0.73}{2019/06/26}{\pkg{fancyvrb}: Fix: Nested \element{div}/\element{pre}.}
% \begin{macrocode}
\newcommand*{\LWR at fvstartnone}{%
\LWR at traceinfo{fvstartnone}%
% \hbox to\z@{
-\LWR at atbeginverbatim[\LWR at FVstyle]{0}{verbatim}%
+\BlockClass[\LWR at FVstyle]{fancyvrb}
+\LWR at stoppars
+\ifx\FV at LabelPositionTopLine\relax\else
+ \ifx\FV at LabelBegin\relax\else
+ \FancyVerbRuleColor{\LWR at FVfindbordercolor}
+ \LWR at htmltagc{%
+ div class="fancyvrblabel" % extra space
+ style="color: \LWR at origpound\LWR at tempcolor"%
+ }
+ \LWR at print@textrm{\FV at LabelBegin}% \textrm preserves emdash
+ \LWR at htmltagc{/div}\LWR at orignewline%
+ \fi
+\fi
+\LWR at atbeginverbatim{0}{verbatim}%
% }%
}
@@ -45472,7 +45774,19 @@
\LWR at traceinfo{fvendnone}%
% \hbox to\z@{
\LWR at afterendverbatim{0}%
-% }%
+\LWR at stoppars%
+\ifx\FV at LabelPositionBottomLine\relax\else
+ \ifx\FV at LabelEnd\relax\else
+ \FancyVerbRuleColor{\LWR at FVfindbordercolor}
+ \LWR at htmltagc{%
+ div class="fancyvrblabel" % extra space
+ style="color: \LWR at origpound\LWR at tempcolor"%
+ }
+ \LWR at print@textrm{\FV at LabelEnd}
+ \LWR at htmltagc{/div}\LWR at orignewline%
+ \fi
+\fi
+\endBlockClass
}
\newcommand*{\LWR at fvstartsingle}{%
@@ -45515,10 +45829,10 @@
% border width of \FV at FrameRule
\newcommand*{\LWR at FVborderstyle}[1]{%
-padding#1: \strip at pt\dimexpr \FV at FrameSep\relax\relax pt ; %
-\LWR at FVfindbordercolor %
-border#1: \strip at pt\dimexpr \FV at FrameRule\relax\relax pt %
-solid \LWR at origpound\LWR at tempcolor ; %
+padding#1: \strip at pt\dimexpr \FV at FrameSep\relax\relax pt ; % space
+\LWR at FVfindbordercolor\LWR at indentHTMLtwo%
+border#1: \strip at pt\dimexpr \FV at FrameRule\relax\relax pt % space
+solid {\FancyVerbRuleColor{\LWR at origpound\LWR at tempcolor}} ; % space
}
\def\FV at Frame@none{%
@@ -45531,7 +45845,10 @@
\FV at Frame@none% default values
\def\FV at Frame@single{%
-\renewcommand*{\LWR at FVstyle}{\LWR at currenttextcolorstyle\LWR at FVborderstyle{}}%
+\renewcommand*{\LWR at FVstyle}{%
+ \LWR at currenttextcolorstyle\LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{}%
+}%
\let\FV at BeginListFrame\LWR at fvstartsingle%
\let\FV at LeftListFrame\FV at LeftListFrame@Single%
\let\FV at RightListFrame\FV at RightListFrame@Single%
@@ -45539,7 +45856,10 @@
\def\FV at Frame@lines{%
\renewcommand*{\LWR at FVstyle}{%
- \LWR at currenttextcolorstyle\LWR at FVborderstyle{-top}\LWR at FVborderstyle{-bottom}%
+ \LWR at currenttextcolorstyle\LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{-top}%
+ \LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{-bottom}%
}%
\let\FV at BeginListFrame\LWR at fvstartline%
\let\FV at LeftListFrame\relax%
@@ -45547,7 +45867,10 @@
\let\FV at EndListFrame\LWR at fvendline}
\def\FV at Frame@topline{%
-\renewcommand*{\LWR at FVstyle}{\LWR at currenttextcolorstyle\LWR at FVborderstyle{-top}}%
+\renewcommand*{\LWR at FVstyle}{%
+ \LWR at currenttextcolorstyle\LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{-top}%
+}%
\let\FV at BeginListFrame\LWR at fvstartline%
\let\FV at LeftListFrame\relax%
\let\FV at RightListFrame\relax%
@@ -45554,7 +45877,10 @@
\let\FV at EndListFrame\LWR at fvendnone}
\def\FV at Frame@bottomline{%
-\renewcommand*{\LWR at FVstyle}{\LWR at currenttextcolorstyle\LWR at FVborderstyle{-bottom}}%
+\renewcommand*{\LWR at FVstyle}{%
+ \LWR at currenttextcolorstyle\LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{-bottom}%
+}%
\let\FV at BeginListFrame\LWR at fvstartnone%
\let\FV at LeftListFrame\relax%
\let\FV at RightListFrame\relax%
@@ -45561,7 +45887,10 @@
\let\FV at EndListFrame\LWR at fvendline}
\def\FV at Frame@leftline{%
-\renewcommand*{\LWR at FVstyle}{\LWR at currenttextcolorstyle\LWR at FVborderstyle{-left}}%
+\renewcommand*{\LWR at FVstyle}{%
+ \LWR at currenttextcolorstyle\LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{-left}%
+}%
% To define the \FV at FrameFillLine macro (from \FV at BeginListFrame)
\ifx\FancyVerbFillColor\relax%
\let\FV at FrameFillLine\relax%
@@ -45580,6 +45909,7 @@
%
% Adds the optional label to the top and bottom edges.
% Original code is from the \pkg{fancyvrb} package.
+% \changes{v0.73}{2019/06/26}{\pkg{fancyvrb}: Fix: Nested \element{div}/\element{pre}.}
% \begin{macrocode}
\def\FV at SingleFrameLine#1{%
% \hbox to\z@{%
@@ -45596,26 +45926,11 @@
% \setbox\z@\hbox{\strut\enspace\FV at LabelBegin\enspace\strut}%
\ifx\FV at LabelPositionTopLine\relax
\else
- \LWR at FVfindbordercolor
- \LWR at htmltagc{%
- div class="fancyvrblabel" % extra space
- style="color: \LWR at origpound\LWR at tempcolor"%
- }
- \LWR at print@textrm{\FV at LabelBegin}% \textrm preserves emdash
- \LWR at htmltagc{/div}
\fi
\else
% \setbox\z@\hbox{\strut\enspace\FV at LabelEnd\enspace\strut}%
\ifx\FV at LabelPositionBottomLine\relax
\else
- \LWR at FVfindbordercolor
-
- \LWR at htmltagc{%
- div class="fancyvrblabel" % extra space
- style="color: \LWR at origpound\LWR at tempcolor"%
- }
- \LWR at print@textrm{\FV at LabelEnd}
- \LWR at htmltagc{/div}
\fi
\fi
\fi
@@ -47194,7 +47509,6 @@
\def\fn at startfntext{%
\setbox\z@\vbox\bgroup%
\fn at startnote%
- \fn at prefntext%
\ignorespaces%
}
% \end{macrocode}
@@ -47204,7 +47518,6 @@
\def\fn at endfntext{%
\LWR at htmltagc{/\LWR at tagregularparagraph}%
\LWR at orignewline%
- \fn at postfntext%
\egroup%
\begingroup%
\let\@makefntext\@empty%
@@ -50352,18 +50665,19 @@
% \pkg{intopdf} is emulated.
%
% \changes{v0.58}{2018/06/08}{\pkg{intopdf}: Added.}
+% \changes{v0.73}{2019/06/09}{\pkg{intopdf}: Updated to v0.2.1.}
%
-% The MIME type and description are ignored for now.
+% The filespec, MIME type, and description are ignored for now.
%
% \codehtml
%
% \begin{macrocode}
-\LWR at ProvidesPackageDrop{intopdf}[2018/03/15]
+\LWR at ProvidesPackageDrop{intopdf}[2019/05/28]
% \end{macrocode}
%
% \begin{macrocode}
-\NewDocumentCommand{\attachandlink}{m o m m}{%
- \href{#1}{#4}%
+\NewDocumentCommand{\attachandlink}{o m o m m}{%
+ \href{#2}{#5}%
}
% \end{macrocode}
%
@@ -51673,7 +51987,9 @@
\ifx\lst at title\@empty
% \end{macrocode}
% New \pkg{lwarp} code to create a caption:
+% \changes{v0.73}{2019/06/25}{\pkg{listings}: Fix: Paragraph tags.}
% \begin{macrocode}
+ \LWR at stoppars%
\lst at makecaption\fnum at lstlisting{\ignorespaces \lst at caption}
\else
% \end{macrocode}
@@ -52431,6 +52747,74 @@
%
%
% \iffalse
+%<*lyluatex>
+% \fi
+%
+% \part{lwarp-lyluatex.sty}
+%
+% \section{lyluatex}
+%
+% \credits{Fr. Jacques Peron, Urs Liska, Br. Samuel Springuel}
+%
+% \DescribePackage{lyluatex}
+% \pkg{lyluatex} is patched for use by \pkg{lwarp}.
+%
+%
+% For the first compile, to set \prog{lwarpmk}'s configuration, use:
+% \begin{sourceverb}
+% lualatex --shell-escape <filename>
+% \end{sourceverb}
+%
+% Avoid using the \optn{insert=fullpage} option, or use it
+% inside \cs{warpprintonly} or the \env{warpprint} environment.
+%
+% \changes{v0.73}{2019/06/10}{\pkg{lyluatex}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{lyluatex}[2019/05/27]
+% \end{macrocode}
+%
+% User-redefinable \attribute{ALT} tag:
+% \begin{macrocode}
+\newcommand*{\lyluateximagename}{(-lilypond-~\packagediagramname)}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\LetLtxMacro\LWR at orig@ly at compilescore\ly at compilescore
+
+\renewcommand*{\ly at compilescore}[1]{%
+ \begin{lateximage}[\lyluateximagename]%
+ \LWR at orig@ly at 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}
+}
+% \end{macrocode}
+%
+% \iffalse
+%</lyluatex>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*magaz>
% \fi
%
@@ -54820,8 +55204,8 @@
% \DescribePackage{musicography}
% \pkg{musicography} is patched for use by \pkg{lwarp}.
%
-% Images are used for the meter symbols, since the
-% \HTML\ fonts tend not to be the correct size.
+% Images are used for the meter symbols and fingered bass, since the
+% \HTML\ fonts tend not to be the correct size and \HTML\ cannot stack items.
% The \HTML\ \attribute{alt} tag copies |C| and |3/2|, etc.
% Hashes are used for the meter images, which are then reused
% as necessary.
@@ -54828,30 +55212,36 @@
%
% Note that browser support for musical symbols may be buggy.
% \watchout
-% Copy/paste into a text editor works well.
+% ALT text and copy/paste into a text editor work well.
%
% \changes{v0.62}{2017/11/12}{\pkg{musicography}: Added.}
+% \changes{v0.73}{2019/06/09}{\pkg{musicography}: Updated to 2019/05/28.
+% Now supports \env{lateximage}s.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR at ProvidesPackagePass{musicography}[2018/05/21]
+\LWR at ProvidesPackagePass{musicography}[2019/05/28]
% \end{macrocode}
%
% \begin{macrocode}
-\RenewDocumentCommand{\musSymbol}{ O{\musFont} m m m m }{%
+\NewDocumentCommand{\LWR at HTML@musSymbol}{ O{\musFont} m m m m }{%
\begin{lateximage}%
{#1\kern#2\raisebox{#3}{#5}\kern#4}%
\end{lateximage}%
}
-\RenewDocumentCommand{\musStemmedNote}{ m }{%
+\LWR at formatted{musSymbol}
+
+\NewDocumentCommand{\LWR at HTML@musStemmedNote}{ m }{%
\begin{lateximage}%
\musSymbol{0.05em}{0.5ex}{0.2em}{#1\musStem}%
\end{lateximage}%
}
-\RenewDocumentCommand{\musFlaggedNote}{ m m }{%
+\LWR at formatted{musStemmedNote}
+
+\NewDocumentCommand{\LWR at HTML@musFlaggedNote}{ m m }{%
\begin{lateximage}%
\musSymbol{0.05em}{0.5ex}{0pt}{#1\musStem}%
\musSymbol{0pt}{0pt}{0.9em}{#2}%
@@ -54858,59 +55248,130 @@
\end{lateximage}%
}
-\RenewDocumentCommand{\musDottedNote}{ m }{%
+\LWR at formatted{musFlaggedNote}
+
+\NewDocumentCommand{\LWR at HTML@musDottedNote}{ m }{%
\begin{lateximage}%
#1\musDot%
\end{lateximage}%
}
-\RenewDocumentCommand{\musMeter}{ m m }{%
+\LWR at formatted{musDottedNote}
+
+\NewDocumentCommand{\LWR at 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 at formatted{musMeter}
+
+\NewDocumentCommand{\LWR at HTML@meterCplus}{ m }{%
\begin{lateximage}*[C#1]%
\meterC{}\kern-0.7pt#1%
\end{lateximage}%
}
-\RenewDocumentCommand{\meterC}{}{%
+\LWR at formatted{meterCplus}
+
+\NewDocumentCommand{\LWR at HTML@meterC}{}{%
\begin{lateximage}*[C]%
\musSymbolMeter{\symbol{83}}%
\end{lateximage}%
}
-\RenewDocumentCommand{\meterCutC}{}{%
+\LWR at formatted{meterC}
+
+\NewDocumentCommand{\LWR at HTML@meterCutC}{}{%
\begin{lateximage}*[C|]%
\musSymbolMeter{\symbol{82}}%
\end{lateximage}%
}
-\RenewDocumentCommand{\meterCThreeTwo}{}{%
+\LWR at formatted{meterCutC}
+
+\NewDocumentCommand{\LWR at 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}}
+\LWR at formatted{meterCThreeTwo}
-\RenewDocumentCommand{\musWhole}{}{\HTMLunicode{1D15D}}
-\RenewDocumentCommand{\musHalf}{}{\HTMLunicode{1D15E}}
-\RenewDocumentCommand{\musQuarter}{}{\HTMLunicode{1D15F}}
-\RenewDocumentCommand{\musEighth}{}{\HTMLunicode{1D160}}
-\RenewDocumentCommand{\musSixteenth}{}{\HTMLunicode{1D161}}
+\NewDocumentCommand{\LWR at HTML@meterO}{}{\HTMLunicode{25EF}}
-\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 at formatted{meterO}
+
+\newcommand{\LWR at null@noFig}[1][]{}%
+
+\NewDocumentCommand{\LWR at HTML@musFig}{ m }{%
+\begin{lateximage}*[%
+ {% ALT text for copy/paste
+ \LetLtxMacro\noFig\LWR at null@noFig%
+ \LetLtxMacro\musSharp\LWR at HTML@musSharp%
+ \LetLtxMacro\musDoubleSharp\LWR at HTML@musDoubleSharp%
+ \LetLtxMacro\musFlat\LWR at HTML@musFlat%
+ \LetLtxMacro\musDoubleFlat\LWR at HTML@musDoubleFlat%
+ \LetLtxMacro\musNatural\LWR at HTML@musNatural%
+ ({#1})% braces here because \noFig uses []
+ }%
+]%
+ \musStack[\musFigFont]{#1}%
+\end{lateximage}%
+}
+
+\LWR at formatted{musFig}
+
+\NewDocumentCommand{\LWR at HTML@musFlat} {}{\HTMLunicode{266D}}
+\NewDocumentCommand{\LWR at HTML@musDoubleFlat} {}{\HTMLunicode{1D12B}}
+\NewDocumentCommand{\LWR at HTML@musSharp} {}{\HTMLunicode{266F}}
+\NewDocumentCommand{\LWR at HTML@musDoubleSharp}{}{\HTMLunicode{1D12A}}
+\NewDocumentCommand{\LWR at HTML@musNatural} {}{\HTMLunicode{266E}}
+
+\LWR at formatted{musFlat}
+\LWR at formatted{musDoubleFlat}
+\LWR at formatted{musSharp}
+\LWR at formatted{musDoubleSharp}
+\LWR at formatted{musNatural}
+
+\NewDocumentCommand{\LWR at HTML@musWhole} {}{\HTMLunicode{1D15D}}
+\NewDocumentCommand{\LWR at HTML@musHalf} {}{\HTMLunicode{1D15E}}
+\NewDocumentCommand{\LWR at HTML@musQuarter} {}{\HTMLunicode{1D15F}}
+\NewDocumentCommand{\LWR at HTML@musEighth} {}{\HTMLunicode{1D160}}
+\NewDocumentCommand{\LWR at HTML@musSixteenth} {}{\HTMLunicode{1D161}}
+\NewDocumentCommand{\LWR at HTML@musThirtySecond} {}{\HTMLunicode{1D162}}
+\NewDocumentCommand{\LWR at HTML@musSixtyFourth} {}{\HTMLunicode{1D163}}
+
+\LWR at formatted{musWhole}
+\LWR at formatted{musHalf}
+\LWR at formatted{musQuarter}
+\LWR at formatted{musEighth}
+\LWR at formatted{musSixteenth}
+\LWR at formatted{musThirtySecond}
+\LWR at formatted{musSixtyFourth}
+
+\NewDocumentCommand{\LWR at HTML@musWholeDotted}{}
+ {\HTMLunicode{1D15D}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musHalfDotted}{}
+ {\HTMLunicode{1D15E}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musQuarterDotted}{}
+ {\HTMLunicode{1D15F}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musEighthDotted}{}
+ {\HTMLunicode{1D160}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musSixteenthDotted}{}
+ {\HTMLunicode{1D161}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musThirtySecondDotted}{}
+ {\HTMLunicode{1D162}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musSixtyFourthDotted}{}
+ {\HTMLunicode{1D163}\HTMLunicode{1D16D}}
+
+\LWR at formatted{musWholeDotted}
+\LWR at formatted{musHalfDotted}
+\LWR at formatted{musQuarterDotted}
+\LWR at formatted{musEighthDotted}
+\LWR at formatted{musSixteenthDotted}
+\LWR at formatted{musThirtySecondDotted}
+\LWR at formatted{musSixtyFourthDotted}
% \end{macrocode}
%
% \iffalse
@@ -58521,11 +58982,12 @@
% \pkg{quotchap} is emulated.
%
% \changes{v0.40}{2017/09/22}{\pkg{quotchap}: Added.}
+% \changes{v0.73}{2019/07/11}{\pkg{quotchap}: Updated to v1.2.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR at ProvidesPackageDrop{quotchap}[2012/10/20]
+\LWR at ProvidesPackageDrop{quotchap}[2019/07/09]
% \end{macrocode}
%
% \begin{macrocode}
@@ -58570,12 +59032,21 @@
% \end{macrocode}
% The quotation author is placed inside a \element{div}
% of class \attribute{qauthor}:
+% \changes{v0.73}{2019/06/24}{\pkg{quotchap}: Fix: Paragraph tags.}
% \begin{macrocode}
-\newcommand{\qauthor}[1]{\begin{BlockClass}{qauthor}{#1}\end{BlockClass}}
+\newcommand{\qauthor}[1]{%
+ \LWR at stoppars%
+ \begin{BlockClass}{qauthor}%
+ {#1}%
+ \end{BlockClass}%
+ \LWR at startpars%
+}
% \end{macrocode}
-% \cs{qsetcnfont} is ignored:
+% Fonts are ignored. Use \CSS.
% \begin{macrocode}
\newcommand{\qsetcnfont}[1]{}
+\providecommand*{\quotefont}{}
+\providecommand*{\qauthorfont}{}
% \end{macrocode}
%
% \iffalse
@@ -58599,6 +59070,7 @@
% \pkg{quoting} is patched for use by \pkg{lwarp}.
%
% \changes{v0.56}{2018/05/09}{\pkg{quoting}: Added.}
+% \changes{v0.73}{2019/06/25}{\pkg{quoting}: Fix: Paragraph tags.}
%
% \codehtml
%
@@ -58613,7 +59085,7 @@
{\LWR at patcherror{quoting}{quoting}}
\xpatchcmd{\endquoting}{\quo at endtext}
- {\quo at endtext\end{LWR at blocktextcurrentfont}}
+ {\quo at endtext\end{LWR at blocktextcurrentfont}\LWR at stoppars}
{}
{\LWR at patcherror{imakeidx}{endquoting}}
% \end{macrocode}
@@ -59411,8 +59883,8 @@
\DeclareDocumentCommand{\useshapeofkomafont}{m}{}
\AtBeginDocument{
-\let\LWR at maketitle\maketitle
-\DeclareDocumentCommand{\maketitle}{o}{\LWR at maketitle}
+ \let\LWR at koma@orig at maketitle\maketitle
+ \DeclareDocumentCommand{\maketitle}{o}{\LWR at koma@orig at maketitle}
}
\DeclareDocumentCommand{\extratitle}{m}{}
@@ -59459,12 +59931,16 @@
\DeclareDocumentCommand{\deffootnotemark}{m}{}
\DeclareDocumentCommand{\setfootnoterule}{o m}{}
\DeclareDocumentCommand{\raggedfootnote}{}{}
-
+% \end{macrocode}
+%
+% \changes{v0.73}{2019/06/25}{\pkg{scrextend}: Fix: Paragraph tags.}
+% \begin{macrocode}
\DeclareDocumentCommand{\dictum}{o m}{
\begin{LWR at BlockClassWP}{\LWR at print@mbox{text-align:right}}{}{dictum}
#2
\IfValueT{#1}
{
+ \LWR at stoppars%
\ifbool{FormatWP}
{\begin{BlockClass}[\LWR at print@mbox{border-top:} 1px solid gray]{dictumauthor}}
{\begin{BlockClass}{dictumauthor}}
@@ -59499,9 +59975,13 @@
\let\endaddmargin\relax
\cslet{addmargin*}{\relax}
\cslet{endaddmargin*}{\relax}
-
+% \end{macrocode}
+%
+% \changes{v0.73}{2019/06/25}{\pkg{scrextend}: Fix: Paragraph tags.}
+% \begin{macrocode}
\NewDocumentEnvironment{addmargin}{s O{} m}
{
+\LWR at stoppars%
\setlength{\LWR at templengthtwo}{#3}
\ifblank{#2}
{
@@ -59518,7 +59998,7 @@
]{addmargin}
}
}
-{\end{BlockClass}}
+{\end{BlockClass}\LWR at startpars}
% \end{macrocode}
% Ref to create a starred environment: \\
% \href
@@ -61312,8 +61792,130 @@
%
%
%
+% \iffalse
+%<*stackengine>
+% \fi
%
+% \part{lwarp-stackengine.sty}
+%
+% \section{stackengine}
+%
+% \credits{Steven B. Segletes}
+%
+% \DescribePackage{stackengine}
+% \pkg{stackengine} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.73}{2019/06/11}{\pkg{stackengine}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{stackengine}[2017/02/13]
+% \end{macrocode}
+%
+% The original version is neccessary for the patched \cs{@stack}
+% and \cs{stackanchor},
+% where nesting \env{lateximage}s does not work:
+% \begin{macrocode}
+\LetLtxMacro\LWR at orig@stackengine\stackengine
+% \end{macrocode}
+% \begin{macrocode}
+\renewcommand*{\stackengine}[8]{%
+ \ifstrequal{#4}{O}%
+ {\begin{lateximage}}%
+ {\begin{lateximage}[][][vertical-align:top]}%
+ \LWR at orig@stackengine{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}%
+ \end{lateximage}%
+}
+% \end{macrocode}
+%
+% \cs{@stack} uses a \env{lateximage} with a vertical alignment:
+% \begin{macrocode}
+\LetLtxMacro\LWR at orig@@stack\@stack
+
+\xpatchcmd{\LWR at orig@@stack}{\stackengine}{\LWR at orig@stackengine}
+ {}
+ {\LWR at patcherror{stackengine}{LWR at orig@@stack}}
+
+\renewcommand*{\@stack}[4]{%
+ \ifstrequal{#3}{O}%
+ {\begin{lateximage}}%
+ {\begin{lateximage}[][][vertical-align:top]}%
+ \LWR at orig@@stack{#1}{#2}{#3}{#4}%
+ \end{lateximage}%
+}
+% \end{macrocode}
+%
+%
+% The lapping macros are disabled for \HTML:
+% \begin{macrocode}
+\newcommand*\LWR at HTML@@stacklap[4]{#3}
+\LWR at formatted{@stacklap}
+% \end{macrocode}
+%
+%
+% \cs{stackanchor} is patched for two instances of \cs{stackengine}.
+% A \env{lateximage} with vertical alignment is used.
+% \begin{macrocode}
+\xpatchcmd{\stackanchor}{\stackengine}{\LWR at orig@stackengine}
+ {}
+ {\LWR at patcherror{stackengine}{stackanchor patch 1}}
+
+\xpatchcmd{\stackanchor}{\stackengine}{\LWR at orig@stackengine}
+ {}
+ {\LWR at patcherror{stackengine}{stackanchor patch 2}}
+
+\xpretocmd{\stackanchor}{\begin{lateximage}[][][vertical-align:middle]}
+ {}
+ {\LWR at patcherror{stackengine}{stackanchor pre}}
+
+\xapptocmd{\stackanchor}{\end{lateximage}}
+ {}
+ {\LWR at patcherror{stackengine}{stackanchor app}}
+% \end{macrocode}
+%
+% \cs{Centerstack} is simply placed inside a \env{lateximage} with a vertical alignment:
+% \begin{macrocode}
+\xpretocmd{\Centerstack}{\begin{lateximage}[][][vertical-align:middle]}
+ {}
+ {\LWR at patcherror{stackengine}{Centerstack pre}}
+
+\xapptocmd{\Centerstack}{\end{lateximage}}
+ {}
+ {\LWR at patcherror{stackengine}{Centerstack app}}
+% \end{macrocode}
+%
+% \cs{savestack} reverts to print mode while saving the box, then places it inside a
+% \env{lateximage} when used:
+% \begin{macrocode}
+\renewcommand*\savestack[2]{%
+ \xdef\sv at name{\stack at macro@name{#1}}%
+ \@ifundefined{\sv at name content}{%
+ \expandafter\newsavebox\expandafter{\csname\sv at name content\endcsname}%
+ }{}%
+ \begingroup% lwarp
+ \LWR at restoreorigformatting% lwarp
+ \RenewDocumentEnvironment{lateximage}{s o o o}{}{}% lwarp: inside group
+ \expandafter\LWR at gsavebox\csname\sv at name content\endcsname{#2}%
+ \expandafter\gdef\expandafter#1\expandafter{%
+ \expandafter\begin\expandafter{lateximage\expandafter}% lwarp
+ \expandafter\usebox\expandafter%
+ {\csname\sv at name content\endcsname}%
+ \expandafter\end\expandafter{lateximage\expandafter}% lwarp
+ }%
+ \endgroup% lwarp
+}
+% \end{macrocode}
+%
% \iffalse
+%</stackengine>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*stfloats>
% \fi
%
@@ -62945,7 +63547,7 @@
% \begin{noindenvironment}{threeparttable} \oarg{alignment}
-% To emulate threeparttable:
+%
% \changes{v0.68}{2019/03/01}{\pkg{threeparttable}: Fix for caption type.}
% \begin{macrocode}
\newenvironment*{threeparttable}[1][b]
@@ -62982,6 +63584,18 @@
% \end{macrocode}
% \end{noindmacro}
+
+% \begin{noindenvironment}{measuredfigure} \oarg{alignment}
+%
+% \changes{v0.73}{2019/06/21}{\pkg{threeparttable}: Added \env{measuredfigure}.}
+% \begin{macrocode}
+\newenvironment*{measuredfigure}[1][t]
+ {\def\@captype{figure}}
+ {}
+% \end{macrocode}
+% \end{noindenvironment}
+
+
% \iffalse
%</threeparttable>
% \fi
@@ -63982,8 +64596,9 @@
\@maketitle
% \end{macrocode}
% Immediately generate any \cs{thanks} footnotes:
+% \changes{v0.73}{2019/06/25}{\pkg{titling}: Fix: Paragraph tags.}
% \begin{macrocode}
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
% \end{macrocode}
% Close the \HTML\ titlepage div:
% \begin{macrocode}
@@ -64043,8 +64658,9 @@
\renewcommand*{\LWR at titlingmaketitle}{%
% \end{macrocode}
% Keep pending footnotes out of the title block:
+% \changes{v0.73}{2019/06/25}{\pkg{titling}: Fix: Paragraph tags.}
% \begin{macrocode}
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
% \end{macrocode}
% Select which kind of footnote marks to use:
% \begin{macrocode}
@@ -64059,8 +64675,9 @@
\@maketitle
% \end{macrocode}
% Immediately generate any \cs{thanks} footnotes:
+% \changes{v0.73}{2019/06/25}{\pkg{titling}: Fix: Paragraph tags.}
% \begin{macrocode}
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
% \end{macrocode}
% Reset the footnote counter:
% \begin{macrocode}
@@ -64247,27 +64864,31 @@
% \pkg{tocdata} is patched for use by \pkg{lwarp}.
%
% \changes{v0.69}{2019/03/21}{\pkg{tocdata}: Added.}
+% \changes{v0.73}{2019/07/06}{\pkg{tocdata}: Updated to v2.03.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR at ProvidesPackagePass{tocdata}[2019/03/21]
+\LWR at ProvidesPackagePass{tocdata}[2019/07/06]
% \end{macrocode}
%
+% \changes{v0.73}{2019/06/30}{\pkg{tocdata}: Honors \cs{tocdataformat}.}
% \begin{macrocode}
\renewcommand*{\LWR at maybetocdata}{%
\ifdefempty{\TD at thistocdata}{}{%
- \qquad --- \InlineClass{authorartist}{\TD at thistocdata}%
+ \qquad \InlineClass{authorartist}{\tocdataformat{\TD at thistocdata}}%
\def\TD at thistocdata{}
}
}
-
+% \end{macrocode}
+%
+% \changes{v0.73}{2019/06/30}{\pkg{tocdata}: Improved formatting.}
+% \begin{macrocode}
\renewrobustcmd{\tocdatapartprint}[4]
{%
- \LWR at htmltagc{br /}%
\InlineClass{authorartist}{%
\qquad --- %
- \TD at optionalname{#1}\TD at optionalname{#2}#3#4%
+ \TDoptionalnameprint{#1}\TDoptionalnameprint{#2}#3#4%
}%
}
@@ -64290,10 +64911,10 @@
{}%
}
-\renewcommand{\TD at artistauthorprint}[5]{%
+\renewcommand{\TDartistauthorprint}[5]{%
\LWR at TD@settextalign{#1}%
\begin{BlockClass}[text-align:\LWR at TD@textalign]{floatnotes}%
- \InlineClass{authorartist}{\TD at optionalname{#2}\TD at optionalname{#3}#4#5}%
+ \InlineClass{authorartist}{\TDoptionalnameprint{#2}\TDoptionalnameprint{#3}#4#5}%
\end{BlockClass}%
}
@@ -64310,7 +64931,7 @@
{}%
}
-\renewcommand{\TD at artistauthortextprint}[2]{%
+\renewcommand{\TDartistauthortextprint}[2]{%
\LWR at TD@setnamealign{#1}%
\begin{BlockClass}[text-align:\LWR at TD@textalign]{floatnotes}%
#2%
@@ -65983,11 +66604,12 @@
% \pkg{versonotes} is emulated.
%
% \changes{v0.65}{2018/12/10}{\pkg{versonotes}: Added.}
+% \changes{v0.73}{2019/07/11}{\pkg{versonotes}: Updated to v0.4.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR at ProvidesPackageDrop{versonotes}[2015/12/08]
+\LWR at ProvidesPackageDrop{versonotes}[2019/07/06]
% \end{macrocode}
%
% \begin{macrocode}
@@ -65997,6 +66619,11 @@
\newcommand*{\versolayout}{}
% \end{macrocode}
%
+% In case the user changed the page number before loading \pkg{versonotes}:
+% \begin{macrocode}
+\setcounter{page}{1}
+% \end{macrocode}
+%
% \iffalse
%</versonotes>
% \fi
@@ -66229,8 +66856,9 @@
\renewenvironment*{vwcol}[1][]{%
% \end{macrocode}
% New paragraph, and process the options:
+% \changes{v0.73}{2019/06/24}{\pkg{vwcol}: Fix: Paragraph tags.}
% \begin{macrocode}
-\par\noindent%
+\LWR at stoppars%
\vwcolsetup{#1}%
% \end{macrocode}
% Begin with no style:
@@ -66310,6 +66938,7 @@
% \begin{macrocode}
{
\endBlockClass
+\LWR at startpars
}
% \end{macrocode}
% \end{noindenvironment}
@@ -66842,6 +67471,33 @@
%
% \subsection{High-level macros}
%
+% \begin{macro}{\color}
+% \oarg{model} \marg{color}
+%
+% The current \cs{color} is used by \HTML\ rules and frames, but
+% \watchout
+% does not affect the current \HTML\ text output, due to
+% the lack of \HTML\ states and scoping limitations.
+% Use \cs{textcolor} if possible.
+%
+% \changes{v0.73}{2019/06/14}{Added \HTML\ support.}
+% \begin{macrocode}
+\NewDocumentCommand{\LWR at HTML@color}{o m}{%
+\IfValueTF{#1}{%
+ \LWR at print@color[#1]{#2}%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at tempcolor%
+}{%
+ \LWR at print@color{#2}%
+ \convertcolorspec{named}{#2}{HTML}\LWR at tempcolor%
+}%
+\edef\LWR at currenttextcolor{\LWR at origpound\LWR at tempcolor}%
+}
+
+\LWR at formatted{color}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \label{sec:textcolor}
% \begin{macro}{\textcolor}
% \oarg{model} \marg{color} \marg{text}
@@ -66852,41 +67508,20 @@
% \begin{macrocode}
\NewDocumentCommand{\LWR at HTML@textcolor}{o m m}{%
\begingroup%
-% \end{macrocode}
-%
-% Set the \PDF\ color, to be picked up by \SVG\ math if possible.
-%
-% The print-mode \cs{color} command cannot accept the \optn{named}
-% option with color mixing, but it works with no option at all.
-%
-% \changes{v0.51}{2018/03/14}{Fix: SVG math color.}
-% \begin{macrocode}
\IfValueTF{#1}{%
\color[#1]{#2}%
}{%
\color{#2}%
+}
+\InlineClass[color:\LWR at currenttextcolor]{textcolor}{#3}%
+\endgroup%
}%
-% \end{macrocode}
-% \begin{macrocode}
-\LWR at FBcancel%
-\IfValueTF{#1}{%
-\InlineClass[color:\LWR at colorstyle{#1}{#2}]{textcolor}{%
-\renewcommand*{\LWR at currenttextcolor}{\LWR at origpound\LWR at tempcolor}%
-#3%
-}%
-}{%
-\InlineClass[color:\LWR at colorstyle{named}{#2}]{textcolor}{%
-\renewcommand*{\LWR at currenttextcolor}{\LWR at origpound\LWR at tempcolor}%
-#3%
-}%
-}%
-\endgroup%
-}
\LWR at formatted{textcolor}
% \end{macrocode}
% \end{macro}
+
% \begin{macro}{\pagecolor}
% \oarg{model} \marg{color}
%
@@ -68123,11 +68758,9 @@
% \DescribePackage{xy}
% \pkg{xy} is patched for use by \pkg{lwarp}.
%
-% \cs{xypolygon} must be used inside the \env{xy} environment,
-% \trouble[\cs{xypolygon}]{xy=\pkg{xy}}
-% or inside \cs{xy} \dots \cs{endxy}.
-%
% \changes{v0.50}{2018/02/21}{\pkg{xy}: Added.}
+% \changes{v0.73}{2019/06/19}{\pkg{xy}: Improved \env{xy}, reverted \cs{xymatrix}, for \pkg{qcicuit}.}
+% \changes{v0.73}{2019/06/21}{\pkg{xy}: Fix for \cs{xybox}.}
%
% \codehtml
%
@@ -68135,33 +68768,58 @@
\LWR at ProvidesPackagePass{xy}[2013/10/06]
% \end{macrocode}
+% After \pkg{xy} modules have been loaded:
% \begin{macrocode}
\AtBeginDocument{
+% \end{macrocode}
-\preto{\xy}{\begin{lateximage}[(-xy-~\packagediagramname)]}
-\appto{\endxy}{\end{lateximage}}
+% The original definitions without a \env{lateximage}:
+% \begin{macrocode}
+\LetLtxMacro\LWR at orig@xy\xy
+\LetLtxMacro\LWR at orig@endxy\endxy
+% \end{macrocode}
+%
+% The outer-most \env{xy} environment is placed in a \env{lateximage},
+% but not more than one level deep, which would conflict with \pkg{xy}:
+% \begin{macrocode}
+\renewcommand*{\xy}{%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {\addtocounter{LWR at lateximagedepth}{1}}%
+ {\begin{lateximage}[(-xy-~\packagediagramname)]}%
+ \LWR at orig@xy%
+}
-\@ifundefined{xymatrix}{}{
-\LetLtxMacro\LWR at origxymatrix\xymatrix
-
-\renewcommand{\xymatrix}[1]{%
-\begin{lateximage}[(-xy- xymatrix \packagediagramname)]
-\LWR at origxymatrix{#1}
-\end{lateximage}
+\renewcommand*{\endxy}{%
+ \LWR at orig@endxy%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{1}%
+ {\addtocounter{LWR at lateximagedepth}{-1}}%
+ {\end{lateximage}}%
}
+% \end{macrocode}
+%
+% The \cs{xybox} must use the original definitions of \cs{xy}, \cs{endxy}:
+% \begin{macrocode}
+\def\xybox#1{%
+ \LWR at orig@xy#1\LWR at orig@endxy%
+ \Edge at c={\rectangleEdge}\computeLeftUpness@%
}
+% \end{macrocode}
+% If \cs{xygraph} is used, it is placed inside a \env{lateximage}:
+% \begin{macrocode}
\@ifundefined{xygraph}{}{
+
\LetLtxMacro\LWR at origxygraph\xygraph
\renewcommand{\xygraph}[1]{%
-\begin{lateximage}[(-xy- xygraph \packagediagramname)]
-\LWR at origxygraph{#1}
-\end{lateximage}
+ \begin{lateximage}[(-xy- xygraph \packagediagramname)]
+ \LWR at origxygraph{#1}
+ \end{lateximage}
}
-}
-}
+}% xygraph defined
+
+}% AtBeginDocument
% \end{macrocode}
% \iffalse
@@ -68386,12 +69044,15 @@
% \end{macrocode}
%
% Simple captions are used in all cases.
+% \changes{v0.73}{2019/07/10}{\pkg{lwarp-patch-komascript}: Fix for captions.}
% \begin{macrocode}
-\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}
{}
@@ -68528,7 +69189,7 @@
% \end{macrocode}
%
%
-% \subsection{Laying out the page}
+% \subsection{Page layout}
%
% \begin{macrocode}
\renewcommand*{\stockavi}{}
@@ -68729,9 +69390,22 @@
\renewcommand*{\abstractrunin}{}
% \end{macrocode}
%
+%
% \subsection{Docment divisions}
+%
+%
+% \begin{noindmacro}{\book} * \parg{2:PDF name} \oarg{3:TOC name}
+% \oarg{4:PDF name} \parg{5:PDF name} \marg{6:name}
+% \changes{v0.73}{2019/06/21}{\pkg{lwarp-patch-memoir}: Added \cs{book}.}
% \begin{macrocode}
+\DeclareDocumentCommand{\book}{s d() o o d() m}{%
+ \LWR at section{#1}{#3}{#6}{book}%
+}
+% \end{macrocode}
+% \end{noindmacro}
+
+% \begin{macrocode}
\def\@apppage{%
\part*{\appendixpagename}
}
@@ -68741,9 +69415,20 @@
\def\@sapppage{%
\part*{\appendixpagename}
}
+% \end{macrocode}
+%
+% \changes{v0.73}{2019/06/20}{\pkg{lwarp-patch-memoir}: Fix for \cs{frontmatter*} and \cs{mainmatter*}.}
+% \begin{macrocode}
+\DeclareDocumentCommand{\mainmatter}{s}{%
+ \booltrue{LWR at mainmatter}%
+}
-\csletcs{frontmatter*}{frontmatter}
-\csletcs{mainmatter*}{mainmatter}
+\DeclareDocumentCommand{\frontmatter}{s}{%
+\boolfalse{LWR at mainmatter}%
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
\renewcommand*{\raggedbottomsection}{}
\renewcommand*{\normalbottomsection}{}
\renewcommand*{\bottomsectionskip}{}
@@ -69958,8 +70643,13 @@
\IfFileExists{#2}{%
% \end{macrocode}
% The container \element{div} is sized as desired.
+% \changes{v0.73}{2019/06/24}{\pkg{lwarp-common-multimedia}: Fix: No size for audio file.}
% \begin{macrocode}
- \begin{BlockClass}[\LWR at multimedia@printsize\ margin:auto]{AVviewport}
+ \ifstrequal{#3}{audio}{%
+ \begin{BlockClass}{AVviewport}
+ }{%
+ \begin{BlockClass}[\LWR at multimedia@printsize\ margin:auto]{AVviewport}
+ }
% \end{macrocode}
% Paragraph tags are unnecessary for the \AV\ tags.
% \begin{macrocode}
@@ -69966,11 +70656,14 @@
\LWR at stoppars
% \end{macrocode}
% The \AV\ element is 100\% of the container.
+% \changes{v0.73}{2019/06/24}{\pkg{lwarp-common-multimedia}: Fix: No size for audio file.}
% \begin{macrocode}
\LWR at 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 at orignewline
% \end{macrocode}
@@ -70010,8 +70703,13 @@
\newcommand*{\LWR at multimedia@httpAV}[4]{%
% \end{macrocode}
% The container \element{div} is sized as desired.
+% \changes{v0.73}{2019/06/24}{\pkg{lwarp-common-multimedia}: Fix: No size for audio file.}
% \begin{macrocode}
- \begin{BlockClass}[\LWR at multimedia@printsize\ margin:auto]{AVviewport}
+ \ifstrequal{#3}{audio}{%
+ \begin{BlockClass}{AVviewport}
+ }{%
+ \begin{BlockClass}[\LWR at multimedia@printsize\ margin:auto]{AVviewport}
+ }
% \end{macrocode}
% Paragraph tags are unnecessary for the \AV\ tags.
% \begin{macrocode}
@@ -70018,11 +70716,15 @@
\LWR at stoppars
% \end{macrocode}
% The \AV\ element is 100\% of the container.
+% \changes{v0.73}{2019/06/24}{\pkg{lwarp-common-multimedia}: Fix: No size for audio file.}
% \begin{macrocode}
\LWR at htmltag{%
#3\ % space
- width=\textquotedbl{}100\%\textquotedbl\ % space
- height=\textquotedbl{}100\%\textquotedbl\ controls}\LWR at orignewline
+ \ifstrequal{#3}{audio}{}{%
+ width=\textquotedbl{}100\%\textquotedbl\ % space
+ height=\textquotedbl{}100\%\textquotedbl\ controls%
+ }%
+ }\LWR at orignewline
% \end{macrocode}
% The file source and type:
% \begin{macrocode}
@@ -70108,6 +70810,8 @@
% Examines the file extension to determine the type.
% If not a supported type, creates an embedded object if it has a \URL.
% If neither, create a link to the unsupported object.
+%
+% \changes{v0.73}{2019/06/24}{\pkg{lwarp-common-multimedia}: Fix: Paragraph tags.}
% \begin{macrocode}
\newcommand*{\LWR at multimediab}[3][]{%
% \end{macrocode}
@@ -70119,6 +70823,10 @@
\if#2\@percentchar\LWR at multimedia@percenterror\fi%
\if#3\@percentchar\LWR at multimedia@percenterror\fi%
% \end{macrocode}
+% Paragraph handling:
+% \begin{macrocode}
+ \LWR at stoppars%
+% \end{macrocode}
% Record the desired size.
% \begin{macrocode}
\setlength{\LWR at multimedia@width}{0pt}%
@@ -70143,6 +70851,10 @@
% \begin{macrocode}
\href{#3}{#2}% unknown format
}}}}}}}}%
+% \end{macrocode}
+% Paragraph handling:
+% \begin{macrocode}
+ \LWR at startpars%
\endgroup%
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2019-07-16 21:14:36 UTC (rev 51653)
@@ -241,6 +241,7 @@
\file{lwarp-lua-visual-debug.sty}{\from{lwarp.dtx}{lua-visual-debug}}
\file{lwarp-luacolor.sty}{\from{lwarp.dtx}{luacolor}}
\file{lwarp-luatodonotes.sty}{\from{lwarp.dtx}{luatodonotes}}
+\file{lwarp-lyluatex.sty}{\from{lwarp.dtx}{lyluatex}}
\file{lwarp-magaz.sty}{\from{lwarp.dtx}{magaz}}
\file{lwarp-makeidx.sty}{\from{lwarp.dtx}{makeidx}}
\file{lwarp-manyfoot.sty}{\from{lwarp.dtx}{manyfoot}}
@@ -376,6 +377,7 @@
\file{lwarp-srcltx.sty}{\from{lwarp.dtx}{srcltx}}
\file{lwarp-srctex.sty}{\from{lwarp.dtx}{srctex}}
\file{lwarp-stabular.sty}{\from{lwarp.dtx}{stabular}}
+\file{lwarp-stackengine.sty}{\from{lwarp.dtx}{stackengine}}
\file{lwarp-stfloats.sty}{\from{lwarp.dtx}{stfloats}}
\file{lwarp-struktex.sty}{\from{lwarp.dtx}{struktex}}
\file{lwarp-subcaption.sty}{\from{lwarp.dtx}{subcaption}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -43,6 +43,7 @@
\LWR at applyxfakebold%
}
\newcommand*{\LWR at amsmathenv@before}[1]{%
+ \LWR at stoppars%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
{
\LWR at syncmathjax
@@ -52,11 +53,11 @@
\LWR at beginhideamsmath
}
{
- \LWR at amsmathenv@@before{multline}
+ \LWR at amsmathenv@@before{#1}
}
}
\newcommand*{\LWR at amsmathenv@@after}{%
- \end{lateximage}\end{BlockClass}
+ \end{lateximage}\end{BlockClass}\LWR at startpars%
}
\newcommand*{\LWR at amsmathenv@after}[1]{%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -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 at ProvidesPackagePass{backnaur}[2019/04/14]
-\renewenvironment*{bnf}{%
- \BlockClass{backnaur}%
- \LWR at stoppars%
-}{\endBlockClass}
-
-\renewenvironment*{bnf*}{%
- \BlockClass{backnaur}%
- \LWR at 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 at stoppars%
-}%
-
-\renewcommand{\bnfmore}[1]{%
- \begin{BlockClass}{backnaurprod}\end{BlockClass}
- \begin{BlockClass}{backnaurdesc}#1\end{BlockClass}
- \LWR at stoppars%
-}
-
-\@ifpackagewith{backnaur}{perp}{\renewcommand{\bnfes}{\HTMLunicode{27c2}}}{}% \perp
-\@ifpackagewith{backnaur}{epsilon}{\renewcommand{\bnfes}{\HTMLunicode{3f5}}}{}% \epsilon
+\LWR at ProvidesPackagePass{backnaur}[2019/06/18]
+\renewenvironment{bnf}{\eqnarray}{\endeqnarray}
+\renewenvironment{bnf*}{\csuse{eqnarray*}}{\csuse{endeqnarray*}}
\endinput
%%
%% End of file `lwarp-backnaur.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -20,6 +20,7 @@
\LWR at ProvidesPackagePass{boxedminipage2e}[2015/03/09]
\newenvironment{LWR at HTML@boxedminipage}{%
+ \LWR at stoppars%
\begin{BlockClass}{framebox}%
\minipage%
}
@@ -26,6 +27,7 @@
{%
\endminipage%
\end{BlockClass}%
+ \LWR at startpars%
}
\LWR at formattedenv{boxedminipage}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -51,19 +51,10 @@
\LWR at traceinfo{caption at iiibox: done}%
}
-\def\caption at caption{%
- \caption at iftype
- {%
- \caption at checkgrouplevel\@empty\caption
- \caption at star
- {\caption at refstepcounter\@captype}%
- {\caption at dblarg{\@caption\@captype}}}%
- {\caption at Error{\noexpand\caption outside float}%
- \caption at gobble}%
-}
\long\def\caption@@caption#1[#2]#3{%
- \ifcaption at star \else
+ \ifcaption at star
+ \else
\caption at prepareanchor{#1}{#2}%
\memcaptioninfo{#1}{\csname the#1\endcsname}{#2}{#3}%
\@nameuse{nag at hascaptiontrue}%
@@ -78,9 +69,11 @@
\caption at normalsize
\ifcaption at star
\let\caption at makeanchor\@firstofone
- \fi
+ #3% lwarp
+ \else% lwarp
\@makecaption{\csname fnum@#1\endcsname}%
{\ignorespaces\caption at makeanchor{#3}}%
+ \fi% lwarp
\caption at if@minipage\@minipagetrue\@minipagefalse}%
\caption at end%
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -47,12 +47,18 @@
\newcommand*{\LWR at multimedia@fileAV}[4]{%
\filename at parse{#2}%
\IfFileExists{#2}{%
- \begin{BlockClass}[\LWR at multimedia@printsize\ margin:auto]{AVviewport}
+ \ifstrequal{#3}{audio}{%
+ \begin{BlockClass}{AVviewport}
+ }{%
+ \begin{BlockClass}[\LWR at multimedia@printsize\ margin:auto]{AVviewport}
+ }
\LWR at stoppars
\LWR at 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 at orignewline
\LWR at htmltag{%
@@ -72,12 +78,19 @@
}%
}
\newcommand*{\LWR at multimedia@httpAV}[4]{%
- \begin{BlockClass}[\LWR at multimedia@printsize\ margin:auto]{AVviewport}
+ \ifstrequal{#3}{audio}{%
+ \begin{BlockClass}{AVviewport}
+ }{%
+ \begin{BlockClass}[\LWR at multimedia@printsize\ margin:auto]{AVviewport}
+ }
\LWR at stoppars
\LWR at htmltag{%
#3\ % space
- width=\textquotedbl{}100\%\textquotedbl\ % space
- height=\textquotedbl{}100\%\textquotedbl\ controls}\LWR at orignewline
+ \ifstrequal{#3}{audio}{}{%
+ width=\textquotedbl{}100\%\textquotedbl\ % space
+ height=\textquotedbl{}100\%\textquotedbl\ controls%
+ }%
+ }\LWR at orignewline
\LWR at htmltag{%
source % space
src=\textquotedbl#2\textquotedbl\ % space
@@ -122,6 +135,7 @@
\if#1\@percentchar\LWR at multimedia@percenterror\fi%
\if#2\@percentchar\LWR at multimedia@percenterror\fi%
\if#3\@percentchar\LWR at multimedia@percenterror\fi%
+ \LWR at stoppars%
\setlength{\LWR at multimedia@width}{0pt}%
\setlength{\LWR at multimedia@height}{0pt}%
\setkeys*{LWR at multimedia}{#1}%
@@ -135,6 +149,7 @@
\IfBeginWith{#3}{FTP}{\LWR at multimedia@embed{#2}{#3}{}}{%
\href{#3}{#2}% unknown format
}}}}}}}}%
+ \LWR at startpars%
\endgroup%
}
\newrobustcmd*{\LWR at multimedia}{%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -24,6 +24,7 @@
{
\begin{BlockClass}{qitem}
#1
+\LWR at stoppars%
\ifbool{FormatWP}
{\begin{BlockClass}[border-top:1px solid gray]{epigraphsource}}
{\begin{BlockClass}{epigraphsource}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -81,6 +81,7 @@
}
\RenewDocumentEnvironment{Btrivlist}{m o}
{%
+ \LWR at stoppars%
\begin{BlockClass}{Btrivlist}%
\tabular{#1}%
}
@@ -87,6 +88,7 @@
{%
\endtabular%
\end{BlockClass}%
+ \LWR at startpars%
}
\AtBeginEnvironment{LWR at nestspan}{%
\RenewDocumentEnvironment{Btrivlist}{m o}{}{}%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -65,7 +65,7 @@
\renewcommand*{\FV at SingleFrameSep}{}
\def\FV at BUseVerbatim#1{%
- \LWR at atbeginverbatim[\LWR at FVstyle]{0}{verbatim}%
+ \LWR at atbeginverbatim{0}{verbatim}%
\FV at BVerbatimBegin#1\FV at BVerbatimEnd%
\LWR at afterendverbatim{0}%
}
@@ -73,12 +73,38 @@
\newcommand*{\LWR at FVstyle}{}
\newcommand*{\LWR at fvstartnone}{%
\LWR at traceinfo{fvstartnone}%
-\LWR at atbeginverbatim[\LWR at FVstyle]{0}{verbatim}%
+\BlockClass[\LWR at FVstyle]{fancyvrb}
+\LWR at stoppars
+\ifx\FV at LabelPositionTopLine\relax\else
+ \ifx\FV at LabelBegin\relax\else
+ \FancyVerbRuleColor{\LWR at FVfindbordercolor}
+ \LWR at htmltagc{%
+ div class="fancyvrblabel" % extra space
+ style="color: \LWR at origpound\LWR at tempcolor"%
+ }
+ \LWR at print@textrm{\FV at LabelBegin}% \textrm preserves emdash
+ \LWR at htmltagc{/div}\LWR at orignewline%
+ \fi
+\fi
+\LWR at atbeginverbatim{0}{verbatim}%
}
\newcommand*{\LWR at fvendnone}{%
\LWR at traceinfo{fvendnone}%
\LWR at afterendverbatim{0}%
+\LWR at stoppars%
+\ifx\FV at LabelPositionBottomLine\relax\else
+ \ifx\FV at LabelEnd\relax\else
+ \FancyVerbRuleColor{\LWR at FVfindbordercolor}
+ \LWR at htmltagc{%
+ div class="fancyvrblabel" % extra space
+ style="color: \LWR at origpound\LWR at tempcolor"%
+ }
+ \LWR at print@textrm{\FV at LabelEnd}
+ \LWR at htmltagc{/div}\LWR at orignewline%
+ \fi
+\fi
+\endBlockClass
}
\newcommand*{\LWR at fvstartsingle}{%
@@ -111,10 +137,10 @@
}
\newcommand*{\LWR at FVborderstyle}[1]{%
-padding#1: \strip at pt\dimexpr \FV at FrameSep\relax\relax pt ; %
-\LWR at FVfindbordercolor %
-border#1: \strip at pt\dimexpr \FV at FrameRule\relax\relax pt %
-solid \LWR at origpound\LWR at tempcolor ; %
+padding#1: \strip at pt\dimexpr \FV at FrameSep\relax\relax pt ; % space
+\LWR at FVfindbordercolor\LWR at indentHTMLtwo%
+border#1: \strip at pt\dimexpr \FV at FrameRule\relax\relax pt % space
+solid {\FancyVerbRuleColor{\LWR at origpound\LWR at tempcolor}} ; % space
}
\def\FV at Frame@none{%
@@ -127,7 +153,10 @@
\FV at Frame@none% default values
\def\FV at Frame@single{%
-\renewcommand*{\LWR at FVstyle}{\LWR at currenttextcolorstyle\LWR at FVborderstyle{}}%
+\renewcommand*{\LWR at FVstyle}{%
+ \LWR at currenttextcolorstyle\LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{}%
+}%
\let\FV at BeginListFrame\LWR at fvstartsingle%
\let\FV at LeftListFrame\FV at LeftListFrame@Single%
\let\FV at RightListFrame\FV at RightListFrame@Single%
@@ -135,7 +164,10 @@
\def\FV at Frame@lines{%
\renewcommand*{\LWR at FVstyle}{%
- \LWR at currenttextcolorstyle\LWR at FVborderstyle{-top}\LWR at FVborderstyle{-bottom}%
+ \LWR at currenttextcolorstyle\LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{-top}%
+ \LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{-bottom}%
}%
\let\FV at BeginListFrame\LWR at fvstartline%
\let\FV at LeftListFrame\relax%
@@ -143,7 +175,10 @@
\let\FV at EndListFrame\LWR at fvendline}
\def\FV at Frame@topline{%
-\renewcommand*{\LWR at FVstyle}{\LWR at currenttextcolorstyle\LWR at FVborderstyle{-top}}%
+\renewcommand*{\LWR at FVstyle}{%
+ \LWR at currenttextcolorstyle\LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{-top}%
+}%
\let\FV at BeginListFrame\LWR at fvstartline%
\let\FV at LeftListFrame\relax%
\let\FV at RightListFrame\relax%
@@ -150,7 +185,10 @@
\let\FV at EndListFrame\LWR at fvendnone}
\def\FV at Frame@bottomline{%
-\renewcommand*{\LWR at FVstyle}{\LWR at currenttextcolorstyle\LWR at FVborderstyle{-bottom}}%
+\renewcommand*{\LWR at FVstyle}{%
+ \LWR at currenttextcolorstyle\LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{-bottom}%
+}%
\let\FV at BeginListFrame\LWR at fvstartnone%
\let\FV at LeftListFrame\relax%
\let\FV at RightListFrame\relax%
@@ -157,7 +195,10 @@
\let\FV at EndListFrame\LWR at fvendline}
\def\FV at Frame@leftline{%
-\renewcommand*{\LWR at FVstyle}{\LWR at currenttextcolorstyle\LWR at FVborderstyle{-left}}%
+\renewcommand*{\LWR at FVstyle}{%
+ \LWR at currenttextcolorstyle\LWR at indentHTMLtwo%
+ \LWR at FVborderstyle{-left}%
+}%
\ifx\FancyVerbFillColor\relax%
\let\FV at FrameFillLine\relax%
\else%
@@ -182,25 +223,10 @@
\ifnum#1=\z@
\ifx\FV at LabelPositionTopLine\relax
\else
- \LWR at FVfindbordercolor
- \LWR at htmltagc{%
- div class="fancyvrblabel" % extra space
- style="color: \LWR at origpound\LWR at tempcolor"%
- }
- \LWR at print@textrm{\FV at LabelBegin}% \textrm preserves emdash
- \LWR at htmltagc{/div}
\fi
\else
\ifx\FV at LabelPositionBottomLine\relax
\else
- \LWR at FVfindbordercolor
-
- \LWR at htmltagc{%
- div class="fancyvrblabel" % extra space
- style="color: \LWR at origpound\LWR at tempcolor"%
- }
- \LWR at print@textrm{\FV at LabelEnd}
- \LWR at htmltagc{/div}
\fi
\fi
\fi
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -27,13 +27,11 @@
\def\fn at startfntext{%
\setbox\z@\vbox\bgroup%
\fn at startnote%
- \fn at prefntext%
\ignorespaces%
}
\def\fn at endfntext{%
\LWR at htmltagc{/\LWR at tagregularparagraph}%
\LWR at orignewline%
- \fn at postfntext%
\egroup%
\begingroup%
\let\@makefntext\@empty%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -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 at ProvidesPackageDrop{intopdf}[2018/03/15]
-\NewDocumentCommand{\attachandlink}{m o m m}{%
- \href{#1}{#4}%
+\LWR at ProvidesPackageDrop{intopdf}[2019/05/28]
+\NewDocumentCommand{\attachandlink}{o m o m m}{%
+ \href{#2}{#5}%
}
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -107,6 +107,7 @@
{\begingroup
\LWR at traceinfo{at the selected position}%
\ifx\lst at title\@empty
+ \LWR at stoppars%
\lst at makecaption\fnum at lstlisting{\ignorespaces \lst at caption}
\else
\LWR at traceinfo{Making title: \lst at title}%
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -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 at ProvidesPackagePass{lyluatex}[2019/05/27]
+\newcommand*{\lyluateximagename}{(-lilypond-~\packagediagramname)}
+\LetLtxMacro\LWR at orig@ly at compilescore\ly at compilescore
+
+\renewcommand*{\ly at compilescore}[1]{%
+ \begin{lateximage}[\lyluateximagename]%
+ \LWR at orig@ly at 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'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -15,20 +15,24 @@
%% 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 at ProvidesPackagePass{musicography}[2018/05/21]
-\RenewDocumentCommand{\musSymbol}{ O{\musFont} m m m m }{%
+\LWR at ProvidesPackagePass{musicography}[2019/05/28]
+\NewDocumentCommand{\LWR at HTML@musSymbol}{ O{\musFont} m m m m }{%
\begin{lateximage}%
{#1\kern#2\raisebox{#3}{#5}\kern#4}%
\end{lateximage}%
}
-\RenewDocumentCommand{\musStemmedNote}{ m }{%
+\LWR at formatted{musSymbol}
+
+\NewDocumentCommand{\LWR at HTML@musStemmedNote}{ m }{%
\begin{lateximage}%
\musSymbol{0.05em}{0.5ex}{0.2em}{#1\musStem}%
\end{lateximage}%
}
-\RenewDocumentCommand{\musFlaggedNote}{ m m }{%
+\LWR at formatted{musStemmedNote}
+
+\NewDocumentCommand{\LWR at HTML@musFlaggedNote}{ m m }{%
\begin{lateximage}%
\musSymbol{0.05em}{0.5ex}{0pt}{#1\musStem}%
\musSymbol{0pt}{0pt}{0.9em}{#2}%
@@ -35,59 +39,130 @@
\end{lateximage}%
}
-\RenewDocumentCommand{\musDottedNote}{ m }{%
+\LWR at formatted{musFlaggedNote}
+
+\NewDocumentCommand{\LWR at HTML@musDottedNote}{ m }{%
\begin{lateximage}%
#1\musDot%
\end{lateximage}%
}
-\RenewDocumentCommand{\musMeter}{ m m }{%
+\LWR at formatted{musDottedNote}
+
+\NewDocumentCommand{\LWR at 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 at formatted{musMeter}
+
+\NewDocumentCommand{\LWR at HTML@meterCplus}{ m }{%
\begin{lateximage}*[C#1]%
\meterC{}\kern-0.7pt#1%
\end{lateximage}%
}
-\RenewDocumentCommand{\meterC}{}{%
+\LWR at formatted{meterCplus}
+
+\NewDocumentCommand{\LWR at HTML@meterC}{}{%
\begin{lateximage}*[C]%
\musSymbolMeter{\symbol{83}}%
\end{lateximage}%
}
-\RenewDocumentCommand{\meterCutC}{}{%
+\LWR at formatted{meterC}
+
+\NewDocumentCommand{\LWR at HTML@meterCutC}{}{%
\begin{lateximage}*[C|]%
\musSymbolMeter{\symbol{82}}%
\end{lateximage}%
}
-\RenewDocumentCommand{\meterCThreeTwo}{}{%
+\LWR at formatted{meterCutC}
+
+\NewDocumentCommand{\LWR at 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}}
+\LWR at formatted{meterCThreeTwo}
-\RenewDocumentCommand{\musWhole}{}{\HTMLunicode{1D15D}}
-\RenewDocumentCommand{\musHalf}{}{\HTMLunicode{1D15E}}
-\RenewDocumentCommand{\musQuarter}{}{\HTMLunicode{1D15F}}
-\RenewDocumentCommand{\musEighth}{}{\HTMLunicode{1D160}}
-\RenewDocumentCommand{\musSixteenth}{}{\HTMLunicode{1D161}}
+\NewDocumentCommand{\LWR at HTML@meterO}{}{\HTMLunicode{25EF}}
-\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 at formatted{meterO}
+
+\newcommand{\LWR at null@noFig}[1][]{}%
+
+\NewDocumentCommand{\LWR at HTML@musFig}{ m }{%
+\begin{lateximage}*[%
+ {% ALT text for copy/paste
+ \LetLtxMacro\noFig\LWR at null@noFig%
+ \LetLtxMacro\musSharp\LWR at HTML@musSharp%
+ \LetLtxMacro\musDoubleSharp\LWR at HTML@musDoubleSharp%
+ \LetLtxMacro\musFlat\LWR at HTML@musFlat%
+ \LetLtxMacro\musDoubleFlat\LWR at HTML@musDoubleFlat%
+ \LetLtxMacro\musNatural\LWR at HTML@musNatural%
+ ({#1})% braces here because \noFig uses []
+ }%
+]%
+ \musStack[\musFigFont]{#1}%
+\end{lateximage}%
+}
+
+\LWR at formatted{musFig}
+
+\NewDocumentCommand{\LWR at HTML@musFlat} {}{\HTMLunicode{266D}}
+\NewDocumentCommand{\LWR at HTML@musDoubleFlat} {}{\HTMLunicode{1D12B}}
+\NewDocumentCommand{\LWR at HTML@musSharp} {}{\HTMLunicode{266F}}
+\NewDocumentCommand{\LWR at HTML@musDoubleSharp}{}{\HTMLunicode{1D12A}}
+\NewDocumentCommand{\LWR at HTML@musNatural} {}{\HTMLunicode{266E}}
+
+\LWR at formatted{musFlat}
+\LWR at formatted{musDoubleFlat}
+\LWR at formatted{musSharp}
+\LWR at formatted{musDoubleSharp}
+\LWR at formatted{musNatural}
+
+\NewDocumentCommand{\LWR at HTML@musWhole} {}{\HTMLunicode{1D15D}}
+\NewDocumentCommand{\LWR at HTML@musHalf} {}{\HTMLunicode{1D15E}}
+\NewDocumentCommand{\LWR at HTML@musQuarter} {}{\HTMLunicode{1D15F}}
+\NewDocumentCommand{\LWR at HTML@musEighth} {}{\HTMLunicode{1D160}}
+\NewDocumentCommand{\LWR at HTML@musSixteenth} {}{\HTMLunicode{1D161}}
+\NewDocumentCommand{\LWR at HTML@musThirtySecond} {}{\HTMLunicode{1D162}}
+\NewDocumentCommand{\LWR at HTML@musSixtyFourth} {}{\HTMLunicode{1D163}}
+
+\LWR at formatted{musWhole}
+\LWR at formatted{musHalf}
+\LWR at formatted{musQuarter}
+\LWR at formatted{musEighth}
+\LWR at formatted{musSixteenth}
+\LWR at formatted{musThirtySecond}
+\LWR at formatted{musSixtyFourth}
+
+\NewDocumentCommand{\LWR at HTML@musWholeDotted}{}
+ {\HTMLunicode{1D15D}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musHalfDotted}{}
+ {\HTMLunicode{1D15E}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musQuarterDotted}{}
+ {\HTMLunicode{1D15F}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musEighthDotted}{}
+ {\HTMLunicode{1D160}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musSixteenthDotted}{}
+ {\HTMLunicode{1D161}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musThirtySecondDotted}{}
+ {\HTMLunicode{1D162}\HTMLunicode{1D16D}}
+\NewDocumentCommand{\LWR at HTML@musSixtyFourthDotted}{}
+ {\HTMLunicode{1D163}\HTMLunicode{1D16D}}
+
+\LWR at formatted{musWholeDotted}
+\LWR at formatted{musHalfDotted}
+\LWR at formatted{musQuarterDotted}
+\LWR at formatted{musEighthDotted}
+\LWR at formatted{musSixteenthDotted}
+\LWR at formatted{musThirtySecondDotted}
+\LWR at formatted{musSixtyFourthDotted}
\endinput
%%
%% End of file `lwarp-musicography.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -53,11 +53,13 @@
\renewcommand{\chapter at 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}
{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -221,6 +221,9 @@
\renewcommand*{\abstractintoc}{}
\renewcommand*{\abstractnum}{}
\renewcommand*{\abstractrunin}{}
+\DeclareDocumentCommand{\book}{s d() o o d() m}{%
+ \LWR at section{#1}{#3}{#6}{book}%
+}
\def\@apppage{%
\part*{\appendixpagename}
@@ -231,9 +234,13 @@
\def\@sapppage{%
\part*{\appendixpagename}
}
+\DeclareDocumentCommand{\mainmatter}{s}{%
+ \booltrue{LWR at mainmatter}%
+}
-\csletcs{frontmatter*}{frontmatter}
-\csletcs{mainmatter*}{mainmatter}
+\DeclareDocumentCommand{\frontmatter}{s}{%
+\boolfalse{LWR at mainmatter}%
+}
\renewcommand*{\raggedbottomsection}{}
\renewcommand*{\normalbottomsection}{}
\renewcommand*{\bottomsectionskip}{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -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 at ProvidesPackageDrop{quotchap}[2012/10/20]
+\LWR at ProvidesPackageDrop{quotchap}[2019/07/09]
\newcommand{\@quotchap}{}
\newlength{\LWR at 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 at stoppars%
+ \begin{BlockClass}{qauthor}%
+ {#1}%
+ \end{BlockClass}%
+ \LWR at startpars%
+}
\newcommand{\qsetcnfont}[1]{}
+\providecommand*{\quotefont}{}
+\providecommand*{\qauthorfont}{}
\endinput
%%
%% End of file `lwarp-quotchap.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -24,7 +24,7 @@
{\LWR at patcherror{quoting}{quoting}}
\xpatchcmd{\endquoting}{\quo at endtext}
- {\quo at endtext\end{LWR at blocktextcurrentfont}}
+ {\quo at endtext\end{LWR at blocktextcurrentfont}\LWR at stoppars}
{}
{\LWR at patcherror{imakeidx}{endquoting}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -28,8 +28,8 @@
\DeclareDocumentCommand{\useshapeofkomafont}{m}{}
\AtBeginDocument{
-\let\LWR at maketitle\maketitle
-\DeclareDocumentCommand{\maketitle}{o}{\LWR at maketitle}
+ \let\LWR at koma@orig at maketitle\maketitle
+ \DeclareDocumentCommand{\maketitle}{o}{\LWR at koma@orig at maketitle}
}
\DeclareDocumentCommand{\extratitle}{m}{}
@@ -76,12 +76,12 @@
\DeclareDocumentCommand{\deffootnotemark}{m}{}
\DeclareDocumentCommand{\setfootnoterule}{o m}{}
\DeclareDocumentCommand{\raggedfootnote}{}{}
-
\DeclareDocumentCommand{\dictum}{o m}{
\begin{LWR at BlockClassWP}{\LWR at print@mbox{text-align:right}}{}{dictum}
#2
\IfValueT{#1}
{
+ \LWR at stoppars%
\ifbool{FormatWP}
{\begin{BlockClass}[\LWR at 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 at stoppars%
\setlength{\LWR at templengthtwo}{#3}
\ifblank{#2}
{
@@ -135,7 +135,7 @@
]{addmargin}
}
}
-{\end{BlockClass}}
+{\end{BlockClass}\LWR at startpars}
\ExplSyntaxOn
\cs_new:cpn {addmargin*} {\addmargin*}
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -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 at ProvidesPackagePass{stackengine}[2017/02/13]
+\LetLtxMacro\LWR at orig@stackengine\stackengine
+\renewcommand*{\stackengine}[8]{%
+ \ifstrequal{#4}{O}%
+ {\begin{lateximage}}%
+ {\begin{lateximage}[][][vertical-align:top]}%
+ \LWR at orig@stackengine{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}%
+ \end{lateximage}%
+}
+\LetLtxMacro\LWR at orig@@stack\@stack
+
+\xpatchcmd{\LWR at orig@@stack}{\stackengine}{\LWR at orig@stackengine}
+ {}
+ {\LWR at patcherror{stackengine}{LWR at orig@@stack}}
+
+\renewcommand*{\@stack}[4]{%
+ \ifstrequal{#3}{O}%
+ {\begin{lateximage}}%
+ {\begin{lateximage}[][][vertical-align:top]}%
+ \LWR at orig@@stack{#1}{#2}{#3}{#4}%
+ \end{lateximage}%
+}
+\newcommand*\LWR at HTML@@stacklap[4]{#3}
+\LWR at formatted{@stacklap}
+\xpatchcmd{\stackanchor}{\stackengine}{\LWR at orig@stackengine}
+ {}
+ {\LWR at patcherror{stackengine}{stackanchor patch 1}}
+
+\xpatchcmd{\stackanchor}{\stackengine}{\LWR at orig@stackengine}
+ {}
+ {\LWR at patcherror{stackengine}{stackanchor patch 2}}
+
+\xpretocmd{\stackanchor}{\begin{lateximage}[][][vertical-align:middle]}
+ {}
+ {\LWR at patcherror{stackengine}{stackanchor pre}}
+
+\xapptocmd{\stackanchor}{\end{lateximage}}
+ {}
+ {\LWR at patcherror{stackengine}{stackanchor app}}
+\xpretocmd{\Centerstack}{\begin{lateximage}[][][vertical-align:middle]}
+ {}
+ {\LWR at patcherror{stackengine}{Centerstack pre}}
+
+\xapptocmd{\Centerstack}{\end{lateximage}}
+ {}
+ {\LWR at patcherror{stackengine}{Centerstack app}}
+\renewcommand*\savestack[2]{%
+ \xdef\sv at name{\stack at macro@name{#1}}%
+ \@ifundefined{\sv at name content}{%
+ \expandafter\newsavebox\expandafter{\csname\sv at name content\endcsname}%
+ }{}%
+ \begingroup% lwarp
+ \LWR at restoreorigformatting% lwarp
+ \RenewDocumentEnvironment{lateximage}{s o o o}{}{}% lwarp: inside group
+ \expandafter\LWR at gsavebox\csname\sv at name content\endcsname{#2}%
+ \expandafter\gdef\expandafter#1\expandafter{%
+ \expandafter\begin\expandafter{lateximage\expandafter}% lwarp
+ \expandafter\usebox\expandafter%
+ {\csname\sv at name content\endcsname}%
+ \expandafter\end\expandafter{lateximage\expandafter}% lwarp
+ }%
+ \endgroup% lwarp
+}
+\endinput
+%%
+%% End of file `lwarp-stackengine.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -37,6 +37,10 @@
}
\newcommand{\tnote}[1]{\LWR at htmlspan{sup}{#1}}
+\newenvironment*{measuredfigure}[1][t]
+ {\def\@captype{figure}}
+ {}
+
\endinput
%%
%% End of file `lwarp-threeparttable.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -67,7 +67,7 @@
\@bsmarkseries
\LWR at maketitlesetup
\@maketitle
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
\end{titlepage}
\@bscontmark
}
@@ -99,11 +99,11 @@
\maketitlehookd
}
\renewcommand*{\LWR at titlingmaketitle}{%
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
\@bsmarkseries
\LWR at maketitlesetup
\@maketitle
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
\@bscontmark
}
\renewcommand{\thanksmarkseries}[1]{%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -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 at ProvidesPackagePass{tocdata}[2019/03/21]
+\LWR at ProvidesPackagePass{tocdata}[2019/07/06]
\renewcommand*{\LWR at maybetocdata}{%
\ifdefempty{\TD at thistocdata}{}{%
- \qquad --- \InlineClass{authorartist}{\TD at thistocdata}%
+ \qquad \InlineClass{authorartist}{\tocdataformat{\TD at thistocdata}}%
\def\TD at thistocdata{}
}
}
-
\renewrobustcmd{\tocdatapartprint}[4]
{%
- \LWR at htmltagc{br /}%
\InlineClass{authorartist}{%
\qquad --- %
- \TD at optionalname{#1}\TD at optionalname{#2}#3#4%
+ \TDoptionalnameprint{#1}\TDoptionalnameprint{#2}#3#4%
}%
}
@@ -51,10 +49,10 @@
{}%
}
-\renewcommand{\TD at artistauthorprint}[5]{%
+\renewcommand{\TDartistauthorprint}[5]{%
\LWR at TD@settextalign{#1}%
\begin{BlockClass}[text-align:\LWR at TD@textalign]{floatnotes}%
- \InlineClass{authorartist}{\TD at optionalname{#2}\TD at optionalname{#3}#4#5}%
+ \InlineClass{authorartist}{\TDoptionalnameprint{#2}\TDoptionalnameprint{#3}#4#5}%
\end{BlockClass}%
}
@@ -71,7 +69,7 @@
{}%
}
-\renewcommand{\TD at artistauthortextprint}[2]{%
+\renewcommand{\TDartistauthortextprint}[2]{%
\LWR at TD@setnamealign{#1}%
\begin{BlockClass}[text-align:\LWR at TD@textalign]{floatnotes}%
#2%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -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 at ProvidesPackageDrop{versonotes}[2015/12/08]
+\LWR at 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'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -30,7 +30,7 @@
}%
}
\renewenvironment*{vwcol}[1][]{%
-\par\noindent%
+\LWR at stoppars%
\vwcolsetup{#1}%
\newcommand*{\LWR at vwcolstyle}{}
\if at vwcol@presep
@@ -81,6 +81,7 @@
}
{
\endBlockClass
+\LWR at startpars
}
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -66,6 +66,18 @@
border:\LWR at printlength{\LWR at atleastonept} solid \LWR at colorstyle{#1}{#2} ; %
padding:\LWR at printlength{\fboxsep}%
}
+\NewDocumentCommand{\LWR at HTML@color}{o m}{%
+\IfValueTF{#1}{%
+ \LWR at print@color[#1]{#2}%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at tempcolor%
+}{%
+ \LWR at print@color{#2}%
+ \convertcolorspec{named}{#2}{HTML}\LWR at tempcolor%
+}%
+\edef\LWR at currenttextcolor{\LWR at origpound\LWR at tempcolor}%
+}
+
+\LWR at formatted{color}
\NewDocumentCommand{\LWR at HTML@textcolor}{o m m}{%
\begingroup%
\IfValueTF{#1}{%
@@ -72,21 +84,10 @@
\color[#1]{#2}%
}{%
\color{#2}%
+}
+\InlineClass[color:\LWR at currenttextcolor]{textcolor}{#3}%
+\endgroup%
}%
-\LWR at FBcancel%
-\IfValueTF{#1}{%
-\InlineClass[color:\LWR at colorstyle{#1}{#2}]{textcolor}{%
-\renewcommand*{\LWR at currenttextcolor}{\LWR at origpound\LWR at tempcolor}%
-#3%
-}%
-}{%
-\InlineClass[color:\LWR at colorstyle{named}{#2}]{textcolor}{%
-\renewcommand*{\LWR at currenttextcolor}{\LWR at origpound\LWR at tempcolor}%
-#3%
-}%
-}%
-\endgroup%
-}
\LWR at formatted{textcolor}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -20,31 +20,40 @@
\AtBeginDocument{
-\preto{\xy}{\begin{lateximage}[(-xy-~\packagediagramname)]}
-\appto{\endxy}{\end{lateximage}}
+\LetLtxMacro\LWR at orig@xy\xy
+\LetLtxMacro\LWR at orig@endxy\endxy
+\renewcommand*{\xy}{%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {\addtocounter{LWR at lateximagedepth}{1}}%
+ {\begin{lateximage}[(-xy-~\packagediagramname)]}%
+ \LWR at orig@xy%
+}
-\@ifundefined{xymatrix}{}{
-\LetLtxMacro\LWR at origxymatrix\xymatrix
-
-\renewcommand{\xymatrix}[1]{%
-\begin{lateximage}[(-xy- xymatrix \packagediagramname)]
-\LWR at origxymatrix{#1}
-\end{lateximage}
+\renewcommand*{\endxy}{%
+ \LWR at orig@endxy%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{1}%
+ {\addtocounter{LWR at lateximagedepth}{-1}}%
+ {\end{lateximage}}%
}
+\def\xybox#1{%
+ \LWR at orig@xy#1\LWR at orig@endxy%
+ \Edge at c={\rectangleEdge}\computeLeftUpness@%
}
\@ifundefined{xygraph}{}{
+
\LetLtxMacro\LWR at origxygraph\xygraph
\renewcommand{\xygraph}[1]{%
-\begin{lateximage}[(-xy- xygraph \packagediagramname)]
-\LWR at origxygraph{#1}
-\end{lateximage}
+ \begin{lateximage}[(-xy- xygraph \packagediagramname)]
+ \LWR at origxygraph{#1}
+ \end{lateximage}
}
-}
-}
+}% xygraph defined
+}% AtBeginDocument
+
\endinput
%%
%% End of file `lwarp-xy.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2019-07-16 21:13:53 UTC (rev 51652)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2019-07-16 21:14:36 UTC (rev 51653)
@@ -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 at loadafter{lua-visual-debug}
\LWR at loadafter{luacolor}
\LWR at loadafter{luatodonotes}
+\LWR at loadafter{lyluatex}
\LWR at loadafter{magaz}
\LWR at notmemoirloadafter{makeidx}
\LWR at loadafter{manyfoot}
@@ -515,6 +516,7 @@
\LWR at loadafter{srcltx}
\LWR at loadafter{srctex}
\LWR at loadafter{stabular}
+\LWR at loadafter{stackengine}
\LWR at notltjloadafter{stfloats}
\LWR at loadafter{struktex}
\LWR at loadafter{subcaption}
@@ -687,6 +689,7 @@
\arabic{LWR at tempcountone}%
}
+
\newcommand*{\LWR at patcherror}[2]{%
\PackageError{lwarp}
{Unable to patch package #1, macro #2}
@@ -701,10 +704,41 @@
\@ifpackageloaded{xeCJK}{
\renewcommand{\LWR at isolate}[1]{\null#1\null}%
}{}
+\newcommand*{\LWR at forceemptyline}{%
+ \LWR at origrule{0pt}{1\baselineskip}%
+ \LWR at orignewline%
+}
\long\def\LWR at firstoffour#1#2#3#4{#1}
\long\def\LWR at secondoffour#1#2#3#4{#2}
\long\def\LWR at thirdoffour#1#2#3#4{#3}
\long\def\LWR at fourthoffour#1#2#3#4{#4}
+\DeclareRobustCommand\LWR at gsavebox[1]{%
+ \@ifnextchar(%)
+ {\LWR@@gsavepicbox#1}{\@ifnextchar[{\LWR@@gsavebox#1}{\LWR at gsbox#1}}}%
+\long\def\LWR at gsbox#1#2{\global\setbox#1\hbox{%
+ \color at setgroup#2\color at 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 at 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 at gsbox#1{\@imakepicbox(#2,#3)[#4]{#5}}}
+
+\def\LWR at glrbox#1{%
+ \edef\reserved at a{%
+ \endgroup
+ \global\setbox#1\hbox{%
+ \begingroup\aftergroup}%
+ \def\noexpand\@currenvir{\@currenvir}%
+ \def\noexpand\@currenvline{\on at line}}%
+ \reserved at a
+ \@endpefalse
+ \color at setgroup
+ \ignorespaces}
+\let\LWR at endglrbox\LWR at endlrbox
\let\LWRpercent\@percentchar
\catcode`\$=12
\def\LWRdollar{$}
@@ -1264,7 +1298,7 @@
\immediate\openout\LWR at quickfile #1_html_inc.tex% lwarp
\immediate\write\LWR at quickfile{\string\input{#1.tex}}% lwarp
\immediate\closeout\LWR at quickfile% lwarp
-\LWR at origclearpage% \changed
+\LWR at orignewpage% changed from clearpage
\if at 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 at origclearpage% changed
+ \LWR at orignewpage% changed from clearpage
\@writeckpt{#1}%
\if at filesw
\immediate\closeout\@partaux
@@ -1577,8 +1611,6 @@
\LetLtxMacro\LWR at origfootnote\footnote
\let\LWR at orig@mpfootnotetext\@mpfootnotetext
-\let\LWR at origclearpage\clearpage
-
\AtBeginDocument{% in case packages change definition
\LetLtxMacro\LWR at orighline\hline%
\LetLtxMacro\LWR at origcline\cline%
@@ -1867,6 +1899,8 @@
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 @@
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 @@
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 @@
}
.fancyvrblabel {
- font-weight:bold;
+ font-size: .85em ;
text-align: center ;
+ font-weight: bold ;
+ margin-top: 1ex ;
+ margin-bottom: 1ex ;
}
.verse {
@@ -3112,10 +3156,13 @@
}
.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: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 @@
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 @@
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.72"
+printversion = "v0.73"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -4854,6 +4901,7 @@
\newcommand*{\LWR at depthnone}{-5}
\newcommand*{\LWR at depthfinished}{-4}
+\newcommand*{\LWR at depthbook}{-2}
\newcommand*{\LWR at depthpart}{-1}
\newcommand*{\LWR at depthchapter}{0}
\newcommand*{\LWR at depthsection}{1}
@@ -5221,9 +5269,10 @@
\begin{warpHTML}
-
\newcommand*{\LWR at tagtitle}{h1}
\newcommand*{\LWR at tagtitleend}{/h1}
+\newcommand*{\LWR at tagbook}{div class="book"}
+\newcommand*{\LWR at tagbookend}{/div}
\newcommand*{\LWR at tagpart}{h2}
\newcommand*{\LWR at tagpartend}{/h2}
\newcommand*{\LWR at tagchapter}{h3}
@@ -5293,7 +5342,11 @@
\LWR at orignewline\LWR at origrule{2em}{0pt}%
}
+\newcommand*{\LWR at indentHTMLtwo}{%
+ \LWR at orignewline\LWR at origrule{4em}{0pt}%
+}
+
\newcommand*{\LWR at htmltagc}[1]{%
\LWR at traceinfo{LWR at htmltagc !\detokenize{#1}!}%
\begingroup%
@@ -5330,6 +5383,8 @@
\let\item\LWR at nestspanitem%
}%
\renewcommand{\LWR at listend}{\LWR at htmltagc{br /}\LWR at htmltagc{br /}}%
+ \renewenvironment{quote}{\LWR at htmltagc{br /}}{\LWR at htmltagc{br /}}%
+ \renewenvironment{quotation}{\LWR at htmltagc{br /}}{\LWR at htmltagc{br /}}%
}% not in a lateximage
\LWR at traceinfo{LWR at nestspan starting: done}%
}% starting env
@@ -5427,6 +5482,7 @@
\NewDocumentCommand{\LWR at htmlelementclass}{m o m}{%
\LWR at stoppars%
+\LWR at forceemptyline%
\LWR at subhtmlelementclass{#1}[#2]{#3}%
\LWR at startpars%
}
@@ -5452,6 +5508,7 @@
\NewDocumentCommand{\LWR at htmlelementclassline}{m o m +m}{%
\LWR at stoppars
+\LWR at forceemptyline%
\LWR at subhtmlelementclass{#1}[#2]{#3}%
#4%
\LWR at htmltag{/#1}
@@ -5479,7 +5536,6 @@
\NewDocumentEnvironment{LWR at print@BlockClass}{o m}{}{}%
\NewDocumentEnvironment{LWR at HTML@BlockClass}{o m}%
{%
- \LWR at origpar%
\LWR at htmldivclass[#1]{#2}%
}
{\LWR at htmldivclassend{#2}}
@@ -5491,7 +5547,6 @@
\end{warpall}
\begin{warpHTML}
\newcommand{\LWR at HTML@BlockClassSingle}[2]{%
-\LWR at origpar%
\LWR at htmlelementclassline{div}{#1}{#2}%
}
@@ -5550,6 +5605,8 @@
\begin{warpHTML}
+\newcommand*{\LWR at printclosebook}
+ {\ifbool{HTMLDebugComments}{\LWR at htmlcomment{Closing book}}{}}
\newcommand*{\LWR at printclosepart}
{\ifbool{HTMLDebugComments}{\LWR at htmlcomment{Closing part}}{}}
\newcommand*{\LWR at printclosechapter}
@@ -5785,7 +5842,7 @@
}
\end{warpHTML}
\begin{warpall}
-\providecommand{\thetitle}{}
+\providecommand{\thetitle}{\BaseJobname}
\newcommand{\theHTMLTitle}{\thetitle}
@@ -5943,17 +6000,18 @@
}%
}
\newcommand{\marginparBlock}[2][]{%
+\LWR at stoppars%
\ifbool{FormatWP}%
{%
-\begin{LWR at BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
-#2
-\end{LWR at BlockClassWP}
+ \begin{LWR at BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
+ #2
+ \end{LWR at BlockClassWP}
+}{%
+ \begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock}
+ #2
+ \end{BlockClass}
}%
-{%
-\begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock}
-#2
-\end{BlockClass}
-}%
+\LWR at startpars%
}
\renewcommand*{\reversemarginpar}{}
\renewcommand*{\normalmarginpar}{}
@@ -6170,11 +6228,13 @@
\ifbool{FormatEPUB}
{}
{
- \LWR at htmlelement{footer}
+ \ifdefempty{\LWR at pagebottom}{}{%
+ \LWR at htmlelement{footer}
- \LWR at pagebottom
+ \LWR at pagebottom
- \LWR at htmlelementend{footer}
+ \LWR at htmlelementend{footer}
+ }
}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
{}
@@ -6233,11 +6293,13 @@
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
{}
{
- \LWR at htmlelement{header}
+ \ifdefempty{\LWR at pagetop}{}{
+ \LWR at htmlelement{header}
- \LWR at pagetop
+ \LWR at pagetop
- \LWR at htmlelementend{header}
+ \LWR at htmlelementend{header}
+ }
}
\LWR at htmlelementclass{div}{bodyandsidetoc}
@@ -6495,6 +6557,9 @@
}
+\providecommand*{\prebookname}{}
+\providecommand*{\postbookname}{}
+
\providecommand*{\prepartname}{}
\providecommand*{\postpartname}{}
@@ -6727,11 +6792,13 @@
\LWR at traceinfo{LWR at lwarpStart: Starting new file.}
\LWR at filestart
\LWR at traceinfo{LWR at lwarpStart: Generating first header.}
-\LWR at htmltag{header}\LWR at orignewline
-\LWR at startpars
-\LWR at firstpagetop
-\LWR at stoppars
-\LWR at htmltag{/header}\LWR at orignewline
+\ifdefempty{\LWR at firstpagetop}{}{%
+ \LWR at htmltag{header}\LWR at orignewline
+ \LWR at startpars
+ \LWR at firstpagetop
+ \LWR at stoppars
+ \LWR at htmltag{/header}\LWR at orignewline
+}%
\LWR at htmlelementclass{div}{bodywithoutsidetoc}
\LWR at htmlelementclass{div}{bodycontainer}
\LWR at traceinfo{LWR at lwarpStart: Generating textbody.}
@@ -6771,11 +6838,13 @@
\LWR at htmlelementclassend{div}{bodycontainer}
\LWR at htmlelementclassend{div}{bodyandsidetoc}
\LWR at printpendingfootnotes
-\LWR at htmlelement{footer}
+\ifdefempty{\LWR at pagebottom}{}{%
+ \LWR at htmlelement{footer}
-\LWR at pagebottom
+ \LWR at pagebottom
-\LWR at htmlelementend{footer}
+ \LWR at htmlelementend{footer}
+}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
{}
@@ -6855,7 +6924,7 @@
}
\end{warpHTML}
\begin{warpall}
-\newcommand*{\printthanks}{\@thanks}
+\newcommand*{\printthanks}{\LWR at stoppars\@thanks\LWR at startpars}
\end{warpall}
\begin{warpHTML}
@@ -6940,7 +7009,7 @@
\begin{titlepage}
\LWR at maketitlesetup
\@maketitle
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
\end{titlepage}
\setcounter{footnote}{0}%
\global\let\thanks\relax
@@ -6956,9 +7025,11 @@
\global\let\and\relax
}
\DeclareDocumentCommand{\@maketitle}{}{%
- \LWR at stoppars\LWR at htmltag{\LWR at tagtitle}%
+ \LWR at stoppars%
+ \LWR at htmltag{\LWR at tagtitle}%
\@title%
- \LWR at htmltag{\LWR at tagtitleend}\LWR at startpars%
+ \LWR at htmltag{\LWR at tagtitleend}%
+ \LWR at startpars%
\begin{BlockClass}{author}%
\renewcommand*{\cr}{}%
\renewcommand*{\crcr}{}%
@@ -6977,10 +7048,10 @@
}
\newcommand*{\LWR at titlingmaketitle}{%
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
\LWR at maketitlesetup
\@maketitle
-\@thanks
+\LWR at stoppars\@thanks\LWR at startpars
}
\end{warpHTML}
\begin{warpall}
@@ -7039,9 +7110,11 @@
\begin{warpHTML}
\newcommand{\attribution}[1]{%
+ \LWR at stoppars%
\begin{BlockClass}{attribution}
#1
\end{BlockClass}
+ \LWR at startpars%
}
\end{warpHTML}
\begin{warpprint}
@@ -7310,10 +7383,16 @@
\LWR at stoppars%
\LWR at setlatestname{#1}%
\LWR at startnewdepth{descitem}%
+\begingroup%
+\let\LWR at orig@desc at makelabel\makelabel
+\renewcommand*{\makelabel}[1]{%
+ \LWR at htmltag{dt}%
+ \LWR at orig@desc at makelabel{#1}%
+ \LWR at htmltag{/dt}%
+}
\LWR at select@html at nohspace%
-\LWR at origitem[]%
-\LWR at select@html at hspace%
-\LWR at htmltag{dt}#1\LWR at htmltag{/dt}%
+\LWR at origitem[#1]%
+\endgroup%
\LWR at orignewline%
\LWR at htmltag{dd}%
\LWR at startpars%
@@ -8947,6 +9026,16 @@
\NewDocumentCommand{\LWR at HTML@@tabular}{d<> o m}
{%
\LWR at traceinfo{LWR at HTML@@tabular started}%
+\ifnumcomp{\value{LWR at 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 at tabulardepth}{1}%
\global\boolfalse{LWR at startedrow}%
\setcounter{LWR at hlines}{0}%
@@ -9549,7 +9638,7 @@
\let\LWR at origcaptionof\captionof
\renewcommand*{\captionof}{%
-\LWR at stoppars
+\LWR at stoppars%
\LWR at origcaptionof%
}
}
@@ -9747,6 +9836,8 @@
{}%
}
+\DeclareDocumentCommand{\l at book}{m m}{\hypertoc{-2}{book}{#1}{#2}}
+
\DeclareDocumentCommand{\l at part}{m m}{\hypertoc{-1}{part}{#1}{#2}}
\@ifundefined{chapter}
@@ -9798,17 +9889,17 @@
\newcommand{\LWR at indexitem}[1][\@empty]{
-\InlineClass{indexitem}{}#1%
+\InlineClass{indexitem}{\LWR at htmlcomment{}}#1%
}
\newcommand{\LWR at indexsubitem}{
-\InlineClass{indexsubitem}{}
+\InlineClass{indexsubitem}{\LWR at htmlcomment{}}
}
\newcommand{\LWR at indexsubsubitem}{
-\InlineClass{indexsubsubitem}{}
+\InlineClass{indexsubsubitem}{\LWR at htmlcomment{}}
}
\def\LWR at wrindex#1{%
@@ -9984,7 +10075,7 @@
\renewcommand*{\$}{%
\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
{\LWR at origtextdollar}%
-{\HTMLentity{dollar}}%
+{\HTMLunicode{00024}}%
}
\AtBeginDocument{
@@ -10012,13 +10103,16 @@
}
}{
\PackageWarningNoLine{lwarp}{Load graphicx or graphics
- for improved SVG math baselines,}
+ for improved\MessageBreak
+ SVG math baselines%
+ }
\newcommand*{\LWR at addbaselinemarker}{}
}
}
}{% lwarp_baseline_marker.png or .eps is not present
- \PackageWarningNoLine{lwarp}{File \LWR at baselinename\space is not installed alongside
- the lwarp-*.sty files, so SVG math baselines may not be accurate,}
+ \PackageWarningNoLine{lwarp}{File \LWR at baselinename\space is not installed\MessageBreak
+ alongside the lwarp-*.sty files,\MessageBreak
+ so SVG math baselines may not be accurate}
\newcommand*{\LWR at addbaselinemarker}{}
}
@@ -11261,7 +11355,7 @@
\ifbool{LWR at forceminipagefullwidth}%
{}%
{%
- \ifthenelse{\lengthtest{#4}=\linewidth}%
+ \ifdimequal{#4}{\linewidth}%
{}%
{width:\LWR at printlength{\LWR at minipagewidth} ; }%
}%
@@ -11425,11 +11519,13 @@
\begin{warpHTML}
\newcommand{\LWR at HTML@fboxBlock}[1]{%
\LWR at forceminwidth{\fboxrule}%
+\LWR at stoppars%
\begin{BlockClass}[%
\LWR at fboxstyle%
]{fboxBlock}
#1
\end{BlockClass}
+\LWR at startpars%
}
\LWR at formatted{fboxBlock}
@@ -11481,7 +11577,7 @@
\ifbool{LWR at forceminipagefullwidth}%
{}%
{%
- \ifthenelse{\lengthtest{\LWR at tempwidth}=\linewidth}%
+ \ifdimequal{\LWR at tempwidth}{\linewidth}%
{}%
{width:\LWR at printlength{\LWR at tempwidth} ; }%
}%
@@ -11804,6 +11900,7 @@
\renewcommand{\textsuperscript}[1]{##1}%
\renewcommand{\textsubscript}[1]{##1}%
\renewcommand{\underline}[1]{##1}%
+\RenewDocumentCommand{\hspace}{s m}{}
\RenewDocumentCommand{\LWR at htmlspanclass}{o m +m}{##3}%
\DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}%
\def\(##1\){}%
@@ -11861,6 +11958,7 @@
}
\newenvironment*{LWR at blocktextcurrentfont}{%
+\LWR at stoppars%
\BlockClass{%
text\LWR at f@family\LWR at origtilde{}%
text\LWR at f@series\LWR at origtilde{}%
@@ -11867,7 +11965,7 @@
text\LWR at f@shape\LWR at origtilde{}%
text\LWR at f@shapecaps%
}%
-}{\endBlockClass}
+}{\endBlockClass\LWR at startpars}
\newrobustcmd*{\LWR at HTML@mdseries}{\renewcommand*{\LWR at f@series}{md}}
\LWR at formatted{mdseries}
@@ -12095,7 +12193,8 @@
\quad%
\addtolength{\LWR at templengthone}{-1em}%
}%
- }{}%
+ }%
+ {\LWR at htmlcomment{}}%
\LWR at htmltagc{/span}%
}%
\LWR at minipagestartpars%
@@ -12176,7 +12275,8 @@
\_{}%
\addtolength{\LWR at templengthone}{-1em}%
}%
- }{}%
+ }%
+ {\LWR at htmlcomment{}}%
\LWR at htmltagc{/span}%
\LWR at minipagestartpars%
}% non-zero width
More information about the tex-live-commits
mailing list