summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-02 20:57:55 +0000
committerKarl Berry <karl@freefriends.org>2019-09-02 20:57:55 +0000
commit1bcbcdf719a79c5b851d5506608fd117288f90cc (patch)
tree68aa7a4043fbc9c087fb8499ad1fe4b96a565b62 /Master/texmf-dist/tex/latex/lwarp
parentdc3d664b996915ebf8a1409711fb346af9f6247a (diff)
lwarp (2sep19)
git-svn-id: svn://tug.org/texlive/trunk@52016 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-academicons.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty3
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty12
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty20
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty22
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome.sty8
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome5.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty14
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty11
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty1
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty62
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-marvosym.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty30
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty14
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty8
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pifont.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty10
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty16
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-typicons.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty336
36 files changed, 452 insertions, 185 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-academicons.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-academicons.sty
index 0a15db6d104..a49a2784eb0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-academicons.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-academicons.sty
@@ -21,7 +21,7 @@
\let\LWR@academicons@orig@AI\AI
\newcommand*{\LWR@academicons@symbol}[1]{%
- \begin{lateximage}*[(academicon)][academicons#1]%
+ \begin{lateximage}*[academicon][academicons#1]%
\begingroup%
\LWR@academicons@orig@AI%
\LWR@orig@symbol{#1}%
@@ -35,7 +35,7 @@
\renewcommand*{\aiicon}[1]
{%
- \begin{lateximage}*[(#1 icon)][academicons#1]%
+ \begin{lateximage}*[#1 icon][academicons#1]%
\AI\csname aiicon@#1\endcsname%
\end{lateximage}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
index ee80af4ad0c..4e13e17cc3b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
@@ -39,7 +39,7 @@
\begin{BlockClass}{displaymathnumbered}
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[\LWR@amsmathbodynumbered{#1}]
+ \begin{lateximage}[\LWR@amsmathbodynumbered{#1}]*
\LWR@applyxfakebold%
}
\newcommand*{\LWR@amsmathenv@before}[1]{%
@@ -67,6 +67,7 @@
\LWR@addmathjax{#1}{\the\@envbody}
}
{\LWR@amsmathenv@@after}
+\gdef\LWR@ThisAltText{}%
}
\BeforeBeginEnvironment{multline}{\LWR@amsmathenv@before{multline}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty
index 4da47490bec..e4468d6194a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty
@@ -16,12 +16,14 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\LWR@ProvidesPackagePass{asymptote}[2016/11/26]
-\BeforeBeginEnvironment{asy}{\begin{lateximage}[(-asymptote-~\packagediagramname)]}
+\BeforeBeginEnvironment{asy}{%
+ \begin{lateximage}[-asymptote-~\PackageDiagramAltText]%
+}
\AfterEndEnvironment{asy}{\end{lateximage}}
\xpatchcmd{\asyinclude}
{\begingroup}
- {\begin{lateximage}[(-asymptote-~\packagediagramname)]}
+ {\begin{lateximage}[-asymptote-~\PackageDiagramAltText]}
{}
{\LWR@patcherror{asymptote}{asyinclude-begingroup}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty
index a4d08184948..6655a6815b7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty
@@ -18,7 +18,9 @@
\LWR@ProvidesPackagePass{axodraw2}[2018/02/15]
-\BeforeBeginEnvironment{axopicture}{\begin{lateximage}[(-axopicture-~\packagediagramname)]}
+\BeforeBeginEnvironment{axopicture}{%
+ \begin{lateximage}[-axopicture-~\PackageDiagramAltText]%
+}
\AfterEndEnvironment{axopicture}{\end{lateximage}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty
index 636ca606743..6412346b42f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty
@@ -18,7 +18,7 @@
\LWR@ProvidesPackagePass{bitpattern}[2015/12/11]
\xpatchcmd{\bitpattern}
{\begingroup}
- {\begin{lateximage}[(-bitpattern-~\packagediagramname)]}
+ {\begin{lateximage}[-bitpattern-~\PackageDiagramAltText]}
{}
{\LWR@patcherror{bitpattern}{bitpattern}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty
index a19e8c67432..f88a35ec761 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty
@@ -24,7 +24,7 @@
\begin{BlockClass}{displaymathnumbered}
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[-breqn dmath- \mathimagename]
+ \begin{lateximage}[-breqn dmath- \MathImageAltText]
}
\AfterEndEnvironment{dmath}{
@@ -35,7 +35,7 @@
\begin{BlockClass}{displaymath}
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[-breqn dmath*- \mathimagename]
+ \begin{lateximage}[-breqn dmath*- \MathImageAltText]
}
\AfterEndEnvironment{dmath*}{
@@ -46,7 +46,7 @@
\begin{BlockClass}{displaymathnumbered}
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[-breqn dseries- \mathimagename]
+ \begin{lateximage}[-breqn dseries- \MathImageAltText]
}
\AfterEndEnvironment{dseries}{
@@ -57,7 +57,7 @@
\begin{BlockClass}{displaymath}
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[-breqn dseries*- \mathimagename]
+ \begin{lateximage}[-breqn dseries*- \MathImageAltText]
}
\AfterEndEnvironment{dseries*}{
@@ -68,7 +68,7 @@
\begin{BlockClass}{displaymath}
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[-breqn dgroup- \mathimagename]
+ \begin{lateximage}[-breqn dgroup- \MathImageAltText]
}
\AfterEndEnvironment{dgroup}{
@@ -79,7 +79,7 @@
\begin{BlockClass}{displaymath}
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[-breqn dgroup*- \mathimagename]
+ \begin{lateximage}[-breqn dgroup*- \MathImageAltText]
}
\AfterEndEnvironment{dgroup*}{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty
index 494ca5cdb68..c528fbf47b8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty
@@ -18,7 +18,9 @@
\LWR@ProvidesPackagePass{bytefield}[2017/09/15]
-\BeforeBeginEnvironment{bytefield}{\begin{lateximage}[(-bytefield-~\packagediagramname)]}
+\BeforeBeginEnvironment{bytefield}{%
+ \begin{lateximage}[-bytefield-~\PackageDiagramAltText]%
+}
\AfterEndEnvironment{bytefield}{\end{lateximage}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty
index 57cd130e829..77efb83c48a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty
@@ -20,7 +20,7 @@
\begin{BlockClass}{displaymathnumbered}
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[-cases- \mathimagename]
+ \begin{lateximage}[-cases- \MathImageAltText]
}
\AfterEndEnvironment{numcases}{
@@ -31,7 +31,7 @@
\begin{BlockClass}{displaymathnumbered}
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[-cases- \mathimagename]
+ \begin{lateximage}[-cases- \MathImageAltText]
}
\AfterEndEnvironment{subnumcases}{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty
index d5c1dd21069..d9c2b8fb9e9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty
@@ -27,19 +27,21 @@
\LetLtxMacro\LWR@chemfig@origchemfig\chemfig
\renewcommand*{\chemfig}[2][]{%
- \begin{lateximage}[(-chemfig-~\packagediagramname)]%
+ \begin{lateximage}[-chemfig-~\PackageDiagramAltText]%
\LWR@chemfig@origchemfig[#1]{#2}%
\end{lateximage}%
}
\GlobalLetLtxMacro\LWR@chemfig@origCF_lewisc\CF_lewisc
\gdef\CF_lewisc#1,#2\_nil{%
- \begin{lateximage}[(-chemfig-~\packagediagramname)]%
+ \begin{lateximage}[-chemfig-~\PackageDiagramAltText]%
\LWR@chemfig@origCF_lewisc#1,#2\_nil
\end{lateximage}
}
- \gpreto{\schemestart}{\begin{lateximage}[(-chemfig-~\packagediagramname)]}
+ \gpreto{\schemestart}{%
+ \begin{lateximage}[-chemfig-~\PackageDiagramAltText]%
+ }
\gappto{\CF_schemestop}{\end{lateximage}}
}% 2019/04/18 or newer
@@ -48,7 +50,7 @@
\LetLtxMacro\LWR@chemfig@origchemfig\chemfig
\DeclareDocumentCommand\chemfig{s O{} O{} m}{%
- \begin{lateximage}[(-chemfig-~\packagediagramname)]%
+ \begin{lateximage}[-chemfig-~\PackageDiagramAltText]%
\IfBooleanTF{#1}{%
\LWR@chemfig@origchemfig*[#2][#3]{#4}%
}{%
@@ -60,12 +62,14 @@
\LetLtxMacro\LWR@chemfig@origCF@lewis@b\CF@lewis@b
\def\CF@lewis@b#1#2{%
- \begin{lateximage}[(-chemfig-~\packagediagramname)]%
+ \begin{lateximage}[-chemfig-~\PackageDiagramAltText]%
\LWR@chemfig@origCF@lewis@b{#1}{#2}%
\end{lateximage}%
}
- \preto{\schemestart}{\begin{lateximage}[(-chemfig-~\packagediagramname)]}
+ \preto{\schemestart}{%
+ \begin{lateximage}[-chemfig-~\PackageDiagramAltText]%
+ }
\appto{\CF@schemestop}{\end{lateximage}}
}% older than 2019/04/18
@@ -75,7 +79,7 @@
\LetLtxMacro\LWR@chemfig@origchemleft\chemleft
\def\chemleft#1#2\chemright#3{%
-\begin{lateximage}[(-chemfig-~\packagediagramname)]%
+\begin{lateximage}[-chemfig-~\PackageDiagramAltText]%
\LWR@chemfig@origchemleft#1#2\chemright#3%
\end{lateximage}%
}
@@ -83,7 +87,7 @@
\LetLtxMacro\LWR@chemfig@origchemup\chemup
\def\chemup#1#2\chemdown#3{%
-\begin{lateximage}[(-chemfig-~\packagediagramname)]%
+\begin{lateximage}[-chemfig-~\PackageDiagramAltText]%
\LWR@chemfig@origchemup#1#2\chemdown#3%
\end{lateximage}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty
index 511de15ae90..45a741ddfde 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty
@@ -68,7 +68,7 @@
}
\RenewDocumentCommand \charrow { mO{}O{} }
{
- \begin{lateximage}[(-chemformula- charrow)]
+ \begin{lateximage}[-chemformula- charrow]
\group_begin:
\__chemformula_draw_arrow:nnn {#1} {#2} {#3}
\group_end:
@@ -78,7 +78,7 @@
{
\begin{lateximage}*[%
\textbackslash{}chname(\LWR@HTMLsanitize{#1})(\LWR@HTMLsanitize{#2})
- ]%
+ ]*%
\chemformula_chwritebelow:nn {#1} {#2}
\end{lateximage}
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
index 0f0e0975d66..29c30b99918 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
@@ -25,11 +25,11 @@
\ExplSyntaxOff
\DeclareDocumentEnvironment{polymerdelims}{}
-{\begin{lateximage}[(-chemmacros- polymer)]}
+{\begin{lateximage}[-chemmacros- polymer]}
{\end{lateximage}}
\DeclareDocumentEnvironment{redoxreaction}{m m}
-{\begin{lateximage}[(-chemmacros- redoxreaction)]}
+{\begin{lateximage}[-chemmacros- redoxreaction]}
{\end{lateximage}}
\ExplSyntaxOn
\AtBeginDocument{
@@ -198,13 +198,13 @@
}
\EndChemCompatibility
\RenewDocumentCommand \Sconf { O{S} } {
-\begin{lateximage}[\textbackslash{}Sconf{[}#1{]}]
+\begin{lateximage}[\textbackslash{}Sconf{[}#1{]}]*
\chemmacros_sconf:n {#1}
\end{lateximage}
}
\RenewDocumentCommand \Rconf { O{R} } {
-\begin{lateximage}[\textbackslash{}Rconf{[}#1{]}]
+\begin{lateximage}[\textbackslash{}Rconf{[}#1{]}]*
\chemmacros_rconf:n {#1}
\end{lateximage}
}
@@ -441,8 +441,8 @@
\RenewDocumentCommand \newman {od()m}%
{
\IfValueTF{#2}
- {\begin{lateximage}[\textbackslash{}newman(#2)\{#3\}]}
- {\begin{lateximage}[\textbackslash{}newman\{#3\}]}
+ {\begin{lateximage}[\textbackslash{}newman(#2)\{#3\}]*}
+ {\begin{lateximage}[\textbackslash{}newman\{#3\}]*}
\group_begin:
\IfNoValueF {#1} { \chemmacros_set_keys:nn {newman} {#1} }
\IfNoValueTF {#2}
@@ -464,12 +464,12 @@
{
\begin{lateximage}[%
\textbackslash{}orbital{[}\LWR@HTMLsanitize{#1}{]}\{#2\}%
- ][][margin-left: 1em ; margin-right: 1em]
+ ]*[][margin-left: 1em ; margin-right: 1em]
}
{
\begin{lateximage}[%
\textbackslash{}orbital\{#2\}%
- ][][margin-left: 1em ; margin-right: 1em]
+ ]*[][margin-left: 1em ; margin-right: 1em]
}
\group_begin:
\chemmacros_set_keys:nn {orbital/type} {#2}
@@ -490,13 +490,17 @@
{
\exp_args:Nnx \DeclareDocumentEnvironment {#1} { O{} \prg_replicate:nn {#3+0} {m} }
{
- \boolfalse{mathjax}% lwarp
+ \boolfalse{mathjax}% lwarp
+ \ifdefvoid{\LWR@ThisAltText}{% lwarp
+ \ThisAltText{-chemmacros-~reaction}% lwarp
+ }{}% lwarp
\chemmacros_add_reaction_description:n {##1}
\__chemmacros_begin_reaction:
\chemmacros_reaction_read:nnw {#2} {#4}
}
{
\__chemmacros_end_reaction:
+ \gdef\LWR@ThisAltText{}% lwarp
}
}
\cs_generate_variant:Nn \chemmacros_declare_reaction_env:nnnn {nnnV}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome.sty
index cfcb9b67d2b..6bec2486ffc 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome.sty
@@ -23,7 +23,7 @@
\newfontfamily{\LWR@orig@FA}{FontAwesome}
\newcommand*{\LWR@fontawesome@xelatex@symbol}[1]{%
-\begin{lateximage}*[(icon)][fontawesomexetex#1]%
+\begin{lateximage}*[icon][fontawesomexetex#1]%
\begingroup%
\LWR@orig@FA%
\LWR@orig@symbol{#1}%
@@ -38,7 +38,7 @@
\else
\newcommand*{\LWR@fontawesome@symbolone}[1]{%
-\begin{lateximage}*[(icon #1)][fontawesomeone#1]%
+\begin{lateximage}*[icon #1][fontawesomeone#1]%
\begingroup%
\fontencoding{U}\fontfamily{fontawesomeone}\selectfont%
\LWR@orig@symbol{#1}%
@@ -47,7 +47,7 @@
}
\newcommand*{\LWR@fontawesome@symboltwo}[1]{%
-\begin{lateximage}*[(icon #1)][fontawesometwo#1]%
+\begin{lateximage}*[icon #1][fontawesometwo#1]%
\begingroup%
\fontencoding{U}\fontfamily{fontawesometwo}\selectfont%
\LWR@orig@symbol{#1}%
@@ -56,7 +56,7 @@
}
\newcommand*{\LWR@fontawesome@symbolthree}[1]{%
-\begin{lateximage}*[(icon #1)][fontawesomethree#1]%
+\begin{lateximage}*[icon #1][fontawesomethree#1]%
\begingroup%
\fontencoding{U}\fontfamily{fontawesomeonethree}\selectfont%
\LWR@orig@symbol{#1}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome5.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome5.sty
index 594080c1d37..668a2cab51e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome5.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome5.sty
@@ -19,7 +19,7 @@
\ExplSyntaxOn
\cs_set:Nn\fontawesome_use_icon:nn{
\cs_if_exist:cTF{c__fontawesome_slot_#2_tl}{
- \begin{lateximage}*[(#2)][#1]
+ \begin{lateximage}*[#2][#1]
\exp_last_unbraced:Nv
\__fontawesome_icon_at:nnnn
{c__fontawesome_slot_#2_tl}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty
index 5300deaf9a6..d222886dfa0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty
@@ -30,7 +30,7 @@
{Lwarp uses an environment for images, but \Forest* cannot work in an environment.}%
\let\forest@next\forest@env%
}{\let\forest@next\forest@group@env}%
- \begin{lateximage}[forest]% lwarp
+ \begin{lateximage}[-forest-~\PackageDiagramAltText]% lwarp
\forest@next{#3}%
\end{lateximage}% lwarp
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
index 3afb9e6aa60..c5c2ee4c37a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
@@ -17,7 +17,19 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{geometry}[2018/04/16]
+\LWR@ProvidesPackageDropA{geometry}{2018/04/16}
+\ifbool{LWR@allowanothergeometry}{%
+\newcommand*{\LWR@newgeometryoptions}{reset,}
+
+\DeclareOption*{%
+ \edef\LWR@newgeometryoptions{\LWR@newgeometryoptions\CurrentOption,}%
+}
+\ProcessOptions\relax
+\ifdefvoid{\LWR@newgeometryoptions}{}{
+ \expandafter\LWR@origgeometry\expandafter{\LWR@newgeometryoptions}
+}
+
+}{}% LWR@allowanothergeometry
\renewcommand*{\geometry}[1]{}
\renewcommand*{\newgeometry}[1]{}
\renewcommand*{\restoregeometry}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
index 64e8aa1b18c..61c5a38bef4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
@@ -51,7 +51,7 @@
\newcommand*{\LWR@igxscale}{1}
\newcommand*{\LWR@igyscale}{1}
\newcommand*{\LWR@igclass}{inlineimage}
-\newcommand*{\LWR@igalt}{(image)}
+\newcommand*{\LWR@igalt}{\ImageAltText}
\define@key{igraph}{width}{%
\setlength{\LWR@igwidth}{#1}%
@@ -196,7 +196,11 @@
\renewcommand*{\LWR@igxscale}{1}%
\renewcommand*{\LWR@igyscale}{1}%
\renewcommand*{\LWR@igclass}{inlineimage}%
-\renewcommand*{\LWR@igalt}{(image)}%
+\ifdefvoid{\LWR@ThisAltText}{%
+ \renewcommand*{\LWR@igalt}{\ImageAltText}%
+}{%
+ \renewcommand*{\LWR@igalt}{\LWR@ThisAltText}%
+}%
\IfValueF{#3}{%
\IfValueTF{#2}%
{\setkeys{igraph}{#2}}%
@@ -316,10 +320,11 @@ src="%
"\LWR@indentHTML%
}{}%
class="\LWR@igclass"\LWR@indentHTML%
-alt="\LWR@igalt" \LWR@orignewline%
+alt="\AltTextOpen\LWR@igalt\AltTextClose" \LWR@orignewline%
}% end of image tags
}% end of href
\endgroup
+\gdef\LWR@ThisAltText{}%
\LWR@traceinfo{LWR@includegraphicsb done}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
index 00e8488ba15..6b959804450 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
@@ -82,6 +82,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
\detokenize\expandafter{#1}\LWR@hashmark%
\detokenize\expandafter{#2}.\detokenize\expandafter{#3}%
"%
+ \LWR@addlinktitle%
}%
\endgroup%
\LWR@hyperreffinish%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty
index d77574e1597..72772a2edba 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty
@@ -15,31 +15,53 @@
%% 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@origRequirePackage{luacode}
+
\LWR@ProvidesPackagePass{lyluatex}[2019/05/27]
-\newcommand*{\lyluateximagename}{(-lilypond-~\packagediagramname)}
+\newcommand*{\LyluatexImageAltText}{-lilypond-~\PackageDiagramAltText}
\LetLtxMacro\LWR@orig@ly@compilescore\ly@compilescore
\renewcommand*{\ly@compilescore}[1]{%
- \begin{lateximage}[\lyluateximagename]%
- \LWR@orig@ly@compilescore{#1}%
- \end{lateximage}%
-}
-
-\AtBeginDocument{
- \lysetoption{paperwidth}{6in}
- \lysetoption{paperheight}{9in}
- \lysetoption{line-width}{5.5in}
- \lysetoption{twoside}{false}
- \lysetoption{fullpagestyle}{empty}
- \lysetoption{fullpagealign}{crop}
- \lysetoption{print-page-number}{false}
- \lysetoption{insert}{systems}
- \lysetoption{extra-top-margin}{0}
- \lysetoption{extra-bottom-margin}{0}
- \lysetoption{valign}{center}
- \lysetoption{staffsize}{20}
- \lysetoption{inline-staffsize}{14}
+ \begingroup%
+ \LWR@orignewpage%
+ \LWR@origloadgeometry{LWR@usergeometry}%
+ \LWR@print@normalsize%
+ \renewcommand{\includegraphics}[2][]{%
+ \InlineClass{lyluatex}{%
+ \begin{lateximage}[\LyluatexImageAltText]%
+ \LWR@addbaselinemarker%
+ \LWR@origincludegraphics{##2}%
+ \end{lateximage}%
+ }%
+ }%
+ \ly@setunits%
+ \directlua{
+ ly_opts:set_option('currfiledir', [[\currfiledir]])
+ ly_opts:set_option('twoside', '\ly@istwosided')
+ #1
+ }%
+ \ly@resetunits%
+ \ly@currentfonts%
+ \directlua{
+ if (ly.score.insert == 'fullpage') then
+ tex.print{[[\string\begin{BlockClass}{lyluatex}]]}
+ end
+ }%
+ \directlua{ly.score:process()}%
+ \directlua{
+ if (ly.score.insert == 'fullpage') then
+ tex.print{[[\string\end{BlockClass}]]}
+ end
+ }%
+ \LWR@orignewpage%
+ \LWR@origrestoregeometry%
+ \endgroup%
}
+\xpatchcmd{\endly@bufferenv}
+ {\hspace{0pt}\\}
+ {}
+ {}
+ {\LWR@patcherror{lyluatex}{endly@bufferenv}}
\endinput
%%
%% End of file `lwarp-lyluatex.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marvosym.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marvosym.sty
index 958bf2ea2d2..7be49853d09 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marvosym.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marvosym.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\LWR@ProvidesPackagePass{marvosym}[2011/07/20]
\renewcommand{\mvchr}[1]{%
- \begin{lateximage}*[(symbol #1)][marvosym #1]%
+ \begin{lateximage}*[symbol #1][marvosym #1]%
\mvs\char#1%
\end{lateximage}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty
index d96cfc200c1..0634ee5650c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty
@@ -21,7 +21,20 @@
\LetLtxMacro\LWR@mhchem@origce\ce
\newcommand{\LWR@mhchem@HTML@ce}[1]{%
-\begin{lateximage}*[\textbackslash{}ce\{\LWR@HTMLsanitize{#1}\}]%
+\LWR@findcurrenttextcolor% sets \LWR@tempcolor
+\ifbool{LWR@xfakebold}%
+ {\def\LWR@tempone{Y}}%
+ {\def\LWR@tempone{N}}%
+\begin{lateximage}*[\textbackslash{}ce\{\LWR@HTMLsanitize{#1}\}]*%
+ [%
+ FM\LWR@f@family%
+ SR\LWR@f@series%
+ SH\LWR@f@shape%
+ SHC\LWR@f@shapecaps%
+ CL\LWR@tempcolor%
+ FB\LWR@tempone% xfakebold
+ ]%
+\LWR@setcurrentfont%
\LWR@mhchem@origce{#1}%
\end{lateximage}%
\endgroup%
@@ -44,7 +57,20 @@
\newcommand*{\LWR@mhchem@HTML@cesplit}[2]
{%
-\begin{lateximage}*[\textbackslash{}cesplit\{\LWR@HTMLsanitize{#2}\}]%
+\LWR@findcurrenttextcolor% sets \LWR@tempcolor
+\ifbool{LWR@xfakebold}%
+ {\def\LWR@tempone{Y}}%
+ {\def\LWR@tempone{N}}%
+\begin{lateximage}*[\textbackslash{}cesplit\{\LWR@HTMLsanitize{#2}\}]*%
+ [%
+ FM\LWR@f@family%
+ SR\LWR@f@series%
+ SH\LWR@f@shape%
+ SHC\LWR@f@shapecaps%
+ CL\LWR@tempcolor%
+ FB\LWR@tempone% xfakebold
+ ]%
+\LWR@setcurrentfont%
\LWR@mhchem@origcesplit{#1}{#2}%
\end{lateximage}%
\endgroup%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty
index 12143adac48..e0393841295 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty
@@ -50,7 +50,7 @@
\LWR@formatted{musDottedNote}
\NewDocumentCommand{\LWR@HTML@musMeter}{ m m }{%
-\begin{lateximage}*[#1/#2][#1#2]%
+\begin{lateximage}*[#1/#2][#1#2]*%
\musStack{#1 #2}\kern0.05em%
\end{lateximage}%
}
@@ -58,7 +58,7 @@
\LWR@formatted{musMeter}
\NewDocumentCommand{\LWR@HTML@meterCplus}{ m }{%
-\begin{lateximage}*[C#1]%
+\begin{lateximage}*[C#1]*%
\meterC{}\kern-0.7pt#1%
\end{lateximage}%
}
@@ -66,7 +66,7 @@
\LWR@formatted{meterCplus}
\NewDocumentCommand{\LWR@HTML@meterC}{}{%
-\begin{lateximage}*[C]%
+\begin{lateximage}*[C]*%
\musSymbolMeter{\symbol{83}}%
\end{lateximage}%
}
@@ -74,7 +74,7 @@
\LWR@formatted{meterC}
\NewDocumentCommand{\LWR@HTML@meterCutC}{}{%
-\begin{lateximage}*[C|]%
+\begin{lateximage}*[C|]*%
\musSymbolMeter{\symbol{82}}%
\end{lateximage}%
}
@@ -82,7 +82,7 @@
\LWR@formatted{meterCutC}
\NewDocumentCommand{\LWR@HTML@meterCThreeTwo}{}{%
-\begin{lateximage}*[C3/2]%
+\begin{lateximage}*[C3/2]*%
\meterCplus{\musStack{3 2}}%
\end{lateximage}%
}
@@ -104,9 +104,9 @@
\LetLtxMacro\musFlat\LWR@HTML@musFlat%
\LetLtxMacro\musDoubleFlat\LWR@HTML@musDoubleFlat%
\LetLtxMacro\musNatural\LWR@HTML@musNatural%
- ({#1})% braces here because \noFig uses []
+ {#1}% braces here because \noFig uses []
}%
-]%
+]*%
\musStack[\musFigFont]{#1}%
\end{lateximage}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
index d4ec1042017..d5ed3d6c629 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
@@ -81,8 +81,8 @@
{\LWR@patcherror{pdfpages}{AM@output-3}}
\xpretocmd{\includepdf}{%
\begingroup%
- \setlength{\paperwidth}{8in}%
- \setlength{\paperheight}{10.5in}%
+ \setlength{\paperwidth}{\LWR@userspaperwidth}%
+ \setlength{\paperheight}{\LWR@userspaperheight}%
}{}{}
\xapptocmd{\includepdf}{%
@@ -91,8 +91,8 @@
\xpretocmd{\includepdfmerge}{%
\begingroup%
- \setlength{\paperwidth}{8in}%
- \setlength{\paperheight}{10.5in}%
+ \setlength{\paperwidth}{\LWR@userspaperwidth}%
+ \setlength{\paperheight}{\LWR@userspaperheight}%
}{}{}
\xapptocmd{\includepdfmerge}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pifont.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pifont.sty
index 1d3fb5ff1ed..68cde54f561 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pifont.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pifont.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\LWR@ProvidesPackagePass{pifont}[2005/04/12]
\renewcommand{\Pisymbol}[2]{%
- \begin{lateximage}*[(Pisymbol)][pisymbol#1#2]%
+ \begin{lateximage}*[Pisymbol][pisymbol#1#2]%
{\Pifont{#1}\char#2}%
\end{lateximage}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty
index 3b138904bed..0fae38d5da6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\LWR@ProvidesPackagePass{psfrag}[1998/04/11]
\BeforeBeginEnvironment{psfrags}{%
- \begin{lateximage}[(-psfrags-~\packagediagramname)]%
+ \begin{lateximage}[-psfrags-~\PackageDiagramAltText]%
}
\AfterEndEnvironment{psfrags}{\end{lateximage}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty
index f2bb0e0d081..bba4f2e7004 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty
@@ -17,13 +17,13 @@
%% version 2005/12/01 or later.
\LWR@ProvidesPackagePass{psfragx}[2012/05/02]
\def\pfx@includegraphicx#1#2{%
- \begin{lateximage}[(-psfragx-~\packagediagramname)]%
+ \begin{lateximage}[-psfragx-~\PackageDiagramAltText]%
\mbox{\pfx@overpix{#1}{#2}\endpfx@overpix}%
\end{lateximage}%
}
\def\@@@overpix[#1]<#2>[#3]#4{%
- \begin{lateximage}[(-psfragx-~\packagediagramname)]%
+ \begin{lateximage}[-psfragx-~\PackageDiagramAltText]%
\pfx@overpix{#1,ovpfgd={#2},ovpbgd={#3}}{#4}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty
index e0be9e2e9d6..813f422277f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\LWR@ProvidesPackagePass{pstool}[2018/01/20]
\renewcommand\pstool@alwaysprocess[3][]{%
- \begin{lateximage}[(-pstool-~\packagediagramname)]%
+ \begin{lateximage}[-pstool-~\PackageDiagramAltText]%
\includegraphics{#2.pdf}%
\end{lateximage}%
}
@@ -25,7 +25,7 @@
\LetLtxMacro\pstool@maybeprocess\pstool@alwaysprocess
\renewcommand\pstool@@psfragfig[4]{%
- \begin{lateximage}[(-pstool-~\packagediagramname)]%
+ \begin{lateximage}[-pstool-~\PackageDiagramAltText]%
\includegraphics{#2.pdf}%
\end{lateximage}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty
index 120712a3a6f..3203734dd44 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty
@@ -16,7 +16,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\LWR@ProvidesPackagePass{pstricks}[2018/01/06]
-\BeforeBeginEnvironment{pspicture}{\begin{lateximage}[(pspicture)]}
+\BeforeBeginEnvironment{pspicture}{%
+ \begin{lateximage}[pspicture]%
+}
\AfterEndEnvironment{pspicture}{\end{lateximage}}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty
index e16df1e6f02..dae6862726a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty
@@ -20,7 +20,10 @@
\xpatchcmd{\register}
{\centering}
- {\begin{center}\begin{lateximage}[(-register-~\packagediagramname)]}
+ {%
+ \begin{center}%
+ \begin{lateximage}[-register-~\PackageDiagramAltText]%
+ }
{}
{\LWR@patcherror{register}{register}}
@@ -34,7 +37,10 @@
{\LWR@patcherror{register}{endregister}}
\expandafter\xapptocmd\csname register*\endcsname
- {\begin{center}\begin{lateximage}[(-register-~\packagediagramname)]}
+ {%
+ \begin{center}%
+ \begin{lateximage}[-register-~\PackageDiagramAltText]%
+ }
{}
{\LWR@patcherror{register}{register*}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty
index 55112e993f9..32ee6a05d4b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty
@@ -19,8 +19,8 @@
\LetLtxMacro\LWR@orig@stackengine\stackengine
\renewcommand*{\stackengine}[8]{%
\ifstrequal{#4}{O}%
- {\begin{lateximage}}%
- {\begin{lateximage}[][][vertical-align:top]}%
+ {\begin{lateximage}[\ImageAltText]}%
+ {\begin{lateximage}[\ImageAltText][][vertical-align:top]}%
\LWR@orig@stackengine{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}%
\end{lateximage}%
}
@@ -32,8 +32,8 @@
\renewcommand*{\@stack}[4]{%
\ifstrequal{#3}{O}%
- {\begin{lateximage}}%
- {\begin{lateximage}[][][vertical-align:top]}%
+ {\begin{lateximage}[\ImageAltText]}%
+ {\begin{lateximage}[\ImageAltText][][vertical-align:top]}%
\LWR@orig@@stack{#1}{#2}{#3}{#4}%
\end{lateximage}%
}
@@ -47,14 +47,16 @@
{}
{\LWR@patcherror{stackengine}{stackanchor patch 2}}
-\xpretocmd{\stackanchor}{\begin{lateximage}[][][vertical-align:middle]}
+\xpretocmd{\stackanchor}
+ {\begin{lateximage}[\ImageAltText][][vertical-align:middle]}
{}
{\LWR@patcherror{stackengine}{stackanchor pre}}
\xapptocmd{\stackanchor}{\end{lateximage}}
{}
{\LWR@patcherror{stackengine}{stackanchor app}}
-\xpretocmd{\Centerstack}{\begin{lateximage}[][][vertical-align:middle]}
+\xpretocmd{\Centerstack}
+ {\begin{lateximage}[\ImageAltText][][vertical-align:middle]}
{}
{\LWR@patcherror{stackengine}{Centerstack pre}}
@@ -68,7 +70,7 @@
}{}%
\begingroup% lwarp
\LWR@restoreorigformatting% lwarp
- \RenewDocumentEnvironment{lateximage}{s o o o}{}{}% lwarp: inside group
+ \RenewDocumentEnvironment{lateximage}{s o s o o}{}{}% lwarp: inside group
\expandafter\LWR@gsavebox\csname\sv@name content\endcsname{#2}%
\expandafter\gdef\expandafter#1\expandafter{%
\expandafter\begin\expandafter{lateximage\expandafter}% lwarp
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty
index 75834ca80dd..b58d9c9ea1f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty
@@ -16,7 +16,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\LWR@ProvidesPackagePass{struktex}[2018/06/04]
-\BeforeBeginEnvironment{struktogramm}{\begin{lateximage}[(struktogramm)]}
+\BeforeBeginEnvironment{struktogramm}{%
+ \begin{lateximage}[-struktex-~\PackageDiagramAltText]%
+}
\AfterEndEnvironment{struktogramm}{\end{lateximage}}
\newenvironment{LWR@HTML@centernss}{\begin{center}}{\end{center}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
index ba395ec7538..126ebee95cd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
@@ -26,7 +26,7 @@
{\boolfalse{LWR@tikzbabel}}
\preto\pgfpicture{%
- \begin{lateximage}%
+ \begin{lateximage}[-tikz-~\PackageDiagramAltText]%
\ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0
{}%
{\catcode`\$=3}% dollar sign is math shift
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-typicons.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-typicons.sty
index 34e96b8529f..dc3a2cee1e3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-typicons.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-typicons.sty
@@ -21,7 +21,7 @@
\let\LWR@orig@typicon@TI\TI
\newcommand*{\LWR@typicon@symbol}[1]{%
- \begin{lateximage}*[(typicon)][typicon#1]%
+ \begin{lateximage}*[typicon][typicon#1]%
\begingroup%
\LWR@orig@typicon@TI%
\LWR@orig@symbol{#1}%
@@ -35,7 +35,7 @@
\renewcommand*{\ticon}[1]
{%
- \begin{lateximage}*[(#1 icon)][typicon#1]%
+ \begin{lateximage}*[#1 icon][typicon#1]%
\TI\csname ticon@#1\endcsname%
\end{lateximage}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty
index cea0f69c599..04bd66739f9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty
@@ -20,7 +20,7 @@
\renewenvironment{vowel}[1][]
{%
- \begin{lateximage}[(-vowel-~\packagediagramname)]%
+ \begin{lateximage}[-vowel-~\PackageDiagramAltText]%
\@vowel[#1]%
}
{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty
index 0ca8db9c041..601e7e54295 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty
@@ -27,7 +27,9 @@
\NewDocumentCommand{\LWR@HTML@keyboard}{ O{}m }
{
\begin{lateximage}*
- [(-xpiano-~\packagediagramname{}: \detokenize\expandafter{#2})]
+ [%
+ -xpiano-~\PackageDiagramAltText{}: \detokenize\expandafter{#2}%
+ ]
[\detokenize\expandafter{#1}]
\xpiano_keyboard:nn { #1 } { #2 }
\end{lateximage}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
index 8266fe1df15..db49cd37737 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
@@ -25,7 +25,7 @@
\renewcommand*{\xy}{%
\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
{\addtocounter{LWR@lateximagedepth}{1}}%
- {\begin{lateximage}[(-xy-~\packagediagramname)]}%
+ {\begin{lateximage}[-xy-~\PackageDiagramAltText]}%
\LWR@orig@xy%
}
@@ -45,7 +45,7 @@
\LetLtxMacro\LWR@origxygraph\xygraph
\renewcommand{\xygraph}[1]{%
- \begin{lateximage}[(-xy- xygraph \packagediagramname)]
+ \begin{lateximage}[-xy- xygraph \PackageDiagramAltText]
\LWR@origxygraph{#1}
\end{lateximage}
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index dcd7ad4fa11..2fca6085b4a 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}
- [2019/07/11 v0.73 Allows LaTeX to directly produce HTML5 output.]
+ [2019/09/02 v0.74 Allows LaTeX to directly produce HTML5 output.]
@@ -1001,18 +1001,52 @@
\end{warpHTML}
\begin{warpHTML}
-\RequirePackage{geometry}
-\geometry{
- paperheight=190in,%
- paperwidth=20in,%
- left=2in,right=6in,%
- top=1in,bottom=1in,%
-}
+\@ifpackageloaded{geometry}
+{}{
+ \RequirePackage[
+ reset,
+ paperwidth=\paperwidth,
+ paperheight=\paperheight,
+ textwidth=\textwidth,
+ textheight=\textheight,
+ left=\oddsidemargin,
+ top=\topmargin,
+ marginparsep=\marginparsep,
+ marginparwidth=\marginparwidth,
+ ]{geometry}
+}
+\LetLtxMacro\LWR@origgeometry\geometry
+\LetLtxMacro\LWR@orignewgeometry\newgeometry
+\LetLtxMacro\LWR@origrestoregeometry\restoregeometry
+\LetLtxMacro\LWR@origsavegeometry\savegeometry
+\LetLtxMacro\LWR@origloadgeometry\loadgeometry
+\newbool{LWR@allowanothergeometry}
+\booltrue{LWR@allowanothergeometry}
+\AtEndPreamble{
+\LWR@origsavegeometry{LWR@usergeometry}
+\newlength{\LWR@userspaperwidth}
+\setlength{\LWR@userspaperwidth}{\paperwidth}
+
+\newlength{\LWR@userspaperheight}
+\setlength{\LWR@userspaperheight}{\paperheight}
+\LWR@origgeometry{
+ reset,
+ paperheight=190in,
+ paperwidth=20in,
+ left=2in,
+ right=6in,
+ top=1in,
+ bottom=1in,
+ heightrounded,%
+}
+\LWR@origsavegeometry{LWR@lwarpgeometry}
+\boolfalse{LWR@allowanothergeometry}%
\setlength{\textheight}{0.8\paperheight}
\setlength{\textwidth}{0.7\paperwidth}
\@twosidefalse
\@mparswitchfalse
+}% \AtEndPreamble
\end{warpHTML}
@@ -1253,19 +1287,25 @@
\ProcessOptions\relax
}
-\NewDocumentCommand{\LWR@ProvidesPackageDrop}{m o}{
-\PackageInfo{lwarp}{%
- Replacing package `#1' with the lwarp version,\MessageBreak
- and discarding options,%
-}%
-\IfValueTF{#2}
-{\ProvidesPackage{lwarp-#1}[#2]}
-{\ProvidesPackage{lwarp-#1}}
-\DeclareOption*{}
+\newcommand*{\LWR@ProvidesPackageDropA}[2]{%
+ \PackageInfo{lwarp}{%
+ Replacing package `#1' with the lwarp version,\MessageBreak
+ and discarding options,%
+ }%
+ \IfValueTF{#2}
+ {\ProvidesPackage{lwarp-#1}[#2]}
+ {\ProvidesPackage{lwarp-#1}}
+}
+\newcommand*{\LWR@ProvidesPackageDropB}{%
\let\ds@\@empty% from the original \ProcessOptions
\edef\@curroptions{}% lwarp modification to \ProcessOptions
\@process@ptions\relax% from the original \ProcessOptions
}
+\NewDocumentCommand{\LWR@ProvidesPackageDrop}{m o}{
+\LWR@ProvidesPackageDropA{#1}{#2}
+\DeclareOption*{}
+\LWR@ProvidesPackageDropB
+}
\end{warpHTML}
@@ -1565,6 +1605,7 @@
\LetLtxMacro\LWR@origttfamily\ttfamily
\LetLtxMacro\LWR@origem\em
+
\LetLtxMacro\LWR@orignormalfont\normalfont
\let\LWR@origonecolumn\onecolumn
@@ -2925,6 +2966,17 @@ div.cellcolor {
margin: -.5ex -.5em -.5ex -.5em ;
}
+/* for lyluatex */
+span.lyluatex {
+ display: inline-block ;
+}
+
+div.lyluatex p span.lateximagesource img {
+ display: block ;
+ margin-top: 3ex ;
+ margin-bottom: 3ex ;
+}
+
/* for bigdelim */
.ldelim, .rdelim { font-size: 200% }
@@ -4033,7 +4085,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.73"
+printversion = "v0.74"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -4063,7 +4115,8 @@ lwarpmk pdftohtml [-p project]:
lwarpmk pdftosvg <list of file names>: Converts each PDF file to SVG.
lwarpmk epstopdf <list of file names>: Converts each EPS file to PDF.
lwarpmk clean [-p project]: Remove *.aux, *.toc, *.lof/t,
- *.idx, *.ind, *.log, *_html_inc.*, .gl*
+ *.idx, *.ind, *.log, *_html_inc.*, .gl*,
+ *_html.pdf, *_html.html, *_html.sidetoc
lwarpmk cleanall [-p project]: Remove auxiliary files, project.pdf, *.html
lwarpmk cleanlimages: Removes all images from the "lateximages" directory.
lwarpmk -h: Print this help message.
@@ -4073,6 +4126,23 @@ lwarpmk --help: Print this help message.
-- printconf ()
end
+function splitfilename ( pathandfilename )
+--
+-- Separates out the path and extension from a filename.
+-- Returns path, filename with extension, and extension.
+-- Ex: thispath, thisfilename, thisextension = splitfilename ("path/to/filename.ext")
+--
+-- https://www.fhug.org.uk/wiki/wiki/doku.php?id=plugins:code_snippets:
+-- split_filename_in_to_path_filename_and_extension
+--
+ if lfs.attributes(pathandfilename,"mode") == "directory" then
+ local strPath = pathandfilename:gsub("[\\/]$","") -- $ (syntax highlighting)
+ return strPath.."\\","",""
+ end
+ pathandfilename = pathandfilename.."."
+ return pathandfilename:match("^(.-)([^\\/]-)%.([^\\/%.]-)%.?$")
+end
+
function splitfile (destfile,sourcefile)
--
-- Split one large sourcefile into a number of files,
@@ -4389,6 +4459,8 @@ function removeaux ()
--
-- Remove auxiliary files:
-- All .aux files are removed since there may be many bbl*.aux files.
+-- Also removes sourcename_html.pdf, sourcename_html.html,
+-- and sourcename_html.sidetoc.
--
os.execute ( rmname .. " *.aux " ..
sourcename ..".toc " .. sourcename .. "_html.toc " ..
@@ -4399,6 +4471,9 @@ os.execute ( rmname .. " *.aux " ..
sourcename ..".ps " .. sourcename .."_html.ps " ..
sourcename ..".log " .. sourcename .. "_html.log " ..
sourcename ..".gl* " .. sourcename .. "_html.gl* " ..
+ sourcename .. "_html.pdf " ..
+ sourcename .. "_html.html " ..
+ sourcename .. "_html.sidetoc " ..
" *_html_inc.* "
)
end
@@ -4640,7 +4715,7 @@ function convertepstopdf ()
--
-- Converts EPS files to PDF files.
-- The filenames are arg[argindex] and up.
--- arg[1] is the command "pdftosvg".
+-- arg[1] is the command "epstopdf".
--
ignoreconf ()
for i = argindex , #arg do
@@ -4648,7 +4723,16 @@ for i = argindex , #arg do
print ("lwarpmk: File \"" .. arg[i] .. "\" does not exist.")
else
print ("lwarpmk: Converting \"" .. arg[i] .. "\"")
- os.execute ( "epstopdf " .. arg[i] )
+ thispath, thisfilename, thisextension = splitfilename(arg[i])
+ if ( thispath == nil ) then
+ os.execute ( "epstopdf " .. arg[i] )
+ else
+ os.execute (
+ "epstopdf " ..
+ thispath .. thisfilename .. "." .. thisextension .. " " ..
+ thispath .. thisfilename .. ".pdf"
+ )
+ end
end -- if
end -- do
end --function
@@ -4665,7 +4749,16 @@ for i = argindex , #arg do
print ("lwarpmk: File \"" .. arg[i] .. "\" does not exist.")
else
print ("lwarpmk: Converting \"" .. arg[i] .. "\"")
- os.execute ( "pdftocairo -svg " .. arg[i] )
+ thispath, thisfilename, thisextension = splitfilename(arg[i])
+ if ( thispath == nil ) then
+ os.execute ( "pdftocairo -svg " .. arg[i] )
+ else
+ os.execute (
+ "pdftocairo -svg " ..
+ thispath .. thisfilename .. "." .. thisextension .. " " ..
+ thispath .. thisfilename .. ".svg"
+ )
+ end
end -- if
end -- do
end --function
@@ -9266,6 +9359,13 @@ rowspan="#2" %
}
+\newcommand*{\LWR@addlinktitle}{%
+ \ifdefvoid{\LWR@ThisAltText}{}{ % space
+ title="\LWR@ThisAltText" % space
+ \gdef\LWR@ThisAltText{}%
+ }%
+}
+
\newcommand*{\LWR@startref}[1]
{%
\LWR@sanitize{#1}%
@@ -9292,7 +9392,9 @@ rowspan="#2" %
}%
}%
\LWR@traceinfo{LWR@startref E}%
-"}%
+"%
+\LWR@addlinktitle%
+}%
\LWR@traceinfo{LWR@startref F}%
}
@@ -9348,6 +9450,7 @@ autopage-\theLWR@currentautosec%
\LWR@sanitize{#1}%
\LWR@htmltag{%
a href="\LWR@sanitized" % space
+ \LWR@addlinktitle % space
target="\_{}blank" % space
}%
}
@@ -9363,6 +9466,7 @@ autopage-\theLWR@currentautosec%
a % space
href="\begingroup\@sanitize#1\endgroup" % space
class="#3" % space
+ \LWR@addlinktitle % space
}\LWR@orignewline%
#2\LWR@orignewline%
\LWR@htmltag{/a}%
@@ -9422,24 +9526,24 @@ autopage-\theLWR@currentautosec%
\LWR@urlb%
}
-\newcommand*{\LWR@subinlineimage}[5][]{%
-\ifblank{#1}%
-{%
- \LWR@htmltag{img \LWR@indentHTML
- src="#3.#4" \LWR@indentHTML
- alt="#3" \LWR@indentHTML
- style="#5" \LWR@indentHTML
- class="#2" \LWR@orignewline
+\newcommand*{\LWR@subinlineimage}[5]{%
+ \ifblank{#1}%
+ {%
+ \LWR@htmltag{img \LWR@indentHTML
+ src="#3.#4" \LWR@indentHTML
+ alt="#3" \LWR@indentHTML
+ style="#5" \LWR@indentHTML
+ class="#2" \LWR@orignewline
+ }%
}%
-}%
-{%
- \LWR@htmltag{img \LWR@indentHTML
- src="#3.#4" \LWR@indentHTML
- alt="#1" \LWR@indentHTML
- style="#5" \LWR@indentHTML
- class="#2" \LWR@orignewline
+ {%
+ \LWR@htmltag{img \LWR@indentHTML
+ src="#3.#4" \LWR@indentHTML
+ alt="#1" \LWR@indentHTML
+ style="#5" \LWR@indentHTML
+ class="#2" \LWR@orignewline
+ }%
}%
-}%
}
\end{warpHTML}
@@ -9751,6 +9855,16 @@ autopage-\theLWR@currentautosec%
\newcounter{SideTOCDepth}
\setcounter{SideTOCDepth}{1}
+\AtBeginDocument{%
+ \ifnumcomp{\value{SideTOCDepth}}{<}{\value{FileDepth}}{
+ \PackageWarningNoLine{lwarp}
+ {%
+ SideTOCDepth is less than FileDepth,\MessageBreak
+ so some website pages may be inaccessible%
+ }
+ }{}
+}
+
\newcommand{\sidetocname}{Contents}
\end{warpall}
@@ -10050,9 +10164,21 @@ autopage-\theLWR@currentautosec%
\begin{warpall}
-\newcommand*{\mathimagename}{math image}
+\newcommand*{\AltTextOpen}{(}
+
+\newcommand*{\AltTextClose}{)}
+
+\newcommand*{\ImageAltText}{image}
+
+\newcommand*{\MathImageAltText}{math image}
+
+\newcommand*{\LWR@ThisAltText}{}
-\newcommand*{\packagediagramname}{diagram}
+\newcommand*{\ThisAltText}[1]{%
+ \renewcommand{\LWR@ThisAltText}{#1}%
+}
+
+\newcommand*{\PackageDiagramAltText}{diagram}
\end{warpall}
@@ -10070,6 +10196,17 @@ autopage-\theLWR@currentautosec%
\newcommand*{\LWR@applyxfakebold}{}
+\newcommand*{\LWR@setcurrentfont}{%
+ \LWR@traceinfo{Using font family \LWR@f@family}%
+ \@nameuse{LWR@print@\LWR@f@family family}%
+ \LWR@traceinfo{Using font series \LWR@f@series}%
+ \@nameuse{LWR@print@\LWR@f@series series}%
+ \LWR@traceinfo{Using font shape \LWR@f@shape}%
+ \@nameuse{LWR@print@\LWR@f@shape shape}%
+ \LWR@traceinfo{Using font caps shape \LWR@f@shapecaps}%
+ \@nameuse{LWR@print@\LWR@f@shapecaps shape}%
+}
+
\let\LWR@origtextdollar\$
\renewcommand*{\$}{%
@@ -10110,7 +10247,8 @@ autopage-\theLWR@currentautosec%
}
}
}{% lwarp_baseline_marker.png or .eps is not present
- \PackageWarningNoLine{lwarp}{File \LWR@baselinename\space is not installed\MessageBreak
+ \PackageWarningNoLine{lwarp}{%
+ File \LWR@baselinename\space is not installed\MessageBreak
alongside the lwarp-*.sty files,\MessageBreak
so SVG math baselines may not be accurate}
\newcommand*{\LWR@addbaselinemarker}{}
@@ -10139,7 +10277,11 @@ autopage-\theLWR@currentautosec%
bool{mathjax} or
( bool{FormatWP} and bool{WPMarkMath} )
) and
- ( not test { \ifstrequal {#2} {(\mathimagename)} } ) and % from \ensuredmath
+ ( not test {
+ \ifstrequal {#2}
+ {\AltTextOpen\MathImageAltText\AltTextClose} % from \ensuredmath
+ }
+ ) and
( not bool{LWR@dynamicmath} )
}%
{%
@@ -10150,16 +10292,9 @@ autopage-\theLWR@currentautosec%
\LWR@traceinfo{LWR@subsingledollar: NOT mathjax, or is ensuremath, or is dynamic}%
\begingroup%
\LWR@restoreorigformatting%
- \RenewDocumentEnvironment{lateximage}{s o o o}{}{}% inside group
+ \RenewDocumentEnvironment{lateximage}{s o s o o}{}{}% inside group
\LWR@print@normalsize%
- \LWR@traceinfo{Using font family \LWR@f@family}%
- \@nameuse{LWR@orig\LWR@f@family family}%
- \LWR@traceinfo{Using font series \LWR@f@series}%
- \@nameuse{LWR@orig\LWR@f@series series}%
- \LWR@traceinfo{Using font shape \LWR@f@shape}%
- \@nameuse{LWR@orig\LWR@f@shape shape}%
- \LWR@traceinfo{Using font caps shape \LWR@f@shapecaps}%
- \@nameuse{LWR@orig\LWR@f@shapecaps shape}%
+ \LWR@setcurrentfont%
\global\advance\c@LWR@lateximagedepth 1\relax%
\ifmmode%
\global\sbox{\LWR@singledollarbox}{#4}%
@@ -10233,7 +10368,7 @@ autopage-\theLWR@currentautosec%
\ifbool{LWR@dynamicmath}{%
\LWR@traceinfo{subsingledollar: dynamic}%
\begin{lateximage}% no hashing
- [(\mathimagename)]% alt tag
+ [\MathImageAltText]% alt tag
[]% no add'l hashing
[\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS
}{%
@@ -10245,6 +10380,7 @@ autopage-\theLWR@currentautosec%
{\def\LWR@tempone{N}}%
\begin{lateximage}*% use hashing
[#2]% alt
+ *% do not add open/closing braces
[% addl' hashing
#3%
FM\LWR@f@family%
@@ -10270,6 +10406,7 @@ autopage-\theLWR@currentautosec%
}% not mathjax
\endgroup%
}% not in a lateximage
+\gdef\LWR@ThisAltText{}%
\LWR@traceinfo{LWR@subsingledollar: done}%
}
@@ -10306,11 +10443,13 @@ autopage-\theLWR@currentautosec%
\LWR@HTMLsanitize{#1} % extra space
\textbackslash{]}%
]%
+ *% do not add open/closing braces
\LWR@applyxfakebold%
\LWR@origdollar\LWR@origdollar#1\LWR@origdollar\LWR@origdollar%
\end{lateximage}%
\end{BlockClass}%
}% not mathjax
+\gdef\LWR@ThisAltText{}%
}%
\protected\gdef\LWR@singledollar#1${%
\ifbool{mathjax}{%
@@ -10332,6 +10471,7 @@ autopage-\theLWR@currentautosec%
{singledollar}% add'l hashing
{\LWR@origensuredmath{#1}}% contents
}% not mathjax
+\gdef\LWR@ThisAltText{}%
}
\AtBeginDocument{
@@ -10349,7 +10489,7 @@ autopage-\theLWR@currentautosec%
\renewcommand{\@ensuredmath}[1]{%
\ifbool{mathjax}{%
- \LWR@subsingledollar*{(\mathimagename)}{%
+ \LWR@subsingledollar*{\AltTextOpen\MathImageAltText\AltTextClose}{%
\protect\LWR@HTMLsanitize{\detokenize\expandafter{#1}}%
}{\relax%
\LWR@origensuredmath{#1}%
@@ -10361,7 +10501,7 @@ autopage-\theLWR@currentautosec%
\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
{\LWR@origensuredmath{#1}}%
{%
- \LWR@subsingledollar*{(\mathimagename)}{%
+ \LWR@subsingledollar*{\AltTextOpen\MathImageAltText\AltTextClose}{%
\protect\LWR@HTMLsanitize{\detokenize\expandafter{#1}}%
}{%
\LWR@origensuredmath{#1}%
@@ -10369,6 +10509,7 @@ autopage-\theLWR@currentautosec%
}%
\fi%
}%
+\gdef\LWR@ThisAltText{}%
}
\let\math\relax
@@ -10389,7 +10530,7 @@ autopage-\theLWR@currentautosec%
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
\begin{lateximage}%
- [(display math)]%
+ [\MathImageAltText]%
\LWR@origdollar\LWR@origdollar%
}
{%
@@ -10402,8 +10543,7 @@ autopage-\theLWR@currentautosec%
\begin{BlockClass}{displaymathnumbered}%
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}%
- [(display math)]%
+ \begin{lateximage}[\MathImageAltText]%
\LWR@origequation%
}
{%
@@ -10489,7 +10629,7 @@ autopage-\theLWR@currentautosec%
\textbackslash{begin\{#2\}} % extra space
\LWR@HTMLsanitizeexpand{\detokenize\expandafter{#1}} % extra space
\textbackslash{end\{#2\}}%
- ]% alt tag
+ ]*% alt tag
\LWR@applyxfakebold%
\@nameuse{LWR@orig#2}%
#1% contents collected by \collect@body
@@ -10497,6 +10637,7 @@ autopage-\theLWR@currentautosec%
\end{lateximage}%
\end{BlockClass}%
}% not mathjax
+\gdef\LWR@ThisAltText{}%
}
\newcommand*{\LWR@doendequation}[1]{%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
@@ -10504,6 +10645,7 @@ autopage-\theLWR@currentautosec%
\LWR@addmathjax{#1}{\BODY}%
}{}%
+\gdef\LWR@ThisAltText{}%
}
\AtBeginDocument{
@@ -10639,7 +10781,7 @@ autopage-\theLWR@currentautosec%
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
\begin{lateximage}[(\LWR@startingequationtag--\LWR@equationtag)
- \LWR@addmathjax{eqnarray}{\BODY}]
+ \LWR@addmathjax{eqnarray}{\BODY}]*
\LWR@applyxfakebold%
\LWR@origeqnarray
\BODY
@@ -10651,7 +10793,7 @@ autopage-\theLWR@currentautosec%
\begin{BlockClass}{displaymath}
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[\LWR@addmathjax{eqnarray*}{\BODY}]
+ \begin{lateximage}[\LWR@addmathjax{eqnarray*}{\BODY}]*
\LWR@applyxfakebold%
\LWR@origeqnarray
\BODY
@@ -10662,6 +10804,7 @@ autopage-\theLWR@currentautosec%
}% LWR@numbereqnarray
}% not mathjax
\booltrue{LWR@numbereqnarray}
+\gdef\LWR@ThisAltText{}%
}
\RenewEnviron{eqnarray}
{%
@@ -10687,7 +10830,7 @@ autopage-\theLWR@currentautosec%
\newcommand*{\LateximageFontSizeName}{normalsize}
-\newcommand*{\LateximageFontScale}{.75}
+\newcommand*{\LateximageFontScale}{1}
\end{warpall}
@@ -10783,9 +10926,35 @@ autopage-\theLWR@currentautosec%
}
+\newcommand{\LWR@lateximage@oneimageb}[3]{%
+ \LWR@subinlineimage{#1}{lateximage}%
+ {%
+ \LWR@print@mbox{%
+ \LWR@ImagesDirectory\OSPathSymbol%
+ #2%
+ }%
+ }{svg}{#3}%
+}
+
+\newcommand{\LWR@lateximage@oneimage}[4]{%
+ \ifdefvoid{\LWR@ThisAltText}{%
+ \IfBooleanTF{#4}{%
+ \LWR@lateximage@oneimageb{#1}{#2}{#3}%
+ }{%
+ \LWR@lateximage@oneimageb%
+ {\AltTextOpen#1\AltTextClose}%
+ {#2}{#3}%
+ }%
+ }{%
+ \LWR@lateximage@oneimageb%
+ {\AltTextOpen\LWR@ThisAltText\AltTextClose}%
+ {#2}{#3}%
+ }%
+}
+
\catcode`\$=\active%
-\NewDocumentEnvironment{lateximage}{s O{(image)} O{} O{}}
+\NewDocumentEnvironment{lateximage}{s O{\ImageAltText} s O{} O{}}
{%
\LWR@traceinfo{lateximage: starting on \jobname.pdf page \arabic{page}}%
\LWR@traceinfo{lateximage: entering depth is \arabic{LWR@lateximagedepth}}%
@@ -10817,10 +10986,20 @@ autopage-\theLWR@currentautosec%
\LWR@traceinfo{lateximage: about to write to \BaseJobname-images.txt}%
\IfBooleanTF{#1}% starred
{% hash
- \LWR@traceinfo{lateximage: hash true, adding %
- !\detokenize\expandafter{#2}!\detokenize\expandafter{#3}!}%
- \edef\LWR@hashedname{%
- \LWR@mdfive{\detokenize\expandafter{#2}-!-#3}%
+ \ifdefvoid{\LWR@ThisAltText}{%
+ \IfBooleanTF{#3}{%
+ \edef\LWR@hashedname{%
+ \LWR@mdfive{\detokenize\expandafter{#2}-!-#4}%
+ }%
+ }{%
+ \edef\LWR@hashedname{%
+ \LWR@mdfive{\detokenize\expandafter{\AltTextOpen#2\AltTextClose}-!-#4}%
+ }%
+ }%
+ }{%
+ \edef\LWR@hashedname{%
+ \LWR@mdfive{\detokenize\expandafter{\AltTextOpen\LWR@ThisAltText\AltTextClose}-!-#4}%
+ }%
}%
\LWR@traceinfo{lateximage: hash is \LWR@hashedname}%
\immediate\write\LWR@lateximagesfile{%
@@ -10883,18 +11062,10 @@ autopage-\theLWR@currentautosec%
\LWR@traceinfo{lateximage: The page after the image is \arabic{page}}%
\IfBooleanTF{#1}% starred
{% hash
- \LWR@subinlineimage[#2]{lateximage}%
- {%
- \LWR@ImagesDirectory\OSPathSymbol%
- \LWR@print@mbox{\LWR@hashedname}%
- }{svg}{#4}%
+ \LWR@lateximage@oneimage{#2}{\LWR@hashedname}{#5}{#3}%
}% hash
{% no hash
- \LWR@subinlineimage[#2]{lateximage}%
- {%
- \LWR@ImagesDirectory\OSPathSymbol%
- \LWR@print@mbox{\LWR@ImagesName\theLWR@externalfilecnt}%
- }{svg}{#4}%
+ \LWR@lateximage@oneimage{#2}{\LWR@ImagesName\theLWR@externalfilecnt}{#5}{#3}%
}% no hash
\LWR@ensuredoingapar%
\LWR@htmltag{/span}%
@@ -10902,6 +11073,7 @@ autopage-\theLWR@currentautosec%
\LWR@htmlcomment{End of lateximage}%
}{}%
\addtocounter{LWR@lateximagedepth}{-1}%
+ \gdef\LWR@ThisAltText{}%
}% end of outer-most lateximage
\LWR@traceinfo{lateximage: exiting depth is \arabic{LWR@lateximagedepth}}%
\LWR@traceinfo{lateximage: done}%
@@ -10911,7 +11083,7 @@ autopage-\theLWR@currentautosec%
\begin{warpprint}
-\NewDocumentEnvironment{lateximage}{s o o o}
+\NewDocumentEnvironment{lateximage}{s o s o o}
{\begin{varwidth}[b]{\linewidth}}
{\end{varwidth}}
@@ -11281,7 +11453,7 @@ autopage-\theLWR@currentautosec%
\begin{warpHTML}
-\BeforeBeginEnvironment{picture}{\begin{lateximage}[(picture)]}
+\BeforeBeginEnvironment{picture}{\begin{lateximage}[picture]}
\AfterEndEnvironment{picture}{\end{lateximage}}
@@ -11900,7 +12072,7 @@ color:\LWR@origpound\LWR@tempcolor%
\renewcommand{\textsuperscript}[1]{##1}%
\renewcommand{\textsubscript}[1]{##1}%
\renewcommand{\underline}[1]{##1}%
-\RenewDocumentCommand{\hspace}{s m}{}
+\RenewDocumentCommand{\hspace}{s m}{}%
\RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}%
\DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}%
\def\(##1\){}%
@@ -12176,7 +12348,7 @@ color:\LWR@origpound\LWR@tempcolor%
\ifnum\gluestretchorder\LWR@tempwidth>0%
\setlength{\LWR@tempwidth}{2em}%
\fi%
-\ifdimcomp{\LWR@tempwidth}{=}{0pt}{}{%
+\ifdimcomp{\LWR@tempwidth}{>}{0pt}{%
\LWR@minipagestoppars%
\ifdimcomp{\LWR@tempwidth}{=}{.16667em}%
{%
@@ -12198,7 +12370,7 @@ color:\LWR@origpound\LWR@tempcolor%
\LWR@htmltagc{/span}%
}%
\LWR@minipagestartpars%
-}% width not 0
+}{}% width greater than 0
}%
}
\newcommand{\LWR@select@html@nohspace}{%