summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-08-28 20:05:10 +0000
committerKarl Berry <karl@freefriends.org>2023-08-28 20:05:10 +0000
commitec27223e000735d66cd64e75c0ad530ec299d0f4 (patch)
tree6be1d373ea4d17fc585104e4726237aa0d874733 /Master/texmf-dist/tex
parentb6074427c2ead94702ad509fd83af9b4a85f298b (diff)
lwarp (28aug23)
git-svn-id: svn://tug.org/texlive/trunk@68097 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty9
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty23
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty5
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty132
4 files changed, 92 insertions, 77 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
index 7fded726da7..3aded682c47 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
@@ -17,14 +17,7 @@
%% version 2005/12/01 or later.
-\PackageInfo{lwarp}{%
-Using the lwarp HTML version of package `nameref',\MessageBreak
-and discarding options.\MessageBreak
-(Not using \protect\ProvidesPackage, so that other packages\MessageBreak
-do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
-}
-\DeclareOption*{}
-\ProcessOptions\relax
+\LWR@ProvidesPackageDrop{nameref}[2023-08-07]
\endinput
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 d46eb2a259f..96295c0f191 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
@@ -48,18 +48,21 @@
\RequirePackage{lwarp-titling}% req'd
\RequirePackage{lwarp-tocloft}% req'd
\RequirePackage{lwarp-verse}% req'd
-\LetLtxMacro\LWR@orig@label\@mem@old@label
-\LetLtxMacro\@mem@old@label\LWR@new@label
\AtBeginDocument{
\renewcommand*{\sf@@memsub@label}[1]{%
\@bsphack
- \sf@@memsub@label@hook{#1}%
- \cref@label{#1}% lwarp
+ \cref@label{#1}% lwarp
\LWR@label@createtag{sub@#1}% lwarp
\protected@write\@auxout{}{%
\string\newlabel{sub@#1}%
- {{\@nameuse{@@thesub\@captype}}%
- {\thepage}}}%
+ {%
+ {\@nameuse{@@thesub\@captype}}%
+ {\thepage}%
+ {\detokenize\expandafter{\@currentlabelname}}% name
+ {#1}% Href
+ {}% reserved
+ }%
+ }%
\LWR@write@lwarplabel{sub@#1}% lwarp
\@esphack
}
@@ -962,14 +965,6 @@
\renewcommand*{\headnameref}{}
\renewcommand*{\tocnameref}{}
-\providecounter{LWR@currenttitle}
-
-\renewcommand*{\currenttitle}{%
- \addtocounter{LWR@currenttitle}{1}%
- \label{currenttitle\arabic{LWR@currenttitle}}%
- \nameref{currenttitle\arabic{LWR@currenttitle}}%
-}
-
\renewcommand*{\theTitleReference}[2]{}
\renewcommand*{\namerefon}{}
\renewcommand*{\namerefoff}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty
index 0daeab4f754..d346c27e52f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty
@@ -123,8 +123,8 @@
\end{BlockClass}
\LWR@tcolorbox@doendfloat%
}
-\newcommand{\tcblower}{
- \tcb@insert@after@upper%
+\newcommand{\LWR@HTML@tcb@error@nolower}{%
+ \tcb@insert@after@upper%
\end{BlockClass}
\begin{BlockClass}[%
border-top: 1px dashed \LWR@origpound\LWR@tcbcolframe ;
@@ -132,6 +132,7 @@
]{tcolorboxlower}
\tcb@insert@before@lower%
}
+\LWR@formatted{tcb@error@nolower}
\AtBeginDocument{
\ifdef{\tcbline}{
\newcommand*{\LWR@sub@tcbline}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index a9485052bb5..1fc21a62319 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `package')
%% This is a generated file.
-%% Copyright 2016-2018 Brian Dunn
+%% Copyright 2016-2022 Brian Dunn
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2023/02/28 v0.911 Allows LaTeX to directly produce HTML5 output.]
+ [2023/08/28 v0.912 Allows LaTeX to directly produce HTML5 output.]
@@ -575,7 +575,6 @@
\LWR@loadafter{musicography}
\LWR@loadafter{mwe}
\LWR@loadafter{nameauth}
-\LWR@loadafter{nameref}
\LWR@loadafter{natbib}
\LWR@notmemoirloadafter{nccfancyhdr}
\LWR@loadafter{nccfoots}
@@ -974,6 +973,10 @@
\long\def\LWR@thirdoffive#1#2#3#4#5{#3}
\long\def\LWR@fourthoffive#1#2#3#4#5{#4}
\long\def\LWR@fifthoffive#1#2#3#4#5{#5}
+\long\def\LWR@edeffirstoffive#1#2#3#4#5{%
+ \edef\@tempa{#1}%
+}%
+
\newcounter{LWR@texboxdepth}
\setcounter{LWR@texboxdepth}{0}
\newcommand*{\LWR@maybe@orignewpage}{%
@@ -4865,9 +4868,9 @@ MathJax = {
\begin{filecontents*}[overwrite]{lwarpmk.lua}
#!/usr/bin/env texlua
--- Copyright 2016-2022 Brian Dunn
+-- Copyright 2016-2023 Brian Dunn
-printversion = "v0.911"
+printversion = "v0.912"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -6515,7 +6518,7 @@ end -- not --version
}
\NewDocumentCommand{\LWR@htmlspanclass}{o D(){} m +m}{%
- \LWR@traceinfo{LWR@htmlspanclass |#1|#2|#3|}%
+ \LWR@traceinfo{LWR@htmlspanclass #3}%
\LWR@ensuredoingapar%
\ifblank{#2}%
{\LWR@subhtmlelementclass{span}[#1]{#3}}%
@@ -6523,8 +6526,8 @@ end -- not --version
\begin{LWR@nestspan}%
#4%
\LWR@htmltagc{/span}%
- \LWR@traceinfo{LWR@htmlspanclass done}%
\end{LWR@nestspan}%
+ \LWR@traceinfo{LWR@htmlspanclass done}%
}
@@ -6572,7 +6575,7 @@ end -- not --version
\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} D(){} m}{%
- \LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!#4!}%
+ \LWR@traceinfo{LWR@subhtmlelementclass !#1!#4!}%
\ifblank{#2}%
{% empty style
\LWR@htmltag{%
@@ -8134,15 +8137,6 @@ end -- not --version
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@htmltag{!-\/-[if lt IE 9]}\LWR@orignewline
-\LWR@htmltag{%
- script % space
- src=\LWR@orig@textquotedbl{}%
- http://html5shiv.googlecode.com/svn/trunk/html5.js%
- \LWR@orig@textquotedbl%
-}%
-\LWR@htmltag{/script}\LWR@orignewline
-\LWR@htmltag{![endif]-\/-}\LWR@orignewline
\ifthenelse{\equal{\theHTMLTitle}{}}%
{}%
{%
@@ -9772,10 +9766,12 @@ end -- not --version
{%
\LWR@traceinfo{LWR@tabledatasinglecolumntag}%
\LWR@maybenewtablerow%
- \ifbool{LWR@intabularmetadata}%
- {%
- \ifbool{LWR@exitingtabular}{}%
- {% not exiting tabular
+ \ifboolexpr{
+ bool{LWR@intabularmetadata}
+ and not bool{LWR@exitingtabular}
+ and not bool {LWR@in@multirow@par}
+ }%
+ {% making a tabular data cell
\LWR@tabularleftedge%
\xdef\LWR@strresult{%
\LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}%
@@ -9821,8 +9817,8 @@ end -- not --version
\LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tableLaTeXcolindex}}%
}%
\boolfalse{LWR@intabularmetadata}%
- }% not exiting tabular
- }{}% in tabular metadata
+ }% making a tabular data cell
+ {}% not making a tabular data cell
\LWR@traceinfo{LWR@tabledatasinglecolumntag: done}%
}%
@@ -11035,7 +11031,9 @@ end -- not --version
{\LWR@subnewref{#2}{#2}}%
}
+\AtBeginDocument{% **8*
\LWR@formatted{ref}
+}
\NewDocumentCommand{\LWR@HTML@Ref}{s m}{%
\LWR@traceinfo{LWR@HTML@Ref !#2!}%
@@ -11044,33 +11042,39 @@ end -- not --version
{\LWR@subnewref{#2}{#2}}%
}
+\AtBeginDocument{% **8*
\LWR@formatted{Ref}
+}
\NewDocumentCommand{\LWR@refwithsection}{s m}{%
\LWR@traceinfo{LWR@refwithsection !#2!}%
\IfBooleanTF{#1}%
{\LWR@print@ref{\BaseJobname-autopage-\LWR@currentautosecpageref{#2}}}%
- {%
- \LWR@startref{#2}%
- \edef\@tempa{\LWR@currentautosecpageref{#2}}%
- \ifdefstring{\@tempa}{??}%
- {??}%
+ {% not starred
+ \ifstrequal{#2}{Doc-Start}%
{%
- \edef\@tempa{%
- \csname
- r@\BaseJobname-autopage-\LWR@currentautosecpageref{#2}%
- \endcsname%
- }%
- \edef\@tempa{\expandafter\@firstoftwo\@tempa}%
- \expandafter\ifblank\expandafter{\@tempa}%
- {*}
- {%
- \LWR@print@ref{%
- \BaseJobname-autopage-\LWR@currentautosecpageref{#2}%
- }%
- }%
+ \LWR@startref{\BaseJobname-autopage-1}%
+ *%
+ \LWR@htmltag{/a}%
}%
- \LWR@htmltag{/a}%
- }%
+ {% not Doc-Start
+ \LWR@startref{#2}%
+ \edef\@tempa{\LWR@currentautosecpageref{#2}}%
+ \ifdefstring{\@tempa}{??}%
+ {??}%
+ {% not ??
+ \edef\@tempa{\csexpandonce{r@\BaseJobname-autopage-\@tempa}}%
+ \expandafter\LWR@edeffirstoffive\@tempa%
+ \expandafter\ifblank\expandafter{\@tempa}%
+ {*}
+ {%
+ \LWR@print@ref{%
+ \BaseJobname-autopage-\LWR@currentautosecpageref{#2}%
+ }%
+ }%
+ }% not ??
+ \LWR@htmltag{/a}%
+ }% not Doc-Start
+ }% not starred
}
\CustomizeMathJax{\let\LWRref\ref}
\CustomizeMathJax{\renewcommand{\ref}{\ifstar\LWRref\LWRref}}
@@ -11081,7 +11085,9 @@ end -- not --version
{(\cpageref{#2})}%
}
-\newrobustcmd*{\nameref}[1]{%
+\providecommand{\nameref}[1]{}%
+
+\renewrobustcmd*{\nameref}[1]{%
\LWR@traceinfo{nameref}%
\LWR@startref{#1}%
\LWR@traceinfo{nameref B}%
@@ -11829,7 +11835,7 @@ end -- not --version
\newcommand*{\LWR@indexnameref@ref}[1]{%
\edef\LWR@thisref{\csuse{r@LWRindex-#1}}%
\ifdefvoid{\LWR@thisref}{}{%
- \edef\LWR@thisref{\expandafter\@firstoftwo\LWR@thisref}%
+ \edef\LWR@thisref{\expandafter\@firstoffive\LWR@thisref}%
\ifdefvoid{\LWR@thisref}%
{\LWR@indexnameref@anonref{#1}}%
{\ref{LWRindex-#1}}%
@@ -11839,7 +11845,7 @@ end -- not --version
\newcommand*{\LWR@indexnameref@refnameref}[1]{%
\edef\LWR@thisref{\csuse{r@LWRindex-#1}}%
\ifdefvoid{\LWR@thisref}{}{%
- \edef\LWR@thisref{\expandafter\@firstoftwo\LWR@thisref}%
+ \edef\LWR@thisref{\expandafter\@firstoffive\LWR@thisref}%
\ifdefvoid{\LWR@thisref}{}{%
\ifdefstring{\LWR@thisref}{(*)}%
{}%
@@ -11854,7 +11860,7 @@ end -- not --version
\ifdefvoid{\LWR@thisref}{%
\nameref{LWRindex-#1}%
}{%
- \edef\LWR@thisref{\expandafter\@firstoftwo\LWR@thisref}%
+ \edef\LWR@thisref{\expandafter\@firstoffive\LWR@thisref}%
\ifdefvoid{\LWR@thisref}{%
\nameref{LWRindex-#1}%
}{%
@@ -11872,7 +11878,7 @@ end -- not --version
\ifdefvoid{\LWR@thisref}%
{}%
{%
- \edef\LWR@thisref{\expandafter\@firstoftwo\LWR@thisref}%
+ \edef\LWR@thisref{\expandafter\@firstoffive\LWR@thisref}%
\ifdefvoid{\LWR@thisref}%
{}%
{%
@@ -13190,7 +13196,8 @@ end -- not --version
\def\thempfn{\thefootnote}%
\LetLtxMacro\@footnotetext\LWR@footnotetext%
}%
- \LWR@traceinfo{lateximage: about to create label}%
+ \LWR@traceinfo{lateximage: about to create label
+ LWRlateximage-\BaseJobname-\arabic{LWR@lateximagenumber}}%
\LWR@orig@label{LWRlateximage-\BaseJobname-\arabic{LWR@lateximagenumber}}%
\LWR@traceinfo{lateximage: finished creating the label}%
\ifdefvoid{\LWR@ruleHTMLcolor}{}{%
@@ -13334,6 +13341,8 @@ end -- not --version
{}%
}
+\LWR@PreloadedPackage{nameref}
+
\LWR@PreloadedPackage{inputtrc}
\LWR@PreloadedPackage{textcomp}
@@ -13539,11 +13548,29 @@ end -- not --version
\end{warpHTML}
\begin{warpHTML}
-\LetLtxMacro\LWR@orig@label\label% includes memoir, before cleveref
+\LetLtxMacro\LWR@orig@label\label
\LetLtxMacro\label\LWR@new@label
-\LetLtxMacro\LWR@orig@pageref\pageref
-\LetLtxMacro\pageref\LWR@new@pageref
+\AtBeginDocument{%
+\LetLtxMacro\LWR@orig@pageref\pageref%
+\LetLtxMacro\pageref\LWR@new@pageref%
+}
+
+\xpatchcmd{\LWR@orig@label}
+ {{\@currentlabelname}}
+ {{\detokenize\expandafter{\@currentlabelname}}}
+ {}
+ {
+ \typeout{***}
+ \typeout{***}
+ \typeout{*** Package lwarp warning:}
+ \typeout{*** Could not patch \string\label.}
+ \typeout{*** This may cause an error with section names or float captions}
+ \typeout{*** containing math, for example.}
+ \typeout{*** (Recent updates in the LaTeX kernel may make things work again.)}
+ \typeout{***}
+ \typeout{***}
+ }
\end{warpHTML}
@@ -13781,7 +13808,6 @@ end -- not --version
\newcommand*{\LWR@fboxstyle}{%
\LWR@findcurrenttextcolor%
-\LWR@traceinfo{LWR@fboxstyle B}%
border:\LWR@printlength{\LWR@atleastonept} solid \LWR@origpound\LWR@tempcolor ; %
padding:\LWR@printlength{\fboxsep} ; %
color:\LWR@origpound\LWR@tempcolor%