lwarp (6feb24)

git-svn-id: svn://tug.org/texlive/trunk@69724 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 85 insertions, 31 deletions

diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
index 8e98a7fa638..cb4719b4503 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
@@ -42,7 +42,9 @@
     \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}%
     \renewcommand*{\LWR@printopenlist}{%
         \LWR@findhangingleftmargin%
-        ul style=\textquotedbl%
+        ul % space
+        class=\textquotedbl{}hanging\textquotedbl{} % space
+        style=\textquotedbl%
             \LWR@print@mbox{list-style-type:none;} % extra space
             \LWR@print@mbox{%
                 margin-left:\LWR@printlength{\LWR@templengthone}%
@@ -70,7 +72,8 @@
         \LWR@findhangingleftmargin%
         \LWR@print@mbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; %
         \LWR@print@mbox{text-indent:-\LWR@printlength{\hangingindent}}%
-    ]{labeledpar}#2%
+    ]{labeledpar}%
+    \InlineClass{labeledparlabel}{#2}%
 }
 {\endBlockClass}
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty
index d5b40a6ca34..e3ad1274155 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty
@@ -163,7 +163,7 @@
     \LWR@subcustomizedmathjax{%
         \newenvironment{#1}{\begin{gathered}}{\end{gathered}}%
     }%
-    \appto\LWR@customizedMathJax{\LWRbackslash)}%
+    \appto\LWR@customizedMathJax{\LWRbackslash)\LWR@orignewline}%
 }
 \@onlypreamble\newgathered
 
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 64ef1c5f3c5..629acc2d0e3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
@@ -926,12 +926,12 @@
 \renewenvironment{qframe}{\framed}{\endframed}
 \renewenvironment{qshade}{\shaded}{\endshaded}
 \renewcommand*{\setverbatimfont}[1]{}
-\renewcommand*{\tabson}[1]{}
-\renewcommand*{\tabsoff}{}
-\renewcommand*{\wrappingon}{}
-\renewcommand*{\wrappingoff}{}
-\renewcommand*{\verbatimindent}{}
-\renewcommand*{\verbatimbreakchar}[1]{}
+\renewcommand*{\tabson}[1]{}% disabled as of 3.8.2
+\renewcommand*{\tabsoff}{}% disabled as of 3.8.2
+\renewcommand*{\wrappingon}{}% disabled as of 3.8.2
+\renewcommand*{\wrappingoff}{}% disabled as of 3.8.2
+\renewcommand*{\verbatimindent}{}% no longer used as of 3.8.2
+\renewcommand*{\verbatimbreakchar}[1]{}% no longer used as of 3.8.2
 \DefineVerbatimEnvironment{fboxverbatim}{Verbatim}{frame=single}
 \renewcommand*{\bvbox}{}
 \renewcommand*{\bvtopandtail}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
index 4f24da38acf..beaa91264de 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.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{pdfpages}[2022-10-09]
+\LWR@ProvidesPackagePass{pdfpages}[2024-01-21]
 \define@key{pdfpages}{fitpaper}[false]{}
 \define@key{pdfpages}{landscape}[false]{}
 \define@key{pdfpages}{openright}[false]{}
@@ -62,16 +62,16 @@
     \global\let\ESO@HookIIBG\@empty%
 }
 }
-\VerifyCommand[lwarp][pdfpages]{\AM@output@i}{642914BBA600927BFEC7D27A97A4A59D}
+\VerifyCommand[lwarp][pdfpages]{\AM@output@i}{A962EC58215FABF2447E4ADEEDC3D3D5}
 
 \xpatchcmd{\AM@output@i}
-    {\newpage}
+    {\clearpage}%
     {\LWR@esopic@newpage}
     {}
     {\LWR@patcherror{pdfpages}{AM@output-1}}
 
 \xpatchcmd{\AM@output@i}
-    {\newpage}
+    {\clearpage}%
     {\LWR@esopic@newpage}
     {}
     {\LWR@patcherror{pdfpages}{AM@output-2}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 3498edfac7a..a16a5e017bc 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}
