summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/lwarp
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-07-18 03:00:52 +0000
committerNorbert Preining <norbert@preining.info>2021-07-18 03:00:52 +0000
commitba3d555da29f2da7ca04bf225218e22c8d12d7f8 (patch)
tree9445559f439b402707e57e21eca6516269741cf6 /macros/latex/contrib/lwarp
parent59d62d23cea172fbad8d928adf81755656d4e7e3 (diff)
CTAN sync 202107180300
Diffstat (limited to 'macros/latex/contrib/lwarp')
-rw-r--r--macros/latex/contrib/lwarp/README.txt2
-rw-r--r--macros/latex/contrib/lwarp/lwarp.dtx176
-rw-r--r--macros/latex/contrib/lwarp/lwarp.ins1
-rw-r--r--macros/latex/contrib/lwarp/lwarp.pdfbin3210245 -> 3118198 bytes
-rwxr-xr-xmacros/latex/contrib/lwarp/lwarpmk.lua4
5 files changed, 143 insertions, 40 deletions
diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt
index f89d6b4dd8..84c75558b6 100644
--- a/macros/latex/contrib/lwarp/README.txt
+++ b/macros/latex/contrib/lwarp/README.txt
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.899 README.txt
+LaTeX lwarp package v0.900 README.txt
Files included are:
diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx
index 54b4857907..fce36d1771 100644
--- a/macros/latex/contrib/lwarp/lwarp.dtx
+++ b/macros/latex/contrib/lwarp/lwarp.dtx
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2021/06/29 v0.899 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2021/07/17 v0.900 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -24,8 +24,8 @@
\PassOptionsToPackage{quiet}{textcomp}% Not all chars supported in TT font.
\usepackage{lmodern}
-\usepackage{libertine}
-% *88* \usepackage[space]{erewhon}
+% \usepackage{libertine}
+\usepackage[space]{erewhon}
\usepackage[varqu,varl]{inconsolata} % typewriter
% \usepackage{roboto}% conflicts with \textsc inside a float
% \usepackage{sourcecodepro}
@@ -3100,7 +3100,7 @@ This boolean may be tested by the user for later use.
%<*package>
% \fi
%
-% \CheckSum{54297}
+% \CheckSum{54342}
%
% \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
@@ -3241,6 +3241,7 @@ This boolean may be tested by the user for later use.
% \changes{v0.897}{2021/05/24}{\ 2021/05/24}
% \changes{v0.898}{2021/05/29}{\ 2021/05/29}
% \changes{v0.899}{2021/06/29}{\ 2021/06/29}
+% \changes{v0.900}{2021/07/17}{\ 2021/07/17}
@@ -3466,9 +3467,21 @@ This boolean may be tested by the user for later use.
%
% \begin{description}
% \needspace{2\baselineskip}
+% \item[v0.900:] Package updates.
+% \begin{itemize}
+% \item Fix for detecting |\usepackage{lwarp}|.
+% \margintag{core}
+% \item \pkg{amsmath}: Fixed \env{alignat} with \brand{MathJax}.
+% \margintag{packages}
+% \item \pkg{changes}: Updated to v4.2.1.
+% \item \pkg{froufrou}: Updated to v1.4.0.
+% \item \pkg{lipsum}: Updated to v2.3.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.899:] Minor updates.
% \begin{itemize}
% \item \prog{lwarpmk}: Warns if |\usepackage{lwarp}| is not detected.
+% \margintag{core}
% \item \pkg{graphics}: Added support for \optn{keepaspectratio}.
% \margintag{packages}
% \item \pkg{keyfloat}: Fix: \optn{lw} with \optn{h}.
@@ -3483,8 +3496,8 @@ This boolean may be tested by the user for later use.
% \item[v0.897:] \pkg{siunitx} rollback.
% \begin{itemize}
% \item Added a table of file extensions to use with \cs{includegraphics}.
-% See \cref{tab:includegraphicsfilenames}.
% \margintag{docs}
+% See \cref{tab:includegraphicsfilenames}.
% \item Added tests for additional incompatible packages.
% \margintag{core}
% \item \pkg{siunitx}: Supports rollback to v2. Does not yet support v3.
@@ -6019,7 +6032,7 @@ This boolean may be tested by the user for later use.
%
% Package handling: & \spkg{catoptions}. \\
%
-% Debug: & \ipkg{chkfloat}, \ipkg{cmdtrack}, \ipkg{dprogress},
+% Debug: & \ipkg{chkfloat}, \ipkg{cmdtrack}, \ipkg{dprogress}, \mpkg{lipsum},
% \ipkg{lua-visual-debug}, \ipkg{refcheck},
% \ipkg{srcltx}, \ipkg{srctex}, \ipkg{vpe}, \ipkg{xbmks}. \\
%
@@ -20565,7 +20578,7 @@ MathJax = {
-- Copyright 2016-2021 Brian Dunn
-printversion = "v0.899"
+printversion = "v0.900"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -20658,7 +20671,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
@@ -26933,11 +26946,11 @@ end -- not --version
% Remove extra material:
% \changes{v0.84}{2020/04/12}{Improved \HTML\ title.}
% \begin{macrocode}
-\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]%
% \end{macrocode}
%
% If starts with a dash, remove the leading dash:
@@ -27107,8 +27120,11 @@ end -- not --version
% Start of the body:
% \begin{macrocode}
\LWR@htmltag{body}\LWR@orignewline
-\endgroup
-\LWR@traceinfo{LWR@filestart: done}
+% \end{macrocode}
+% \changes{v0.900}{2021/06/14}{Spurrious space.}
+% \begin{macrocode}
+\endgroup%
+\LWR@traceinfo{LWR@filestart: done}%
}
% \end{macrocode}
% \end{macro}
@@ -27231,7 +27247,7 @@ end -- not --version
% Start a new \HTML\ file and a header:
% \begin{macrocode}
\LWR@traceinfo{LWR@lwarpStart: Starting new file.}
-\LWR@filestart
+\LWR@filestart%
% \end{macrocode}
% Tell \prog{lwarpmk} that the \pkg{lwarp} package is in use.
% This allows \prog{lwarpmk} to warn if |usepackage{lwarp}| was somehow
@@ -37674,7 +37690,7 @@ end -- not --version
% \end{macro}
-% \begin{macro}{\LWR@addmathjax} \marg{environment} \marg{contents}
+% \begin{macro}{\LWR@addmathjax} \marg{environment name} \marg{contents}
%
% Given the name of a math environment and its contents,
% create a \brand{MathJax} instance.
@@ -37682,16 +37698,32 @@ end -- not --version
% \begin{macrocode}
\NewDocumentCommand{\LWR@addmathjax}{m +m}{%
% \end{macrocode}
-% Enclose the \brand{MathJax} environment inside printed ``\cs{(}'' and ``\cs{)}'' characters.
% \begin{macrocode}
\LWR@origtilde\LWR@orignewline
% \end{macrocode}
+% Enclose the \brand{MathJax} environment inside printed ``\cs{(}'' and ``\cs{)}'' characters.
% Print the environment name and contents, sanitizing for \HTML\ special characters.
% \changes{v0.89}{2020/08/01}{TT font for \brand{MathJax}.}
% \begin{macrocode}
{%
\LWR@print@ttfamily%
\textbackslash{}begin\{#1\}
+% \end{macrocode}
+%
+% The \env{alignat} environment takes a mandatory argument, which must
+% be replicated here.
+% \changes{v0.900}{2021/07/11}{Fix: \env{alignat} with \brand{MathJax}.}
+% \begin{macrocode}
+ \ifboolexpr{
+ test {\ifstrequal{#1}{alignat}} or
+ test {\ifstrequal{#1}{alignat*}} or
+ test {\ifstrequal{#1}{alignat+}}
+ }%
+ {\{\arabic{LWR@maxfields@}\}}%
+ {}%
+% \end{macrocode}
+% The environment contents and \cs{end}:
+% \begin{macrocode}
\LWR@orignewline%
\LWR@HTMLsanitizeexpand{\detokenize\expandafter{#2}}%
\LWR@orignewline%
@@ -44057,6 +44089,25 @@ color:\LWR@origpound\LWR@tempcolor%
% \changes{v0.73}{2019/06/25}{AMS environments: Fix: \attribute{alt} tags.}
% \changes{v0.73}{2019/06/25}{AMS environments: Fix: Paragraph tags.}
%
+%
+% \DescribeCounter{LWR@maxfields@} A copy of \ctr{maxfields@} as it was passed.
+% This is used to generate the mandatory argument for \env{alignat} and \env{alignat*}
+% when using \brand{MathJax}.
+% \changes{v0.900}{2021/07/11}{Fix: \env{alignat} with \brand{MathJax}.}
+% \begin{macrocode}
+\newcounter{LWR@maxfields@}
+
+\xpatchcmd{\start@align}
+ {\maxfields@#3\relax}
+ {%
+ \maxfields@#3\relax%
+ \setcounter{LWR@maxfields@}{#3}%
+ }
+ {}
+ {\LWR@patcherror{amsmath}{start@align}}
+% \end{macrocode}
+%
+%
% \begin{noindmacro}{\LWR@amsmathenv@@before}* \marg{environment name}
%
% |*| if the environment was starred.
@@ -45551,8 +45602,7 @@ color:\LWR@origpound\LWR@tempcolor%
% \pkg{autonum} is ignored.
%
% All equations are numbered in \HTML\ output.
-% \trouble[numbering]{autonum=\pkg{autonum}}
-%
+% \trouble[numbering, \texttt{+}]{autonum=\pkg{autonum}}
% \brand{MathJax} does not support the ``+'' environments.
%
% \changes{v0.70}{2019/03/28}{\pkg{autonum}: Added.}
@@ -45582,11 +45632,13 @@ color:\LWR@origpound\LWR@tempcolor%
\BeforeBeginEnvironment{multline+}{\LWR@amsmathenv@@before{multline+}}
\AfterEndEnvironment{multline+}{\LWR@amsmathenv@@after}
-
-
+% \end{macrocode}
+%
+% \changes{v0.900}{2021/07/11}{Fix: \env{flalign} name.}
+% \begin{macrocode}
\newenvironment{flalign+}{\flalign}{\endflalign}
-\BeforeBeginEnvironment{flalign+}{\LWR@amsmathenv@@before{flaline+}}
+\BeforeBeginEnvironment{flalign+}{\LWR@amsmathenv@@before{flalign+}}
\AfterEndEnvironment{flalign+}{\LWR@amsmathenv@@after}
@@ -48382,11 +48434,12 @@ s%
% \changes{v0.67}{2019/02/15}{\pkg{changes}: Added.}
% \changes{v0.70}{2019/03/24}{\pkg{changes}: Updated to v3.1.2.}
% \changes{v0.895}{2021/01/30}{\pkg{changes}: Updated to v4.0.1.}
+% \changes{v0.900}{2021/06/14}{\pkg{changes}: Updated to v4.2.1.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{changes}[2021/02/14]
+\LWR@ProvidesPackagePass{changes}[2021/07/15]
% \end{macrocode}
%
% \cs{BaseJobname} is added to the label in case \pkg{xr} or \pkg{xr-hyper} are used.
@@ -48596,7 +48649,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
}}%
}{}%
@@ -48623,7 +48676,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
}}%
}{}%
@@ -48637,7 +48690,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}%
@@ -57669,6 +57722,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
% \pkg{froufrou} is patched for use by \pkg{lwarp}.
%
% \changes{v0.897}{2021/05/02}{\pkg{froufrou}: Added.}
+% \changes{v0.900}{2021/06/14}{\pkg{froufrou}: Updated to v1.4.0.}
%
% \codehtml
%
@@ -57684,17 +57738,35 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
{\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
+}
% \end{macrocode}
%
% \iffalse
@@ -63574,6 +63646,36 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
%
%
%
+% \iffalse
+%<*lipsum>
+% \fi
+%
+% \part{lwarp-lipsum.sty}
+%
+% \section{lipsum}
+%
+% \credits{Patrick Happel}
+%
+% \DescribePackage{lipsum}
+% \pkg{lipsum} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.900}{2021/06/15}{\pkg{lipsum}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{lipsum}[2021-03-03]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\SetLipsumParListItemEnd{\LWR@closeparagraph}
+% \end{macrocode}
+%
+% \iffalse
+%</lipsum>
+% \fi
+%
+%
%
% \iffalse
%<*listings>
diff --git a/macros/latex/contrib/lwarp/lwarp.ins b/macros/latex/contrib/lwarp/lwarp.ins
index 498f83ae47..143e4ba4f1 100644
--- a/macros/latex/contrib/lwarp/lwarp.ins
+++ b/macros/latex/contrib/lwarp/lwarp.ins
@@ -281,6 +281,7 @@ version 2005/12/01 or later.
\file{lwarp-libertinust1math.sty}{\from{lwarp.dtx}{libertinust1math}}
\file{lwarp-lineno.sty}{\from{lwarp.dtx}{lineno}}
\file{lwarp-lips.sty}{\from{lwarp.dtx}{lips}}
+\file{lwarp-lipsum.sty}{\from{lwarp.dtx}{lipsum}}
\file{lwarp-listings.sty}{\from{lwarp.dtx}{listings}}
\file{lwarp-listliketab.sty}{\from{lwarp.dtx}{listliketab}}
\file{lwarp-lltjext.sty}{\from{lwarp.dtx}{lltjext}}
diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf
index 387f0601f7..aafbad9edd 100644
--- a/macros/latex/contrib/lwarp/lwarp.pdf
+++ b/macros/latex/contrib/lwarp/lwarp.pdf
Binary files differ
diff --git a/macros/latex/contrib/lwarp/lwarpmk.lua b/macros/latex/contrib/lwarp/lwarpmk.lua
index cb684409a3..6206329a3b 100755
--- a/macros/latex/contrib/lwarp/lwarpmk.lua
+++ b/macros/latex/contrib/lwarp/lwarpmk.lua
@@ -2,7 +2,7 @@
-- Copyright 2016-2021 Brian Dunn
-printversion = "v0.899"
+printversion = "v0.900"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -92,7 +92,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