diff options
| author | Karl Berry <karl@freefriends.org> | 2019-07-16 21:14:36 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-07-16 21:14:36 +0000 |
| commit | cf12bb505e9a4455ac9fb495f04cf7a2d079186c (patch) | |
| tree | eeb96649fd30bc3ac8752f78005b52d8efc47d57 /Master | |
| parent | d2055c0169cf583fb9af2de4061319e5b31a4303 (diff) | |
lwarp (16jul19)
git-svn-id: svn://tug.org/texlive/trunk@51653 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
32 files changed, 1579 insertions, 522 deletions
diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index f74a0eb0fa7..8096e91183a 100644 --- a/Master/texmf-dist/doc/latex/lwarp/README.txt +++ b/Master/texmf-dist/doc/latex/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.72 README.txt +LaTeX lwarp package v0.73 README.txt Files included are: diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf Binary files differindex 53cdb67eedc..be96e39d95f 100644 --- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf +++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua index c65a9fd7354..3b4bb8564bb 100755 --- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua +++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2019 Brian Dunn -printversion = "v0.72" +printversion = "v0.73" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx index a573bac8f6b..1fb0b0536c8 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx @@ -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 @@ or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xta 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 @@ This boolean may be tested by the user for later use. %<*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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % % \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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % 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 @@ This boolean may be tested by the user for later use. % 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 @@ This boolean may be tested by the user for later use. \LWR@loadafter{lua-visual-debug} \LWR@loadafter{luacolor} \LWR@loadafter{luatodonotes} +\LWR@loadafter{lyluatex} \LWR@loadafter{magaz} \LWR@notmemoirloadafter{makeidx} \LWR@loadafter{manyfoot} @@ -11344,6 +11384,7 @@ This boolean may be tested by the user for later use. \LWR@loadafter{srcltx} \LWR@loadafter{srctex} \LWR@loadafter{stabular} +\LWR@loadafter{stackengine} \LWR@notltjloadafter{stfloats} \LWR@loadafter{struktex} \LWR@loadafter{subcaption} @@ -11610,6 +11651,7 @@ This boolean may be tested by the user for later use. % % \section{Miscellaneous tools} % +% \subsection{Lengths and units} % % \begin{macro}{\LWR@providelength} \marg{\cs{lengthname}} % Provides the length if it isn't defined yet. @@ -11647,6 +11689,8 @@ This boolean may be tested by the user for later use. % \end{macro} +% \subsection{Patching} + % \begin{macro}{\LWR@patcherror} \marg{packagename} \marg{macroname} % % Prints an error if could not patch a macro. @@ -11660,6 +11704,7 @@ This boolean may be tested by the user for later use. % \end{macro} % % +% \subsection{Chinese text isolation} % % \begin{macro}{\LWR@isolate} \marg{text} % Isolates Chinese characters from the surrounding text. @@ -11683,6 +11728,22 @@ This boolean may be tested by the user for later use. % \end{macro} % % +% \subsection{Inserting vertical space} +% +% \begin{macro}{\LWR@forceemptyline} Extra vertical space in the \HTML\ output. +% Use after \cs{LWR@stoppars}. +% \changes{v0.73}{2019/06/26}{Added.} +% \begin{macrocode} +\newcommand*{\LWR@forceemptyline}{% + \LWR@origrule{0pt}{1\baselineskip}% + \LWR@orignewline% +} +% \end{macrocode} +% \end{macro} +% +% +% \subsection{Argument selection} +% % \begin{macro}{\LWR@firstoffour} \marg{first} \marg{second} \marg{third} \marg{fourth} % \changes{v0.63}{2019/01/25}{Added.} % \begin{macro}{\LWR@secondoffour} \marg{first} \marg{second} \marg{third} \marg{fourth} @@ -11704,6 +11765,54 @@ This boolean may be tested by the user for later use. % \end{macro} % % +% +% \subsection{Global boxes} +% +% \begin{macro}{\LWR@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@gsavebox[1]{% + \@ifnextchar(%) + {\LWR@@gsavepicbox#1}{\@ifnextchar[{\LWR@@gsavebox#1}{\LWR@gsbox#1}}}% +\long\def\LWR@gsbox#1#2{\global\setbox#1\hbox{% + \color@setgroup#2\color@endgroup}} +\def\LWR@@gsavebox#1[#2]{% + \@ifnextchar [{\LWR@@igsavebox#1[#2]}{\LWR@@igsavebox#1[#2][c]}} +\long\def\LWR@@igsavebox#1[#2][#3]#4{% + \LWR@gsbox#1{\@imakebox[#2][#3]{#4}}} +\def\LWR@@gsavepicbox#1(#2,#3){% + \@ifnextchar[%] + {\LWR@@igsavepicbox#1(#2,#3)}{\LWR@@igsavepicbox#1(#2,#3)[]}} +\long\def\LWR@@igsavepicbox#1(#2,#3)[#4]#5{% + \LWR@gsbox#1{\@imakepicbox(#2,#3)[#4]{#5}}} +% \end{macrocode} +% \end{macro} + +% \begin{environment}{LWR@glrbox} \marg{macroname} +% \begin{macrocode} +\def\LWR@glrbox#1{% + \edef\reserved@a{% + \endgroup + \global\setbox#1\hbox{% + \begingroup\aftergroup}% + \def\noexpand\@currenvir{\@currenvir}% + \def\noexpand\@currenvline{\on@line}}% + \reserved@a + \@endpefalse + \color@setgroup + \ignorespaces} +\let\LWR@endglrbox\LWR@endlrbox +% \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 @@ This boolean may be tested by the user for later use. \begin{warpHTML} % \end{macrocode} -% \begin{macro}{\include} \marg{filename} +% \begin{macro}{\@include} \marg{filename} Modified to load |_html_inc| files. % -% \changes{v0.37}{2017/08/19}{Maintains independent \filenm{aux} files for \protect\HTML.} +% (Below, \cs{clearpage} caused missing text, and was changed to \cs{newpage}.) % -% \begin{macro}{\@include} \marg{filename} Modified to load |_html_inc| files. +% \changes{v0.37}{2017/08/19}{Maintains independent \filenm{aux} files for \protect\HTML.} +% \changes{v0.73}{2019/06/20}{Fix: \cs{newpage} instead of \cs{clearpage}.} % \begin{macrocode} \def\@include#1 {% \immediate\openout\LWR@quickfile #1_html_inc.tex% lwarp \immediate\write\LWR@quickfile{\string\input{#1.tex}}% lwarp \immediate\closeout\LWR@quickfile% lwarp -\LWR@origclearpage% \changed +\LWR@orignewpage% changed from clearpage \if@filesw \immediate\write\@mainaux{\string\@input{#1_html_inc.aux}}% changed \fi @@ -13422,7 +13532,7 @@ This boolean may be tested by the user for later use. \immediate\write\@partaux{\relax}% \fi \@input@{#1_html_inc.tex}% changed - \LWR@origclearpage% changed + \LWR@orignewpage% changed from clearpage \@writeckpt{#1}% \if@filesw \immediate\closeout\@partaux @@ -13435,7 +13545,6 @@ This boolean may be tested by the user for later use. } % \end{macrocode} % \end{macro} -% \end{macro} % \begin{macrocode} \end{warpHTML} @@ -14142,8 +14251,6 @@ This boolean may be tested by the user for later use. \LetLtxMacro\LWR@origfootnote\footnote \let\LWR@orig@mpfootnotetext\@mpfootnotetext -\let\LWR@origclearpage\clearpage - \AtBeginDocument{% in case packages change definition \LetLtxMacro\LWR@orighline\hline% @@ -14781,6 +14888,8 @@ This boolean may be tested by the user for later use. % \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:visited {color:#800000 ; } A:hover {color:#000080 ; text-decoration: underline ;} A:active {color:#800000 ; } +a.tocbook {display: inline-block ; margin-left: 0em ; + font-weight: bold ; margin-top: 1ex ; margin-bottom: 1ex ; } a.tocpart {display: inline-block ; margin-left: 0em ; font-weight: bold ;} a.tocchapter {display: inline-block ; margin-left: 0em ; @@ -15104,7 +15215,7 @@ body div { } -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 @@ h1 { /* title of the entire website, used on each page */ font-size: 2.5em ; padding: .4ex 0em 0ex 0em ; } + +div.book { + text-align: center ; + font-size: 2.325em ; + padding: .4ex 0em 0ex 0em ; +} + h2 { font-size: 2.25em } h3 { font-size: 2em } h4 { font-size: 1.75em } @@ -15390,8 +15508,11 @@ span.abstractrunintitle{ } .fancyvrblabel { - font-weight:bold; + font-size: .85em ; text-align: center ; + font-weight: bold ; + margin-top: 1ex ; + margin-bottom: 1ex ; } @@ -16110,10 +16231,13 @@ span.floatright { float: right ; } } .authorartist{ + display:block ; font-size:.70em ; - font-style: italic; + font-style: italic; } +nav .authorartist{ display:inline; } + /* Native LaTeX theorems: */ @@ -16383,6 +16507,7 @@ span.sidetocthetitle { display: none } % 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 @@ 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", @@ -16653,6 +16778,7 @@ nav.sidetoc a:hover { % \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 @@ span.textsf { -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 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX- -- Copyright 2016-2019 Brian Dunn -printversion = "v0.72" +printversion = "v0.73" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -18267,9 +18393,11 @@ end -- not --version % \begin{macrocode} \newcommand*{\LWR@depthnone}{-5} % \end{macrocode} -% all sectioning depths are deeper than |LWR@depthfinished|: +% All sectioning depths are deeper than |LWR@depthfinished|: +% \changes{v0.73}{2019/06/21}{Added \cs{book} for \pkg{memoir}.} % \begin{macrocode} \newcommand*{\LWR@depthfinished}{-4} +\newcommand*{\LWR@depthbook}{-2} \newcommand*{\LWR@depthpart}{-1} \newcommand*{\LWR@depthchapter}{0} \newcommand*{\LWR@depthsection}{1} @@ -19190,10 +19318,13 @@ end -- not --version % \subsection{Mapping \LaTeX\ sections to \HTML\ sections} - +% +% \changes{v0.73}{2019/06/21}{Added \cs{book} for \pkg{memoir}.} % \begin{macrocode} \newcommand*{\LWR@tagtitle}{h1} \newcommand*{\LWR@tagtitleend}{/h1} +\newcommand*{\LWR@tagbook}{div class="book"} +\newcommand*{\LWR@tagbookend}{/div} \newcommand*{\LWR@tagpart}{h2} \newcommand*{\LWR@tagpartend}{/h2} \newcommand*{\LWR@tagchapter}{h3} @@ -19294,6 +19425,15 @@ end -- not --version % \end{macrocode} % \end{macro} +% \begin{macro}{\LWR@indentHTMLtwo} Newline and indent the output \HTML\ code. +% \changes{v0.73}{2019/06/26}{Added.} +% \begin{macrocode} +\newcommand*{\LWR@indentHTMLtwo}{% + \LWR@orignewline\LWR@origrule{4em}{0pt}% +} +% \end{macrocode} +% \end{macro} + % \subsection{\HTML\ tags} @@ -19332,6 +19472,7 @@ end -- not --version % \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@nestspanitem}{% @@ -19359,6 +19500,8 @@ end -- not --version \let\item\LWR@nestspanitem% }% \renewcommand{\LWR@listend}{\LWR@htmltagc{br /}\LWR@htmltagc{br /}}% + \renewenvironment{quote}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}% + \renewenvironment{quotation}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}% }% not in a lateximage \LWR@traceinfo{LWR@nestspan starting: done}% }% starting env @@ -19539,10 +19682,11 @@ end -- not --version % % \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@htmlelementclass}{m o m}{% \LWR@stoppars% +\LWR@forceemptyline% \LWR@subhtmlelementclass{#1}[#2]{#3}% \LWR@startpars% } @@ -19591,10 +19735,11 @@ end -- not --version % \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@htmlelementclassline}{m o m +m}{% \LWR@stoppars +\LWR@forceemptyline% \LWR@subhtmlelementclass{#1}[#2]{#3}% #4% \LWR@htmltag{/#1} @@ -19668,7 +19813,6 @@ end -- not --version \NewDocumentEnvironment{LWR@print@BlockClass}{o m}{}{}% \NewDocumentEnvironment{LWR@HTML@BlockClass}{o m}% {% - \LWR@origpar% \LWR@htmldivclass[#1]{#2}% } {\LWR@htmldivclassend{#2}} @@ -19696,7 +19840,6 @@ end -- not --version % \begin{macrocode} \begin{warpHTML} \newcommand{\LWR@HTML@BlockClassSingle}[2]{% -\LWR@origpar% \LWR@htmlelementclassline{div}{#1}{#2}% } @@ -19812,6 +19955,8 @@ end -- not --version % Sections H1, H2, etc.\ do not need a closing \HTML\ tag, but we add a comment for readability: % \begin{macrocode} +\newcommand*{\LWR@printclosebook} + {\ifbool{HTMLDebugComments}{\LWR@htmlcomment{Closing book}}{}} \newcommand*{\LWR@printclosepart} {\ifbool{HTMLDebugComments}{\LWR@htmlcomment{Closing part}}{}} \newcommand*{\LWR@printclosechapter} @@ -20463,9 +20608,9 @@ end -- not --version % \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 @@ end -- not --version % \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@stoppars% \ifbool{FormatWP}% {% -\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock} -#2 -\end{LWR@BlockClassWP} -}% -{% -\begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock} -#2 -\end{BlockClass} + \begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock} + #2 + \end{LWR@BlockClassWP} +}{% + \begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock} + #2 + \end{BlockClass} }% +\LWR@startpars% } % \end{macrocode} % \end{macro} @@ -21504,11 +21651,16 @@ end -- not --version \ifbool{FormatEPUB} {} { - \LWR@htmlelement{footer} +% \end{macrocode} +% \changes{v0.73}{2019/06/23}{Fix: Empty header/footer.} +% \begin{macrocode} + \ifdefempty{\LWR@pagebottom}{}{% + \LWR@htmlelement{footer} - \LWR@pagebottom + \LWR@pagebottom - \LWR@htmlelementend{footer} + \LWR@htmlelementend{footer} + } } % \end{macrocode} % @@ -21645,11 +21797,16 @@ end -- not --version \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} {} { - \LWR@htmlelement{header} +% \end{macrocode} +% \changes{v0.73}{2019/06/23}{Fix: Empty header/footer.} +% \begin{macrocode} + \ifdefempty{\LWR@pagetop}{}{ + \LWR@htmlelement{header} - \LWR@pagetop + \LWR@pagetop - \LWR@htmlelementend{header} + \LWR@htmlelementend{header} + } } % \end{macrocode} @@ -22327,6 +22484,20 @@ end -- not --version % \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,11 +23072,16 @@ end -- not --version \LWR@traceinfo{LWR@lwarpStart: Starting new file.} \LWR@filestart \LWR@traceinfo{LWR@lwarpStart: Generating first header.} -\LWR@htmltag{header}\LWR@orignewline -\LWR@startpars -\LWR@firstpagetop -\LWR@stoppars -\LWR@htmltag{/header}\LWR@orignewline +% \end{macrocode} +% \changes{v0.73}{2019/06/23}{Fix: Empty header/footer.} +% \begin{macrocode} +\ifdefempty{\LWR@firstpagetop}{}{% + \LWR@htmltag{header}\LWR@orignewline + \LWR@startpars + \LWR@firstpagetop + \LWR@stoppars + \LWR@htmltag{/header}\LWR@orignewline +}% % \end{macrocode} % \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.} % \begin{macrocode} @@ -23024,13 +23200,18 @@ end -- not --version % \begin{macrocode} \LWR@printpendingfootnotes % \end{macrocode} +% % Create the footer: +% +% \changes{v0.73}{2019/06/23}{Fix: Empty header/footer.} % \begin{macrocode} -\LWR@htmlelement{footer} +\ifdefempty{\LWR@pagebottom}{}{% + \LWR@htmlelement{footer} -\LWR@pagebottom + \LWR@pagebottom -\LWR@htmlelementend{footer} + \LWR@htmlelementend{footer} +} % \end{macrocode} % No bottom navigation if are finishing the home page, @@ -23337,8 +23518,9 @@ end -- not --version % % 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@stoppars\@thanks\LWR@startpars} % \end{macrocode} % % @@ -23603,8 +23785,9 @@ end -- not --version \@maketitle % \end{macrocode} % Immediately generate any \cs{thanks} footnotes: +% \changes{v0.73}{2019/06/25}{Fix: Paragraph tags.} % \begin{macrocode} -\@thanks +\LWR@stoppars\@thanks\LWR@startpars % \end{macrocode} % Close the \HTML\ titlepage div and cleanup: % \begin{macrocode} @@ -23636,9 +23819,11 @@ end -- not --version % % \begin{macrocode} \DeclareDocumentCommand{\@maketitle}{}{% - \LWR@stoppars\LWR@htmltag{\LWR@tagtitle}% + \LWR@stoppars% + \LWR@htmltag{\LWR@tagtitle}% \@title% - \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars% + \LWR@htmltag{\LWR@tagtitleend}% + \LWR@startpars% \begin{BlockClass}{author}% % \end{macrocode} % For \pkg{IEEEtran} class: @@ -23672,8 +23857,9 @@ end -- not --version \newcommand*{\LWR@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@stoppars\@thanks\LWR@startpars % \end{macrocode} % Set up special patches: % \begin{macrocode} @@ -23684,8 +23870,9 @@ end -- not --version \@maketitle % \end{macrocode} % Immediately generate any \cs{thanks} footnotes: +% \changes{v0.73}{2019/06/25}{Fix: Paragraph tags.} % \begin{macrocode} -\@thanks +\LWR@stoppars\@thanks\LWR@startpars } % \end{macrocode} % \end{macro} @@ -23835,13 +24022,17 @@ end -- not --version % % 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@stoppars% \begin{BlockClass}{attribution} #1 \end{BlockClass} + \LWR@startpars% } \end{warpHTML} % \end{macrocode} @@ -24554,23 +24745,20 @@ end -- not --version \LWR@setlatestname{#1}% \LWR@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@orig@desc@makelabel\makelabel +\renewcommand*{\makelabel}[1]{% + \LWR@htmltag{dt}% + \LWR@orig@desc@makelabel{#1}% + \LWR@htmltag{/dt}% +} \LWR@select@html@nohspace% -% \end{macrocode} -% Process the original \cs{item} code: -% \begin{macrocode} -\LWR@origitem[]% -% \end{macrocode} -% Restore \cs{hspace} for use in the item text: -% \begin{macrocode} -\LWR@select@html@hspace% -% \end{macrocode} -% \begin{macrocode} -\LWR@htmltag{dt}#1\LWR@htmltag{/dt}% +\LWR@origitem[#1]% +\endgroup% \LWR@orignewline% \LWR@htmltag{dd}% \LWR@startpars% @@ -28300,13 +28488,39 @@ rowspan="#2" % % \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 \NewDocumentCommand{\LWR@HTML@@tabular}{d<> o m} {% \LWR@traceinfo{LWR@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@spandepth}}{>}{0}{% + \PackageWarning{lwarp}{% + A tabular is being used inside a span such as\MessageBreak + a minipage. Some formatting may not be correct\MessageBreak + in the tabular.\MessageBreak + It is recommended to use \protect\warpprintonly\space or the\MessageBreak + warpprint environment to isolate the span to\MessageBreak + print-only,% + } +}{}% \addtocounter{LWR@tabulardepth}{1}% % \end{macrocode} % Not yet started a table row: @@ -29842,7 +30056,7 @@ autopage-\theLWR@currentautosec% \let\LWR@origcaptionof\captionof \renewcommand*{\captionof}{% -\LWR@stoppars +\LWR@stoppars% \LWR@origcaptionof% } } @@ -30335,6 +30549,16 @@ autopage-\theLWR@currentautosec% % \end{macro} % Automatically called by \cs{contentsline}: +% +% \begin{macro}{\l@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@book}{m m}{\hypertoc{-2}{book}{#1}{#2}} +% \end{macrocode} +% \end{macro} + % \begin{macro}{\l@part} \marg{name} \marg{page} % % Uses \cs{DeclareDocumentCommand} in case the class does not happen to have a \cs{part}. @@ -30458,28 +30682,31 @@ autopage-\theLWR@currentautosec% % 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@indexitem}[1][\@empty]{ -\InlineClass{indexitem}{}#1% +\InlineClass{indexitem}{\LWR@htmlcomment{}}#1% } % \end{macrocode} % \end{macro} % \begin{macro}{\LWR@indexsubitem} +% \changes{v0.73}{2019/06/24}{Fix: Avoid empty \element{span}.} % \begin{macrocode} \newcommand{\LWR@indexsubitem}{ -\InlineClass{indexsubitem}{} +\InlineClass{indexsubitem}{\LWR@htmlcomment{}} } % \end{macrocode} % \end{macro} % \begin{macro}{\LWR@indexsubsubitem} +% \changes{v0.73}{2019/06/24}{Fix: Avoid empty \element{span}.} % \begin{macrocode} \newcommand{\LWR@indexsubsubitem}{ -\InlineClass{indexsubsubitem}{} +\InlineClass{indexsubsubitem}{\LWR@htmlcomment{}} } % \end{macrocode} % \end{macro} @@ -30957,14 +31184,15 @@ autopage-\theLWR@currentautosec% % 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@origtextdollar\$ \renewcommand*{\$}{% \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {\LWR@origtextdollar}% -{\HTMLentity{dollar}}% +{\HTMLunicode{00024}}% } % \end{macrocode} @@ -30998,6 +31226,7 @@ autopage-\theLWR@currentautosec% % \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 @@ autopage-\theLWR@currentautosec% } }{ \PackageWarningNoLine{lwarp}{Load graphicx or graphics - for improved SVG math baselines,} + for improved\MessageBreak + SVG math baselines% + } \newcommand*{\LWR@addbaselinemarker}{} } } }{% lwarp_baseline_marker.png or .eps is not present - \PackageWarningNoLine{lwarp}{File \LWR@baselinename\space is not installed alongside - the lwarp-*.sty files, so SVG math baselines may not be accurate,} + \PackageWarningNoLine{lwarp}{File \LWR@baselinename\space is not installed\MessageBreak + alongside the lwarp-*.sty files,\MessageBreak + so SVG math baselines may not be accurate} \newcommand*{\LWR@addbaselinemarker}{} } @@ -33981,7 +34213,7 @@ autopage-\theLWR@currentautosec% \ifbool{LWR@forceminipagefullwidth}% {}% {% - \ifthenelse{\lengthtest{#4}=\linewidth}% + \ifdimequal{#4}{\linewidth}% {}% {width:\LWR@printlength{\LWR@minipagewidth} ; }% }% @@ -34309,15 +34541,18 @@ color:\LWR@origpound\LWR@tempcolor% % 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@HTML@fboxBlock}[1]{% \LWR@forceminwidth{\fboxrule}% +\LWR@stoppars% \begin{BlockClass}[% \LWR@fboxstyle% ]{fboxBlock} #1 \end{BlockClass} +\LWR@startpars% } \LWR@formatted{fboxBlock} @@ -34421,7 +34656,7 @@ color:\LWR@origpound\LWR@tempcolor% \ifbool{LWR@forceminipagefullwidth}% {}% {% - \ifthenelse{\lengthtest{\LWR@tempwidth}=\linewidth}% + \ifdimequal{\LWR@tempwidth}{\linewidth}% {}% {width:\LWR@printlength{\LWR@tempwidth} ; }% }% @@ -34901,6 +35136,10 @@ color:\LWR@origpound\LWR@tempcolor% % \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@htmlspanclass}{o m +m}{##3}% \DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}% @@ -35007,15 +35246,17 @@ color:\LWR@origpound\LWR@tempcolor% % 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@blocktextcurrentfont}{% +\LWR@stoppars% \BlockClass{% text\LWR@f@family\LWR@origtilde{}% text\LWR@f@series\LWR@origtilde{}% text\LWR@f@shape\LWR@origtilde{}% text\LWR@f@shapecaps% }% -}{\endBlockClass} +}{\endBlockClass\LWR@startpars} % \end{macrocode} % \end{environment} @@ -35624,7 +35865,13 @@ color:\LWR@origpound\LWR@tempcolor% \quad% \addtolength{\LWR@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@htmlcomment{}}% % \end{macrocode} % Close the span: % \begin{macrocode} @@ -35794,8 +36041,8 @@ color:\LWR@origpound\LWR@tempcolor% span\LWR@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@currenttextcolor ; }% % \end{macrocode} @@ -35841,7 +36088,13 @@ color:\LWR@origpound\LWR@tempcolor% \_{}% \addtolength{\LWR@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@htmlcomment{}}% % \end{macrocode} % Close the span: % \begin{macrocode} @@ -37546,7 +37799,8 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % \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@amsmathenv@@before} \marg{environment name} % @@ -37568,6 +37822,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % Embeds the environment with \brand{MathJax} or a \env{lateximage}. % \begin{macrocode} \newcommand*{\LWR@amsmathenv@before}[1]{% + \LWR@stoppars% \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% { \LWR@syncmathjax @@ -37576,11 +37831,12 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% \ifstrequal{#1}{multline*}{\booltrue{LWR@amsmultline}}{} % \end{macrocode} % \pkg{autonum}'s ``+'' environments are not supported by \brand{MathJax}. +% \watchout % \begin{macrocode} \LWR@beginhideamsmath } { - \LWR@amsmathenv@@before{multline} + \LWR@amsmathenv@@before{#1} } } % \end{macrocode} @@ -37590,9 +37846,10 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % \begin{noindmacro}{\LWR@amsmathenv@@after} % % Embeds the environment inside a \env{lateximage}. +% \changes{v0.73}{2019/06/25}{AMS environments: Fix: Paragraph tags.} % \begin{macrocode} \newcommand*{\LWR@amsmathenv@@after}{% - \end{lateximage}\end{BlockClass} + \end{lateximage}\end{BlockClass}\LWR@startpars% } % \end{macrocode} % \end{noindmacro} @@ -38918,52 +39175,60 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackagePass{backnaur}[2019/04/14] +\LWR@ProvidesPackagePass{backnaur}[2019/06/18] % \end{macrocode} % -% A purely \HTML\ text output is generated, without math images. -% -% The various instances of \cs{LWR@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@stoppars% -}{\endBlockClass} - -\renewenvironment*{bnf*}{% - \BlockClass{backnaur}% - \LWR@stoppars% -}{\endBlockClass} - -\renewcommand{\bnfpn}[1]{\HTMLunicode{27e8}#1\HTMLunicode{27e9}}% \langle, rangle -\renewcommand{\bnfor}{ \HTMLunicode{7c} }% \mid -\renewcommand{\bnfsp}{ } -\renewcommand{\bnfes}{\HTMLunicode{3bb}}% \lambda -\renewcommand{\bnftd}[1]{\textnormal{\textit{#1}}} -\renewcommand{\bnfsk}{\HTMLunicode{2026} }% \dots, ellipsis -\renewcommand{\bnfpo}{\HTMLunicode{22a8}}% \models - -\renewcommand{\bnfprod}[2]{% - \begin{BlockClass}{backnaurprod}\bnfpn{#1} \bnfpo \end{BlockClass}% - \begin{BlockClass}{backnaurdesc}#2\end{BlockClass}% - \LWR@stoppars% -}% - -\renewcommand{\bnfmore}[1]{% - \begin{BlockClass}{backnaurprod}\end{BlockClass} - \begin{BlockClass}{backnaurdesc}#1\end{BlockClass} - \LWR@stoppars% -} - -\@ifpackagewith{backnaur}{perp}{\renewcommand{\bnfes}{\HTMLunicode{27c2}}}{}% \perp -\@ifpackagewith{backnaur}{epsilon}{\renewcommand{\bnfes}{\HTMLunicode{3f5}}}{}% \epsilon +\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@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@stoppars% +% ^^A % }{\endBlockClass} +% ^^A % +% ^^A % \renewenvironment*{bnf*}{% +% ^^A % \BlockClass{backnaur}% +% ^^A % \LWR@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@stoppars% +% ^^A % }% +% ^^A % +% ^^A % \RenewDocumentCommand{\bnfmore}{s m}{% +% ^^A % \begin{BlockClass}{backnaurprod}\end{BlockClass} +% ^^A % \begin{BlockClass}{backnaurdesc}#2\end{BlockClass} +% ^^A % \LWR@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 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % % \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,12 +40168,14 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % \begin{macrocode} \newenvironment{LWR@HTML@boxedminipage}{% + \LWR@stoppars% \begin{BlockClass}{framebox}% \minipage% } {% \endminipage% \end{BlockClass}% + \LWR@startpars% } \LWR@formattedenv{boxedminipage} % \end{macrocode} @@ -40348,21 +40616,22 @@ s% \LWR@traceinfo{caption@iiibox: done}% } -\def\caption@caption{% - \caption@iftype - {% - \caption@checkgrouplevel\@empty\caption - \caption@star - {\caption@refstepcounter\@captype}% - {\caption@dblarg{\@caption\@captype}}}% - {\caption@Error{\noexpand\caption outside float}% - \caption@gobble}% -} +% \def\caption@caption{% +% \caption@iftype +% {% +% \caption@checkgrouplevel\@empty\caption +% \caption@star +% {\caption@refstepcounter\@captype}% +% {\caption@dblarg{\@caption\@captype}}}% +% {\caption@Error{\noexpand\caption outside float}% +% \caption@gobble}% +% } \long\def\caption@@caption#1[#2]#3{% % \end{macrocode} % \begin{macrocode} - \ifcaption@star \else + \ifcaption@star + \else \caption@prepareanchor{#1}{#2}% \memcaptioninfo{#1}{\csname the#1\endcsname}{#2}{#3}% \@nameuse{nag@hascaptiontrue}% @@ -40377,11 +40646,16 @@ s% \@setminipage \fi \caption@normalsize +% \end{macrocode} +% \changes{v0.73}{2019/07/11}{\pkg{caption}: Fix for starred captions.} +% \begin{macrocode} \ifcaption@star \let\caption@makeanchor\@firstofone - \fi + #3% lwarp + \else% lwarp \@makecaption{\csname fnum@#1\endcsname}% {\ignorespaces\caption@makeanchor{#3}}% + \fi% lwarp % \end{macrocode} % \changes{v0.70}{2019/03/24}{\pkg{caption}: Fix: Extra par tags.} % \begin{macrocode} @@ -40405,6 +40679,9 @@ s% \let\caption@tfmt\@firstofone }% \caption@applyfont +% \end{macrocode} +% \cs{caption@fmt} with \optn{plain} format is defined as |{#1#2#3\par}|: +% \begin{macrocode} % \caption@fmt {\ifcaption@star\else \begingroup @@ -44239,11 +44516,13 @@ name = \chemmacros_translate:n {scheme-name} \LWR@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@stoppars% \ifbool{FormatWP} {\begin{BlockClass}[border-top:1px solid gray]{epigraphsource}} {\begin{BlockClass}{epigraphsource}} @@ -44936,7 +45215,7 @@ name = \chemmacros_translate:n {scheme-name} \renewrobustcmd{\textsuperscript}[1]{\LWR@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@doingstartpars} \AND% @@ -45024,15 +45303,18 @@ name = \chemmacros_translate:n {scheme-name} % 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@stoppars% \begin{BlockClass}{Btrivlist}% \tabular{#1}% } {% \endtabular% \end{BlockClass}% + \LWR@startpars% } % \end{macrocode} % \end{noindmacro} @@ -45330,6 +45612,12 @@ name = \chemmacros_translate:n {scheme-name} % \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 @@ name = \chemmacros_translate:n {scheme-name} % Adds \HTML\ formatting: % \begin{macrocode} \def\FV@BUseVerbatim#1{% - \LWR@atbeginverbatim[\LWR@FVstyle]{0}{verbatim}% + \LWR@atbeginverbatim{0}{verbatim}% \FV@BVerbatimBegin#1\FV@BVerbatimEnd% \LWR@afterendverbatim{0}% } @@ -45460,11 +45748,25 @@ name = \chemmacros_translate:n {scheme-name} % 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@fvstartnone}{% \LWR@traceinfo{fvstartnone}% % \hbox to\z@{ -\LWR@atbeginverbatim[\LWR@FVstyle]{0}{verbatim}% +\BlockClass[\LWR@FVstyle]{fancyvrb} +\LWR@stoppars +\ifx\FV@LabelPositionTopLine\relax\else + \ifx\FV@LabelBegin\relax\else + \FancyVerbRuleColor{\LWR@FVfindbordercolor} + \LWR@htmltagc{% + div class="fancyvrblabel" % extra space + style="color: \LWR@origpound\LWR@tempcolor"% + } + \LWR@print@textrm{\FV@LabelBegin}% \textrm preserves emdash + \LWR@htmltagc{/div}\LWR@orignewline% + \fi +\fi +\LWR@atbeginverbatim{0}{verbatim}% % }% } @@ -45472,7 +45774,19 @@ name = \chemmacros_translate:n {scheme-name} \LWR@traceinfo{fvendnone}% % \hbox to\z@{ \LWR@afterendverbatim{0}% -% }% +\LWR@stoppars% +\ifx\FV@LabelPositionBottomLine\relax\else + \ifx\FV@LabelEnd\relax\else + \FancyVerbRuleColor{\LWR@FVfindbordercolor} + \LWR@htmltagc{% + div class="fancyvrblabel" % extra space + style="color: \LWR@origpound\LWR@tempcolor"% + } + \LWR@print@textrm{\FV@LabelEnd} + \LWR@htmltagc{/div}\LWR@orignewline% + \fi +\fi +\endBlockClass } \newcommand*{\LWR@fvstartsingle}{% @@ -45515,10 +45829,10 @@ name = \chemmacros_translate:n {scheme-name} % border width of \FV@FrameRule \newcommand*{\LWR@FVborderstyle}[1]{% -padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; % -\LWR@FVfindbordercolor % -border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt % -solid \LWR@origpound\LWR@tempcolor ; % +padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; % space +\LWR@FVfindbordercolor\LWR@indentHTMLtwo% +border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt % space +solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space } \def\FV@Frame@none{% @@ -45531,7 +45845,10 @@ solid \LWR@origpound\LWR@tempcolor ; % \FV@Frame@none% default values \def\FV@Frame@single{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{}% +}% \let\FV@BeginListFrame\LWR@fvstartsingle% \let\FV@LeftListFrame\FV@LeftListFrame@Single% \let\FV@RightListFrame\FV@RightListFrame@Single% @@ -45539,7 +45856,10 @@ solid \LWR@origpound\LWR@tempcolor ; % \def\FV@Frame@lines{% \renewcommand*{\LWR@FVstyle}{% - \LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-top}% + \LWR@indentHTMLtwo% + \LWR@FVborderstyle{-bottom}% }% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% @@ -45547,21 +45867,30 @@ solid \LWR@origpound\LWR@tempcolor ; % \let\FV@EndListFrame\LWR@fvendline} \def\FV@Frame@topline{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-top}% +}% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendnone} \def\FV@Frame@bottomline{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-bottom}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-bottom}% +}% \let\FV@BeginListFrame\LWR@fvstartnone% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendline} \def\FV@Frame@leftline{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-left}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-left}% +}% % To define the \FV@FrameFillLine macro (from \FV@BeginListFrame) \ifx\FancyVerbFillColor\relax% \let\FV@FrameFillLine\relax% @@ -45580,6 +45909,7 @@ solid \LWR@origpound\LWR@tempcolor ; % % % 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@SingleFrameLine#1{% % \hbox to\z@{% @@ -45596,26 +45926,11 @@ solid \LWR@origpound\LWR@tempcolor ; % % \setbox\z@\hbox{\strut\enspace\FV@LabelBegin\enspace\strut}% \ifx\FV@LabelPositionTopLine\relax \else - \LWR@FVfindbordercolor - \LWR@htmltagc{% - div class="fancyvrblabel" % extra space - style="color: \LWR@origpound\LWR@tempcolor"% - } - \LWR@print@textrm{\FV@LabelBegin}% \textrm preserves emdash - \LWR@htmltagc{/div} \fi \else % \setbox\z@\hbox{\strut\enspace\FV@LabelEnd\enspace\strut}% \ifx\FV@LabelPositionBottomLine\relax \else - \LWR@FVfindbordercolor - - \LWR@htmltagc{% - div class="fancyvrblabel" % extra space - style="color: \LWR@origpound\LWR@tempcolor"% - } - \LWR@print@textrm{\FV@LabelEnd} - \LWR@htmltagc{/div} \fi \fi \fi @@ -47194,7 +47509,6 @@ solid \LWR@origpound\LWR@tempcolor ; % \def\fn@startfntext{% \setbox\z@\vbox\bgroup% \fn@startnote% - \fn@prefntext% \ignorespaces% } % \end{macrocode} @@ -47204,7 +47518,6 @@ solid \LWR@origpound\LWR@tempcolor ; % \def\fn@endfntext{% \LWR@htmltagc{/\LWR@tagregularparagraph}% \LWR@orignewline% - \fn@postfntext% \egroup% \begingroup% \let\@makefntext\@empty% @@ -50352,18 +50665,19 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % \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@ProvidesPackageDrop{intopdf}[2018/03/15] +\LWR@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 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \ifx\lst@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@stoppars% \lst@makecaption\fnum@lstlisting{\ignorespaces \lst@caption} \else % \end{macrocode} @@ -52431,6 +52747,74 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % % % \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@ProvidesPackagePass{lyluatex}[2019/05/27] +% \end{macrocode} +% +% User-redefinable \attribute{ALT} tag: +% \begin{macrocode} +\newcommand*{\lyluateximagename}{(-lilypond-~\packagediagramname)} +% \end{macrocode} +% +% \begin{macrocode} +\LetLtxMacro\LWR@orig@ly@compilescore\ly@compilescore + +\renewcommand*{\ly@compilescore}[1]{% + \begin{lateximage}[\lyluateximagename]% + \LWR@orig@ly@compilescore{#1}% + \end{lateximage}% +} + +\AtBeginDocument{ + \lysetoption{paperwidth}{6in} + \lysetoption{paperheight}{9in} + \lysetoption{line-width}{5.5in} + \lysetoption{twoside}{false} + \lysetoption{fullpagestyle}{empty} + \lysetoption{fullpagealign}{crop} + \lysetoption{print-page-number}{false} + \lysetoption{insert}{systems} + \lysetoption{extra-top-margin}{0} + \lysetoption{extra-bottom-margin}{0} + \lysetoption{valign}{center} + \lysetoption{staffsize}{20} + \lysetoption{inline-staffsize}{14} +} +% \end{macrocode} +% +% \iffalse +%</lyluatex> +% \fi +% +% +% +% +% \iffalse %<*magaz> % \fi % @@ -54820,97 +55204,174 @@ class="td% % \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. % % 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@ProvidesPackagePass{musicography}[2018/05/21] +\LWR@ProvidesPackagePass{musicography}[2019/05/28] % \end{macrocode} % % \begin{macrocode} -\RenewDocumentCommand{\musSymbol}{ O{\musFont} m m m m }{% +\NewDocumentCommand{\LWR@HTML@musSymbol}{ O{\musFont} m m m m }{% \begin{lateximage}% {#1\kern#2\raisebox{#3}{#5}\kern#4}% \end{lateximage}% } -\RenewDocumentCommand{\musStemmedNote}{ m }{% +\LWR@formatted{musSymbol} + +\NewDocumentCommand{\LWR@HTML@musStemmedNote}{ m }{% \begin{lateximage}% \musSymbol{0.05em}{0.5ex}{0.2em}{#1\musStem}% \end{lateximage}% } -\RenewDocumentCommand{\musFlaggedNote}{ m m }{% +\LWR@formatted{musStemmedNote} + +\NewDocumentCommand{\LWR@HTML@musFlaggedNote}{ m m }{% \begin{lateximage}% \musSymbol{0.05em}{0.5ex}{0pt}{#1\musStem}% \musSymbol{0pt}{0pt}{0.9em}{#2}% \end{lateximage}% } -\RenewDocumentCommand{\musDottedNote}{ m }{% +\LWR@formatted{musFlaggedNote} + +\NewDocumentCommand{\LWR@HTML@musDottedNote}{ m }{% \begin{lateximage}% #1\musDot% \end{lateximage}% } -\RenewDocumentCommand{\musMeter}{ m m }{% +\LWR@formatted{musDottedNote} + +\NewDocumentCommand{\LWR@HTML@musMeter}{ m m }{% \begin{lateximage}*[#1/#2][#1#2]% -\musStack{#1}{#2}\kern0.05em% +\musStack{#1 #2}\kern0.05em% \end{lateximage}% } -\RenewDocumentCommand{\meterCplus}{ m }{% +\LWR@formatted{musMeter} + +\NewDocumentCommand{\LWR@HTML@meterCplus}{ m }{% \begin{lateximage}*[C#1]% \meterC{}\kern-0.7pt#1% \end{lateximage}% } -\RenewDocumentCommand{\meterC}{}{% +\LWR@formatted{meterCplus} + +\NewDocumentCommand{\LWR@HTML@meterC}{}{% \begin{lateximage}*[C]% \musSymbolMeter{\symbol{83}}% \end{lateximage}% } -\RenewDocumentCommand{\meterCutC}{}{% +\LWR@formatted{meterC} + +\NewDocumentCommand{\LWR@HTML@meterCutC}{}{% \begin{lateximage}*[C|]% \musSymbolMeter{\symbol{82}}% \end{lateximage}% } -\RenewDocumentCommand{\meterCThreeTwo}{}{% +\LWR@formatted{meterCutC} + +\NewDocumentCommand{\LWR@HTML@meterCThreeTwo}{}{% \begin{lateximage}*[C3/2]% -\meterCplus{\musStack{3}{2}}% +\meterCplus{\musStack{3 2}}% \end{lateximage}% } -\RenewDocumentCommand{\musFlat} {}{\HTMLunicode{266D}} -\RenewDocumentCommand{\musDoubleFlat} {}{\HTMLunicode{1D12B}} -\RenewDocumentCommand{\musSharp} {}{\HTMLunicode{266F}} -\RenewDocumentCommand{\musDoubleSharp}{}{\HTMLunicode{1D12A}} -\RenewDocumentCommand{\musNatural} {}{\HTMLunicode{266E}} +\LWR@formatted{meterCThreeTwo} + +\NewDocumentCommand{\LWR@HTML@meterO}{}{\HTMLunicode{25EF}} -\RenewDocumentCommand{\musWhole}{}{\HTMLunicode{1D15D}} -\RenewDocumentCommand{\musHalf}{}{\HTMLunicode{1D15E}} -\RenewDocumentCommand{\musQuarter}{}{\HTMLunicode{1D15F}} -\RenewDocumentCommand{\musEighth}{}{\HTMLunicode{1D160}} -\RenewDocumentCommand{\musSixteenth}{}{\HTMLunicode{1D161}} +\LWR@formatted{meterO} + +\newcommand{\LWR@null@noFig}[1][]{}% + +\NewDocumentCommand{\LWR@HTML@musFig}{ m }{% +\begin{lateximage}*[% + {% ALT text for copy/paste + \LetLtxMacro\noFig\LWR@null@noFig% + \LetLtxMacro\musSharp\LWR@HTML@musSharp% + \LetLtxMacro\musDoubleSharp\LWR@HTML@musDoubleSharp% + \LetLtxMacro\musFlat\LWR@HTML@musFlat% + \LetLtxMacro\musDoubleFlat\LWR@HTML@musDoubleFlat% + \LetLtxMacro\musNatural\LWR@HTML@musNatural% + ({#1})% braces here because \noFig uses [] + }% +]% + \musStack[\musFigFont]{#1}% +\end{lateximage}% +} -\RenewDocumentCommand{\musWholeDotted}{}{\HTMLunicode{1D15D}\HTMLunicode{1D16D}} -\RenewDocumentCommand{\musHalfDotted}{}{\HTMLunicode{1D15E}\HTMLunicode{1D16D}} -\RenewDocumentCommand{\musQuarterDotted}{}{\HTMLunicode{1D15F}\HTMLunicode{1D16D}} -\RenewDocumentCommand{\musEighthDotted}{}{\HTMLunicode{1D160}\HTMLunicode{1D16D}} -\RenewDocumentCommand{\musSixteenthDotted}{}{\HTMLunicode{1D161}\HTMLunicode{1D16D}} +\LWR@formatted{musFig} + +\NewDocumentCommand{\LWR@HTML@musFlat} {}{\HTMLunicode{266D}} +\NewDocumentCommand{\LWR@HTML@musDoubleFlat} {}{\HTMLunicode{1D12B}} +\NewDocumentCommand{\LWR@HTML@musSharp} {}{\HTMLunicode{266F}} +\NewDocumentCommand{\LWR@HTML@musDoubleSharp}{}{\HTMLunicode{1D12A}} +\NewDocumentCommand{\LWR@HTML@musNatural} {}{\HTMLunicode{266E}} + +\LWR@formatted{musFlat} +\LWR@formatted{musDoubleFlat} +\LWR@formatted{musSharp} +\LWR@formatted{musDoubleSharp} +\LWR@formatted{musNatural} + +\NewDocumentCommand{\LWR@HTML@musWhole} {}{\HTMLunicode{1D15D}} +\NewDocumentCommand{\LWR@HTML@musHalf} {}{\HTMLunicode{1D15E}} +\NewDocumentCommand{\LWR@HTML@musQuarter} {}{\HTMLunicode{1D15F}} +\NewDocumentCommand{\LWR@HTML@musEighth} {}{\HTMLunicode{1D160}} +\NewDocumentCommand{\LWR@HTML@musSixteenth} {}{\HTMLunicode{1D161}} +\NewDocumentCommand{\LWR@HTML@musThirtySecond} {}{\HTMLunicode{1D162}} +\NewDocumentCommand{\LWR@HTML@musSixtyFourth} {}{\HTMLunicode{1D163}} + +\LWR@formatted{musWhole} +\LWR@formatted{musHalf} +\LWR@formatted{musQuarter} +\LWR@formatted{musEighth} +\LWR@formatted{musSixteenth} +\LWR@formatted{musThirtySecond} +\LWR@formatted{musSixtyFourth} + +\NewDocumentCommand{\LWR@HTML@musWholeDotted}{} + {\HTMLunicode{1D15D}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musHalfDotted}{} + {\HTMLunicode{1D15E}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musQuarterDotted}{} + {\HTMLunicode{1D15F}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musEighthDotted}{} + {\HTMLunicode{1D160}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musSixteenthDotted}{} + {\HTMLunicode{1D161}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musThirtySecondDotted}{} + {\HTMLunicode{1D162}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musSixtyFourthDotted}{} + {\HTMLunicode{1D163}\HTMLunicode{1D16D}} + +\LWR@formatted{musWholeDotted} +\LWR@formatted{musHalfDotted} +\LWR@formatted{musQuarterDotted} +\LWR@formatted{musEighthDotted} +\LWR@formatted{musSixteenthDotted} +\LWR@formatted{musThirtySecondDotted} +\LWR@formatted{musSixtyFourthDotted} % \end{macrocode} % % \iffalse @@ -58521,11 +58982,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \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@ProvidesPackageDrop{quotchap}[2012/10/20] +\LWR@ProvidesPackageDrop{quotchap}[2019/07/09] % \end{macrocode} % % \begin{macrocode} @@ -58570,12 +59032,21 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \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@stoppars% + \begin{BlockClass}{qauthor}% + {#1}% + \end{BlockClass}% + \LWR@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 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \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 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', {\LWR@patcherror{quoting}{quoting}} \xpatchcmd{\endquoting}{\quo@endtext} - {\quo@endtext\end{LWR@blocktextcurrentfont}} + {\quo@endtext\end{LWR@blocktextcurrentfont}\LWR@stoppars} {} {\LWR@patcherror{imakeidx}{endquoting}} % \end{macrocode} @@ -59411,8 +59883,8 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \DeclareDocumentCommand{\useshapeofkomafont}{m}{} \AtBeginDocument{ -\let\LWR@maketitle\maketitle -\DeclareDocumentCommand{\maketitle}{o}{\LWR@maketitle} + \let\LWR@koma@orig@maketitle\maketitle + \DeclareDocumentCommand{\maketitle}{o}{\LWR@koma@orig@maketitle} } \DeclareDocumentCommand{\extratitle}{m}{} @@ -59459,12 +59931,16 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \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@BlockClassWP}{\LWR@print@mbox{text-align:right}}{}{dictum} #2 \IfValueT{#1} { + \LWR@stoppars% \ifbool{FormatWP} {\begin{BlockClass}[\LWR@print@mbox{border-top:} 1px solid gray]{dictumauthor}} {\begin{BlockClass}{dictumauthor}} @@ -59499,9 +59975,13 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \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@stoppars% \setlength{\LWR@templengthtwo}{#3} \ifblank{#2} { @@ -59518,7 +59998,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', ]{addmargin} } } -{\end{BlockClass}} +{\end{BlockClass}\LWR@startpars} % \end{macrocode} % Ref to create a starred environment: \\ % \href @@ -61312,6 +61792,128 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% \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@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@orig@stackengine\stackengine +% \end{macrocode} +% \begin{macrocode} +\renewcommand*{\stackengine}[8]{% + \ifstrequal{#4}{O}% + {\begin{lateximage}}% + {\begin{lateximage}[][][vertical-align:top]}% + \LWR@orig@stackengine{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}% + \end{lateximage}% +} +% \end{macrocode} +% +% \cs{@stack} uses a \env{lateximage} with a vertical alignment: +% \begin{macrocode} +\LetLtxMacro\LWR@orig@@stack\@stack + +\xpatchcmd{\LWR@orig@@stack}{\stackengine}{\LWR@orig@stackengine} + {} + {\LWR@patcherror{stackengine}{LWR@orig@@stack}} + +\renewcommand*{\@stack}[4]{% + \ifstrequal{#3}{O}% + {\begin{lateximage}}% + {\begin{lateximage}[][][vertical-align:top]}% + \LWR@orig@@stack{#1}{#2}{#3}{#4}% + \end{lateximage}% +} +% \end{macrocode} +% +% +% The lapping macros are disabled for \HTML: +% \begin{macrocode} +\newcommand*\LWR@HTML@@stacklap[4]{#3} +\LWR@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@orig@stackengine} + {} + {\LWR@patcherror{stackengine}{stackanchor patch 1}} + +\xpatchcmd{\stackanchor}{\stackengine}{\LWR@orig@stackengine} + {} + {\LWR@patcherror{stackengine}{stackanchor patch 2}} + +\xpretocmd{\stackanchor}{\begin{lateximage}[][][vertical-align:middle]} + {} + {\LWR@patcherror{stackengine}{stackanchor pre}} + +\xapptocmd{\stackanchor}{\end{lateximage}} + {} + {\LWR@patcherror{stackengine}{stackanchor app}} +% \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@patcherror{stackengine}{Centerstack pre}} + +\xapptocmd{\Centerstack}{\end{lateximage}} + {} + {\LWR@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@name{\stack@macro@name{#1}}% + \@ifundefined{\sv@name content}{% + \expandafter\newsavebox\expandafter{\csname\sv@name content\endcsname}% + }{}% + \begingroup% lwarp + \LWR@restoreorigformatting% lwarp + \RenewDocumentEnvironment{lateximage}{s o o o}{}{}% lwarp: inside group + \expandafter\LWR@gsavebox\csname\sv@name content\endcsname{#2}% + \expandafter\gdef\expandafter#1\expandafter{% + \expandafter\begin\expandafter{lateximage\expandafter}% lwarp + \expandafter\usebox\expandafter% + {\csname\sv@name content\endcsname}% + \expandafter\end\expandafter{lateximage\expandafter}% lwarp + }% + \endgroup% lwarp +} +% \end{macrocode} +% +% \iffalse +%</stackengine> +% \fi +% +% +% +% % % \iffalse %<*stfloats> @@ -62945,7 +63547,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \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 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \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 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \@maketitle % \end{macrocode} % Immediately generate any \cs{thanks} footnotes: +% \changes{v0.73}{2019/06/25}{\pkg{titling}: Fix: Paragraph tags.} % \begin{macrocode} -\@thanks +\LWR@stoppars\@thanks\LWR@startpars % \end{macrocode} % Close the \HTML\ titlepage div: % \begin{macrocode} @@ -64043,8 +64658,9 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \renewcommand*{\LWR@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@stoppars\@thanks\LWR@startpars % \end{macrocode} % Select which kind of footnote marks to use: % \begin{macrocode} @@ -64059,8 +64675,9 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \@maketitle % \end{macrocode} % Immediately generate any \cs{thanks} footnotes: +% \changes{v0.73}{2019/06/25}{\pkg{titling}: Fix: Paragraph tags.} % \begin{macrocode} -\@thanks +\LWR@stoppars\@thanks\LWR@startpars % \end{macrocode} % Reset the footnote counter: % \begin{macrocode} @@ -64247,27 +64864,31 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \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@ProvidesPackagePass{tocdata}[2019/03/21] +\LWR@ProvidesPackagePass{tocdata}[2019/07/06] % \end{macrocode} % +% \changes{v0.73}{2019/06/30}{\pkg{tocdata}: Honors \cs{tocdataformat}.} % \begin{macrocode} \renewcommand*{\LWR@maybetocdata}{% \ifdefempty{\TD@thistocdata}{}{% - \qquad --- \InlineClass{authorartist}{\TD@thistocdata}% + \qquad \InlineClass{authorartist}{\tocdataformat{\TD@thistocdata}}% \def\TD@thistocdata{} } } - +% \end{macrocode} +% +% \changes{v0.73}{2019/06/30}{\pkg{tocdata}: Improved formatting.} +% \begin{macrocode} \renewrobustcmd{\tocdatapartprint}[4] {% - \LWR@htmltagc{br /}% \InlineClass{authorartist}{% \qquad --- % - \TD@optionalname{#1}\TD@optionalname{#2}#3#4% + \TDoptionalnameprint{#1}\TDoptionalnameprint{#2}#3#4% }% } @@ -64290,10 +64911,10 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', {}% } -\renewcommand{\TD@artistauthorprint}[5]{% +\renewcommand{\TDartistauthorprint}[5]{% \LWR@TD@settextalign{#1}% \begin{BlockClass}[text-align:\LWR@TD@textalign]{floatnotes}% - \InlineClass{authorartist}{\TD@optionalname{#2}\TD@optionalname{#3}#4#5}% + \InlineClass{authorartist}{\TDoptionalnameprint{#2}\TDoptionalnameprint{#3}#4#5}% \end{BlockClass}% } @@ -64310,7 +64931,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', {}% } -\renewcommand{\TD@artistauthortextprint}[2]{% +\renewcommand{\TDartistauthortextprint}[2]{% \LWR@TD@setnamealign{#1}% \begin{BlockClass}[text-align:\LWR@TD@textalign]{floatnotes}% #2% @@ -65983,11 +66604,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \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@ProvidesPackageDrop{versonotes}[2015/12/08] +\LWR@ProvidesPackageDrop{versonotes}[2019/07/06] % \end{macrocode} % % \begin{macrocode} @@ -65997,6 +66619,11 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \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 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \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@stoppars% \vwcolsetup{#1}% % \end{macrocode} % Begin with no style: @@ -66310,6 +66938,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \begin{macrocode} { \endBlockClass +\LWR@startpars } % \end{macrocode} % \end{noindenvironment} @@ -66842,6 +67471,33 @@ padding:\LWR@printlength{\fboxsep}% % % \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@HTML@color}{o m}{% +\IfValueTF{#1}{% + \LWR@print@color[#1]{#2}% + \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% +}{% + \LWR@print@color{#2}% + \convertcolorspec{named}{#2}{HTML}\LWR@tempcolor% +}% +\edef\LWR@currenttextcolor{\LWR@origpound\LWR@tempcolor}% +} + +\LWR@formatted{color} +% \end{macrocode} +% \end{macro} +% +% % \label{sec:textcolor} % \begin{macro}{\textcolor} % \oarg{model} \marg{color} \marg{text} @@ -66852,41 +67508,20 @@ padding:\LWR@printlength{\fboxsep}% % \begin{macrocode} \NewDocumentCommand{\LWR@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}% -}% -% \end{macrocode} -% \begin{macrocode} -\LWR@FBcancel% -\IfValueTF{#1}{% -\InlineClass[color:\LWR@colorstyle{#1}{#2}]{textcolor}{% -\renewcommand*{\LWR@currenttextcolor}{\LWR@origpound\LWR@tempcolor}% -#3% -}% -}{% -\InlineClass[color:\LWR@colorstyle{named}{#2}]{textcolor}{% -\renewcommand*{\LWR@currenttextcolor}{\LWR@origpound\LWR@tempcolor}% -#3% -}% -}% -\endgroup% } +\InlineClass[color:\LWR@currenttextcolor]{textcolor}{#3}% +\endgroup% +}% \LWR@formatted{textcolor} % \end{macrocode} % \end{macro} + % \begin{macro}{\pagecolor} % \oarg{model} \marg{color} % @@ -68123,11 +68758,9 @@ height:\LWR@printlength{\LWR@tempheight}% % \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 @@ height:\LWR@printlength{\LWR@tempheight}% \LWR@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}} - -\@ifundefined{xymatrix}{}{ -\LetLtxMacro\LWR@origxymatrix\xymatrix +% The original definitions without a \env{lateximage}: +% \begin{macrocode} +\LetLtxMacro\LWR@orig@xy\xy +\LetLtxMacro\LWR@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@lateximagedepth}}{>}{0}% + {\addtocounter{LWR@lateximagedepth}{1}}% + {\begin{lateximage}[(-xy-~\packagediagramname)]}% + \LWR@orig@xy% +} -\renewcommand{\xymatrix}[1]{% -\begin{lateximage}[(-xy- xymatrix \packagediagramname)] -\LWR@origxymatrix{#1} -\end{lateximage} +\renewcommand*{\endxy}{% + \LWR@orig@endxy% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{1}% + {\addtocounter{LWR@lateximagedepth}{-1}}% + {\end{lateximage}}% } +% \end{macrocode} +% +% The \cs{xybox} must use the original definitions of \cs{xy}, \cs{endxy}: +% \begin{macrocode} +\def\xybox#1{% + \LWR@orig@xy#1\LWR@orig@endxy% + \Edge@c={\rectangleEdge}\computeLeftUpness@% } +% \end{macrocode} +% If \cs{xygraph} is used, it is placed inside a \env{lateximage}: +% \begin{macrocode} \@ifundefined{xygraph}{}{ + \LetLtxMacro\LWR@origxygraph\xygraph \renewcommand{\xygraph}[1]{% -\begin{lateximage}[(-xy- xygraph \packagediagramname)] -\LWR@origxygraph{#1} -\end{lateximage} -} + \begin{lateximage}[(-xy- xygraph \packagediagramname)] + \LWR@origxygraph{#1} + \end{lateximage} } -} +}% xygraph defined + +}% AtBeginDocument % \end{macrocode} % \iffalse @@ -68386,12 +69044,15 @@ height:\LWR@printlength{\LWR@tempheight}% % \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 @@ height:\LWR@printlength{\LWR@tempheight}% % \end{macrocode} % % -% \subsection{Laying out the page} +% \subsection{Page layout} % % \begin{macrocode} \renewcommand*{\stockavi}{} @@ -68729,9 +69390,22 @@ height:\LWR@printlength{\LWR@tempheight}% \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@section{#1}{#3}{#6}{book}% +} +% \end{macrocode} +% \end{noindmacro} + +% \begin{macrocode} \def\@apppage{% \part*{\appendixpagename} } @@ -68741,9 +69415,20 @@ height:\LWR@printlength{\LWR@tempheight}% \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@mainmatter}% +} -\csletcs{frontmatter*}{frontmatter} -\csletcs{mainmatter*}{mainmatter} +\DeclareDocumentCommand{\frontmatter}{s}{% +\boolfalse{LWR@mainmatter}% +} +% \end{macrocode} +% +% \begin{macrocode} \renewcommand*{\raggedbottomsection}{} \renewcommand*{\normalbottomsection}{} \renewcommand*{\bottomsectionskip}{} @@ -69958,19 +70643,27 @@ height:\LWR@printlength{\LWR@tempheight}% \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@multimedia@printsize\ margin:auto]{AVviewport} + \ifstrequal{#3}{audio}{% + \begin{BlockClass}{AVviewport} + }{% + \begin{BlockClass}[\LWR@multimedia@printsize\ margin:auto]{AVviewport} + } % \end{macrocode} % Paragraph tags are unnecessary for the \AV\ tags. % \begin{macrocode} \LWR@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@htmltag{% #3\ % space - width=\textquotedbl{}100\%\textquotedbl\ % space - height=\textquotedbl{}100\%\textquotedbl\ % space + \ifstrequal{#3}{audio}{}{% + width=\textquotedbl{}100\%\textquotedbl\ % space + height=\textquotedbl{}100\%\textquotedbl\ % space + }% controls% }\LWR@orignewline % \end{macrocode} @@ -70010,19 +70703,28 @@ height:\LWR@printlength{\LWR@tempheight}% \newcommand*{\LWR@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@multimedia@printsize\ margin:auto]{AVviewport} + \ifstrequal{#3}{audio}{% + \begin{BlockClass}{AVviewport} + }{% + \begin{BlockClass}[\LWR@multimedia@printsize\ margin:auto]{AVviewport} + } % \end{macrocode} % Paragraph tags are unnecessary for the \AV\ tags. % \begin{macrocode} \LWR@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@htmltag{% #3\ % space - width=\textquotedbl{}100\%\textquotedbl\ % space - height=\textquotedbl{}100\%\textquotedbl\ controls}\LWR@orignewline + \ifstrequal{#3}{audio}{}{% + width=\textquotedbl{}100\%\textquotedbl\ % space + height=\textquotedbl{}100\%\textquotedbl\ controls% + }% + }\LWR@orignewline % \end{macrocode} % The file source and type: % \begin{macrocode} @@ -70108,6 +70810,8 @@ height:\LWR@printlength{\LWR@tempheight}% % 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@multimediab}[3][]{% % \end{macrocode} @@ -70119,6 +70823,10 @@ height:\LWR@printlength{\LWR@tempheight}% \if#2\@percentchar\LWR@multimedia@percenterror\fi% \if#3\@percentchar\LWR@multimedia@percenterror\fi% % \end{macrocode} +% Paragraph handling: +% \begin{macrocode} + \LWR@stoppars% +% \end{macrocode} % Record the desired size. % \begin{macrocode} \setlength{\LWR@multimedia@width}{0pt}% @@ -70143,6 +70851,10 @@ height:\LWR@printlength{\LWR@tempheight}% % \begin{macrocode} \href{#3}{#2}% unknown format }}}}}}}}% +% \end{macrocode} +% Paragraph handling: +% \begin{macrocode} + \LWR@startpars% \endgroup% } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins index 0644207fb56..5290fa245c2 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins @@ -241,6 +241,7 @@ version 2005/12/01 or later. \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 @@ version 2005/12/01 or later. \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}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty index 03df09ab716..ee80af4ad0c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty @@ -43,6 +43,7 @@ \LWR@applyxfakebold% } \newcommand*{\LWR@amsmathenv@before}[1]{% + \LWR@stoppars% \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% { \LWR@syncmathjax @@ -52,11 +53,11 @@ \LWR@beginhideamsmath } { - \LWR@amsmathenv@@before{multline} + \LWR@amsmathenv@@before{#1} } } \newcommand*{\LWR@amsmathenv@@after}{% - \end{lateximage}\end{BlockClass} + \end{lateximage}\end{BlockClass}\LWR@startpars% } \newcommand*{\LWR@amsmathenv@after}[1]{% \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty index 3b9ab2f58c9..e6fec10cc14 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty @@ -15,39 +15,9 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{backnaur}[2019/04/14] -\renewenvironment*{bnf}{% - \BlockClass{backnaur}% - \LWR@stoppars% -}{\endBlockClass} - -\renewenvironment*{bnf*}{% - \BlockClass{backnaur}% - \LWR@stoppars% -}{\endBlockClass} - -\renewcommand{\bnfpn}[1]{\HTMLunicode{27e8}#1\HTMLunicode{27e9}}% \langle, rangle -\renewcommand{\bnfor}{ \HTMLunicode{7c} }% \mid -\renewcommand{\bnfsp}{ } -\renewcommand{\bnfes}{\HTMLunicode{3bb}}% \lambda -\renewcommand{\bnftd}[1]{\textnormal{\textit{#1}}} -\renewcommand{\bnfsk}{\HTMLunicode{2026} }% \dots, ellipsis -\renewcommand{\bnfpo}{\HTMLunicode{22a8}}% \models - -\renewcommand{\bnfprod}[2]{% - \begin{BlockClass}{backnaurprod}\bnfpn{#1} \bnfpo \end{BlockClass}% - \begin{BlockClass}{backnaurdesc}#2\end{BlockClass}% - \LWR@stoppars% -}% - -\renewcommand{\bnfmore}[1]{% - \begin{BlockClass}{backnaurprod}\end{BlockClass} - \begin{BlockClass}{backnaurdesc}#1\end{BlockClass} - \LWR@stoppars% -} - -\@ifpackagewith{backnaur}{perp}{\renewcommand{\bnfes}{\HTMLunicode{27c2}}}{}% \perp -\@ifpackagewith{backnaur}{epsilon}{\renewcommand{\bnfes}{\HTMLunicode{3f5}}}{}% \epsilon +\LWR@ProvidesPackagePass{backnaur}[2019/06/18] +\renewenvironment{bnf}{\eqnarray}{\endeqnarray} +\renewenvironment{bnf*}{\csuse{eqnarray*}}{\csuse{endeqnarray*}} \endinput %% %% End of file `lwarp-backnaur.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty index 88c9931767d..4a448dc4341 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty @@ -20,12 +20,14 @@ \LWR@ProvidesPackagePass{boxedminipage2e}[2015/03/09] \newenvironment{LWR@HTML@boxedminipage}{% + \LWR@stoppars% \begin{BlockClass}{framebox}% \minipage% } {% \endminipage% \end{BlockClass}% + \LWR@startpars% } \LWR@formattedenv{boxedminipage} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty index 186fab5ffc4..9e0808fb78f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty @@ -51,19 +51,10 @@ \LWR@traceinfo{caption@iiibox: done}% } -\def\caption@caption{% - \caption@iftype - {% - \caption@checkgrouplevel\@empty\caption - \caption@star - {\caption@refstepcounter\@captype}% - {\caption@dblarg{\@caption\@captype}}}% - {\caption@Error{\noexpand\caption outside float}% - \caption@gobble}% -} \long\def\caption@@caption#1[#2]#3{% - \ifcaption@star \else + \ifcaption@star + \else \caption@prepareanchor{#1}{#2}% \memcaptioninfo{#1}{\csname the#1\endcsname}{#2}{#3}% \@nameuse{nag@hascaptiontrue}% @@ -78,9 +69,11 @@ \caption@normalsize \ifcaption@star \let\caption@makeanchor\@firstofone - \fi + #3% lwarp + \else% lwarp \@makecaption{\csname fnum@#1\endcsname}% {\ignorespaces\caption@makeanchor{#3}}% + \fi% lwarp \caption@if@minipage\@minipagetrue\@minipagefalse}% \caption@end% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty index b6cea33596c..c57d58df19c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty @@ -47,12 +47,18 @@ \newcommand*{\LWR@multimedia@fileAV}[4]{% \filename@parse{#2}% \IfFileExists{#2}{% - \begin{BlockClass}[\LWR@multimedia@printsize\ margin:auto]{AVviewport} + \ifstrequal{#3}{audio}{% + \begin{BlockClass}{AVviewport} + }{% + \begin{BlockClass}[\LWR@multimedia@printsize\ margin:auto]{AVviewport} + } \LWR@stoppars \LWR@htmltag{% #3\ % space - width=\textquotedbl{}100\%\textquotedbl\ % space - height=\textquotedbl{}100\%\textquotedbl\ % space + \ifstrequal{#3}{audio}{}{% + width=\textquotedbl{}100\%\textquotedbl\ % space + height=\textquotedbl{}100\%\textquotedbl\ % space + }% controls% }\LWR@orignewline \LWR@htmltag{% @@ -72,12 +78,19 @@ }% } \newcommand*{\LWR@multimedia@httpAV}[4]{% - \begin{BlockClass}[\LWR@multimedia@printsize\ margin:auto]{AVviewport} + \ifstrequal{#3}{audio}{% + \begin{BlockClass}{AVviewport} + }{% + \begin{BlockClass}[\LWR@multimedia@printsize\ margin:auto]{AVviewport} + } \LWR@stoppars \LWR@htmltag{% #3\ % space - width=\textquotedbl{}100\%\textquotedbl\ % space - height=\textquotedbl{}100\%\textquotedbl\ controls}\LWR@orignewline + \ifstrequal{#3}{audio}{}{% + width=\textquotedbl{}100\%\textquotedbl\ % space + height=\textquotedbl{}100\%\textquotedbl\ controls% + }% + }\LWR@orignewline \LWR@htmltag{% source % space src=\textquotedbl#2\textquotedbl\ % space @@ -122,6 +135,7 @@ \if#1\@percentchar\LWR@multimedia@percenterror\fi% \if#2\@percentchar\LWR@multimedia@percenterror\fi% \if#3\@percentchar\LWR@multimedia@percenterror\fi% + \LWR@stoppars% \setlength{\LWR@multimedia@width}{0pt}% \setlength{\LWR@multimedia@height}{0pt}% \setkeys*{LWR@multimedia}{#1}% @@ -135,6 +149,7 @@ \IfBeginWith{#3}{FTP}{\LWR@multimedia@embed{#2}{#3}{}}{% \href{#3}{#2}% unknown format }}}}}}}}% + \LWR@startpars% \endgroup% } \newrobustcmd*{\LWR@multimedia}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty index 17eab164f34..ffd683ee9da 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty @@ -24,6 +24,7 @@ { \begin{BlockClass}{qitem} #1 +\LWR@stoppars% \ifbool{FormatWP} {\begin{BlockClass}[border-top:1px solid gray]{epigraphsource}} {\begin{BlockClass}{epigraphsource}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty index 1067f2b630e..a65b6095ac1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty @@ -81,12 +81,14 @@ } \RenewDocumentEnvironment{Btrivlist}{m o} {% + \LWR@stoppars% \begin{BlockClass}{Btrivlist}% \tabular{#1}% } {% \endtabular% \end{BlockClass}% + \LWR@startpars% } \AtBeginEnvironment{LWR@nestspan}{% \RenewDocumentEnvironment{Btrivlist}{m o}{}{}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty index 541ca0ad1fc..c003418243d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -65,7 +65,7 @@ \renewcommand*{\FV@SingleFrameSep}{} \def\FV@BUseVerbatim#1{% - \LWR@atbeginverbatim[\LWR@FVstyle]{0}{verbatim}% + \LWR@atbeginverbatim{0}{verbatim}% \FV@BVerbatimBegin#1\FV@BVerbatimEnd% \LWR@afterendverbatim{0}% } @@ -73,12 +73,38 @@ \newcommand*{\LWR@FVstyle}{} \newcommand*{\LWR@fvstartnone}{% \LWR@traceinfo{fvstartnone}% -\LWR@atbeginverbatim[\LWR@FVstyle]{0}{verbatim}% +\BlockClass[\LWR@FVstyle]{fancyvrb} +\LWR@stoppars +\ifx\FV@LabelPositionTopLine\relax\else + \ifx\FV@LabelBegin\relax\else + \FancyVerbRuleColor{\LWR@FVfindbordercolor} + \LWR@htmltagc{% + div class="fancyvrblabel" % extra space + style="color: \LWR@origpound\LWR@tempcolor"% + } + \LWR@print@textrm{\FV@LabelBegin}% \textrm preserves emdash + \LWR@htmltagc{/div}\LWR@orignewline% + \fi +\fi +\LWR@atbeginverbatim{0}{verbatim}% } \newcommand*{\LWR@fvendnone}{% \LWR@traceinfo{fvendnone}% \LWR@afterendverbatim{0}% +\LWR@stoppars% +\ifx\FV@LabelPositionBottomLine\relax\else + \ifx\FV@LabelEnd\relax\else + \FancyVerbRuleColor{\LWR@FVfindbordercolor} + \LWR@htmltagc{% + div class="fancyvrblabel" % extra space + style="color: \LWR@origpound\LWR@tempcolor"% + } + \LWR@print@textrm{\FV@LabelEnd} + \LWR@htmltagc{/div}\LWR@orignewline% + \fi +\fi +\endBlockClass } \newcommand*{\LWR@fvstartsingle}{% @@ -111,10 +137,10 @@ } \newcommand*{\LWR@FVborderstyle}[1]{% -padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; % -\LWR@FVfindbordercolor % -border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt % -solid \LWR@origpound\LWR@tempcolor ; % +padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; % space +\LWR@FVfindbordercolor\LWR@indentHTMLtwo% +border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt % space +solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space } \def\FV@Frame@none{% @@ -127,7 +153,10 @@ solid \LWR@origpound\LWR@tempcolor ; % \FV@Frame@none% default values \def\FV@Frame@single{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{}% +}% \let\FV@BeginListFrame\LWR@fvstartsingle% \let\FV@LeftListFrame\FV@LeftListFrame@Single% \let\FV@RightListFrame\FV@RightListFrame@Single% @@ -135,7 +164,10 @@ solid \LWR@origpound\LWR@tempcolor ; % \def\FV@Frame@lines{% \renewcommand*{\LWR@FVstyle}{% - \LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-top}% + \LWR@indentHTMLtwo% + \LWR@FVborderstyle{-bottom}% }% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% @@ -143,21 +175,30 @@ solid \LWR@origpound\LWR@tempcolor ; % \let\FV@EndListFrame\LWR@fvendline} \def\FV@Frame@topline{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-top}% +}% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendnone} \def\FV@Frame@bottomline{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-bottom}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-bottom}% +}% \let\FV@BeginListFrame\LWR@fvstartnone% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendline} \def\FV@Frame@leftline{% -\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-left}}% +\renewcommand*{\LWR@FVstyle}{% + \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% + \LWR@FVborderstyle{-left}% +}% \ifx\FancyVerbFillColor\relax% \let\FV@FrameFillLine\relax% \else% @@ -182,25 +223,10 @@ solid \LWR@origpound\LWR@tempcolor ; % \ifnum#1=\z@ \ifx\FV@LabelPositionTopLine\relax \else - \LWR@FVfindbordercolor - \LWR@htmltagc{% - div class="fancyvrblabel" % extra space - style="color: \LWR@origpound\LWR@tempcolor"% - } - \LWR@print@textrm{\FV@LabelBegin}% \textrm preserves emdash - \LWR@htmltagc{/div} \fi \else \ifx\FV@LabelPositionBottomLine\relax \else - \LWR@FVfindbordercolor - - \LWR@htmltagc{% - div class="fancyvrblabel" % extra space - style="color: \LWR@origpound\LWR@tempcolor"% - } - \LWR@print@textrm{\FV@LabelEnd} - \LWR@htmltagc{/div} \fi \fi \fi diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty index 35edb0737b7..bf5c343043d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty @@ -27,13 +27,11 @@ \def\fn@startfntext{% \setbox\z@\vbox\bgroup% \fn@startnote% - \fn@prefntext% \ignorespaces% } \def\fn@endfntext{% \LWR@htmltagc{/\LWR@tagregularparagraph}% \LWR@orignewline% - \fn@postfntext% \egroup% \begingroup% \let\@makefntext\@empty% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty index 21ad41ada43..ca380407735 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty @@ -15,9 +15,9 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{intopdf}[2018/03/15] -\NewDocumentCommand{\attachandlink}{m o m m}{% - \href{#1}{#4}% +\LWR@ProvidesPackageDrop{intopdf}[2019/05/28] +\NewDocumentCommand{\attachandlink}{o m o m m}{% + \href{#2}{#5}% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index 5478dcbdb6c..f523cd76d40 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -107,6 +107,7 @@ {\begingroup \LWR@traceinfo{at the selected position}% \ifx\lst@title\@empty + \LWR@stoppars% \lst@makecaption\fnum@lstlisting{\ignorespaces \lst@caption} \else \LWR@traceinfo{Making title: \lst@title}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty new file mode 100644 index 00000000000..d77574e1597 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty @@ -0,0 +1,45 @@ +%% +%% This is file `lwarp-lyluatex.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `lyluatex') +%% This is a generated file. +%% Copyright 2016-2019 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{lyluatex}[2019/05/27] +\newcommand*{\lyluateximagename}{(-lilypond-~\packagediagramname)} +\LetLtxMacro\LWR@orig@ly@compilescore\ly@compilescore + +\renewcommand*{\ly@compilescore}[1]{% + \begin{lateximage}[\lyluateximagename]% + \LWR@orig@ly@compilescore{#1}% + \end{lateximage}% +} + +\AtBeginDocument{ + \lysetoption{paperwidth}{6in} + \lysetoption{paperheight}{9in} + \lysetoption{line-width}{5.5in} + \lysetoption{twoside}{false} + \lysetoption{fullpagestyle}{empty} + \lysetoption{fullpagealign}{crop} + \lysetoption{print-page-number}{false} + \lysetoption{insert}{systems} + \lysetoption{extra-top-margin}{0} + \lysetoption{extra-bottom-margin}{0} + \lysetoption{valign}{center} + \lysetoption{staffsize}{20} + \lysetoption{inline-staffsize}{14} +} +\endinput +%% +%% End of file `lwarp-lyluatex.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty index dca86fc472d..12143adac48 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty @@ -15,79 +15,154 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{musicography}[2018/05/21] -\RenewDocumentCommand{\musSymbol}{ O{\musFont} m m m m }{% +\LWR@ProvidesPackagePass{musicography}[2019/05/28] +\NewDocumentCommand{\LWR@HTML@musSymbol}{ O{\musFont} m m m m }{% \begin{lateximage}% {#1\kern#2\raisebox{#3}{#5}\kern#4}% \end{lateximage}% } -\RenewDocumentCommand{\musStemmedNote}{ m }{% +\LWR@formatted{musSymbol} + +\NewDocumentCommand{\LWR@HTML@musStemmedNote}{ m }{% \begin{lateximage}% \musSymbol{0.05em}{0.5ex}{0.2em}{#1\musStem}% \end{lateximage}% } -\RenewDocumentCommand{\musFlaggedNote}{ m m }{% +\LWR@formatted{musStemmedNote} + +\NewDocumentCommand{\LWR@HTML@musFlaggedNote}{ m m }{% \begin{lateximage}% \musSymbol{0.05em}{0.5ex}{0pt}{#1\musStem}% \musSymbol{0pt}{0pt}{0.9em}{#2}% \end{lateximage}% } -\RenewDocumentCommand{\musDottedNote}{ m }{% +\LWR@formatted{musFlaggedNote} + +\NewDocumentCommand{\LWR@HTML@musDottedNote}{ m }{% \begin{lateximage}% #1\musDot% \end{lateximage}% } -\RenewDocumentCommand{\musMeter}{ m m }{% +\LWR@formatted{musDottedNote} + +\NewDocumentCommand{\LWR@HTML@musMeter}{ m m }{% \begin{lateximage}*[#1/#2][#1#2]% -\musStack{#1}{#2}\kern0.05em% +\musStack{#1 #2}\kern0.05em% \end{lateximage}% } -\RenewDocumentCommand{\meterCplus}{ m }{% +\LWR@formatted{musMeter} + +\NewDocumentCommand{\LWR@HTML@meterCplus}{ m }{% \begin{lateximage}*[C#1]% \meterC{}\kern-0.7pt#1% \end{lateximage}% } -\RenewDocumentCommand{\meterC}{}{% +\LWR@formatted{meterCplus} + +\NewDocumentCommand{\LWR@HTML@meterC}{}{% \begin{lateximage}*[C]% \musSymbolMeter{\symbol{83}}% \end{lateximage}% } -\RenewDocumentCommand{\meterCutC}{}{% +\LWR@formatted{meterC} + +\NewDocumentCommand{\LWR@HTML@meterCutC}{}{% \begin{lateximage}*[C|]% \musSymbolMeter{\symbol{82}}% \end{lateximage}% } -\RenewDocumentCommand{\meterCThreeTwo}{}{% +\LWR@formatted{meterCutC} + +\NewDocumentCommand{\LWR@HTML@meterCThreeTwo}{}{% \begin{lateximage}*[C3/2]% -\meterCplus{\musStack{3}{2}}% +\meterCplus{\musStack{3 2}}% \end{lateximage}% } -\RenewDocumentCommand{\musFlat} {}{\HTMLunicode{266D}} -\RenewDocumentCommand{\musDoubleFlat} {}{\HTMLunicode{1D12B}} -\RenewDocumentCommand{\musSharp} {}{\HTMLunicode{266F}} -\RenewDocumentCommand{\musDoubleSharp}{}{\HTMLunicode{1D12A}} -\RenewDocumentCommand{\musNatural} {}{\HTMLunicode{266E}} - -\RenewDocumentCommand{\musWhole}{}{\HTMLunicode{1D15D}} -\RenewDocumentCommand{\musHalf}{}{\HTMLunicode{1D15E}} -\RenewDocumentCommand{\musQuarter}{}{\HTMLunicode{1D15F}} -\RenewDocumentCommand{\musEighth}{}{\HTMLunicode{1D160}} -\RenewDocumentCommand{\musSixteenth}{}{\HTMLunicode{1D161}} - -\RenewDocumentCommand{\musWholeDotted}{}{\HTMLunicode{1D15D}\HTMLunicode{1D16D}} -\RenewDocumentCommand{\musHalfDotted}{}{\HTMLunicode{1D15E}\HTMLunicode{1D16D}} -\RenewDocumentCommand{\musQuarterDotted}{}{\HTMLunicode{1D15F}\HTMLunicode{1D16D}} -\RenewDocumentCommand{\musEighthDotted}{}{\HTMLunicode{1D160}\HTMLunicode{1D16D}} -\RenewDocumentCommand{\musSixteenthDotted}{}{\HTMLunicode{1D161}\HTMLunicode{1D16D}} +\LWR@formatted{meterCThreeTwo} + +\NewDocumentCommand{\LWR@HTML@meterO}{}{\HTMLunicode{25EF}} + +\LWR@formatted{meterO} + +\newcommand{\LWR@null@noFig}[1][]{}% + +\NewDocumentCommand{\LWR@HTML@musFig}{ m }{% +\begin{lateximage}*[% + {% ALT text for copy/paste + \LetLtxMacro\noFig\LWR@null@noFig% + \LetLtxMacro\musSharp\LWR@HTML@musSharp% + \LetLtxMacro\musDoubleSharp\LWR@HTML@musDoubleSharp% + \LetLtxMacro\musFlat\LWR@HTML@musFlat% + \LetLtxMacro\musDoubleFlat\LWR@HTML@musDoubleFlat% + \LetLtxMacro\musNatural\LWR@HTML@musNatural% + ({#1})% braces here because \noFig uses [] + }% +]% + \musStack[\musFigFont]{#1}% +\end{lateximage}% +} + +\LWR@formatted{musFig} + +\NewDocumentCommand{\LWR@HTML@musFlat} {}{\HTMLunicode{266D}} +\NewDocumentCommand{\LWR@HTML@musDoubleFlat} {}{\HTMLunicode{1D12B}} +\NewDocumentCommand{\LWR@HTML@musSharp} {}{\HTMLunicode{266F}} +\NewDocumentCommand{\LWR@HTML@musDoubleSharp}{}{\HTMLunicode{1D12A}} +\NewDocumentCommand{\LWR@HTML@musNatural} {}{\HTMLunicode{266E}} + +\LWR@formatted{musFlat} +\LWR@formatted{musDoubleFlat} +\LWR@formatted{musSharp} +\LWR@formatted{musDoubleSharp} +\LWR@formatted{musNatural} + +\NewDocumentCommand{\LWR@HTML@musWhole} {}{\HTMLunicode{1D15D}} +\NewDocumentCommand{\LWR@HTML@musHalf} {}{\HTMLunicode{1D15E}} +\NewDocumentCommand{\LWR@HTML@musQuarter} {}{\HTMLunicode{1D15F}} +\NewDocumentCommand{\LWR@HTML@musEighth} {}{\HTMLunicode{1D160}} +\NewDocumentCommand{\LWR@HTML@musSixteenth} {}{\HTMLunicode{1D161}} +\NewDocumentCommand{\LWR@HTML@musThirtySecond} {}{\HTMLunicode{1D162}} +\NewDocumentCommand{\LWR@HTML@musSixtyFourth} {}{\HTMLunicode{1D163}} + +\LWR@formatted{musWhole} +\LWR@formatted{musHalf} +\LWR@formatted{musQuarter} +\LWR@formatted{musEighth} +\LWR@formatted{musSixteenth} +\LWR@formatted{musThirtySecond} +\LWR@formatted{musSixtyFourth} + +\NewDocumentCommand{\LWR@HTML@musWholeDotted}{} + {\HTMLunicode{1D15D}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musHalfDotted}{} + {\HTMLunicode{1D15E}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musQuarterDotted}{} + {\HTMLunicode{1D15F}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musEighthDotted}{} + {\HTMLunicode{1D160}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musSixteenthDotted}{} + {\HTMLunicode{1D161}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musThirtySecondDotted}{} + {\HTMLunicode{1D162}\HTMLunicode{1D16D}} +\NewDocumentCommand{\LWR@HTML@musSixtyFourthDotted}{} + {\HTMLunicode{1D163}\HTMLunicode{1D16D}} + +\LWR@formatted{musWholeDotted} +\LWR@formatted{musHalfDotted} +\LWR@formatted{musQuarterDotted} +\LWR@formatted{musEighthDotted} +\LWR@formatted{musSixteenthDotted} +\LWR@formatted{musThirtySecondDotted} +\LWR@formatted{musSixtyFourthDotted} \endinput %% %% End of file `lwarp-musicography.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty index dd06b49ac3f..fd375bea782 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty @@ -53,11 +53,13 @@ \renewcommand{\chapter@preamble}{#3}% } } -\LetLtxMacro\captionbelow\caption -\LetLtxMacro\captionabove\caption +\AtBeginDocument{ + \LetLtxMacro\captionbelow\caption + \LetLtxMacro\captionabove\caption -\LetLtxMacro\captionofbelow\captionof -\LetLtxMacro\captionofabove\captionof + \LetLtxMacro\captionofbelow\captionof + \LetLtxMacro\captionofabove\captionof +} \RenewDocumentEnvironment{captionbeside}{o m o o o s} {} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty index c24ad4c098b..511dc188501 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -221,6 +221,9 @@ \renewcommand*{\abstractintoc}{} \renewcommand*{\abstractnum}{} \renewcommand*{\abstractrunin}{} +\DeclareDocumentCommand{\book}{s d() o o d() m}{% + \LWR@section{#1}{#3}{#6}{book}% +} \def\@apppage{% \part*{\appendixpagename} @@ -231,9 +234,13 @@ \def\@sapppage{% \part*{\appendixpagename} } +\DeclareDocumentCommand{\mainmatter}{s}{% + \booltrue{LWR@mainmatter}% +} -\csletcs{frontmatter*}{frontmatter} -\csletcs{mainmatter*}{mainmatter} +\DeclareDocumentCommand{\frontmatter}{s}{% +\boolfalse{LWR@mainmatter}% +} \renewcommand*{\raggedbottomsection}{} \renewcommand*{\normalbottomsection}{} \renewcommand*{\bottomsectionskip}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty index 4ce744ef978..9a92243919b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty @@ -15,7 +15,7 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{quotchap}[2012/10/20] +\LWR@ProvidesPackageDrop{quotchap}[2019/07/09] \newcommand{\@quotchap}{} \newlength{\LWR@quotchapwidth} @@ -34,8 +34,16 @@ \global\let\@quotchap\BODY \global\let\@printcites\@iprintcites% } -\newcommand{\qauthor}[1]{\begin{BlockClass}{qauthor}{#1}\end{BlockClass}} +\newcommand{\qauthor}[1]{% + \LWR@stoppars% + \begin{BlockClass}{qauthor}% + {#1}% + \end{BlockClass}% + \LWR@startpars% +} \newcommand{\qsetcnfont}[1]{} +\providecommand*{\quotefont}{} +\providecommand*{\qauthorfont}{} \endinput %% %% End of file `lwarp-quotchap.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty index 088eff09790..3f59ee57203 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty @@ -24,7 +24,7 @@ {\LWR@patcherror{quoting}{quoting}} \xpatchcmd{\endquoting}{\quo@endtext} - {\quo@endtext\end{LWR@blocktextcurrentfont}} + {\quo@endtext\end{LWR@blocktextcurrentfont}\LWR@stoppars} {} {\LWR@patcherror{imakeidx}{endquoting}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty index 09f0d9c0cea..9db031a5442 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty @@ -28,8 +28,8 @@ \DeclareDocumentCommand{\useshapeofkomafont}{m}{} \AtBeginDocument{ -\let\LWR@maketitle\maketitle -\DeclareDocumentCommand{\maketitle}{o}{\LWR@maketitle} + \let\LWR@koma@orig@maketitle\maketitle + \DeclareDocumentCommand{\maketitle}{o}{\LWR@koma@orig@maketitle} } \DeclareDocumentCommand{\extratitle}{m}{} @@ -76,12 +76,12 @@ \DeclareDocumentCommand{\deffootnotemark}{m}{} \DeclareDocumentCommand{\setfootnoterule}{o m}{} \DeclareDocumentCommand{\raggedfootnote}{}{} - \DeclareDocumentCommand{\dictum}{o m}{ \begin{LWR@BlockClassWP}{\LWR@print@mbox{text-align:right}}{}{dictum} #2 \IfValueT{#1} { + \LWR@stoppars% \ifbool{FormatWP} {\begin{BlockClass}[\LWR@print@mbox{border-top:} 1px solid gray]{dictumauthor}} {\begin{BlockClass}{dictumauthor}} @@ -116,9 +116,9 @@ \let\endaddmargin\relax \cslet{addmargin*}{\relax} \cslet{endaddmargin*}{\relax} - \NewDocumentEnvironment{addmargin}{s O{} m} { +\LWR@stoppars% \setlength{\LWR@templengthtwo}{#3} \ifblank{#2} { @@ -135,7 +135,7 @@ ]{addmargin} } } -{\end{BlockClass}} +{\end{BlockClass}\LWR@startpars} \ExplSyntaxOn \cs_new:cpn {addmargin*} {\addmargin*} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty new file mode 100644 index 00000000000..55112e993f9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty @@ -0,0 +1,83 @@ +%% +%% This is file `lwarp-stackengine.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `stackengine') +%% This is a generated file. +%% Copyright 2016-2019 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{stackengine}[2017/02/13] +\LetLtxMacro\LWR@orig@stackengine\stackengine +\renewcommand*{\stackengine}[8]{% + \ifstrequal{#4}{O}% + {\begin{lateximage}}% + {\begin{lateximage}[][][vertical-align:top]}% + \LWR@orig@stackengine{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}% + \end{lateximage}% +} +\LetLtxMacro\LWR@orig@@stack\@stack + +\xpatchcmd{\LWR@orig@@stack}{\stackengine}{\LWR@orig@stackengine} + {} + {\LWR@patcherror{stackengine}{LWR@orig@@stack}} + +\renewcommand*{\@stack}[4]{% + \ifstrequal{#3}{O}% + {\begin{lateximage}}% + {\begin{lateximage}[][][vertical-align:top]}% + \LWR@orig@@stack{#1}{#2}{#3}{#4}% + \end{lateximage}% +} +\newcommand*\LWR@HTML@@stacklap[4]{#3} +\LWR@formatted{@stacklap} +\xpatchcmd{\stackanchor}{\stackengine}{\LWR@orig@stackengine} + {} + {\LWR@patcherror{stackengine}{stackanchor patch 1}} + +\xpatchcmd{\stackanchor}{\stackengine}{\LWR@orig@stackengine} + {} + {\LWR@patcherror{stackengine}{stackanchor patch 2}} + +\xpretocmd{\stackanchor}{\begin{lateximage}[][][vertical-align:middle]} + {} + {\LWR@patcherror{stackengine}{stackanchor pre}} + +\xapptocmd{\stackanchor}{\end{lateximage}} + {} + {\LWR@patcherror{stackengine}{stackanchor app}} +\xpretocmd{\Centerstack}{\begin{lateximage}[][][vertical-align:middle]} + {} + {\LWR@patcherror{stackengine}{Centerstack pre}} + +\xapptocmd{\Centerstack}{\end{lateximage}} + {} + {\LWR@patcherror{stackengine}{Centerstack app}} +\renewcommand*\savestack[2]{% + \xdef\sv@name{\stack@macro@name{#1}}% + \@ifundefined{\sv@name content}{% + \expandafter\newsavebox\expandafter{\csname\sv@name content\endcsname}% + }{}% + \begingroup% lwarp + \LWR@restoreorigformatting% lwarp + \RenewDocumentEnvironment{lateximage}{s o o o}{}{}% lwarp: inside group + \expandafter\LWR@gsavebox\csname\sv@name content\endcsname{#2}% + \expandafter\gdef\expandafter#1\expandafter{% + \expandafter\begin\expandafter{lateximage\expandafter}% lwarp + \expandafter\usebox\expandafter% + {\csname\sv@name content\endcsname}% + \expandafter\end\expandafter{lateximage\expandafter}% lwarp + }% + \endgroup% lwarp +} +\endinput +%% +%% End of file `lwarp-stackengine.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty index 32ecc91967b..5bfd85a1359 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty @@ -37,6 +37,10 @@ } \newcommand{\tnote}[1]{\LWR@htmlspan{sup}{#1}} +\newenvironment*{measuredfigure}[1][t] + {\def\@captype{figure}} + {} + \endinput %% %% End of file `lwarp-threeparttable.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty index 22ebc54b835..04ae5aaa84e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty @@ -67,7 +67,7 @@ \@bsmarkseries \LWR@maketitlesetup \@maketitle -\@thanks +\LWR@stoppars\@thanks\LWR@startpars \end{titlepage} \@bscontmark } @@ -99,11 +99,11 @@ \maketitlehookd } \renewcommand*{\LWR@titlingmaketitle}{% -\@thanks +\LWR@stoppars\@thanks\LWR@startpars \@bsmarkseries \LWR@maketitlesetup \@maketitle -\@thanks +\LWR@stoppars\@thanks\LWR@startpars \@bscontmark } \renewcommand{\thanksmarkseries}[1]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty index 481789d69a2..cdae740bda5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty @@ -15,20 +15,18 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{tocdata}[2019/03/21] +\LWR@ProvidesPackagePass{tocdata}[2019/07/06] \renewcommand*{\LWR@maybetocdata}{% \ifdefempty{\TD@thistocdata}{}{% - \qquad --- \InlineClass{authorartist}{\TD@thistocdata}% + \qquad \InlineClass{authorartist}{\tocdataformat{\TD@thistocdata}}% \def\TD@thistocdata{} } } - \renewrobustcmd{\tocdatapartprint}[4] {% - \LWR@htmltagc{br /}% \InlineClass{authorartist}{% \qquad --- % - \TD@optionalname{#1}\TD@optionalname{#2}#3#4% + \TDoptionalnameprint{#1}\TDoptionalnameprint{#2}#3#4% }% } @@ -51,10 +49,10 @@ {}% } -\renewcommand{\TD@artistauthorprint}[5]{% +\renewcommand{\TDartistauthorprint}[5]{% \LWR@TD@settextalign{#1}% \begin{BlockClass}[text-align:\LWR@TD@textalign]{floatnotes}% - \InlineClass{authorartist}{\TD@optionalname{#2}\TD@optionalname{#3}#4#5}% + \InlineClass{authorartist}{\TDoptionalnameprint{#2}\TDoptionalnameprint{#3}#4#5}% \end{BlockClass}% } @@ -71,7 +69,7 @@ {}% } -\renewcommand{\TD@artistauthortextprint}[2]{% +\renewcommand{\TDartistauthortextprint}[2]{% \LWR@TD@setnamealign{#1}% \begin{BlockClass}[text-align:\LWR@TD@textalign]{floatnotes}% #2% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty index 8ccf58b72fe..abbbfa9a2ff 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty @@ -15,11 +15,12 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{versonotes}[2015/12/08] +\LWR@ProvidesPackageDrop{versonotes}[2019/07/06] \newcommand{\versonote}[1]{\marginpar{#1}} \newdimen\versotextwidth \newdimen\versoleftmargin \newcommand*{\versolayout}{} +\setcounter{page}{1} \endinput %% %% End of file `lwarp-versonotes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty index d9406455044..f2529f9272a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty @@ -30,7 +30,7 @@ }% } \renewenvironment*{vwcol}[1][]{% -\par\noindent% +\LWR@stoppars% \vwcolsetup{#1}% \newcommand*{\LWR@vwcolstyle}{} \if@vwcol@presep @@ -81,6 +81,7 @@ } { \endBlockClass +\LWR@startpars } \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index 68f61f6cced..e4e85161186 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -66,27 +66,28 @@ border:\LWR@printlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % padding:\LWR@printlength{\fboxsep}% } +\NewDocumentCommand{\LWR@HTML@color}{o m}{% +\IfValueTF{#1}{% + \LWR@print@color[#1]{#2}% + \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% +}{% + \LWR@print@color{#2}% + \convertcolorspec{named}{#2}{HTML}\LWR@tempcolor% +}% +\edef\LWR@currenttextcolor{\LWR@origpound\LWR@tempcolor}% +} + +\LWR@formatted{color} \NewDocumentCommand{\LWR@HTML@textcolor}{o m m}{% \begingroup% \IfValueTF{#1}{% \color[#1]{#2}% }{% \color{#2}% -}% -\LWR@FBcancel% -\IfValueTF{#1}{% -\InlineClass[color:\LWR@colorstyle{#1}{#2}]{textcolor}{% -\renewcommand*{\LWR@currenttextcolor}{\LWR@origpound\LWR@tempcolor}% -#3% -}% -}{% -\InlineClass[color:\LWR@colorstyle{named}{#2}]{textcolor}{% -\renewcommand*{\LWR@currenttextcolor}{\LWR@origpound\LWR@tempcolor}% -#3% -}% -}% -\endgroup% } +\InlineClass[color:\LWR@currenttextcolor]{textcolor}{#3}% +\endgroup% +}% \LWR@formatted{textcolor} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty index e05e1c64217..8266fe1df15 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty @@ -20,30 +20,39 @@ \AtBeginDocument{ -\preto{\xy}{\begin{lateximage}[(-xy-~\packagediagramname)]} -\appto{\endxy}{\end{lateximage}} - -\@ifundefined{xymatrix}{}{ -\LetLtxMacro\LWR@origxymatrix\xymatrix +\LetLtxMacro\LWR@orig@xy\xy +\LetLtxMacro\LWR@orig@endxy\endxy +\renewcommand*{\xy}{% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {\addtocounter{LWR@lateximagedepth}{1}}% + {\begin{lateximage}[(-xy-~\packagediagramname)]}% + \LWR@orig@xy% +} -\renewcommand{\xymatrix}[1]{% -\begin{lateximage}[(-xy- xymatrix \packagediagramname)] -\LWR@origxymatrix{#1} -\end{lateximage} +\renewcommand*{\endxy}{% + \LWR@orig@endxy% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{1}% + {\addtocounter{LWR@lateximagedepth}{-1}}% + {\end{lateximage}}% } +\def\xybox#1{% + \LWR@orig@xy#1\LWR@orig@endxy% + \Edge@c={\rectangleEdge}\computeLeftUpness@% } \@ifundefined{xygraph}{}{ + \LetLtxMacro\LWR@origxygraph\xygraph \renewcommand{\xygraph}[1]{% -\begin{lateximage}[(-xy- xygraph \packagediagramname)] -\LWR@origxygraph{#1} -\end{lateximage} -} + \begin{lateximage}[(-xy- xygraph \packagediagramname)] + \LWR@origxygraph{#1} + \end{lateximage} } -} +}% xygraph defined + +}% AtBeginDocument \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index e9e738fd8a2..dcd7ad4fa11 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2019/06/08 v0.72 Allows LaTeX to directly produce HTML5 output.] + [2019/07/11 v0.73 Allows LaTeX to directly produce HTML5 output.] @@ -383,6 +383,7 @@ \LWR@loadafter{lua-visual-debug} \LWR@loadafter{luacolor} \LWR@loadafter{luatodonotes} +\LWR@loadafter{lyluatex} \LWR@loadafter{magaz} \LWR@notmemoirloadafter{makeidx} \LWR@loadafter{manyfoot} @@ -515,6 +516,7 @@ \LWR@loadafter{srcltx} \LWR@loadafter{srctex} \LWR@loadafter{stabular} +\LWR@loadafter{stackengine} \LWR@notltjloadafter{stfloats} \LWR@loadafter{struktex} \LWR@loadafter{subcaption} @@ -687,6 +689,7 @@ \arabic{LWR@tempcountone}% } + \newcommand*{\LWR@patcherror}[2]{% \PackageError{lwarp} {Unable to patch package #1, macro #2} @@ -701,10 +704,41 @@ \@ifpackageloaded{xeCJK}{ \renewcommand{\LWR@isolate}[1]{\null#1\null}% }{} +\newcommand*{\LWR@forceemptyline}{% + \LWR@origrule{0pt}{1\baselineskip}% + \LWR@orignewline% +} \long\def\LWR@firstoffour#1#2#3#4{#1} \long\def\LWR@secondoffour#1#2#3#4{#2} \long\def\LWR@thirdoffour#1#2#3#4{#3} \long\def\LWR@fourthoffour#1#2#3#4{#4} +\DeclareRobustCommand\LWR@gsavebox[1]{% + \@ifnextchar(%) + {\LWR@@gsavepicbox#1}{\@ifnextchar[{\LWR@@gsavebox#1}{\LWR@gsbox#1}}}% +\long\def\LWR@gsbox#1#2{\global\setbox#1\hbox{% + \color@setgroup#2\color@endgroup}} +\def\LWR@@gsavebox#1[#2]{% + \@ifnextchar [{\LWR@@igsavebox#1[#2]}{\LWR@@igsavebox#1[#2][c]}} +\long\def\LWR@@igsavebox#1[#2][#3]#4{% + \LWR@gsbox#1{\@imakebox[#2][#3]{#4}}} +\def\LWR@@gsavepicbox#1(#2,#3){% + \@ifnextchar[%] + {\LWR@@igsavepicbox#1(#2,#3)}{\LWR@@igsavepicbox#1(#2,#3)[]}} +\long\def\LWR@@igsavepicbox#1(#2,#3)[#4]#5{% + \LWR@gsbox#1{\@imakepicbox(#2,#3)[#4]{#5}}} + +\def\LWR@glrbox#1{% + \edef\reserved@a{% + \endgroup + \global\setbox#1\hbox{% + \begingroup\aftergroup}% + \def\noexpand\@currenvir{\@currenvir}% + \def\noexpand\@currenvline{\on@line}}% + \reserved@a + \@endpefalse + \color@setgroup + \ignorespaces} +\let\LWR@endglrbox\LWR@endlrbox \let\LWRpercent\@percentchar \catcode`\$=12 \def\LWRdollar{$} @@ -1264,7 +1298,7 @@ \immediate\openout\LWR@quickfile #1_html_inc.tex% lwarp \immediate\write\LWR@quickfile{\string\input{#1.tex}}% lwarp \immediate\closeout\LWR@quickfile% lwarp -\LWR@origclearpage% \changed +\LWR@orignewpage% changed from clearpage \if@filesw \immediate\write\@mainaux{\string\@input{#1_html_inc.aux}}% changed \fi @@ -1282,7 +1316,7 @@ \immediate\write\@partaux{\relax}% \fi \@input@{#1_html_inc.tex}% changed - \LWR@origclearpage% changed + \LWR@orignewpage% changed from clearpage \@writeckpt{#1}% \if@filesw \immediate\closeout\@partaux @@ -1577,8 +1611,6 @@ \LetLtxMacro\LWR@origfootnote\footnote \let\LWR@orig@mpfootnotetext\@mpfootnotetext -\let\LWR@origclearpage\clearpage - \AtBeginDocument{% in case packages change definition \LetLtxMacro\LWR@orighline\hline% \LetLtxMacro\LWR@origcline\cline% @@ -1867,6 +1899,8 @@ A:visited {color:#800000 ; } A:hover {color:#000080 ; text-decoration: underline ;} A:active {color:#800000 ; } +a.tocbook {display: inline-block ; margin-left: 0em ; + font-weight: bold ; margin-top: 1ex ; margin-bottom: 1ex ; } a.tocpart {display: inline-block ; margin-left: 0em ; font-weight: bold ;} a.tocchapter {display: inline-block ; margin-left: 0em ; @@ -2156,7 +2190,7 @@ body div { margin: 0ex; } -h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph +div.book, h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph { font-family: "Linux Libertine O", "Hoefler Text", "Garamond", "Bembo", "Janson", "TeX Gyre Pagella", "Palatino", @@ -2172,6 +2206,13 @@ h1 { /* title of the entire website, used on each page */ font-size: 2.5em ; padding: .4ex 0em 0ex 0em ; } + +div.book { + text-align: center ; + font-size: 2.325em ; + padding: .4ex 0em 0ex 0em ; +} + h2 { font-size: 2.25em } h3 { font-size: 2em } h4 { font-size: 1.75em } @@ -2435,8 +2476,11 @@ span.abstractrunintitle{ } .fancyvrblabel { - font-weight:bold; + font-size: .85em ; text-align: center ; + font-weight: bold ; + margin-top: 1ex ; + margin-bottom: 1ex ; } .verse { @@ -3112,10 +3156,13 @@ span.floatright { float: right ; } } .authorartist{ + display:block ; font-size:.70em ; font-style: italic; } +nav .authorartist{ display:inline; } + /* Native LaTeX theorems: */ .theoremcontents { font-style: italic; margin-top: 3ex ; margin-bottom: 3ex ; } @@ -3370,7 +3417,7 @@ A:visited {color:#705030 ; text-shadow:1px 1px 2px #a0a0a0;} A:hover {color:#006000 ; text-decoration: underline ; text-shadow:0px 0px 2px #a0a0a0;} A:active {color:#00C000 ; text-shadow:1px 1px 2px #a0a0a0;} -h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph +div.book, h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph { font-family: "URW Classico", Optima, "Linux Biolinum O", "Linux Libertine O", "Liberation Serif", @@ -3622,7 +3669,7 @@ span.textsf { Geneva, Verdana, sans-serif ; } -h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph +div.book, h1, h2, h3, h4, h5, h6, span.paragraph, span.subparagraph { font-family: "Linux Libertine O", "Hoefler Text", "Garamond", "Bembo", "Janson", "TeX Gyre Pagella", "Palatino", @@ -3986,7 +4033,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX- -- Copyright 2016-2019 Brian Dunn -printversion = "v0.72" +printversion = "v0.73" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -4854,6 +4901,7 @@ end -- not --version \newcommand*{\LWR@depthnone}{-5} \newcommand*{\LWR@depthfinished}{-4} +\newcommand*{\LWR@depthbook}{-2} \newcommand*{\LWR@depthpart}{-1} \newcommand*{\LWR@depthchapter}{0} \newcommand*{\LWR@depthsection}{1} @@ -5221,9 +5269,10 @@ end -- not --version \begin{warpHTML} - \newcommand*{\LWR@tagtitle}{h1} \newcommand*{\LWR@tagtitleend}{/h1} +\newcommand*{\LWR@tagbook}{div class="book"} +\newcommand*{\LWR@tagbookend}{/div} \newcommand*{\LWR@tagpart}{h2} \newcommand*{\LWR@tagpartend}{/h2} \newcommand*{\LWR@tagchapter}{h3} @@ -5293,6 +5342,10 @@ end -- not --version \LWR@orignewline\LWR@origrule{2em}{0pt}% } +\newcommand*{\LWR@indentHTMLtwo}{% + \LWR@orignewline\LWR@origrule{4em}{0pt}% +} + \newcommand*{\LWR@htmltagc}[1]{% \LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}% @@ -5330,6 +5383,8 @@ end -- not --version \let\item\LWR@nestspanitem% }% \renewcommand{\LWR@listend}{\LWR@htmltagc{br /}\LWR@htmltagc{br /}}% + \renewenvironment{quote}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}% + \renewenvironment{quotation}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}% }% not in a lateximage \LWR@traceinfo{LWR@nestspan starting: done}% }% starting env @@ -5427,6 +5482,7 @@ end -- not --version \NewDocumentCommand{\LWR@htmlelementclass}{m o m}{% \LWR@stoppars% +\LWR@forceemptyline% \LWR@subhtmlelementclass{#1}[#2]{#3}% \LWR@startpars% } @@ -5452,6 +5508,7 @@ end -- not --version \NewDocumentCommand{\LWR@htmlelementclassline}{m o m +m}{% \LWR@stoppars +\LWR@forceemptyline% \LWR@subhtmlelementclass{#1}[#2]{#3}% #4% \LWR@htmltag{/#1} @@ -5479,7 +5536,6 @@ end -- not --version \NewDocumentEnvironment{LWR@print@BlockClass}{o m}{}{}% \NewDocumentEnvironment{LWR@HTML@BlockClass}{o m}% {% - \LWR@origpar% \LWR@htmldivclass[#1]{#2}% } {\LWR@htmldivclassend{#2}} @@ -5491,7 +5547,6 @@ end -- not --version \end{warpall} \begin{warpHTML} \newcommand{\LWR@HTML@BlockClassSingle}[2]{% -\LWR@origpar% \LWR@htmlelementclassline{div}{#1}{#2}% } @@ -5550,6 +5605,8 @@ end -- not --version \begin{warpHTML} +\newcommand*{\LWR@printclosebook} + {\ifbool{HTMLDebugComments}{\LWR@htmlcomment{Closing book}}{}} \newcommand*{\LWR@printclosepart} {\ifbool{HTMLDebugComments}{\LWR@htmlcomment{Closing part}}{}} \newcommand*{\LWR@printclosechapter} @@ -5785,7 +5842,7 @@ end -- not --version } \end{warpHTML} \begin{warpall} -\providecommand{\thetitle}{} +\providecommand{\thetitle}{\BaseJobname} \newcommand{\theHTMLTitle}{\thetitle} @@ -5943,17 +6000,18 @@ end -- not --version }% } \newcommand{\marginparBlock}[2][]{% +\LWR@stoppars% \ifbool{FormatWP}% {% -\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock} -#2 -\end{LWR@BlockClassWP} -}% -{% -\begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock} -#2 -\end{BlockClass} + \begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock} + #2 + \end{LWR@BlockClassWP} +}{% + \begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock} + #2 + \end{BlockClass} }% +\LWR@startpars% } \renewcommand*{\reversemarginpar}{} \renewcommand*{\normalmarginpar}{} @@ -6170,11 +6228,13 @@ end -- not --version \ifbool{FormatEPUB} {} { - \LWR@htmlelement{footer} + \ifdefempty{\LWR@pagebottom}{}{% + \LWR@htmlelement{footer} - \LWR@pagebottom + \LWR@pagebottom - \LWR@htmlelementend{footer} + \LWR@htmlelementend{footer} + } } \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} {} @@ -6233,11 +6293,13 @@ end -- not --version \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} {} { - \LWR@htmlelement{header} + \ifdefempty{\LWR@pagetop}{}{ + \LWR@htmlelement{header} - \LWR@pagetop + \LWR@pagetop - \LWR@htmlelementend{header} + \LWR@htmlelementend{header} + } } \LWR@htmlelementclass{div}{bodyandsidetoc} @@ -6495,6 +6557,9 @@ end -- not --version } +\providecommand*{\prebookname}{} +\providecommand*{\postbookname}{} + \providecommand*{\prepartname}{} \providecommand*{\postpartname}{} @@ -6727,11 +6792,13 @@ end -- not --version \LWR@traceinfo{LWR@lwarpStart: Starting new file.} \LWR@filestart \LWR@traceinfo{LWR@lwarpStart: Generating first header.} -\LWR@htmltag{header}\LWR@orignewline -\LWR@startpars -\LWR@firstpagetop -\LWR@stoppars -\LWR@htmltag{/header}\LWR@orignewline +\ifdefempty{\LWR@firstpagetop}{}{% + \LWR@htmltag{header}\LWR@orignewline + \LWR@startpars + \LWR@firstpagetop + \LWR@stoppars + \LWR@htmltag{/header}\LWR@orignewline +}% \LWR@htmlelementclass{div}{bodywithoutsidetoc} \LWR@htmlelementclass{div}{bodycontainer} \LWR@traceinfo{LWR@lwarpStart: Generating textbody.} @@ -6771,11 +6838,13 @@ end -- not --version \LWR@htmlelementclassend{div}{bodycontainer} \LWR@htmlelementclassend{div}{bodyandsidetoc} \LWR@printpendingfootnotes -\LWR@htmlelement{footer} +\ifdefempty{\LWR@pagebottom}{}{% + \LWR@htmlelement{footer} -\LWR@pagebottom + \LWR@pagebottom -\LWR@htmlelementend{footer} + \LWR@htmlelementend{footer} +} \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} {} @@ -6855,7 +6924,7 @@ end -- not --version } \end{warpHTML} \begin{warpall} -\newcommand*{\printthanks}{\@thanks} +\newcommand*{\printthanks}{\LWR@stoppars\@thanks\LWR@startpars} \end{warpall} \begin{warpHTML} @@ -6940,7 +7009,7 @@ end -- not --version \begin{titlepage} \LWR@maketitlesetup \@maketitle -\@thanks +\LWR@stoppars\@thanks\LWR@startpars \end{titlepage} \setcounter{footnote}{0}% \global\let\thanks\relax @@ -6956,9 +7025,11 @@ end -- not --version \global\let\and\relax } \DeclareDocumentCommand{\@maketitle}{}{% - \LWR@stoppars\LWR@htmltag{\LWR@tagtitle}% + \LWR@stoppars% + \LWR@htmltag{\LWR@tagtitle}% \@title% - \LWR@htmltag{\LWR@tagtitleend}\LWR@startpars% + \LWR@htmltag{\LWR@tagtitleend}% + \LWR@startpars% \begin{BlockClass}{author}% \renewcommand*{\cr}{}% \renewcommand*{\crcr}{}% @@ -6977,10 +7048,10 @@ end -- not --version } \newcommand*{\LWR@titlingmaketitle}{% -\@thanks +\LWR@stoppars\@thanks\LWR@startpars \LWR@maketitlesetup \@maketitle -\@thanks +\LWR@stoppars\@thanks\LWR@startpars } \end{warpHTML} \begin{warpall} @@ -7039,9 +7110,11 @@ end -- not --version \begin{warpHTML} \newcommand{\attribution}[1]{% + \LWR@stoppars% \begin{BlockClass}{attribution} #1 \end{BlockClass} + \LWR@startpars% } \end{warpHTML} \begin{warpprint} @@ -7310,10 +7383,16 @@ end -- not --version \LWR@stoppars% \LWR@setlatestname{#1}% \LWR@startnewdepth{descitem}% +\begingroup% +\let\LWR@orig@desc@makelabel\makelabel +\renewcommand*{\makelabel}[1]{% + \LWR@htmltag{dt}% + \LWR@orig@desc@makelabel{#1}% + \LWR@htmltag{/dt}% +} \LWR@select@html@nohspace% -\LWR@origitem[]% -\LWR@select@html@hspace% -\LWR@htmltag{dt}#1\LWR@htmltag{/dt}% +\LWR@origitem[#1]% +\endgroup% \LWR@orignewline% \LWR@htmltag{dd}% \LWR@startpars% @@ -8947,6 +9026,16 @@ rowspan="#2" % \NewDocumentCommand{\LWR@HTML@@tabular}{d<> o m} {% \LWR@traceinfo{LWR@HTML@@tabular started}% +\ifnumcomp{\value{LWR@spandepth}}{>}{0}{% + \PackageWarning{lwarp}{% + A tabular is being used inside a span such as\MessageBreak + a minipage. Some formatting may not be correct\MessageBreak + in the tabular.\MessageBreak + It is recommended to use \protect\warpprintonly\space or the\MessageBreak + warpprint environment to isolate the span to\MessageBreak + print-only,% + } +}{}% \addtocounter{LWR@tabulardepth}{1}% \global\boolfalse{LWR@startedrow}% \setcounter{LWR@hlines}{0}% @@ -9549,7 +9638,7 @@ autopage-\theLWR@currentautosec% \let\LWR@origcaptionof\captionof \renewcommand*{\captionof}{% -\LWR@stoppars +\LWR@stoppars% \LWR@origcaptionof% } } @@ -9747,6 +9836,8 @@ autopage-\theLWR@currentautosec% {}% } +\DeclareDocumentCommand{\l@book}{m m}{\hypertoc{-2}{book}{#1}{#2}} + \DeclareDocumentCommand{\l@part}{m m}{\hypertoc{-1}{part}{#1}{#2}} \@ifundefined{chapter} @@ -9798,17 +9889,17 @@ autopage-\theLWR@currentautosec% \newcommand{\LWR@indexitem}[1][\@empty]{ -\InlineClass{indexitem}{}#1% +\InlineClass{indexitem}{\LWR@htmlcomment{}}#1% } \newcommand{\LWR@indexsubitem}{ -\InlineClass{indexsubitem}{} +\InlineClass{indexsubitem}{\LWR@htmlcomment{}} } \newcommand{\LWR@indexsubsubitem}{ -\InlineClass{indexsubsubitem}{} +\InlineClass{indexsubsubitem}{\LWR@htmlcomment{}} } \def\LWR@wrindex#1{% @@ -9984,7 +10075,7 @@ autopage-\theLWR@currentautosec% \renewcommand*{\$}{% \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {\LWR@origtextdollar}% -{\HTMLentity{dollar}}% +{\HTMLunicode{00024}}% } \AtBeginDocument{ @@ -10012,13 +10103,16 @@ autopage-\theLWR@currentautosec% } }{ \PackageWarningNoLine{lwarp}{Load graphicx or graphics - for improved SVG math baselines,} + for improved\MessageBreak + SVG math baselines% + } \newcommand*{\LWR@addbaselinemarker}{} } } }{% lwarp_baseline_marker.png or .eps is not present - \PackageWarningNoLine{lwarp}{File \LWR@baselinename\space is not installed alongside - the lwarp-*.sty files, so SVG math baselines may not be accurate,} + \PackageWarningNoLine{lwarp}{File \LWR@baselinename\space is not installed\MessageBreak + alongside the lwarp-*.sty files,\MessageBreak + so SVG math baselines may not be accurate} \newcommand*{\LWR@addbaselinemarker}{} } @@ -11261,7 +11355,7 @@ autopage-\theLWR@currentautosec% \ifbool{LWR@forceminipagefullwidth}% {}% {% - \ifthenelse{\lengthtest{#4}=\linewidth}% + \ifdimequal{#4}{\linewidth}% {}% {width:\LWR@printlength{\LWR@minipagewidth} ; }% }% @@ -11425,11 +11519,13 @@ color:\LWR@origpound\LWR@tempcolor% \begin{warpHTML} \newcommand{\LWR@HTML@fboxBlock}[1]{% \LWR@forceminwidth{\fboxrule}% +\LWR@stoppars% \begin{BlockClass}[% \LWR@fboxstyle% ]{fboxBlock} #1 \end{BlockClass} +\LWR@startpars% } \LWR@formatted{fboxBlock} @@ -11481,7 +11577,7 @@ color:\LWR@origpound\LWR@tempcolor% \ifbool{LWR@forceminipagefullwidth}% {}% {% - \ifthenelse{\lengthtest{\LWR@tempwidth}=\linewidth}% + \ifdimequal{\LWR@tempwidth}{\linewidth}% {}% {width:\LWR@printlength{\LWR@tempwidth} ; }% }% @@ -11804,6 +11900,7 @@ color:\LWR@origpound\LWR@tempcolor% \renewcommand{\textsuperscript}[1]{##1}% \renewcommand{\textsubscript}[1]{##1}% \renewcommand{\underline}[1]{##1}% +\RenewDocumentCommand{\hspace}{s m}{} \RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}% \DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}% \def\(##1\){}% @@ -11861,13 +11958,14 @@ color:\LWR@origpound\LWR@tempcolor% } \newenvironment*{LWR@blocktextcurrentfont}{% +\LWR@stoppars% \BlockClass{% text\LWR@f@family\LWR@origtilde{}% text\LWR@f@series\LWR@origtilde{}% text\LWR@f@shape\LWR@origtilde{}% text\LWR@f@shapecaps% }% -}{\endBlockClass} +}{\endBlockClass\LWR@startpars} \newrobustcmd*{\LWR@HTML@mdseries}{\renewcommand*{\LWR@f@series}{md}} \LWR@formatted{mdseries} @@ -12095,7 +12193,8 @@ color:\LWR@origpound\LWR@tempcolor% \quad% \addtolength{\LWR@templengthone}{-1em}% }% - }{}% + }% + {\LWR@htmlcomment{}}% \LWR@htmltagc{/span}% }% \LWR@minipagestartpars% @@ -12176,7 +12275,8 @@ color:\LWR@origpound\LWR@tempcolor% \_{}% \addtolength{\LWR@templengthone}{-1em}% }% - }{}% + }% + {\LWR@htmlcomment{}}% \LWR@htmltagc{/span}% \LWR@minipagestartpars% }% non-zero width |