diff options
author | Karl Berry <karl@freefriends.org> | 2021-07-17 20:43:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-07-17 20:43:04 +0000 |
commit | 62bf82194bfc49457c5fc3a40177e321bd7d48d0 (patch) | |
tree | 68b905cf855879a3a0df652b0b3d980012bbb2b2 /Master/texmf-dist/tex/latex/lwarp | |
parent | 8d09cd2666eed0e30bee7070359aeb1a06caf80b (diff) |
lwarp (17jul21)
git-svn-id: svn://tug.org/texlive/trunk@59959 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty | 3 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-froufrou.sty | 38 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-lipsum.sty | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 29 |
6 files changed, 83 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty index 71cc4b5c2a2..54eb742ee5d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty @@ -39,6 +39,16 @@ }% not mathjax \newcounter{LWR@amsmathdepth} \setcounter{LWR@amsmathdepth}{0} +\newcounter{LWR@maxfields@} + +\xpatchcmd{\start@align} + {\maxfields@#3\relax} + {% + \maxfields@#3\relax% + \setcounter{LWR@maxfields@}{#3}% + } + {} + {\LWR@patcherror{amsmath}{start@align}} \NewDocumentCommand{\LWR@amsmathenv@@before}{s m}{% \IfBooleanTF{#1}{ \begin{BlockClass}{displaymath} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty index 8ea8c02c369..ca0abaa7c2d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty @@ -31,10 +31,9 @@ \BeforeBeginEnvironment{multline+}{\LWR@amsmathenv@@before{multline+}} \AfterEndEnvironment{multline+}{\LWR@amsmathenv@@after} - \newenvironment{flalign+}{\flalign}{\endflalign} -\BeforeBeginEnvironment{flalign+}{\LWR@amsmathenv@@before{flaline+}} +\BeforeBeginEnvironment{flalign+}{\LWR@amsmathenv@@before{flalign+}} \AfterEndEnvironment{flalign+}{\LWR@amsmathenv@@after} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty index 9139b3223d1..31967e99afc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty @@ -15,7 +15,7 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{changes}[2021/02/14] +\LWR@ProvidesPackagePass{changes}[2021/07/15] \renewcommand{\ChangesListline}[4]{% \IfIsInList{#1}{\Changes@loc@show}{% \LWR@startpars% @@ -210,7 +210,7 @@ test {\ifnumgreater{\csuse{Changes@In########1}}{0}}% {\color{authorcolor}}% {}% \LWR@textcurrentcolor{% lwarp -\Changes@Markup@author{\Changes@output@author{#2}{left}}% +\Changes@Markup@author{\Changes@output@author@position{#2}{left}}% }% lwarp }}% }{}% @@ -237,7 +237,7 @@ test {\ifnumgreater{\csuse{Changes@In########1}}{0}}% {\color{authorcolor}}% {}% \LWR@textcurrentcolor{% lwarp -\Changes@Markup@author{\Changes@output@author{#2}{right}}% +\Changes@Markup@author{\Changes@output@author@position{#2}{right}}% }% lwarp }}% }{}% @@ -251,7 +251,7 @@ test {\ifnumgreater{\csuse{Changes@In########1}}{0}}% \Changes@Markup@comment% {#5}% {#2}% -{\Changes@output@author{#2}{left}\Changes@output@author{#2}{right}}% +{\Changes@output@author{#2}}% }% }% \IfIsEmpty{#2}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-froufrou.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-froufrou.sty index c6456376ca9..2dad25b088f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-froufrou.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-froufrou.sty @@ -23,17 +23,35 @@ {\LWR@patcherror{froufrou}{setfroufrou}} \ExplSyntaxOff -\xpatchcmd{\@realfroufrou} - {\@froufrouOrnament} - {% - \begin{center} - \begin{lateximage}*[froufrou][\LWR@latestfroufrou]% +\RenewDocumentCommand{\froufrou}{s O{}}{% + \nopagebreak[4]\par + + \IfBooleanTF{#1}{\@afterindenttrue}{\@afterindentfalse} + + \nopagebreak[4]\@froufrouspacebefore\nopagebreak[4] + + \bgroup + \setfroufrou{#2}% + \normalsize + \ifdefvoid{\setstretch}{}{\setstretch{\setspace@singlespace}}% normally 1 + \setlength{\parskip}{0pt} + \noindent\centering\bgroup% + \begin{center}% lwarp + \begin{lateximage}*[froufrou][\LWR@latestfroufrou]% lwarp \@froufrouOrnament% - \end{lateximage} - \end{center} - } - {} - {\LWR@patcherror{froufrou}{@realfroufrou}} + \end{lateximage}% lwarp + \end{center}% lwarp + \egroup\par + \egroup + + \nopagebreak[4]\@froufrouspaceafter\nopagebreak[4] + + \@froufrouFixSpacingAfter + + \nopagebreak[3] + + \@afterheading +} \endinput %% %% End of file `lwarp-froufrou.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lipsum.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lipsum.sty new file mode 100644 index 00000000000..3c449f854df --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lipsum.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-lipsum.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `lipsum') +%% This is a generated file. +%% Copyright 2016-2020 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{lipsum}[2021-03-03] +\SetLipsumParListItemEnd{\LWR@closeparagraph} +\endinput +%% +%% End of file `lwarp-lipsum.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index a373b87d3c8..50306247b96 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2021/06/29 v0.899 Allows LaTeX to directly produce HTML5 output.] + [2021/07/17 v0.900 Allows LaTeX to directly produce HTML5 output.] @@ -4762,7 +4762,7 @@ MathJax = { -- Copyright 2016-2021 Brian Dunn -printversion = "v0.899" +printversion = "v0.900" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -4852,7 +4852,7 @@ if ( usinglwarp == false ) then print ("lwarpmk: \\usepackage{lwarp} was not detected.") print ("lwarpmk: The HTML output will not be correct.") print ("lwarpmk: Ensured that \\usepackage{lwarp} is enabled,") - print ("lwarpmk: then lwarpmk print and lwarpmk HTML again.") + print ("lwarpmk: then lwarpmk print and lwarpmk html again.") print ("lwarpmk: ===") end end -- function @@ -7894,11 +7894,11 @@ end -- not --version \begingroup% \LWR@nullfonts% \edef\theHTMLSection{#1}% -\StrSubstitute{\theHTMLSection}{\protect}{\detokenize{-}}[\theHTMLSection] -\StrSubstitute{\theHTMLSection}{\detokenize{-----}}{\detokenize{-}}[\theHTMLSection] -\StrSubstitute{\theHTMLSection}{\detokenize{----}}{\detokenize{-}}[\theHTMLSection] -\StrSubstitute{\theHTMLSection}{\detokenize{---}}{\detokenize{-}}[\theHTMLSection] -\StrSubstitute{\theHTMLSection}{\detokenize{--}}{\detokenize{-}}[\theHTMLSection] +\StrSubstitute{\theHTMLSection}{\protect}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}{\detokenize{-----}}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}{\detokenize{----}}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}{\detokenize{---}}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}{\detokenize{--}}{\detokenize{-}}[\theHTMLSection]% \IfBeginWith{\theHTMLSection}{\detokenize{-}}{% \StrGobbleLeft{\theHTMLSection}{1}[\theHTMLSection]% }{}% @@ -7982,8 +7982,8 @@ end -- not --version {}% \LWR@htmltag{/head}\LWR@orignewline \LWR@htmltag{body}\LWR@orignewline -\endgroup -\LWR@traceinfo{LWR@filestart: done} +\endgroup% +\LWR@traceinfo{LWR@filestart: done}% } \end{warpHTML} @@ -8022,7 +8022,7 @@ end -- not --version \mainmatter \LWR@origpagenumbering{arabic} \LWR@traceinfo{LWR@lwarpStart: Starting new file.} -\LWR@filestart +\LWR@filestart% \begingroup% \LWR@nullfonts% \LWR@htmlblockcomment{% @@ -12444,6 +12444,13 @@ end -- not --version {% \LWR@print@ttfamily% \textbackslash{}begin\{#1\} + \ifboolexpr{ + test {\ifstrequal{#1}{alignat}} or + test {\ifstrequal{#1}{alignat*}} or + test {\ifstrequal{#1}{alignat+}} + }% + {\{\arabic{LWR@maxfields@}\}}% + {}% \LWR@orignewline% \LWR@HTMLsanitizeexpand{\detokenize\expandafter{#2}}% \LWR@orignewline% |