summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-27 21:13:53 +0000
committerKarl Berry <karl@freefriends.org>2020-03-27 21:13:53 +0000
commit7082b1af760d378c92eebdb6ee9e72eed3758b30 (patch)
tree7e8f3f4bb93f7d91e779b32f01cd164ac6f38470 /Master/texmf-dist/tex/latex/lwarp
parentc85e812b46bdb585d381d44dbd26165213eee5ea (diff)
lwarp (27mar20)
git-svn-id: svn://tug.org/texlive/trunk@54586 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty59
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-physunits.sty10
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty4
5 files changed, 41 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
index bd9bc2fb7b8..67ef8867df3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.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.
-\RequirePackage{xcolor}% for \convertcolorspec
+\AtBeginDocument{\RequirePackage{xcolor}}% for \convertcolorspec
\LWR@ProvidesPackagePass{fancyvrb}[2008/02/07]
\fvset{frame=none}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
index de4b3ddd354..ef338125feb 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\LWR@ProvidesPackagePass{framed}[2011/10/22]
-\RequirePackage{xcolor}% for \convertcolorspec
+\AtBeginDocument{\RequirePackage{xcolor}}% for \convertcolorspec
\renewenvironment{framed}{%
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 fc19c62e397..20c2e566fda 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
@@ -17,16 +17,19 @@
%% version 2005/12/01 or later.
\ProvidesPackage{lwarp-patch-memoir}
\RequirePackage{lwarp-abstract}% req'd
-\RequirePackage{lwarp-array}% req'd
\RequirePackage{lwarp-booktabs}% req'd
\RequirePackage{lwarp-changepage}% req'd
\RequirePackage{lwarp-crop}
-\RequirePackage{lwarp-dcolumn}% req'd
\RequirePackage{lwarp-enumerate}% req'd
\RequirePackage{lwarp-epigraph}% req'd
\RequirePackage{lwarp-fancyvrb}% req'd
\RequirePackage{lwarp-footmisc}% req'd
+\let\framed\relax \let\endframed\relax
+\let\shaded\relax \let\endshaded\relax
+\let\leftbar\relax \let\endleftbar\relax
+\let\snugshade\relax \let\endsnugshade\relax
\RequirePackage{lwarp-framed}% req'd
+
\RequirePackage{lwarp-hanging}% req'd
\RequirePackage{lwarp-makeidx}% req'd
\DisemulatePackage{moreverb}
@@ -38,23 +41,10 @@
\RequirePackage{lwarp-parskip}
\RequirePackage{lwarp-setspace}% req'd
\RequirePackage{lwarp-showidx}
+\RequirePackage{lwarp-subcaption}% req'd for \subfloat
-\AtBeginDocument{%
- \@ifpackageloaded{subcaption}{}{
- \RequirePackage{lwarp-subfigure}
- \let\subfigure\subbottom
- \let\subtable\subtop
- }%
-}%
-\makeindex
-\LetLtxMacro\LWR@memorignewsubfloat\newsubfloat
-\RenewDocumentCommand{\newsubfloat}{O{} m}{%
- \@ifundefined{c@sub#2}{%
- \LWR@memorignewsubfloat[#1]{#2}%
- }{}%
-}
-\RequirePackage{lwarp-tabularx}% req'd
+\makeindex
\RequirePackage{lwarp-titling}% req'd
\RequirePackage{lwarp-tocloft}% req'd
\RequirePackage{lwarp-verse}% req'd
@@ -67,18 +57,22 @@
\renewcommand*{\stockav}{}
\renewcommand*{\stockaiv}{}
\renewcommand*{\stockaiii}{}
+\renewcommand*{\stockavii}{}
\renewcommand*{\stockbvi}{}
\renewcommand*{\stockbv}{}
\renewcommand*{\stockbiv}{}
\renewcommand*{\stockbiii}{}
+\renewcommand*{\stockbvii}{}
\renewcommand*{\stockmlargecrownvo}{}
\renewcommand*{\stockmdemyvo}{}
\renewcommand*{\stockmsmallroyalvo}{}
\renewcommand*{\pageavi}{}
+\renewcommand*{\pageavii}{}
\renewcommand*{\pageav}{}
\renewcommand*{\pageaiv}{}
\renewcommand*{\pageaiii}{}
\renewcommand*{\pagebvi}{}
+\renewcommand*{\pagebvii}{}
\renewcommand*{\pagebv}{}
\renewcommand*{\pagebiv}{}
\renewcommand*{\pagebiii}{}
@@ -191,7 +185,7 @@
\let\DoubleSpacing\doublespacing
\renewcommand*{\setPagenoteSpacing}[1]{}
\renewcommand*{\setFloatSpacing}[1]{}
-\let\SingleSpacing\singlespacing
+\renewcommand{\SingleSpacing}{\@ifstar\singlespacing\singlespacing}
\let\setSingleSpace\SetSinglespace
\let\SingleSpace\singlespace
\let\endSingleSpace\endsinglespace
@@ -225,6 +219,8 @@
\thanksscript{\tamark}%
}
+
+\renewcommand\titlingpageend[2]{}
\renewcommand*{\abstractcol}{}
\renewcommand*{\abstractintoc}{}
\renewcommand*{\abstractnum}{}
@@ -700,7 +696,6 @@
\renewcommand{\flegfigure}{\figurename}
\renewcommand{\flegtoctable}{}
\renewcommand{\flegtocfigure}{}
-
\renewcommand{\subcaption}[2][]{%
\ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}%
}
@@ -938,21 +933,33 @@
\addtocounter{LWR@autoindex}{1}%
\LWR@new@label{LWRindex-\arabic{LWR@autoindex}}%
\protected@write\@auxout{}%
- {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}%
+ {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}%
\endgroup
\@esphack}%
\def\@@wrspindexhyp#1||\\{%
\addtocounter{LWR@autoindex}{1}%
\LWR@new@label{LWRindex-\arabic{LWR@autoindex}}%
\protected@write\@auxout{}%
- {%
- \string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}%
- }%
+ {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}%
\endgroup
\@esphack}%
}% \AtBeginDocument
+\renewcommand{\@spindex}[2]{%
+ \@ifundefined{#1@idxfile}%
+ {\ifreportnoidxfile
+ \@memwarn{Undefined index file #1}%
+ \fi
+ \begingroup
+ \@sanitize
+ \@nowrindex}%
+ {\def\@idxfile{#1_html}%
+ \def\@sptheidx{#2}%
+ \begingroup
+ \@sanitize
+ \@wrspindex}}
+
\catcode`\_=12%
\renewcommand*{\makeindex}[1][\BaseJobname]{%
\if@filesw
@@ -1087,17 +1094,15 @@
\RenewDocumentCommand{\subbottom}{O{} O{} m}{%
\subfloat[#1][#2]{#3}%
}
-
\renewcommand{\contsubtop}{%
- \ContinuedFloat\addtocounter{\@captype}{1}%
+ \ContinuedFloat
\subtop%
}
\renewcommand{\contsubbottom}{%
- \ContinuedFloat\addtocounter{\@captype}{1}%
+ \ContinuedFloat
\subbottom%
}
-
\renewcommand{\subconcluded}{}
\let\contsubtable\contsubtop
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-physunits.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-physunits.sty
index d5b3dbe10a4..b8e4f7725f6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-physunits.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-physunits.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{physunits}[2020/01/26]
+\LWR@ProvidesPackagePass{physunits}[2020/03/26]
\begin{warpMathJax}
\LWR@infoprocessingmathjax{physunits}
@@ -36,7 +36,7 @@
\CustomizeMathJax{\newcommand{\J}[1][ ]{\,\mathrm{#1J}}}
\CustomizeMathJax{\newcommand{\Joule}[1][ ]{\,\mathrm{#1J}}}
\CustomizeMathJax{\newcommand{\erg}{\,\mathrm{erg}}}
-\CustomizeMathJax{\newcommand{\kcal}[1]{\,\mathrm{kcal}}}% bug
+\CustomizeMathJax{\newcommand{\kcal}{\,\mathrm{kcal}}}
\CustomizeMathJax{\newcommand{\Cal}{\,\mathrm{Cal}}}
\CustomizeMathJax{\newcommand{\calorie}[1][ ]{\,\mathrm{#1cal}}}
\CustomizeMathJax{\newcommand{\BTU}{\,\mathrm{BTU}}}
@@ -82,9 +82,9 @@
\CustomizeMathJax{\newcommand{\ftpss}{\,\mathrm{ft}\,\mathrm{s}^{-2}}}
\CustomizeMathJax{\newcommand{\K}[1][ ]{\,\mathrm{#1K}}}
\CustomizeMathJax{\newcommand{\Kelvin}[1][ ]{\,\mathrm{#1K}}}
-\CustomizeMathJax{\newcommand{\Celcius}{^\circ{\,\mathrm{C}}}}% move space
-\CustomizeMathJax{\newcommand{\Rankine}{^\circ{\,\mathrm{R}}}}% move space
-\CustomizeMathJax{\newcommand{\Fahrenheit}{^\circ{\,\mathrm{F}}}}% move space
+\CustomizeMathJax{\newcommand{\Celcius}{\,^\circ{\mathrm{C}}}}
+\CustomizeMathJax{\newcommand{\Rankine}{\,^\circ{\mathrm{R}}}}
+\CustomizeMathJax{\newcommand{\Fahrenheit}{\,^\circ{\mathrm{F}}}}
\CustomizeMathJax{\newcommand{\rpm}{\,\mathrm{rev}\,\Min^{-1}}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 09abb4ef2a9..a476c088b8c 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}
- [2020/03/25 v0.82 Allows LaTeX to directly produce HTML5 output.]
+ [2020/03/25 v0.83 Allows LaTeX to directly produce HTML5 output.]
@@ -4197,7 +4197,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js?config=TeX-
-- Copyright 2016-2020 Brian Dunn
-printversion = "v0.82"
+printversion = "v0.83"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()