diff options
author | Karl Berry <karl@freefriends.org> | 2024-02-06 20:34:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-02-06 20:34:02 +0000 |
commit | 37178dabcfa35408ca1e37b2d5fe2aa2c087aa82 (patch) | |
tree | 9cbbf566bdeeab53b2220543ff4f64fb42dcb1d5 | |
parent | e58fcca7a32c316350886b50f81e299f9a302818 (diff) |
lwarp (6feb24)
git-svn-id: svn://tug.org/texlive/trunk@69724 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/lwarp/README.txt | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/lwarp/lwarp.pdf | bin | 3463244 -> 3467122 bytes | |||
-rwxr-xr-x | Master/texmf-dist/scripts/lwarp/lwarpmk.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/lwarp/lwarp.dtx | 284 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 87 |
10 files changed, 322 insertions, 84 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua index 121957dd192..f6b1589850a 100755 --- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua +++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2024 Brian Dunn -printversion = "v0.914" +printversion = "v0.915" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index cfd5523f674..af35531af5b 100644 --- a/Master/texmf-dist/doc/latex/lwarp/README.txt +++ b/Master/texmf-dist/doc/latex/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.914 README.txt +LaTeX lwarp package v0.915 README.txt Files included are: diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf Binary files differindex 08bc4839c06..6e1bff2fdc0 100644 --- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf +++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua index 121957dd192..f6b1589850a 100755 --- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua +++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2024 Brian Dunn -printversion = "v0.914" +printversion = "v0.915" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx index dd633f53a8f..e2d6406106e 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx @@ -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 @@ pdfinfo={% \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 @@ This boolean may be tested by the user for later use. % \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 @@ 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.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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % \} % \end{sourcedisplay} % -% % \ItemDescribeMacro{\HTMLAuthor} \marg{author} \DescribeDefault{\cs{theauthor}} \quad % The \HTML\ header's meta author. % Defaults to \cs{theauthor}, @@ -8840,6 +8854,22 @@ This boolean may be tested by the user for later use. % 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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % \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 @@ MathJax = { -- Copyright 2016-2024 Brian Dunn -printversion = "v0.914" +printversion = "v0.915" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -23756,11 +23806,12 @@ end -- not --version % Nullify several objects inside the span: % ^^A {\LWR@subhtmlelementclass{span}{inlineminipage}}% % ^^A {\LWR@htmltagc{/span}}% +% \changes{v0.915}{2024/01/30}{Fix: \env{BlockClass} optional arg.} % \begin{macrocode} \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}% @@ -23961,7 +24012,7 @@ end -- not --version % \end{macro} -% \begin{macro}{\LWR@htmlelementclass} \marg{element} \oarg{style} \marg{class} +% \begin{macro}{\LWR@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 @@ end -- not --version % \begin{macro}{\LWR@htmlelementclassend} \marg{element} \marg{class} +% \changes{v0.915}{2024/02/05}{Fix for empty class.} % \begin{macrocode} \newcommand*{\LWR@htmlelementclassend}[2]{% \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% } @@ -24817,6 +24871,10 @@ end -- not --version \newcommand{\LWR@pagetop}{} % for all other pages \newcommand{\LWR@pagebottom}{} % \end{macrocode} +% \changes{v0.915}{2024/01/28}{Added \cs{HTMLMeta}, \cs{HTMLAddMeta}.} +% \begin{macrocode} +\newcommand{\LWR@HTMLmeta}{} +% \end{macrocode} % % % \begin{macro}{\HTMLFirstPageTop} \marg{text and logos} @@ -24869,6 +24927,42 @@ end -- not --version % \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@HTMLmeta}{% + \LWR@htmltag{% + meta name=\LWR@orig@textquotedbl{}#1\LWR@orig@textquotedbl\ % space + content=\LWR@orig@textquotedbl{}#2\LWR@orig@textquotedbl\ /% + }\LWR@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@HTMLmeta}{% + \LWR@htmltag{% + meta name=\LWR@orig@textquotedbl{}#1\LWR@orig@textquotedbl\ % space + content=\LWR@orig@textquotedbl{}#2\LWR@orig@textquotedbl\ /% + }\LWR@orignewline% + }{}{}% +} +% \end{macrocode} +% \end{macro} + + % \begin{macrocode} \end{warpall} % \end{macrocode} @@ -25044,14 +25138,15 @@ end -- not --version % 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. % \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 @@ end -- not --version \newcommand{\HTMLDescription}[1]{% \renewcommand{\LWR@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@currentHTMLKeywords}{} + +\newcommand{\HTMLKeywords}[1]{% +\renewcommand{\LWR@currentHTMLKeywords}{#1} +} \end{warpall} % \end{macrocode} % \end{macro} - % \section{Footnotes} % \label{sec:footnotes} % @@ -26551,8 +26664,10 @@ end -- not --version % \begin{macrocode} \LWR@stoppars \LWR@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@htmlelementclass{div data-nosnippet}[display:none]{} \LWR@stoppars % \end{macrocode} % @@ -26563,7 +26678,7 @@ end -- not --version \LWR@print@ttfamily \LWR@customizedMathJax } -\end{BlockClass} +\LWR@htmlelementclassend{div}{} }{} } % \end{macrocode} @@ -28036,6 +28151,7 @@ end -- not --version content=\LWR@orig@textquotedbl{}LaTeX Lwarp package\LWR@orig@textquotedbl\ /% }\LWR@orignewline% % \end{macrocode} +% % If there is a description, add it now: % \begin{macrocode} \ifdefempty{\LWR@currentHTMLDescription}{}{% @@ -28046,6 +28162,17 @@ end -- not --version }% % \end{macrocode} % +% If there are keywords, add it now: +% \changes{v0.915}{2024/02/04}{Added \cs{HTMLKeywords}.} +% \begin{macrocode} +\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 +}% +% \end{macrocode} +% % Mobile-friendly viewport: % \gindex{HTML>meta tag>viewport} % \gindex{viewport>HTML meta tag} @@ -28060,6 +28187,13 @@ end -- not --version % % \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@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 @@ end -- not --version % % % -% \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 -- not --version % \end{macro} % \begin{macro}{\LWR@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@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{}% } % \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 -- not --version % \end{macro} % % +% \begin{macro}{\LWR@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@makelabeltag}{} +% \end{macrocode} +% \end{macro} % % % \begin{macro}{\@item} @@ -30076,9 +30221,25 @@ end -- not --version \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@makelabeltag}{}{\LWR@htmltag{\LWR@makelabeltag}}% + \InlineClass{listmarker}{\makelabel{#1}}% + \ifdefempty{\LWR@makelabeltag}{}{\LWR@htmltag{/\LWR@makelabeltag}} % extra space + }% % \sbox\@tempboxa{\makelabel{#1}% % \global\setbox\@labels\hbox{% % \unhbox\@labels @@ -30209,11 +30370,14 @@ end -- not --version % \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@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% @@ -30230,11 +30394,14 @@ end -- not --version % \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@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% @@ -30256,17 +30423,20 @@ end -- not --version % 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@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% +% \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@orignewline% \LWR@htmltag{dd}% \LWR@startpars% @@ -30279,10 +30449,14 @@ end -- not --version % 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@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% } @@ -50156,6 +50330,7 @@ s% % \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 @@ name = \chemmacros_translate:n {scheme-name} \@doi@linksubs#1\#\@@\@doi@code \@onelevel@sanitize{\@doi@code}% \def\@doi@text{}% -\@doi@textsubs#1\@nil\@@\@doi@text +\@doi@textsubs#1\@nil\@@\@doi@text% \xpretocmd{\@doi@code}{http://dx.doi.org/}{}{}% \expandafter\href\expandafter{\@doi@code}{\doitext{\@doi@text}}} % \end{macrocode} @@ -63563,12 +63738,18 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space } {\endBlockClass} +% \end{macrocode} +% +% \changes{v0.915}{2024/01/24}{\pkg{hang}: Add \HTML\ class to lists.} +% \begin{macrocode} \newenvironment{hanginglist} {% \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}% @@ -63596,7 +63777,8 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \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} @@ -70395,6 +70577,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % \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 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \LWR@subcustomizedmathjax{% \newenvironment{#1}{\begin{gathered}}{\end{gathered}}% }% - \appto\LWR@customizedMathJax{\LWRbackslash)}% + \appto\LWR@customizedMathJax{\LWRbackslash)\LWR@orignewline}% } \@onlypreamble\newgathered @@ -77288,7 +77471,7 @@ background: % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackagePass{pdfpages}[2022-10-09] +\LWR@ProvidesPackagePass{pdfpages}[2024-01-21] % \end{macrocode} % % Disable option which have no meaning for \HTML\ output: @@ -77371,17 +77554,18 @@ background: % \begin{noindmacro}{\AM@output} % Patched to use \cs{LWR@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@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}} @@ -96614,12 +96798,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % \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} 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% } |