-    [2024/01/11 v0.914  Allows LaTeX to directly produce HTML5 output.]
+    [2024/02/05 v0.915  Allows LaTeX to directly produce HTML5 output.]
 
 
 
@@ -4885,7 +4885,7 @@ MathJax = {
 
 -- Copyright 2016-2024 Brian Dunn
 
-printversion = "v0.914"
+printversion = "v0.915"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -6497,7 +6497,7 @@ end -- not --version
         \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}%
             {\LWR@spanwarnformat{minipage or \protect\parbox}}%
             {}%
-        \RenewDocumentEnvironment{BlockClass}{o m}%
+        \RenewDocumentEnvironment{BlockClass}{o D(){} m}%
             {\LWR@spanwarnformat{multi-paragraph object}}%
             {}%
         \RenewDocumentEnvironment{LWR@BlockClassWP}{m m D(){} m}%
@@ -6623,7 +6623,9 @@ end -- not --version
     \LWR@stoppars%
     \LWR@htmltag{/#1}%
     \ifbool{HTMLDebugComments}{%
-        \LWR@htmlcomment{End of #1 ``#2''}%
+        \ifblank{#2}%
+            {\LWR@htmlcomment{End of #1}}%
+            {\LWR@htmlcomment{End of #1 ``#2''}}%
     }{}%
     \LWR@startpars%
 }
@@ -6943,6 +6945,7 @@ end -- not --version
 \newcommand{\LWR@firstpagebottom}{} % for the home page alone
 \newcommand{\LWR@pagetop}{} % for all other pages
 \newcommand{\LWR@pagebottom}{}
+\newcommand{\LWR@HTMLmeta}{}
 \newcommand{\HTMLFirstPageTop}[1]{%
     \renewcommand{\LWR@firstpagetop}{#1}%
 }
@@ -6956,6 +6959,24 @@ end -- not --version
     \renewcommand{\LWR@pagebottom}{#1}%
 }
 
+\newcommand{\HTMLMeta}[2]{%
+    \renewcommand{\LWR@HTMLmeta}{%
+        \LWR@htmltag{%
+            meta name=\LWR@orig@textquotedbl{}#1\LWR@orig@textquotedbl\ % space
+            content=\LWR@orig@textquotedbl{}#2\LWR@orig@textquotedbl\ /%
+        }\LWR@orignewline%
+    }{}{}%
+}
+
+\newcommand{\HTMLAddMeta}[2]{%
+    \apptocmd{\LWR@HTMLmeta}{%
+        \LWR@htmltag{%
+            meta name=\LWR@orig@textquotedbl{}#1\LWR@orig@textquotedbl\ % space
+            content=\LWR@orig@textquotedbl{}#2\LWR@orig@textquotedbl\ /%
+        }\LWR@orignewline%
+    }{}{}%
+}
+
 \end{warpall}
 
 
@@ -7019,6 +7040,12 @@ end -- not --version
 \renewcommand{\LWR@currentHTMLDescription}{#1}
 }
 
+\newcommand{\LWR@currentHTMLKeywords}{}
+
+\newcommand{\HTMLKeywords}[1]{%
+\renewcommand{\LWR@currentHTMLKeywords}{#1}
+}
+
 \end{warpall}
 
 \begin{warpall}
@@ -7621,14 +7648,13 @@ end -- not --version
 \ifbool{mathjax}{
 \LWR@stoppars
 \LWR@htmlcomment{MathJax customizations:}
-
-\begin{BlockClass}{hidden}
+\LWR@htmlelementclass{div data-nosnippet}[display:none]{}
 \LWR@stoppars
 {
     \LWR@print@ttfamily
     \LWR@customizedMathJax
 }
-\end{BlockClass}
+\LWR@htmlelementclassend{div}{}
 }{}
 }
 
@@ -8187,11 +8213,18 @@ end -- not --version
         content=\LWR@orig@textquotedbl\LWR@currentHTMLDescription\LWR@orig@textquotedbl\ /%
     }\LWR@orignewline
 }%
+\ifdefempty{\LWR@currentHTMLKeywords}{}{%
+    \LWR@htmltag{%
+        meta name=\LWR@orig@textquotedbl{}keywords\LWR@orig@textquotedbl\ % space
+        content=\LWR@orig@textquotedbl\LWR@currentHTMLKeywords\LWR@orig@textquotedbl\ /%
+    }\LWR@orignewline
+}%
 \LWR@htmltag{%
     meta % space
     name=\LWR@orig@textquotedbl{}viewport\LWR@orig@textquotedbl\ % space
     content=\LWR@orig@textquotedbl{}width=device-width, initial-scale=1.0\LWR@orig@textquotedbl\ /%
 }\LWR@orignewline
+\LWR@HTMLmeta
 \ifthenelse{\equal{\theHTMLTitle}{}}%
     {}%
     {%
@@ -8901,7 +8934,9 @@ end -- not --version
 \newcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
 
 \newcommand*{\LWR@printopenlist}{%
-    ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}%
+    ul % space
+    class=\textquotedbl{}list\textquotedbl{} % space
+    style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}%
 }
 
 \AtBeginDocument{
@@ -8913,6 +8948,7 @@ end -- not --version
 \def\@donoparitem{%
   \@noparitemfalse
 }
+\newcommand*{\LWR@makelabeltag}{}
 \def\LWR@HTML@item[#1]{%
 \LWR@traceinfo{@item}%
   \if@noparitem
@@ -8937,7 +8973,19 @@ end -- not --version
       \refstepcounter\@listctr
     \fi
   \fi
-    \makelabel{#1} % extra space
+    \ifboolexpr{
+        test {\ifblank{#1}} or
+        (
+            test {\ifstrequal{#1}{\@itemlabel}} and
+            test {\ifdefempty{\@itemlabel}}
+        )
+    }%
+        {}%
+        {%
+            \ifdefempty{\LWR@makelabeltag}{}{\LWR@htmltag{\LWR@makelabeltag}}%
+            \InlineClass{listmarker}{\makelabel{#1}}%
+            \ifdefempty{\LWR@makelabeltag}{}{\LWR@htmltag{/\LWR@makelabeltag}} % extra space
+        }%
   \ignorespaces%
 }
 
@@ -9001,7 +9049,9 @@ end -- not --version
 \newcommand*{\LWR@itemizestart}{%
     \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}%
     \renewcommand*{\LWR@printopenlist}{%
-        ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}%
+        ul % space
+        class=\textquotedbl{}itemize\textquotedbl{} % space
+        style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}%
     }%
     \LetLtxMacro\item\LWR@itemizeitem%
     \LWR@nulllistfills%
@@ -9012,7 +9062,9 @@ end -- not --version
 \newcommand*{\LWR@enumeratestart}{%
     \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}%
     \renewcommand*{\LWR@printopenlist}{%
-        ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}%
+        ul % space
+        class=\textquotedbl{}enumerate\textquotedbl{} % space
+        style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}%
     }%
     \LetLtxMacro\item\LWR@itemizeitem%
     \LWR@nulllistfills%
@@ -9024,15 +9076,11 @@ end -- not --version
     \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}%
-    }
+    \renewcommand*{\LWR@makelabeltag}{dt}%
     \RenewDocumentCommand{\hspace}{s m}{}%
     \LWR@origitem[#1]%
     \endgroup%
+    \leavevmode%
     \LWR@orignewline%
     \LWR@htmltag{dd}%
     \LWR@startpars%
@@ -9040,7 +9088,10 @@ end -- not --version
 
 \newcommand*{\LWR@descriptionstart}{%
     \renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription}
-    \renewcommand*{\LWR@printopenlist}{dl}
+    \renewcommand*{\LWR@printopenlist}{%
+        dl % space
+        class=\textquotedbl{}description\textquotedbl{} % space
+    }
     \LetLtxMacro\item\LWR@descitem%
     \LWR@nulllistfills%
 }