diff options
author | Karl Berry <karl@freefriends.org> | 2019-10-09 21:58:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-10-09 21:58:11 +0000 |
commit | 06d1070e2a43bae3ab6680afbc9b6872f1cc21b6 (patch) | |
tree | f420d25c65b65ff24b85b6c0a134722b01247a4d /Master/texmf-dist/tex/latex/lwarp | |
parent | 4dd1b051116235ae64b5a933d2e66cb4bc10d49d (diff) |
lwarp (9oct19)
git-svn-id: svn://tug.org/texlive/trunk@52327 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty | 52 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 18 |
4 files changed, 66 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty index f330c40b6fc..78bdd718e25 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty @@ -32,6 +32,57 @@ } \ExplSyntaxOn +\@ifpackagelater{acro}{2019/09/23}% +{% v2.10 or later +\cs_gset_protected:Npn \__acro_typeset:nn #1#2 + { + \mode_if_horizontal:F { \leavevmode } + \group_begin: + \use:x + { + \bool_if:cTF {l__acro_custom_#1_format_bool} + { \exp_not:v {l__acro_custom_#1_format_tl} } + { \exp_not:v {l__acro_#1_format_tl} } + {\exp_not:N\LWR@textcurrentfont{#2}}% lwarp + } + \group_end: + } + +\cs_gset_protected:Npn \__acro_ending_format:nn #1#2 + { + \bool_if:NTF \l__acro_include_endings_format_bool + { + \str_case:nn {#1} + { + {long} + { + \bool_if:NTF \l__acro_custom_long_format_bool + { \l__acro_custom_long_format_tl } + { + \bool_if:NTF \l__acro_first_instance_bool + { \l__acro_first_long_format_tl } + { \l__acro_long_format_tl } + } + } + {short} + { + \bool_if:NTF \l__acro_custom_short_format_bool + { \l__acro_custom_short_format_tl } + { \l__acro_short_format_tl } + } + {alt} + { + \bool_if:NTF \l__acro_custom_alt_format_bool + { \l__acro_custom_alt_format_tl } + { \l__acro_alt_format_tl } + } + } + } + { \use:n } + {\exp_not:N\LWR@textcurrentfont{#2}}% lwarp + } +}% v2.10 or later +{% before v2.10 \cs_gset_protected:Npn \acro_write_short:nn #1#2 { \mode_if_horizontal:F { \leavevmode } @@ -76,6 +127,7 @@ } \group_end: } +}% before v2.10 \ExplSyntaxOff \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty index 6ac66ac4bcd..e3c567cabb9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.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{xr-hyper}[2000/03/22] +\LWR@ProvidesPackageDrop{xr-hyper}[2019/10/03]% \LWR@origRequirePackage{lwarp-xr} \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty index 32bde46918c..adf1c3bba3b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty @@ -15,16 +15,14 @@ %% 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. -\ifdef{\externaldocument}{}{ - \LWR@ProvidesPackagePass{xr}[2019/01/05] -} +\LWR@ProvidesPackagePass{xr}[2019/07/22]% \LetLtxMacro\LWR@orig@externaldocument\externaldocument -\renewcommand*{\externaldocument}[2][]{% +\RenewDocumentCommand{\externaldocument}{O{} O{} m O{}}{% \ifblank{#1}{% - \LWR@orig@externaldocument{#2_html}% + \LWR@orig@externaldocument{#3_html}% }{% - \LWR@orig@externaldocument[#1]{#2_html}% + \LWR@orig@externaldocument[#1]{#3_html}% }% } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 89678d63968..6062aacc60e 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/09/23 v0.75 Allows LaTeX to directly produce HTML5 output.] + [2019/10/08 v0.76 Allows LaTeX to directly produce HTML5 output.] @@ -2009,6 +2009,12 @@ span.texteb { font-weight: bolder; } span.textlg { font-weight: lighter; } +span.textup, div.textup { + font-style: normal; + font-variant: normal; + font-variant-numeric: normal ; +} + span.textsc, div.textsc { font-variant: small-caps; font-variant-numeric: oldstyle-nums ; @@ -2021,12 +2027,6 @@ span.textulc, div.textulc { span.textsl, div.textsl { font-style: oblique; } -span.textup, div.textup { - font-style: normal; - font-variant: normal; - font-variant-numeric: normal ; -} - span.textrm, div.textrm { font-family: "DejaVu Serif", "Bitstream Vera Serif", "Lucida Bright", Georgia, serif; @@ -4065,7 +4065,7 @@ MathJax.Hub.Config({ <!-- Alternative CDN provider: --> <script type="text/javascript" async -src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS_HTML-full"> +src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js?config=TeX-AMS_HTML-full"> </script> <!-- No longer supported after April 30, 2017: --> @@ -4088,7 +4088,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX- -- Copyright 2016-2019 Brian Dunn -printversion = "v0.75" +printversion = "v0.76" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () |