texlive[69724] trunk: lwarp (6feb24)
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 6 21:34:02 CET 2024
Revision: 69724
https://tug.org/svn/texlive?view=revision&revision=69724
Author: karl
Date: 2024-02-06 21:34:02 +0100 (Tue, 06 Feb 2024)
Log Message:
-----------
lwarp (6feb24)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2024-02-06 20:33:34 UTC (rev 69723)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2024-02-06 20:34:02 UTC (rev 69724)
@@ -2,7 +2,7 @@
-- Copyright 2016-2024 Brian Dunn
-printversion = "v0.914"
+printversion = "v0.915"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2024-02-06 20:33:34 UTC (rev 69723)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2024-02-06 20:34:02 UTC (rev 69724)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.914 README.txt
+LaTeX lwarp package v0.915 README.txt
Files included are:
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2024-02-06 20:33:34 UTC (rev 69723)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2024-02-06 20:34:02 UTC (rev 69724)
@@ -2,7 +2,7 @@
-- Copyright 2016-2024 Brian Dunn
-printversion = "v0.914"
+printversion = "v0.915"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2024-02-06 20:33:34 UTC (rev 69723)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2024-02-06 20:34:02 UTC (rev 69724)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2024/01/11 v0.914 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2024/02/05 v0.915 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -274,10 +274,10 @@
\newcommand{\credits}[1]{{\footnotesize(\textit{Emulates or patches code by} \textsc{#1}.)}}
-\newcommand*{\codehtml}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{for HTML output:~}}}\vspace{-5.25ex}}
-\newcommand*{\codeprint}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{for PRINT output:~}}}\vspace{-5.25ex}}
-\newcommand*{\codeall}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{for HTML \& PRINT:~}}}\vspace{-5.25ex}}
-\newcommand*{\codeconfig}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{Config file:~}}}\vspace{-5.25ex}}
+\newcommand*{\codehtml}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{for HTML output:\quad}}}\vspace{-5.25ex}}
+\newcommand*{\codeprint}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{for PRINT output:\quad}}}\vspace{-5.25ex}}
+\newcommand*{\codeall}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{for HTML \& PRINT:\quad}}}\vspace{-5.25ex}}
+\newcommand*{\codeconfig}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{Config file:\quad}}}\vspace{-5.25ex}}
\newcommand*{\testthis}{\textcolor{blue}{Please send bug reports!}\watchout[Not fully tested!]}
@@ -3430,6 +3430,7 @@
% \changes{v0.912}{2023/08/28}{\ 2023/08/28}
% \changes{v0.913}{2024/01/05}{\ 2024/01/05}
% \changes{v0.914}{2024/01/11}{\ 2024/01/11}
+% \changes{v0.915}{2024/02/05}{\ 2024/02/05}
@@ -3667,6 +3668,17 @@
% see the end of the Change History on page \pageref{sec:changesend}.
%
% \begin{description}
+% \item[v0.915:] \HTML\ list classes, meta tags.
+% \begin{itemize}
+% \item \LaTeX\ lists now given the class \attribute{itemize},
+% \attribute{enumerate}, \attribute{description}, \attribute{hanging}.
+% \item \LaTeX\ list labels now given the class \attribute{listmarker}.
+% \item Added \cs{HTMLKeywords} for the keywords meta tag.
+% \item Added \cs{HTMLMeta} and \cs{HTMLAddMeta} for custom \attribute{meta} tags.
+% \item Added \attribute{data-nosnippet} to \MathJax\ customization \element{div}s.
+% \item Updated \pkg{pdfpages} to v0.5y.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.914:] Detects changing packages.
% \begin{itemize}
% \item Now verifies many definitions before patching,
@@ -8546,7 +8558,10 @@
% \cs{HTMLTitleAfterSection} & PS & Set subpage \element{title}s to \newline
% \fqquad \attribute{sectioname - \cs{HTMLTitle}}\\
% \cs{HTMLAuthor} & PS & The \HTML\ \attribute{author} meta tag, overriding \cs{author}. \\
-% \cs{HTMLDescription} & PS & The \HTML\ \attribute{description} meta tag. \\
+% \cs{HTMLDescription} & PS & The \HTML\ \attribute{meta} \attribute{description} tag. \\
+% \cs{HTMLKeywords} & PS & The \HTML\ \attribute{meta} \attribute{keywords} tag. \\
+% \cs{HTMLMeta} & PS & Clear and set the custom \attribute{meta} tag. \\
+% \cs{HTMLAddMeta} & PS & Add another \attribute{meta} tag. \\
% \midrule
% \cs{HTMLFirstPageTop} & P & Heading for the home page. \\
% \cs{HTMLFirstPageBottom} & P & Footer for the home page. \\
@@ -8824,7 +8839,6 @@
% \}
% \end{sourcedisplay}
%
-%
% \ItemDescribeMacro{\HTMLAuthor} \marg{author} \DescribeDefault{\cs{theauthor}} \quad
% The \HTML\ header's meta author.
% Defaults to \cs{theauthor},
@@ -8840,6 +8854,22 @@
% the following files. May be changed before each sectioning command which would
% cause a file split.
%
+% \ItemDescribeMacro{\HTMLKeywords} \marg{keywords} \DescribeDefault{<empty>} \quad
+% Sets the \HTML\ \attribute{keywords} tag for
+% the following files. May be changed before each sectioning command which would
+% cause a file split.
+%
+% \ItemDescribeMacro{\HTMLMeta} \marg{name} \marg{contents} \DescribeDefault{<empty>} \quad
+% Clears then sets a new user-definable custom \attribute{meta} tag
+% used for the following pages.
+% Replaces any prior custom \attribute{meta} tags previously set by \cs{HTMLMeta}
+% and \cs{HTMLAddMeta}.
+%
+% \ItemDescribeMacro{\HTMLAddMeta} \marg{name} \marg{contents} \DescribeDefault{<empty>} \quad
+% Add to the user-definable custom \attribute{meta} tags for the following pages.
+% May be used more than once to add multiple tags.
+% Use \cs{HTMLMeta} to empty and start over with a new tag.
+%
% \ItemDescribeMacro{\HTMLPageTop} \marg{contents} \DescribeDefault{<empty>} \quad
% A user-definable custom action applied to
% the top of pages other than the home page. Useful for logos, etc.
@@ -9315,10 +9345,10 @@
% \DescribeDefault{(none)}
%
% Each page of \HTML\ output should have its own \HTML\ meta description,
-% which usually shows up in web search results,
+% which usually shows up in web search results.
% \margintag{limitations}
-% is limited to around
-% 150 characters in length, and should not include the \acro{ASCII} double quote character (").
+% Usually limited to around 150 characters in length,
+% and should not include the \acro{ASCII} double quote character (").
%
% Use \cs{HTMLDescription}
% \margintag{placement}
@@ -9338,6 +9368,26 @@
% \end{sourcedisplay}
%
%
+% \subsection{\HTML\ page meta keywords}
+%
+% \label{sec:htmlkeywords}
+% \gindex{HTML>meta tag>keywords}
+% \gindex{keywords>HTML meta tag}
+% \gindex{meta tag, HTML>keywords}
+% \DescribeMacro{\HTMLKeywords} \marg{Keywords for the web page.}
+% \DescribeDefault{(none)}
+%
+% \cs{HTMLKeywords} behaves like \cs{HTMLDescription}, but adds \HTML\ meta keywords
+% for the following web pages.
+%
+% To disable the generation of \HTML\ keyword meta tags,
+% \margintag{disabling}
+% use:
+% \begin{sourcedisplay}
+% \fqquad \cs{HTMLKeywords}\{\}
+% \end{sourcedisplay}
+%
+%
% \subsection{\HTML\ homepage meta title}
%
% \gindex{HTML>meta tag>title}
@@ -21249,7 +21299,7 @@
-- Copyright 2016-2024 Brian Dunn
-printversion = "v0.914"
+printversion = "v0.915"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -23756,11 +23806,12 @@
% Nullify several objects inside the span:
% ^^A {\LWR at subhtmlelementclass{span}{inlineminipage}}%
% ^^A {\LWR at htmltagc{/span}}%
+% \changes{v0.915}{2024/01/30}{Fix: \env{BlockClass} optional arg.}
% \begin{macrocode}
\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}%
{\LWR at spanwarnformat{minipage or \protect\parbox}}%
{}%
- \RenewDocumentEnvironment{BlockClass}{o m}%
+ \RenewDocumentEnvironment{BlockClass}{o D(){} m}%
{\LWR at spanwarnformat{multi-paragraph object}}%
{}%
\RenewDocumentEnvironment{LWR at BlockClassWP}{m m D(){} m}%
@@ -23961,7 +24012,7 @@
% \end{macro}
-% \begin{macro}{\LWR at htmlelementclass} \marg{element} \oarg{style} \marg{class}
+% \begin{macro}{\LWR at htmlelementclass} \marg{element} \oarg{style} \parg{\ARIA\ role} \marg{class}
%
% \changes{v0.20}{2017/01/17}{Added optional style.}
% \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.}
@@ -23981,12 +24032,15 @@
% \begin{macro}{\LWR at htmlelementclassend} \marg{element} \marg{class}
+% \changes{v0.915}{2024/02/05}{Fix for empty class.}
% \begin{macrocode}
\newcommand*{\LWR at htmlelementclassend}[2]{%
\LWR at stoppars%
\LWR at htmltag{/#1}%
\ifbool{HTMLDebugComments}{%
- \LWR at htmlcomment{End of #1 ``#2''}%
+ \ifblank{#2}%
+ {\LWR at htmlcomment{End of #1}}%
+ {\LWR at htmlcomment{End of #1 ``#2''}}%
}{}%
\LWR at startpars%
}
@@ -24817,6 +24871,10 @@
\newcommand{\LWR at pagetop}{} % for all other pages
\newcommand{\LWR at pagebottom}{}
% \end{macrocode}
+% \changes{v0.915}{2024/01/28}{Added \cs{HTMLMeta}, \cs{HTMLAddMeta}.}
+% \begin{macrocode}
+\newcommand{\LWR at HTMLmeta}{}
+% \end{macrocode}
%
%
% \begin{macro}{\HTMLFirstPageTop} \marg{text and logos}
@@ -24869,7 +24927,43 @@
% \end{macrocode}
% \end{macro}
+
+% \begin{macro}{\HTMLMeta} \marg{name} \marg{content}
+%
+% Sets a custom \attribute{meta} tag for the following pages.
+%
+% \changes{v0.915}{2024/01/28}{Added.}
% \begin{macrocode}
+\newcommand{\HTMLMeta}[2]{%
+ \renewcommand{\LWR at HTMLmeta}{%
+ \LWR at htmltag{%
+ meta name=\LWR at orig@textquotedbl{}#1\LWR at orig@textquotedbl\ % space
+ content=\LWR at orig@textquotedbl{}#2\LWR at orig@textquotedbl\ /%
+ }\LWR at orignewline%
+ }{}{}%
+}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\HTMLAddMeta} \marg{name} \marg{content}
+%
+% Adds to the custom \attribute{meta} tags for the following pages.
+%
+% \changes{v0.915}{2024/01/28}{Added.}
+% \begin{macrocode}
+\newcommand{\HTMLAddMeta}[2]{%
+ \apptocmd{\LWR at HTMLmeta}{%
+ \LWR at htmltag{%
+ meta name=\LWR at orig@textquotedbl{}#1\LWR at orig@textquotedbl\ % space
+ content=\LWR at orig@textquotedbl{}#2\LWR at orig@textquotedbl\ /%
+ }\LWR at orignewline%
+ }{}{}%
+}
+% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macrocode}
\end{warpall}
% \end{macrocode}
@@ -25044,8 +25138,8 @@
% This is placed inside an \HTML\ meta tag at the start of each file.
-% This may be changed mid-document using \cs{HTMLDescription},
-% allowing different \HTML\ descriptions to be used
+% This may be changed mid-document using \cs{HTMLAuthor},
+% allowing different \HTML\ authors to be used
% for different sections of the document.
%
% Do not use double quotes, and do not exceed 150 characters.
@@ -25052,6 +25146,7 @@
% \trouble[HTML author]{HTMLAuthor=\cs{HTMLAuthor}}
% \trouble{HTML>author}
+
% \begin{macro}{\HTMLDescription} \marg{New \HTML\ meta description.} \qquad
% Assigns the \HTML\ file's description meta tag.
%
@@ -25068,13 +25163,31 @@
\newcommand{\HTMLDescription}[1]{%
\renewcommand{\LWR at currentHTMLDescription}{#1}
}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\HTMLKeywords} \marg{New \HTML\ meta keywords.} \qquad
+% Assigns the \HTML\ file's keywords meta tag.
+%
+% \gindex{HTML>meta tag>keywords}
+% \gindex{keywords>HTML meta tag}
+% \gindex{meta tag, HTML>keywords}
+%
+% \changes{v0.915}{2024/02/04}{Added.}
+%
+% \begin{macrocode}
+\newcommand{\LWR at currentHTMLKeywords}{}
+
+\newcommand{\HTMLKeywords}[1]{%
+\renewcommand{\LWR at currentHTMLKeywords}{#1}
+}
+
\end{warpall}
% \end{macrocode}
% \end{macro}
-
% \section{Footnotes}
% \label{sec:footnotes}
%
@@ -26551,8 +26664,10 @@
% \begin{macrocode}
\LWR at stoppars
\LWR at htmlcomment{MathJax customizations:}
-
-\begin{BlockClass}{hidden}
+% \end{macrocode}
+% \changes{v0.915}{2024/02/04}{Added \texttt{data-nosnippet} to \MathJax\ customization \element{div}.}
+% \begin{macrocode}
+\LWR at htmlelementclass{div data-nosnippet}[display:none]{}
\LWR at stoppars
% \end{macrocode}
%
@@ -26563,7 +26678,7 @@
\LWR at print@ttfamily
\LWR at customizedMathJax
}
-\end{BlockClass}
+\LWR at htmlelementclassend{div}{}
}{}
}
% \end{macrocode}
@@ -28036,6 +28151,7 @@
content=\LWR at orig@textquotedbl{}LaTeX Lwarp package\LWR at orig@textquotedbl\ /%
}\LWR at orignewline%
% \end{macrocode}
+%
% If there is a description, add it now:
% \begin{macrocode}
\ifdefempty{\LWR at currentHTMLDescription}{}{%
@@ -28046,6 +28162,17 @@
}%
% \end{macrocode}
%
+% If there are keywords, add it now:
+% \changes{v0.915}{2024/02/04}{Added \cs{HTMLKeywords}.}
+% \begin{macrocode}
+\ifdefempty{\LWR at currentHTMLKeywords}{}{%
+ \LWR at htmltag{%
+ meta name=\LWR at orig@textquotedbl{}keywords\LWR at orig@textquotedbl\ % space
+ content=\LWR at orig@textquotedbl\LWR at currentHTMLKeywords\LWR at orig@textquotedbl\ /%
+ }\LWR at orignewline
+}%
+% \end{macrocode}
+%
% Mobile-friendly viewport:
% \gindex{HTML>meta tag>viewport}
% \gindex{viewport>HTML meta tag}
@@ -28060,6 +28187,13 @@
%
% \changes{v0.912}{2023/08/28}{Removed IE 9 shim patch.}
%
+% Custom \HTML\ \attribute{meta} tags:
+% \changes{v0.915}{2024/01/28}{Added \cs{HTMLMeta}, \cs{HTMLAddMeta}.}
+% \begin{macrocode}
+\LWR at HTMLmeta
+% \end{macrocode}
+%
+%
% The page's title, if there is one.
% A section name is also added if given.
% \changes{v0.44}{2017/11/18}{Add \cs{HTMLTitle}.}
@@ -29938,13 +30072,10 @@
%
%
%
-% \DescribeMacro{\makelabel}
-% \limitsmakelabel
+% \subsection{List environment}
%
% \changes{v0.34}{2017/07/27}{Lists refactored to remove \pkg{enumitem} requirement.}
%
-% \subsection{List environment}
-%
% \codehtml
% \begin{macrocode}
\begin{warpHTML}
@@ -29959,16 +30090,23 @@
% \end{macro}
% \begin{macro}{\LWR at printopenlist}
-% May be locally redefined by \env{enumerate} or \env{description}.
+% May be locally redefined by \env{itemize}, \env{enumerate}, \env{description},
+% or \env{hanginglist} from package \pkg{hang}.
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \changes{v0.895}{2021/01/14}{Improved \HTML\ quotes.}
+% \changes{v0.915}{2024/01/24}{Add \HTML\ class to lists.}
% \begin{macrocode}
\newcommand*{\LWR at printopenlist}{%
- ul style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
+ ul % space
+ class=\textquotedbl{}list\textquotedbl{} % space
+ style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
}
% \end{macrocode}
% \end{macro}
+% \DescribeMacro{\makelabel}
+% \limitsmakelabel
+%
% \begin{macro}{\@mklab}
% Removes \PDF\ spacing.
% \changes{v0.45}{2018/01/11}{Modified for \HTML.}
@@ -30004,6 +30142,13 @@
% \end{macro}
%
%
+% \begin{macro}{\LWR at makelabeltag} Used to add \element{dt} for descriptions.
+% Empty for other list types.
+% \changes{v0.915}{2024/01/24}{Add \HTML\ class to list markers.}
+% \begin{macrocode}
+\newcommand*{\LWR at makelabeltag}{}
+% \end{macrocode}
+% \end{macro}
%
%
% \begin{macro}{\@item}
@@ -30076,9 +30221,25 @@
\fi
\fi
% \end{macrocode}
+%
% \changes{v0.51}{2018/03/17}{Restored list label space.}
+% \changes{v0.915}{2024/01/24}{Add \HTML\ class to list markers.}
+%
+% If not empty, print the label with the class \attribute{listmarker}:
% \begin{macrocode}
- \makelabel{#1} % extra space
+ \ifboolexpr{
+ test {\ifblank{#1}} or
+ (
+ test {\ifstrequal{#1}{\@itemlabel}} and
+ test {\ifdefempty{\@itemlabel}}
+ )
+ }%
+ {}%
+ {%
+ \ifdefempty{\LWR at makelabeltag}{}{\LWR at htmltag{\LWR at makelabeltag}}%
+ \InlineClass{listmarker}{\makelabel{#1}}%
+ \ifdefempty{\LWR at makelabeltag}{}{\LWR at htmltag{/\LWR at makelabeltag}} % extra space
+ }%
% \sbox\@tempboxa{\makelabel{#1}%
% \global\setbox\@labels\hbox{%
% \unhbox\@labels
@@ -30209,11 +30370,14 @@
% \begin{environment}{itemize} \oarg{options}
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \changes{v0.895}{2021/01/14}{Improved \HTML\ quotes.}
+% \changes{v0.915}{2024/01/24}{Add \HTML\ class to lists.}
% \begin{macrocode}
\newcommand*{\LWR at itemizestart}{%
\renewcommand*{\LWR at printcloselist}{\LWR at printcloseitemize}%
\renewcommand*{\LWR at printopenlist}{%
- ul style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
+ ul % space
+ class=\textquotedbl{}itemize\textquotedbl{} % space
+ style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
}%
\LetLtxMacro\item\LWR at itemizeitem%
\LWR at nulllistfills%
@@ -30230,11 +30394,14 @@
% \begin{environment}{enumerate} \oarg{options}
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \changes{v0.895}{2021/01/14}{Improved \HTML\ quotes.}
+% \changes{v0.915}{2024/01/24}{Add \HTML\ class to lists.}
% \begin{macrocode}
\newcommand*{\LWR at enumeratestart}{%
\renewcommand*{\LWR at printcloselist}{\LWR at printcloseitemize}%
\renewcommand*{\LWR at printopenlist}{%
- ul style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
+ ul % space
+ class=\textquotedbl{}enumerate\textquotedbl{} % space
+ style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
}%
\LetLtxMacro\item\LWR at itemizeitem%
\LWR at nulllistfills%
@@ -30256,17 +30423,20 @@
% 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.}
+% \changes{v0.915}{2024/01/24}{Add \HTML\ class to list markers.}
% \begin{macrocode}
\begingroup%
- \let\LWR at orig@desc at makelabel\makelabel
- \renewcommand*{\makelabel}[1]{%
- \LWR at htmltag{dt}%
- \LWR at orig@desc at makelabel{#1}%
- \LWR at htmltag{/dt}%
- }
+ \renewcommand*{\LWR at makelabeltag}{dt}%
\RenewDocumentCommand{\hspace}{s m}{}%
\LWR at origitem[#1]%
\endgroup%
+% \end{macrocode}
+% Allow \cs{item} without an argument:
+% \changes{v0.915}{2024/01/24}{Fix for \cs{item} without opt arg.}
+% \begin{macrocode}
+ \leavevmode%
+% \end{macrocode}
+% \begin{macrocode}
\LWR at orignewline%
\LWR at htmltag{dd}%
\LWR at startpars%
@@ -30279,10 +30449,14 @@
% Footnotes are modified to correctly parse optional arguments.
% \changes{v0.896}{2021/03/14}{Fix: Footnotes inside \env{description} label.}
% \changes{v0.902}{2021/09/24}{Improved footnotes.}
+% \changes{v0.915}{2024/01/24}{Add \HTML\ class to lists.}
% \begin{macrocode}
\newcommand*{\LWR at descriptionstart}{%
\renewcommand*{\LWR at printcloselist}{\LWR at printclosedescription}
- \renewcommand*{\LWR at printopenlist}{dl}
+ \renewcommand*{\LWR at printopenlist}{%
+ dl % space
+ class=\textquotedbl{}description\textquotedbl{} % space
+ }
\LetLtxMacro\item\LWR at descitem%
\LWR at nulllistfills%
}
@@ -50156,6 +50330,7 @@
% \marg{caption label} \marg{caption text}
% \begin{macrocode}
\IfPackageAtLeastTF{caption3}{2020/08/23}{
+%
\VerifyCommand[lwarp][caption3]{\caption@@@make}{F09A9BB05CE4EDF5A477D3CC2AE04F81}
%
\renewcommand\caption@@@make[2]{%
@@ -54866,7 +55041,7 @@
\@doi at linksubs#1\#\@@\@doi at code
\@onelevel at sanitize{\@doi at code}%
\def\@doi at text{}%
-\@doi at textsubs#1\@nil\@@\@doi at text
+\@doi at textsubs#1\@nil\@@\@doi at text%
\xpretocmd{\@doi at code}{http://dx.doi.org/}{}{}%
\expandafter\href\expandafter{\@doi at code}{\doitext{\@doi at text}}}
% \end{macrocode}
@@ -63563,12 +63738,18 @@
}
{\endBlockClass}
+% \end{macrocode}
+%
+% \changes{v0.915}{2024/01/24}{\pkg{hang}: Add \HTML\ class to lists.}
+% \begin{macrocode}
\newenvironment{hanginglist}
{%
\renewcommand*{\LWR at printcloselist}{\LWR at printcloseitemize}%
\renewcommand*{\LWR at printopenlist}{%
\LWR at findhangingleftmargin%
- ul style=\textquotedbl%
+ ul % space
+ class=\textquotedbl{}hanging\textquotedbl{} % space
+ style=\textquotedbl%
\LWR at print@mbox{list-style-type:none;} % extra space
\LWR at print@mbox{%
margin-left:\LWR at printlength{\LWR at templengthone}%
@@ -63596,7 +63777,8 @@
\LWR at findhangingleftmargin%
\LWR at print@mbox{margin-left:\LWR at printlength{\LWR at templengthone}} ; %
\LWR at print@mbox{text-indent:-\LWR at printlength{\hangingindent}}%
- ]{labeledpar}#2%
+ ]{labeledpar}%
+ \InlineClass{labeledparlabel}{#2}%
}
{\endBlockClass}
@@ -70395,6 +70577,7 @@
% \changes{v0.87}{2020/05/20}{\pkg{mathtools}: Improved \cs{underbraket}, \cs{overbracket}.}
% \changes{v0.891}{2020/09/19}{\pkg{mathtools}: Improved \cs{underbraket}, \cs{overbracket}.}
% \changes{v0.901}{2021/08/26}{\pkg{mathtools}: Uses \MathJax\ 3.2 package.}
+% \changes{v0.915}{2024/02/05}{\pkg{mathtools}: Added newline to \cs{newgathered} \MathJax\ customization.}
% \begin{macrocode}
\begin{warpMathJax}
\CustomizeMathJax{\require{mathtools}}
@@ -70535,7 +70718,7 @@
\LWR at subcustomizedmathjax{%
\newenvironment{#1}{\begin{gathered}}{\end{gathered}}%
}%
- \appto\LWR at customizedMathJax{\LWRbackslash)}%
+ \appto\LWR at customizedMathJax{\LWRbackslash)\LWR at orignewline}%
}
\@onlypreamble\newgathered
@@ -77288,7 +77471,7 @@
% \codehtml
%
% \begin{macrocode}
-\LWR at ProvidesPackagePass{pdfpages}[2022-10-09]
+\LWR at ProvidesPackagePass{pdfpages}[2024-01-21]
% \end{macrocode}
%
% Disable option which have no meaning for \HTML\ output:
@@ -77371,17 +77554,18 @@
% \begin{noindmacro}{\AM at output}
% Patched to use \cs{LWR at esopic@newpage}.
% \changes{v0.909}{2022/07/15}{\pkg{pdfpages}: Updated to v0.5w.}
+% \changes{v0.915}{2024/02/05}{\pkg{pdfpages}: Updated to v0.5y.}
% \begin{macrocode}
-\VerifyCommand[lwarp][pdfpages]{\AM at output@i}{642914BBA600927BFEC7D27A97A4A59D}
+\VerifyCommand[lwarp][pdfpages]{\AM at output@i}{A962EC58215FABF2447E4ADEEDC3D3D5}
\xpatchcmd{\AM at output@i}
- {\newpage}
+ {\clearpage}%
{\LWR at esopic@newpage}
{}
{\LWR at patcherror{pdfpages}{AM at output-1}}
\xpatchcmd{\AM at output@i}
- {\newpage}
+ {\clearpage}%
{\LWR at esopic@newpage}
{}
{\LWR at patcherror{pdfpages}{AM at output-2}}
@@ -96614,12 +96798,12 @@
%
% \begin{macrocode}
\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
% \end{macrocode}
%
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty 2024-02-06 20:33:34 UTC (rev 69723)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty 2024-02-06 20:34:02 UTC (rev 69724)
@@ -42,7 +42,9 @@
\renewcommand*{\LWR at printcloselist}{\LWR at printcloseitemize}%
\renewcommand*{\LWR at printopenlist}{%
\LWR at findhangingleftmargin%
- ul style=\textquotedbl%
+ ul % space
+ class=\textquotedbl{}hanging\textquotedbl{} % space
+ style=\textquotedbl%
\LWR at print@mbox{list-style-type:none;} % extra space
\LWR at print@mbox{%
margin-left:\LWR at printlength{\LWR at templengthone}%
@@ -70,7 +72,8 @@
\LWR at findhangingleftmargin%
\LWR at print@mbox{margin-left:\LWR at printlength{\LWR at templengthone}} ; %
\LWR at print@mbox{text-indent:-\LWR at printlength{\hangingindent}}%
- ]{labeledpar}#2%
+ ]{labeledpar}%
+ \InlineClass{labeledparlabel}{#2}%
}
{\endBlockClass}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty 2024-02-06 20:33:34 UTC (rev 69723)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty 2024-02-06 20:34:02 UTC (rev 69724)
@@ -163,7 +163,7 @@
\LWR at subcustomizedmathjax{%
\newenvironment{#1}{\begin{gathered}}{\end{gathered}}%
}%
- \appto\LWR at customizedMathJax{\LWRbackslash)}%
+ \appto\LWR at customizedMathJax{\LWRbackslash)\LWR at orignewline}%
}
\@onlypreamble\newgathered
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty 2024-02-06 20:33:34 UTC (rev 69723)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty 2024-02-06 20:34:02 UTC (rev 69724)
@@ -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}{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty 2024-02-06 20:33:34 UTC (rev 69723)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty 2024-02-06 20:34:02 UTC (rev 69724)
@@ -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 at ProvidesPackagePass{pdfpages}[2022-10-09]
+\LWR at ProvidesPackagePass{pdfpages}[2024-01-21]
\define at key{pdfpages}{fitpaper}[false]{}
\define at key{pdfpages}{landscape}[false]{}
\define at key{pdfpages}{openright}[false]{}
@@ -62,16 +62,16 @@
\global\let\ESO at HookIIBG\@empty%
}
}
-\VerifyCommand[lwarp][pdfpages]{\AM at output@i}{642914BBA600927BFEC7D27A97A4A59D}
+\VerifyCommand[lwarp][pdfpages]{\AM at output@i}{A962EC58215FABF2447E4ADEEDC3D3D5}
\xpatchcmd{\AM at output@i}
- {\newpage}
+ {\clearpage}%
{\LWR at esopic@newpage}
{}
{\LWR at patcherror{pdfpages}{AM at output-1}}
\xpatchcmd{\AM at output@i}
- {\newpage}
+ {\clearpage}%
{\LWR at esopic@newpage}
{}
{\LWR at patcherror{pdfpages}{AM at output-2}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2024-02-06 20:33:34 UTC (rev 69723)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2024-02-06 20:34:02 UTC (rev 69724)
@@ -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 @@
-- Copyright 2016-2024 Brian Dunn
-printversion = "v0.914"
+printversion = "v0.915"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -6497,7 +6497,7 @@
\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}%
{\LWR at spanwarnformat{minipage or \protect\parbox}}%
{}%
- \RenewDocumentEnvironment{BlockClass}{o m}%
+ \RenewDocumentEnvironment{BlockClass}{o D(){} m}%
{\LWR at spanwarnformat{multi-paragraph object}}%
{}%
\RenewDocumentEnvironment{LWR at BlockClassWP}{m m D(){} m}%
@@ -6623,7 +6623,9 @@
\LWR at stoppars%
\LWR at htmltag{/#1}%
\ifbool{HTMLDebugComments}{%
- \LWR at htmlcomment{End of #1 ``#2''}%
+ \ifblank{#2}%
+ {\LWR at htmlcomment{End of #1}}%
+ {\LWR at htmlcomment{End of #1 ``#2''}}%
}{}%
\LWR at startpars%
}
@@ -6943,6 +6945,7 @@
\newcommand{\LWR at firstpagebottom}{} % for the home page alone
\newcommand{\LWR at pagetop}{} % for all other pages
\newcommand{\LWR at pagebottom}{}
+\newcommand{\LWR at HTMLmeta}{}
\newcommand{\HTMLFirstPageTop}[1]{%
\renewcommand{\LWR at firstpagetop}{#1}%
}
@@ -6956,6 +6959,24 @@
\renewcommand{\LWR at pagebottom}{#1}%
}
+\newcommand{\HTMLMeta}[2]{%
+ \renewcommand{\LWR at HTMLmeta}{%
+ \LWR at htmltag{%
+ meta name=\LWR at orig@textquotedbl{}#1\LWR at orig@textquotedbl\ % space
+ content=\LWR at orig@textquotedbl{}#2\LWR at orig@textquotedbl\ /%
+ }\LWR at orignewline%
+ }{}{}%
+}
+
+\newcommand{\HTMLAddMeta}[2]{%
+ \apptocmd{\LWR at HTMLmeta}{%
+ \LWR at htmltag{%
+ meta name=\LWR at orig@textquotedbl{}#1\LWR at orig@textquotedbl\ % space
+ content=\LWR at orig@textquotedbl{}#2\LWR at orig@textquotedbl\ /%
+ }\LWR at orignewline%
+ }{}{}%
+}
+
\end{warpall}
@@ -7019,6 +7040,12 @@
\renewcommand{\LWR at currentHTMLDescription}{#1}
}
+\newcommand{\LWR at currentHTMLKeywords}{}
+
+\newcommand{\HTMLKeywords}[1]{%
+\renewcommand{\LWR at currentHTMLKeywords}{#1}
+}
+
\end{warpall}
\begin{warpall}
@@ -7621,14 +7648,13 @@
\ifbool{mathjax}{
\LWR at stoppars
\LWR at htmlcomment{MathJax customizations:}
-
-\begin{BlockClass}{hidden}
+\LWR at htmlelementclass{div data-nosnippet}[display:none]{}
\LWR at stoppars
{
\LWR at print@ttfamily
\LWR at customizedMathJax
}
-\end{BlockClass}
+\LWR at htmlelementclassend{div}{}
}{}
}
@@ -8187,11 +8213,18 @@
content=\LWR at orig@textquotedbl\LWR at currentHTMLDescription\LWR at orig@textquotedbl\ /%
}\LWR at orignewline
}%
+\ifdefempty{\LWR at currentHTMLKeywords}{}{%
+ \LWR at htmltag{%
+ meta name=\LWR at orig@textquotedbl{}keywords\LWR at orig@textquotedbl\ % space
+ content=\LWR at orig@textquotedbl\LWR at currentHTMLKeywords\LWR at orig@textquotedbl\ /%
+ }\LWR at orignewline
+}%
\LWR at htmltag{%
meta % space
name=\LWR at orig@textquotedbl{}viewport\LWR at orig@textquotedbl\ % space
content=\LWR at orig@textquotedbl{}width=device-width, initial-scale=1.0\LWR at orig@textquotedbl\ /%
}\LWR at orignewline
+\LWR at HTMLmeta
\ifthenelse{\equal{\theHTMLTitle}{}}%
{}%
{%
@@ -8901,7 +8934,9 @@
\newcommand*{\LWR at printcloselist}{\LWR at printcloseitemize}
\newcommand*{\LWR at printopenlist}{%
- ul style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
+ ul % space
+ class=\textquotedbl{}list\textquotedbl{} % space
+ style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
}
\AtBeginDocument{
@@ -8913,6 +8948,7 @@
\def\@donoparitem{%
\@noparitemfalse
}
+\newcommand*{\LWR at makelabeltag}{}
\def\LWR at HTML@item[#1]{%
\LWR at traceinfo{@item}%
\if at noparitem
@@ -8937,7 +8973,19 @@
\refstepcounter\@listctr
\fi
\fi
- \makelabel{#1} % extra space
+ \ifboolexpr{
+ test {\ifblank{#1}} or
+ (
+ test {\ifstrequal{#1}{\@itemlabel}} and
+ test {\ifdefempty{\@itemlabel}}
+ )
+ }%
+ {}%
+ {%
+ \ifdefempty{\LWR at makelabeltag}{}{\LWR at htmltag{\LWR at makelabeltag}}%
+ \InlineClass{listmarker}{\makelabel{#1}}%
+ \ifdefempty{\LWR at makelabeltag}{}{\LWR at htmltag{/\LWR at makelabeltag}} % extra space
+ }%
\ignorespaces%
}
@@ -9001,7 +9049,9 @@
\newcommand*{\LWR at itemizestart}{%
\renewcommand*{\LWR at printcloselist}{\LWR at printcloseitemize}%
\renewcommand*{\LWR at printopenlist}{%
- ul style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
+ ul % space
+ class=\textquotedbl{}itemize\textquotedbl{} % space
+ style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
}%
\LetLtxMacro\item\LWR at itemizeitem%
\LWR at nulllistfills%
@@ -9012,7 +9062,9 @@
\newcommand*{\LWR at enumeratestart}{%
\renewcommand*{\LWR at printcloselist}{\LWR at printcloseitemize}%
\renewcommand*{\LWR at printopenlist}{%
- ul style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
+ ul % space
+ class=\textquotedbl{}enumerate\textquotedbl{} % space
+ style=\textquotedbl\LWR at print@mbox{list-style-type:none}\textquotedbl{}%
}%
\LetLtxMacro\item\LWR at itemizeitem%
\LWR at nulllistfills%
@@ -9024,15 +9076,11 @@
\LWR at setlatestname{#1}%
\LWR at startnewdepth{descitem}%
\begingroup%
- \let\LWR at orig@desc at makelabel\makelabel
- \renewcommand*{\makelabel}[1]{%
- \LWR at htmltag{dt}%
- \LWR at orig@desc at makelabel{#1}%
- \LWR at htmltag{/dt}%
- }
+ \renewcommand*{\LWR at makelabeltag}{dt}%
\RenewDocumentCommand{\hspace}{s m}{}%
\LWR at origitem[#1]%
\endgroup%
+ \leavevmode%
\LWR at orignewline%
\LWR at htmltag{dd}%
\LWR at startpars%
@@ -9040,7 +9088,10 @@
\newcommand*{\LWR at descriptionstart}{%
\renewcommand*{\LWR at printcloselist}{\LWR at printclosedescription}
- \renewcommand*{\LWR at printopenlist}{dl}
+ \renewcommand*{\LWR at printopenlist}{%
+ dl % space
+ class=\textquotedbl{}description\textquotedbl{} % space
+ }
\LetLtxMacro\item\LWR at descitem%
\LWR at nulllistfills%
}
More information about the tex-live-commits
mailing list.