From 64e26532c685fd24d6983508c6239e3c268b810b Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 29 Aug 2023 03:00:56 +0000 Subject: CTAN sync 202308290300 --- macros/latex/contrib/lwarp/README.txt | 2 +- macros/latex/contrib/lwarp/lwarp.dtx | 304 ++++++++++++++++++++------------- macros/latex/contrib/lwarp/lwarp.pdf | Bin 3399651 -> 3405893 bytes macros/latex/contrib/lwarp/lwarpmk.lua | 4 +- 4 files changed, 185 insertions(+), 125 deletions(-) (limited to 'macros/latex/contrib/lwarp') diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt index 92fff483cc..3918deb3e5 100644 --- a/macros/latex/contrib/lwarp/README.txt +++ b/macros/latex/contrib/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.911 README.txt +LaTeX lwarp package v0.912 README.txt Files included are: diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx index 4865f5567e..d7f79fc3cf 100644 --- a/macros/latex/contrib/lwarp/lwarp.dtx +++ b/macros/latex/contrib/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{lwarp} -% [2023/02/28 v0.911 Allows LaTeX to directly produce HTML5 output.] +% [2023/08/28 v0.912 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -3423,6 +3423,7 @@ This boolean may be tested by the user for later use. % \changes{v0.909}{2022/11/22}{\ 2022/11/22} % \changes{v0.910}{2023/01/03}{\ 2023/01/03} % \changes{v0.911}{2023/02/28}{\ 2023/02/28} +% \changes{v0.912}{2023/08/28}{\ 2023/08/28} @@ -3656,6 +3657,13 @@ This boolean may be tested by the user for later use. % see the end of the Change History on page \pageref{sec:changesend}. % % \begin{description} +% \item[v0.912:] Updated for new \LaTeX\ label system. +% \begin{itemize} +% \item Fixed for updated kernel label system, name and back references. +% \item Updated \pkg{memoir}, \pkg{tcolorbox}. +% \item \pkg{nameref}: Now allowed to load before \pkg{lwarp}, such as by \pkg{memoir}. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.911:] Updated \pkg{mismath}, \pkg{tcolorbox}. % \needspace{2\baselineskip} % \item[v0.910:] Updated \pkg{fvextra}, \pkg{minted}. @@ -13906,7 +13914,6 @@ This boolean may be tested by the user for later use. \LWR@loadafter{musicography} \LWR@loadafter{mwe} \LWR@loadafter{nameauth} -\LWR@loadafter{nameref} \LWR@loadafter{natbib} \LWR@notmemoirloadafter{nccfancyhdr} \LWR@loadafter{nccfoots} @@ -14569,6 +14576,18 @@ This boolean may be tested by the user for later use. % \end{macro} % % +% \begin{macro}{\LWR@edeffirstoffive} \marg{first} \marg{second} \marg{third} \marg{fourth} \marg{fifth} +% \cs{edef}s to the first of five arguments. +% Used for back referencing. +% \changes{v0.912}{2023/08/24}{Added.} +% \begin{macrocode} +\long\def\LWR@edeffirstoffive#1#2#3#4#5{% + \edef\@tempa{#1}% +}% +% \end{macrocode} +% \end{macro} + + % \subsection{Inside boxes} % % Greater than zero if currently inside a \TeX\ box, @@ -21118,10 +21137,10 @@ MathJax = { \begin{filecontents*}[overwrite]{lwarpmk.lua} #!/usr/bin/env texlua --- Copyright 2016-2022 Brian Dunn +-- Copyright 2016-2023 Brian Dunn -printversion = "v0.911" +printversion = "v0.912" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -23687,9 +23706,10 @@ end -- not --version % % \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.} % \changes{v0.896}{2021/03/05}{Added \ARIA\ role.} +% \changes{v0.912}{2023/08/27}{Fixed with tracing on.} % \begin{macrocode} \NewDocumentCommand{\LWR@htmlspanclass}{o D(){} m +m}{% - \LWR@traceinfo{LWR@htmlspanclass |#1|#2|#3|}% + \LWR@traceinfo{LWR@htmlspanclass #3}% \LWR@ensuredoingapar% \ifblank{#2}% {\LWR@subhtmlelementclass{span}[#1]{#3}}% @@ -23697,8 +23717,8 @@ end -- not --version \begin{LWR@nestspan}% #4% \LWR@htmltagc{/span}% - \LWR@traceinfo{LWR@htmlspanclass done}% \end{LWR@nestspan}% + \LWR@traceinfo{LWR@htmlspanclass done}% } % \end{macrocode} % \end{macro} @@ -23805,10 +23825,11 @@ end -- not --version % \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.} % \changes{v0.892}{2020/10/03}{Ignore empty class.} % \changes{v0.896}{2021/03/05}{Added \ARIA\ role.} +% \changes{v0.912}{2023/08/27}{Fixed with tracing on.} % % \begin{macrocode} \NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} D(){} m}{% - \LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!#4!}% + \LWR@traceinfo{LWR@subhtmlelementclass !#1!#4!}% \ifblank{#2}% {% empty style \LWR@htmltag{% @@ -24314,7 +24335,8 @@ end -- not --version % \end{macrocode} % % The opening paragraph tag. -% Do not create tag if doing \pkg{algorithm2e} handling instead: +% Do not create tag if doing \pkg{algorithm2e} handling +% or inside a \cs{multirow}. % \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.} % \changes{v0.903}{2021/12/17}{Par handling.} % \begin{macrocode} @@ -27831,19 +27853,7 @@ end -- not --version }\LWR@orignewline % \end{macrocode} % -% IE patch: -% \changes{v0.63}{2018/11/30}{Fix: Break ligature for \pkg{luatexko}.} -% \begin{macrocode} -\LWR@htmltag{!-\/-[if lt IE 9]}\LWR@orignewline -\LWR@htmltag{% - script % space - src=\LWR@orig@textquotedbl{}% - http://html5shiv.googlecode.com/svn/trunk/html5.js% - \LWR@orig@textquotedbl% -}% -\LWR@htmltag{/script}\LWR@orignewline -\LWR@htmltag{![endif]-\/-}\LWR@orignewline -% \end{macrocode} +% \changes{v0.912}{2023/08/28}{Removed IE 9 shim patch.} % % The page's title, if there is one. % A section name is also added if given. @@ -30099,6 +30109,7 @@ end -- not --version % \section{Tabular} +% ^^A *tabular % % This is arguably the most complicated part of the entire package. % Numerous tricks are employed to handle the syntax of the \LaTeX\ core @@ -32085,16 +32096,17 @@ end -- not --version \LWR@maybenewtablerow% % \end{macrocode} % -% Don't start a new paragraph tag if have already started one: +% Don't start a new paragraph tag if have already started one, +% or have found the end of the tabular, +% or if are inside a \cs{multirow}: +% \changes{v0.912}{2023/08/28}{Fixed \cs{multirow} par handling.} % \begin{macrocode} - \ifbool{LWR@intabularmetadata}% - {% -% \end{macrocode} -% -% If have found the end of tabular command, do not create the next data cell: -% \begin{macrocode} - \ifbool{LWR@exitingtabular}{}% - {% not exiting tabular + \ifboolexpr{ + bool{LWR@intabularmetadata} + and not bool{LWR@exitingtabular} + and not bool {LWR@in@multirow@par} + }% + {% making a tabular data cell % \end{macrocode} % % Print the |@| and |!| contents before first column: @@ -32197,8 +32209,8 @@ end -- not --version \LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tableLaTeXcolindex}}% }% \boolfalse{LWR@intabularmetadata}% - }% not exiting tabular - }{}% in tabular metadata + }% making a tabular data cell + {}% not making a tabular data cell \LWR@traceinfo{LWR@tabledatasinglecolumntag: done}% }% % \end{macrocode} @@ -34525,19 +34537,19 @@ end -- not --version % \item [\cs{refstepcounter}:] Steps the couunter and sets \cs{@currentlabel}. % \item [\cs{@currentlabel}:] \cs{p@}\cs{the} Updated by \cs{refstepcounter}. % \item [\cs{label}:] Writes to the |.aux| file: -% \qquad |\newlabel{