summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/lwarp
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-01-04 03:02:24 +0000
committerNorbert Preining <norbert@preining.info>2023-01-04 03:02:24 +0000
commitb2ede2da5ece936a9be421f2b6fbdb6c65cb225a (patch)
tree52e56df44d458efa71d7de971f576d61dbdb2123 /macros/latex/contrib/lwarp
parent660cf44d2a0aee74bd6e69615fedfc57c966a260 (diff)
CTAN sync 202301040302
Diffstat (limited to 'macros/latex/contrib/lwarp')
-rw-r--r--macros/latex/contrib/lwarp/README.txt4
-rw-r--r--macros/latex/contrib/lwarp/lwarp.dtx162
-rw-r--r--macros/latex/contrib/lwarp/lwarp.pdfbin3303971 -> 3398923 bytes
-rwxr-xr-xmacros/latex/contrib/lwarp/lwarpmk.lua2
4 files changed, 104 insertions, 64 deletions
diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt
index ce7ece3bf8..a94a25b44c 100644
--- a/macros/latex/contrib/lwarp/README.txt
+++ b/macros/latex/contrib/lwarp/README.txt
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.909 README.txt
+LaTeX lwarp package v0.910 README.txt
Files included are:
@@ -41,7 +41,7 @@ and version 1.3 or later is part of all distributions of LaTeX
version 2005/12/01 or later.
-Copyright 2016-2022 Brian Dunn
+Copyright 2016-2023 Brian Dunn
Homepage: http://BDTechConcepts.com
Email: bd@BDTechConcepts.com
diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx
index d2ff6b6e28..e4c5d8b7b8 100644
--- a/macros/latex/contrib/lwarp/lwarp.dtx
+++ b/macros/latex/contrib/lwarp/lwarp.dtx
@@ -1,7 +1,7 @@
%
% \iffalse meta-comment
%
-% Copyright 2016-2022 Brian Dunn
+% Copyright 2016-2023 Brian Dunn
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2022/11/22 v0.909 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2023/01/03 v0.910 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -197,7 +197,7 @@
% Indexing, logos, \Describexxxx, etc:
-\usepackage{dtxdescribe}[2021/12/18]
+\usepackage{dtxdescribe}[2023/01/03]
\usepackage{splitidx}
@@ -235,7 +235,7 @@ pdfinfo={%
}}
}
-\AtEndPreamble{
+\AddToHook{begindocument/before}{
\usepackage{cleveref}
}
@@ -1926,7 +1926,8 @@ Avoid using the \cs{includegraphics} \optn{scale} option. Change:
\trouble{graphics>scale=\optn{scale} option}
\begin{sourcedisplay}
\cs{includegraphics}[scale=<xx>]\{\,\dots\}
-\end{sourcedisplay} to:
+\end{sourcedisplay}
+to:
\begin{sourcedisplay}
\cs{includegraphics}[width=<yy>\textbackslash{linewidth}]\{\,\dots\}
\end{sourcedisplay}
@@ -3282,24 +3283,6 @@ This boolean may be tested by the user for later use.
%<*package>
% \fi
%
-% \CheckSum{55554}
-%
-% \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
-% Lower-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
-% Digits \0\1\2\3\4\5\6\7\8\9
-% Exclamation \! Double quote \" Hash (number) \#
-% Dollar \$ Percent \% Ampersand \&
-% Acute accent \' Left paren \( Right paren \)
-% Asterisk \* Plus \+ Comma \,
-% Minus \- Point \. Solidus \/
-% Colon \: Semicolon \; Less than \<
-% Equals \= Greater than \> Question mark \?
-% Commercial at \@ Left bracket \[ Backslash \\
-% Right bracket \] Circumflex \^ Underscore \_
-% Grave accent \` Left brace \{ Vertical bar \|
-% Right brace \} Tilde \~}
-
%
% \changes{v0.10}{2016/03/08}{\ 2016/03/08 Initial version}
% \changes{v0.11}{2016/03/11}{\ 2016/03/11}
@@ -3436,6 +3419,7 @@ This boolean may be tested by the user for later use.
% \changes{v0.907}{2022/07/11}{\ 2022/07/11}
% \changes{v0.908}{2022/07/13}{\ 2022/07/13}
% \changes{v0.909}{2022/11/22}{\ 2022/11/22}
+% \changes{v0.910}{2023/01/03}{\ 2023/01/03}
@@ -3468,7 +3452,7 @@ This boolean may be tested by the user for later use.
%
% \fileversion{} \Dash \filedate
%
-% {\small\textcopyright{} 2016--2022} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com}
+% {\small\textcopyright{} 2016--2023} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com}
%
% \end{center}
%
@@ -3669,14 +3653,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.910:] Updated \pkg{fvextra}, \pkg{minted}.
+% \needspace{2\baselineskip}
% \item[v0.909:] \cs{ref} fix.
% \begin{itemize}
% \item Fixed \cs{ref*}, \pkg{beamerarticle}, \pkg{lyluatex}, \pkg{realscripts}.
% \item Updated \pkg{mismath}, \pkg{nicematrix}, \pkg{pablance},
% \pkg{pdfpages}, \pkg{simplebnf}, \pkg{tagpdf}.
-% \item The \pkg{lwarp} documentation index is not yet fully updated to the
-% latest \pkg{doc} package changes. Index categories and some
-% hyperlinks are not yet working.
% \end{itemize}
% \needspace{2\baselineskip}
% \item[v0.908:] Bug fix.
@@ -8098,6 +8081,7 @@ This boolean may be tested by the user for later use.
% warpHTML & Generate \HTML\ output. \\
% BaseJobname & The \cs{jobname} to use.
% Set to the \cs{jobname} of the printed version even while generating \HTML. \\
+% warpdisable & Disables most of \pkg{lwarp} for testing purposes. \\
% \bottomrule
% \end{tabular}
% \end{table}
@@ -8444,6 +8428,11 @@ This boolean may be tested by the user for later use.
% creating the |*_html.tex| file used to compile the \HTML\ version.
% See \cref{sec:packageoptions}.
%
+% \ItemDescribeOption{warpdisable}
+% Internally disables both \optn{warpprint} and \optn{warpHTML}.
+% This disables most of \pkg{lwarp}, which may be useful for testing
+% purposes to see whether \pkg{lwarp} is causing a problem.
+%
% \end{description}
%
% \clearpage
@@ -14933,6 +14922,8 @@ This boolean may be tested by the user for later use.
% If the \optn{warpdisable} option is given,
% both boolean |warpingprint| and boolean |warpingHTML| are false,
% and may be used for \cs{ifbool} tests.
+% This option may be used to disable almost all of \pkg{lwarp},
+% for testing purposes.
%
% \changes{v0.909}{2022/11/21}{Added option \optn{warpdisable}.}
% \begin{macrocode}
@@ -21125,7 +21116,7 @@ MathJax = {
-- Copyright 2016-2022 Brian Dunn
-printversion = "v0.909"
+printversion = "v0.910"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -23419,7 +23410,7 @@ end -- not --version
% \subsection{Hook while processing tags}
%
-% \DescribeHook[lwarp]{\cs{LWR@hook@processingtags}}
+% \DescribeHook[lwarp]{\LWR@hook@processingtags}
% This is used to disable special text processing while processing \HTML\ tags.
% Special processing includes that done by
% \pkg{babel-french}, \pkg{luavina}, \pkg{xevlna}.
@@ -38509,8 +38500,8 @@ end -- not --version
\LetLtxMacro\LWR@origclosebracket\]
% \end{macrocode}
%
-% \DescribeObject{\$}
-% \DescribeObject{\$\$}
+% \DescribeObject{$}
+% \DescribeObject{$$}
% Redefine the dollar sign to place math inside a \env{lateximage},
% or use \MathJax:
% \begin{macrocode}
@@ -56859,7 +56850,7 @@ name = \chemmacros_translate:n {scheme-name}
\LWR@ProvidesPackagePass{fancyref}[1999/02/03]
% \end{macrocode}
%
-% \DescribeHook[fancyref]{\cs{fancyrefhook}}
+% \DescribeHook[fancyref]{\fancyrefhook}
% To remove the \optn{margin} option, if \cs{fancyrefhook} is anything
% other than the \optn{paren} option, then force it to the default instead.
% (Comparing to the \optn{margin} option was not possible since \pkg{lwarp} has
@@ -60030,11 +60021,12 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
% \pkg{fvextra} is patched for use by \pkg{lwarp}.
%
% \changes{v0.892}{2020/10/05}{\pkg{fvextra}: Added.}
+% \changes{v0.910}{2022/12/15}{\pkg{fvextra}: Updated to v1.5.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{fvextra}[2019/02/04]
+\LWR@ProvidesPackagePass{fvextra}[2022/11/30]
% \end{macrocode}
%
% Ignored are \optn{highlight},
@@ -60047,7 +60039,6 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
% If line numbers on the right side are used along with \optn{breaklines},
% the line numbers will not be aligned.
% \begin{macrocode}
-
\define@booleankey{FV}{obeytabs}%
% {\let\FV@ObeyTabsInit\FV@@ObeyTabsInit}%
{\let\FV@ObeyTabsInit\relax}
@@ -60066,10 +60057,10 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
\newbool{LWR@FV@breaklines}
\define@booleankey{FV}{breaklines}%
- {\FV@BreakLinesfalse
+ {\boolfalse{FV@breaklines}
\booltrue{LWR@FV@breaklines}
\let\FV@ListProcessLine\FV@ListProcessLine@NoBreak}
- {\FV@BreakLinesfalse
+ {\boolfalse{FV@breaklines}
\boolfalse{LWR@FV@breaklines}
\let\FV@ListProcessLine\FV@ListProcessLine@NoBreak}
% \fvset{breaklines}
@@ -64202,7 +64193,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
\AtBeginDocument{
% \end{macrocode}
-% \DescribeHook[keyfloat]{\cs{KFLT@LWR@hook@boxouter}} Integration for \pkg{keyfloat}.
+% \DescribeHook[keyfloat]{\KFLT@LWR@hook@boxouter} Integration for \pkg{keyfloat}.
%
% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
% \begin{macrocode}
@@ -64221,21 +64212,21 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
}
% \end{macrocode}
%
-% \DescribeHook[keyfloat]{\cs{KFLT@LWR@hook@keysubfloats}} Integration for \pkg{keyfloat}.
+% \DescribeHook[keyfloat]{\KFLT@LWR@hook@keysubfloats} Integration for \pkg{keyfloat}.
%
% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
% \begin{macrocode}
\LetLtxMacro\KFLT@LWR@hook@keysubfloats\KFLT@LWR@hook@boxouter
% \end{macrocode}
%
-% \DescribeHook[keyfloat]{\cs{KFLT@LWR@hook@keyfloatsminipage}} Integration for \pkg{keyfloat}.
+% \DescribeHook[keyfloat]{\KFLT@LWR@hook@keyfloatsminipage} Integration for \pkg{keyfloat}.
% \begin{macrocode}
\let\KFLT@LWR@hook@keyfloatsminipage\relax
\let\endKFLT@LWR@hook@keyfloatsminipage\relax
\newenvironment*{KFLT@LWR@hook@keyfloatsminipage}[1]{}{}
% \end{macrocode}
%
-% \DescribeHook[keyfloat]{\cs{KFLT@LWR@hook@keyfloats}} Integration for \pkg{keyfloat}.
+% \DescribeHook[keyfloat]{\KFLT@LWR@hook@keyfloats} Integration for \pkg{keyfloat}.
% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
% \begin{macrocode}
\LetLtxMacro\KFLT@LWR@hook@keyfloats\KFLT@LWR@hook@boxouter
@@ -64434,28 +64425,28 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
}
\renewcommand*{\KFLT@@addartisttext}[3]{%
- % \end{macrocode}
- % Add space and create the name inside a \element{div}:
- % \begin{macrocode}
+% \end{macrocode}
+% Add space and create the name inside a \element{div}:
+% \begin{macrocode}
% \addvspace{\medskipamount}%
- % \begin{minipage}{\linewidth}%
+% \begin{minipage}{\linewidth}%
\LWR@KFLT@setnamealign{#3}%
\begin{BlockClass}[text-align:\LWR@KFLT@textalign]{floatnotes}%
- % \end{macrocode}
- % Text alignment is |#3|, and depends on artist or author:
- % \begin{macrocode}
- % #3%
- % \end{macrocode}
- % |#1| is empty or '|subgrp'| \\
- % |#2| is empty for artist, `|u|' for author:
- % \begin{macrocode}
+% \end{macrocode}
+% Text alignment is |#3|, and depends on artist or author:
+% \begin{macrocode}
+% #3%
+% \end{macrocode}
+% |#1| is empty or '|subgrp'| \\
+% |#2| is empty for artist, `|u|' for author:
+% \begin{macrocode}
\footnotesize\textsc{%
\KFLT@optionalname{\csuse{KFLT@#1a#2p}}%
\KFLT@optionalname{\csuse{KFLT@#1a#2f}}%
\csuse{KFLT@#1a#2l}%
\csuse{KFLT@#1a#2s}%
}%
- % \end{minipage}%
+% \end{minipage}%
\end{BlockClass}
% \par\addvspace{2ex}%
}
@@ -70364,15 +70355,40 @@ background:
%
% \changes{v0.892}{2020/10/07}{\pkg{minted}: Added.}
% \changes{v0.903}{2022/01/02}{\pkg{minted}: Updated to v2.6.}
+% \changes{v0.910}{2022/12/15}{\pkg{minted}: Updated to v2.7.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{minted}[2021/12/24]
+\LWR@ProvidesPackagePass{minted}[2022/12/12]
% \end{macrocode}
%
% \begin{macrocode}
-\xpatchcmd{\minted}
+\renewcommand{\setminted}[2][]{%
+ \ifthenelse{\equal{#1}{}}%
+ {\setkeys{minted@opt@g}{%
+ #2,
+ mathescape=false,breaklines,texcomments=false,highlightlines={}% lwarp
+ }}%
+ {\minted@configlang{#1}%
+ \setkeys{minted@opt@lang}{%
+ #2,
+ mathescape=false,breaklines,texcomments=false,highlightlines={}% lwarp
+ }}}
+
+\renewcommand{\setmintedinline}[2][]{%
+ \ifthenelse{\equal{#1}{}}%
+ {\setkeys{minted@opt@g@i}{%
+ #2,
+ mathescape=false,breaklines,texcomments=false,highlightlines={}% lwarp
+ }}%
+ {\minted@configlang{#1}%
+ \setkeys{minted@opt@lang@i}{%
+ #2,
+ mathescape=false,breaklines,texcomments=false,highlightlines={}% lwarp
+ }}}
+
+\xpatchcmd{\RobustMintInlineProcess}
{\setkeys{minted@opt@cmd}{#1}}
{%
\setkeys{minted@opt@cmd}{%
@@ -70383,17 +70399,18 @@ background:
{}
{\LWR@patcherror{minted}{minted}}
-\xpatchcmd{\mintinline}
+\xpatchcmd{\RobustMintProcess}
{\setkeys{minted@opt@cmd}{#1}}
- {\setkeys{minted@opt@cmd}{%
+ {%
+ \setkeys{minted@opt@cmd}{%
#1,%
mathescape=false,breaklines,texcomments=false,highlightlines={}%
}%
}
{}
- {\LWR@patcherror{minted}{mintinline}}
+ {\LWR@patcherror{minted}{minted}}
-\xpatchcmd{\mint}
+\xpatchcmd{\minted}
{\setkeys{minted@opt@cmd}{#1}}
{%
\setkeys{minted@opt@cmd}{%
@@ -70402,7 +70419,7 @@ background:
}%
}
{}
- {\LWR@patcherror{minted}{mint}}
+ {\LWR@patcherror{minted}{minted}}
\xpatchcmd{\inputminted}
{\setkeys{minted@opt@cmd}{#1}}
@@ -70414,6 +70431,29 @@ background:
{}
{\LWR@patcherror{minted}{inputminted}}
+
+
+%\xpatchcmd{\mintinline}
+% {\setkeys{minted@opt@cmd}{#1}}
+% {\setkeys{minted@opt@cmd}{%
+% #1,%
+% mathescape=false,breaklines,texcomments=false,highlightlines={}%
+% }%
+% }
+% {}
+% {\LWR@patcherror{minted}{mintinline}}
+
+%\xpatchcmd{\mint}
+% {\setkeys{minted@opt@cmd}{#1}}
+% {%
+% \setkeys{minted@opt@cmd}{%
+% #1,%
+% mathescape=false,breaklines,texcomments=false,highlightlines={}%
+% }%
+% }
+% {}
+% {\LWR@patcherror{minted}{mint}}
+
\renewenvironment{minted@snugshade*}[1]%
{%
\colorlet{shadecolor}{#1}%
@@ -71753,7 +71793,7 @@ background:
\LWR@ProvidesPackagePass{nameauth}[2017/03/22]
% \end{macrocode}
%
-% \DescribeHook[nameauth]{\cs{@nameauth@Hook}}
+% \DescribeHook[nameauth]{\@nameauth@Hook}
% \pkg{lwarp} formatting is inserted.
% \begin{macrocode}
\renewcommand*\@nameauth@Hook[1]
diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf
index 4f612e8420..816ab68db6 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 b8cbb9741e..bc93d2d05a 100755
--- a/macros/latex/contrib/lwarp/lwarpmk.lua
+++ b/macros/latex/contrib/lwarp/lwarpmk.lua
@@ -2,7 +2,7 @@
-- Copyright 2016-2022 Brian Dunn
-printversion = "v0.909"
+printversion = "v0.910"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()