diff options
author | Karl Berry <karl@freefriends.org> | 2022-11-22 21:43:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-11-22 21:43:46 +0000 |
commit | f14a9cb23b19c7bd3bd80081f5a697296ae2ebea (patch) | |
tree | 72ec7a34d87b07a0f02cbce52bb63c74671b93d8 /Master/texmf-dist/tex/latex/lwarp | |
parent | d2cac9c735bada4f687aee2fc185c89aeead9c8b (diff) |
lwarp (22nov22)
git-svn-id: svn://tug.org/texlive/trunk@65083 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
13 files changed, 284 insertions, 334 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-beamerarticle.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-beamerarticle.sty index e8e7c0aeb3a..f2fb7188dde 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-beamerarticle.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-beamerarticle.sty @@ -62,7 +62,6 @@ {\endBlockClass} {} {\LWR@patcherror{beamerarticle}{beamer@endframe}} - \xpretocmd\beamer@article@startframe {\LWR@nulllistfills} {} @@ -99,23 +98,28 @@ \gdef\@subtitle{#2} \def\insertsubtitle{#2} } - -\xpatchcmd{\@maketitle} - {% - \LWR@htmltag{\LWR@tagtitleend}% - \LWR@startpars% - }% - {% - \LWR@htmltag{\LWR@tagtitleend}% - \ifdefvoid{\@subtitle}{}{% - \begin{BlockClass}{subtitle}% - \@subtitle% - \end{BlockClass}% - }% - \LWR@startpars% - }% - {} - {\LWR@patcherror{beamerarticle}{@maketitle}} +\AtBeginDocument{ +\IfPackageLoadedTF{lwarp-scrextend} + {}% komascript already has subtitle + {% not komascript + \xpatchcmd{\@maketitle} + {% + \LWR@htmltag{\LWR@tagtitleend}% + \LWR@startpars% + }% + {% + \LWR@htmltag{\LWR@tagtitleend}% + \ifdefvoid{\@subtitle}{}{% + \begin{BlockClass}{subtitle}% + \@subtitle% + \end{BlockClass}% + }% + \LWR@startpars% + }% + {} + {\LWR@patcherror{beamerarticle}{@maketitle}} + }% not komascript +} \RequirePackage{fancyvrb} \DefineVerbatimEnvironment{semiverbatim}{Verbatim}{commandchars=\\\{\}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty index abac10fa799..e502ceb08e0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \LWR@origRequirePackage{luacode} -\LWR@ProvidesPackagePass{lyluatex}[2019/05/27] +\LWR@ProvidesPackagePass{lyluatex}[2022/11/07] \newcommand*{\LyluatexImageAltText}{-lilypond-~\PackageDiagramAltText} \LetLtxMacro\LWR@orig@ly@compilescore\ly@compilescore @@ -35,10 +35,11 @@ }% }% \ly@setunits% + \setluaoption{ly}{currfiledir}{\currfiledir} + \setluaoption{ly}{twoside}{\ly@istwosided} \directlua{ - ly_opts:set_option('currfiledir', [[\currfiledir]]) - ly_opts:set_option('twoside', '\ly@istwosided') #1 + ly.newpage_if_fullpage() }% \ly@resetunits% \ly@currentfonts% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mismath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mismath.sty index 6228900183c..e21aaf7f5cb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mismath.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mismath.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{mismath}[2019/12/27] +\LWR@ProvidesPackagePass{mismath}[2022/11/11] \ifbool{mathjax}{ \RenewEnviron{mathcols}{% \preto\BODY{\begin{aligned}\displaystyle} @@ -127,7 +127,6 @@ \CustomizeMathJax{\newcommand{\mul}{\mathord{\times}}} \CustomizeMathJax{\newcommand{\then}{\ \Longrightarrow \ \mbox{} }} \CustomizeMathJax{\newcommand{\txt}[1]{\quad\text{#1}\quad}} -\CustomizeMathJax{\newcommand{\paren}[1]{\mathopen{\left(#1\right)}}} \CustomizeMathJax{\newcommand{\pow}[2]{\left( #1 \right)^{\!#2}}} \CustomizeMathJax{\newcommand{\abs}[1]{\left\vert#1\right\vert}} \CustomizeMathJax{\newcommand{\lfrac}[2]{\frac{\:#1\:}{\:#2\:}}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nicematrix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nicematrix.sty index 24989f5d8d9..8c2dde5fae8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nicematrix.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nicematrix.sty @@ -15,7 +15,10 @@ %% 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{nicematrix}[2020/11/23] + +\PassOptionsToPackage{no-test-for-array}{nicematrix} + +\LWR@ProvidesPackagePass{nicematrix}[2022/10/06] \begin{warpHTML} \BeforeBeginEnvironment{NiceTabular}{% \begin{lateximage}[-nicematrix-~\PackageDiagramAltText]% @@ -97,8 +100,26 @@ }% } \CustomizeMathJax{\let\hdottedline\hdashline} -\CustomizeMathJax{\let\Hline\hline} - +\CustomizeMathJax{\newcommand{\Hline}[1][]{\hline}} +\CustomizeMathJax{\newcommand{\CodeBefore}{}} +\CustomizeMathJax{\newcommand{\Body}{}} +\CustomizeMathJax{\newcommand{\CodeAfter}{}} +\CustomizeMathJax{\newcommand{\line}[3][]{}} +\CustomizeMathJax{\newcommand{\RowStyle}[2][]{}} +\CustomizeMathJax{\newcommand{\LWRSubMatrix}[1][]{}} +\CustomizeMathJax{\newcommand{\SubMatrix}[4]{\LWRSubMatrix}} +\CustomizeMathJax{\newcommand{\OverBrace}[4][]{}} +\CustomizeMathJax{\newcommand{\UnderBrace}[4][]{}} +\CustomizeMathJax{\newcommand{\ShowCellNames}{}} +\CustomizeMathJax{\newcommand{\cellcolor}[3][]{}} +\CustomizeMathJax{\newcommand{\rowcolor}[3][]{}} +\CustomizeMathJax{\newcommand{\LWRrowcolors}[1][]{}} +\CustomizeMathJax{\newcommand{\rowcolors}[4][]{\LWRrowcolors}} +\CustomizeMathJax{\newcommand{\rowlistcolors}[3][]{\LWRrowcolors}} +\CustomizeMathJax{\newcommand{\columncolor}[3][]{}} +\CustomizeMathJax{\newcommand{\rectanglecolor}[4][]{}} +\CustomizeMathJax{\newcommand{\arraycolor}[2][]{}} +\CustomizeMathJax{\newcommand{\chessboardcolors}[3][]{}} \CustomizeMathJax{\newcommand{\ldots}[1][]{\dots}} \CustomizeMathJax{\newcommand{\Cdots}[1][]{\cdots}} \CustomizeMathJax{\newcommand{\Vdots}[1][]{\vdots}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pbalance.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbalance.sty index b3f2c1d9c4e..ec6afe91acb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pbalance.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbalance.sty @@ -17,8 +17,10 @@ %% version 2005/12/01 or later. \RequirePackage{balance} -\LWR@ProvidesPackageDrop{pbalance}[2020/12/16] +\LWR@ProvidesPackageDrop{pbalance}[2022/07/28] \newcommand\shrinkLastPage[1]{} +\newcommand\balancePageNum[1]{} +\newcommand\nopbalance{} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty index 22dea078f31..dcbad0f36ec 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.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{pdfpages}[2017-10-31] +\LWR@ProvidesPackagePass{pdfpages}[2022-10-09] \define@key{pdfpages}{fitpaper}[false]{} \define@key{pdfpages}{landscape}[false]{} \define@key{pdfpages}{openright}[false]{} @@ -62,19 +62,19 @@ \global\let\ESO@HookIIBG\@empty% } } -\xpatchcmd{\AM@output} +\xpatchcmd{\AM@output@i} {\newpage} {\LWR@esopic@newpage} {} {\LWR@patcherror{pdfpages}{AM@output-1}} -\xpatchcmd{\AM@output} +\xpatchcmd{\AM@output@i} {\newpage} {\LWR@esopic@newpage} {} {\LWR@patcherror{pdfpages}{AM@output-2}} -\xpatchcmd{\AM@output} +\xpatchcmd{\AM@output@i} {\newpage} {\LWR@esopic@newpage} {} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty index ffe4743fb6a..6e3d3136fd3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty @@ -18,121 +18,18 @@ \LWR@ProvidesPackagePass{realscripts}[2016/02/13] \ExplSyntaxOn -\DeclareDocumentCommand \LWR@print@realsubscript {m} { - \fontspec_if_fontspec_font:TF { - \fontspec_if_opentype:TF - { \fontspec_if_feature:nTF {+subs} - { {\addfontfeature{VerticalPosition=Inferior}#1} } - { \fontspec_if_feature:nTF {+sinf} - { {\addfontfeature{VerticalPosition=ScientificInferior}#1} } - { \fakesubscript{#1} } - } - } - { \fontspec_if_aat_feature:nnTF {10} {2} - { {\addfontfeature{VerticalPosition=Inferior}#1} } - { \fakesubscript{#1} } - } - } - { \fakesubscript{#1} } -} - \DeclareDocumentCommand \LWR@HTML@realsubscript {m} { \LWR@HTML@textsubscript{#1} } \LWR@formatted{realsubscript} -\DeclareDocumentCommand \LWR@print@realsuperscript {m} { - \fontspec_if_fontspec_font:TF - { - \fontspec_if_opentype:TF - { \fontspec_if_feature:nTF {+sups} - { {\addfontfeature{VerticalPosition=Superior}#1} } - { \fakesuperscript{#1} } - } - { \fontspec_if_aat_feature:nnTF {10} {1} - { {\addfontfeature{VerticalPosition=Superior}#1} } - { \fakesuperscript{#1} } - } - } - { \fakesuperscript{#1} } -} - \DeclareDocumentCommand \LWR@HTML@realsuperscript {m} { \LWR@HTML@textsuperscript{#1} } \LWR@formatted{realsuperscript} -\DeclareDocumentCommand \LWR@print@textsubsuperscript {s O{l} mm} { - \leavevmode - \group_begin: - \IfBooleanTF #1 - { - \hbox_set:Nn \l_tmpa_box {\textsubscript*{#3}} - \hbox_set:Nn \l_tmpb_box {\textsuperscript*{#4}} - } - { - \hbox_set:Nn \l_tmpa_box {\textsubscript{#3}} - \hbox_set:Nn \l_tmpb_box {\textsuperscript{#4}} - } - \hbox_set:Nn \l_tmpa_box - { \box_move_down:nn \subsupersep {\box_use:N \l_tmpa_box} } - \hbox_set:Nn \l_tmpb_box - { \box_move_up:nn \subsupersep {\box_use:N \l_tmpb_box} } - \str_case:nnF {#2} - { - {l}{\use_i:nnn} - {c}{\use_ii:nnn} - {r}{\use_iii:nnn} - } - { - \PackageWarning{realscripts}{ - Unknown~alignment~option~`#2'. \MessageBreak - One~ of~ `l',~ `c',~ `r',~ only - } - \use_i:nnn - } - { - \hbox_overlap_right:n { \box_use:N \l_tmpa_box } - \hbox_overlap_right:n { \box_use:N \l_tmpb_box } - \skip_horizontal:n { - \dim_max:nn {\box_wd:N \l_tmpa_box} {\box_wd:N \l_tmpb_box} - } - } - { - \dim_compare:nTF { \box_wd:N \l_tmpa_box > \box_wd:N \l_tmpb_box } - { - \skip_horizontal:n { - 0.5\box_wd:N \l_tmpa_box-0.5\box_wd:N \l_tmpb_box - } - \box_use:N \l_tmpb_box - \skip_horizontal:n { - -0.5\box_wd:N \l_tmpa_box-0.5\box_wd:N \l_tmpb_box - } - \box_use:N \l_tmpa_box - } - { - \skip_horizontal:n { - 0.5\box_wd:N \l_tmpb_box-0.5\box_wd:N \l_tmpa_box - } - \box_use:N \l_tmpa_box - \skip_horizontal:n { - -0.5\box_wd:N \l_tmpb_box-0.5\box_wd:N \l_tmpa_box - } - \box_use:N \l_tmpb_box - } - } - { - \skip_horizontal:n { - \dim_max:nn {\box_wd:N \l_tmpa_box} {\box_wd:N \l_tmpb_box} - } - \hbox_overlap_left:n { \box_use:N \l_tmpa_box } - \hbox_overlap_left:n { \box_use:N \l_tmpb_box } - } - \group_end: -} - \ExplSyntaxOff \newcommand*{\LWR@realscriptsalign}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty index d4914ddabcf..868dec83f18 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty @@ -15,31 +15,27 @@ %% 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{simplebnf}[2020/09/01] +\LWR@ProvidesPackagePass{simplebnf}[2022/05/08] \ExplSyntaxOn -\RenewDocumentEnvironment { bnfgrammar } { +b } +\RenewDocumentEnvironment { bnfgrammar } { O{llcll} O{[^\|]\|[^\|]} O{\|\|} +b } { + \regex_gset:Nn \g_simplebnf_rhs_newline_r { #2 } + \regex_gset:Nn \g_simplebnf_rhs_nb_r { #3 } + %% \l__input_seq is a list of term definitions. - \regex_split:nnN { ;; } { #1 } \l__input_seq + \regex_split:nnN { ;; } { #4 } \l__input_seq \begin{center} - \begin{lateximage}[#1]% lwarp + \begin{lateximage}[#4]% lwarp \tl_set:Nn \l__table_tl { - \begin{tabular}{lcll} + \begin{tabular}{#1} } + \bool_set_true:N \l_tmp_first_term % Is this the first term in this grammar? \seq_map_inline:Nn \l__input_seq { - %% \l__term_seq - (term, rhses)... - %% \l__term_tl - term - %% \l__keypairs_tl - rhses - \regex_split:nnN { ::= } { ##1 } \l__term_seq - \seq_pop_left:NN \l__term_seq \l__term_tl - \seq_pop_left:NN \l__term_seq \l__keypairs_tl - - \regex_replace_once:nnN { ^\s+ } {} \l__term_tl - + %% If not-first, add newline \bool_if:NTF \l_tmp_first_term { \bool_set_false:N \l_tmp_first_term @@ -47,15 +43,48 @@ { \tl_put_right:Nn \l__table_tl { \\ } } - \tl_put_right:Nx \l__table_tl + + \regex_split:nnNTF { ::= } { ##1 } \l__term_seq + % Parse a ::= definition { - \bnfexpr { \l__term_tl } & \g__simplebnf_defeq_tl & + %% \l__term_seq - (lhs, rhses)... + %% \l__term_tl - lhs + %% \l__keypairs_tl - rhses + \seq_pop_left:NN \l__term_seq \l__term_tl + \seq_pop_left:NN \l__term_seq \l__keypairs_tl + + \simplebnf_typeset_lhs:n{\l__term_tl} + \tl_put_right:Nn \l__table_tl + { + & \SimpleBNFDefEq & + } + %% \l__keypairs_seq - (rhs:annot | rhs)... + \regex_split:NVN \g_simplebnf_rhs_newline_r \l__keypairs_tl \l__keypairs_seq + + \bool_set_true:N \l__first_rhs + \seq_map_function:NN \l__keypairs_seq \simplebnf_typeset_rhs:n } - %% \l__keypairs_seq - (rhs:annot | rhs)... - \seq_set_split:NnV \l__keypairs_seq { | } \l__keypairs_tl + { + % Else, parse a \in declaration + \regex_split:nnNTF { \c{in} } { ##1 } \l__term_seq + { + %% \l__term_seq - (lhs, rhs) + \seq_pop_left:NN \l__term_seq \l_tmpa_tl - \bool_set_true:N \l__first_rhs - \seq_map_function:NN \l__keypairs_seq \simplebnf_typeset_rhs:n + \simplebnf_typeset_lhs:n{\l_tmpa_tl} + \tl_put_right:Nn \l__table_tl + { + & $\in$ & $ + } + \seq_pop_left:NN \l__term_seq \l_tmpa_tl + \tl_put_right:NV \l__table_tl \l_tmpa_tl + \tl_put_right:Nn \l__table_tl + { + $ & + } + } + { \msg_error:nn {simplebnf} { Could not parser ##1 } } + } } \tl_put_right:Nn \l__table_tl { \end{tabular} } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf-base.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf-base.sty new file mode 100644 index 00000000000..42a2b149fda --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf-base.sty @@ -0,0 +1,67 @@ +%% +%% This is file `lwarp-tagpdf-base.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tagpdf-base') +%% This is a generated file. +%% 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 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% 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{tagpdf-base}[2022-08-24] +\ExplSyntaxOn + +\newcommand*{\LWR@tagpdf@deactivate}{ + \keys_set:nn { __tag / setup } { + activate-space = false , + activate-mc = false , + activate-tree = false , + activate-struct = false + } +} + +\RenewDocumentCommand \tagpdfsetup { m }{ + \keys_set:nn { __tag / setup } { #1 } + \LWR@tagpdf@deactivate +} + +\RenewDocumentCommand \tagmcbegin { m } + { + \keys_set:nn { __tag / mc } {#1} + } + +\RenewDocumentCommand \tagmcend { } + { + \ThisAltText{}% lwarp + } + +\RenewDocumentCommand \tagmcuse { m } + { + } + +\RenewDocumentCommand \tagstructbegin { m } + { + \keys_set:nn { __tag / struct} { #1 }% lwarp + } + +\RenewDocumentCommand \tagstructend { } + { + \ThisAltText{}% lwarp + } + +\RenewDocumentCommand \tagstructuse { m } + { + } + +\ExplSyntaxOff +\endinput +%% +%% End of file `lwarp-tagpdf-base.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf-mc-code-generic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf-mc-code-generic.sty new file mode 100644 index 00000000000..3ae8b913642 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf-mc-code-generic.sty @@ -0,0 +1,33 @@ +%% +%% This is file `lwarp-tagpdf-mc-code-generic.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tagpdf-mc-code-generic') +%% This is a generated file. +%% 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 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% 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{tagpdf-mc-code-generic}[2022-08-24] +\ExplSyntaxOn + +\keys_define:nn { __tag / mc } + { + alt .code:n = % Alt property + { + \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}% lwarp + }, + } + +\ExplSyntaxOff +\endinput +%% +%% End of file `lwarp-tagpdf-mc-code-generic.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf-mc-code-lua.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf-mc-code-lua.sty new file mode 100644 index 00000000000..5a83e7d070f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf-mc-code-lua.sty @@ -0,0 +1,33 @@ +%% +%% This is file `lwarp-tagpdf-mc-code-lua.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tagpdf-mc-code-lua') +%% This is a generated file. +%% 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 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% 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{tagpdf-mc-code-lua}[2022-08-24] +\ExplSyntaxOn + +\keys_define:nn { __tag / mc } + { + alt .code:n = % Alt property + { + \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}% lwarp + }, + } + +\ExplSyntaxOff +\endinput +%% +%% End of file `lwarp-tagpdf-mc-code-lua.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf.sty index e84ff2527c3..caf6224a130 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tagpdf.sty @@ -16,177 +16,19 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{tagpdf}[2021-08-27] +\LWR@ProvidesPackagePass{tagpdf}[2022-08-24] \ExplSyntaxOn -\tl_new:N \l__uftag_mc_key_label_tl - -\keys_define:nn { __tag / mc } - { - stash .bool_set:N = \l__tag_mc_key_stash_bool, - __artifact-bool .bool_set:N = \l__tag_mc_artifact_bool, - __artifact-type .choice:, - __artifact-type / pagination .code:n = - {}, - __artifact-type / pagination/header .code:n = - {}, - __artifact-type / pagination/footer .code:n = - {}, - __artifact-type / layout .code:n = - {}, - __artifact-type / page .code:n = - {}, - __artifact-type / background .code:n = - {}, - __artifact-type / notype .code:n = - {}, - __artifact-type / .code:n = - {}, - } - -\keys_define:nn { __tag / mc } - { - tag .code:n = % the name (H,P,Span) etc - {}, - raw .code:n = - {}, - alttext .code:n = % Alt property - { - \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}% - }, - actualtext .code:n = % ActualText property - {}, - label .tl_set:N = \l__tag_mc_key_label_tl, - artifact .code:n = - {}, - artifact .default:n = {notype} - } - \keys_define:nn { __tag / struct } { - label .tl_set:N = \l__tag_struct_key_label_tl, - stash .bool_set:N = \l__tag_struct_elem_stash_bool, - tag .code:n = % S property - {}, - title .code:n = % T property - {}, - title-o .code:n = % T property - {}, - alttext .code:n = % Alt property + alt .code:n = % Alt property { - \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}% + \gdef\LWR@ThisAltText{\detokenize\expandafter{#1}}% lwarp }, - actualtext .code:n = % ActualText property - {}, - lang .code:n = % Lang property - {}, - ref .code:n = % Lang property - {}, - E .code:n = % E property - {}, - } - -\keys_define:nn { __tag / struct } - { - AF .code:n = % AF property - {}, - ,AFinline .code:n = - {} - ,AFinline-o .code:n = - {} - } - -\keys_define:nn { __tag / struct } - { - attribute-class .code:n = - {} - } - -\keys_define:nn { __tag / struct } - { - attribute .code:n = % A property (attribute, value currently a dictionary) - {}, - } - -\cs_new_protected:Npn \__tag_ref_label:nn #1 #2 %#1 label, #2 name of list mc or struct - { - \@bsphack - \ref_label:nv {#1}{c__tag_ref#2_clist} - \@esphack - } -\cs_generate_variant:Nn \__tag_ref_label:nn {en} - -\cs_new:Npn \__tag_ref_value:nnn #1 #2 #3 %#1 label, #2 attribute, #3 default - { - \ref_value:nnn {#1}{#2}{#3} - } -\cs_generate_variant:Nn \__tag_ref_value:nnn {enn} -\cs_new:Npn \__tag_ref_value_lastpage:nn #1 #2 - { - \ref_value:nnn {__tag_LastPage}{#1}{#2} } -\NewDocumentCommand \tagpdfsetup { m }{} - -\cs_set_eq:NN\tagpdfifluatexTF \sys_if_engine_luatex:TF -\cs_set_eq:NN\tagpdfifluatexT \sys_if_engine_luatex:T -\cs_set_eq:NN\tagpdfifpdftexT \sys_if_engine_pdftex:T -\cs_new:Npn \tagpdfget #1 {} -\cs_new:Npn \uftag_get:n #1 {} - -\NewDocumentCommand \tagmcifinTF { m m }{} - -\NewDocumentCommand \tagmcbegin { m }{% - \tag_mc_begin:n {#1}%\ignorespaces -} - -\cs_new_protected:Npn \tag_mc_begin:n #1 %#1 keyval - { - \keys_set:nn { __tag / mc } {#1} - } - -\NewDocumentCommand \tagmcend {}{\ThisAltText{}} - -\NewDocumentCommand \tagmcuse { m }{} - -\cs_new_protected:Nn \uftag_mc_use:n {} - -\NewDocumentCommand \tagstructbegin { m } - { - \tag_struct_begin:n {#1} - } - -\cs_new_protected:Npn \tag_struct_begin:n #1 %#1 key-val - { - \keys_set:nn { __tag / struct} { #1 } - } - -\NewDocumentCommand \tagstructend { } - { - \tag_struct_end: - } - -\cs_new_protected:Nn \tag_struct_end: - {\ThisAltText{}} - -\NewDocumentCommand \tagstructuse { m }{} - -\NewDocumentCommand\ShowTagging { m } - {} - -\sys_if_engine_luatex:T -{ - \NewDocumentCommand\pdffakespace { } - {} -} - -\newcommand\tagpdfparaOn {} - -\newcommand\tagpdfparaOff{} - -\NewDocumentCommand\tagpdfsuppressmarks{m}{} - \ExplSyntaxOff +\LWR@tagpdf@deactivate \endinput %% %% End of file `lwarp-tagpdf.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index a1bcf16e026..57631fbcb4e 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} - [2022/07/13 v0.908 Allows LaTeX to directly produce HTML5 output.] + [2022/11/22 v0.909 Allows LaTeX to directly produce HTML5 output.] @@ -654,7 +654,6 @@ \LWR@loadafter{quotchap} \LWR@loadafter{quoting} \LWR@loadafter{ragged2e} -\LWR@loadafter{realscripts} \LWR@loadafter{refcheck} \LWR@loadafter{register} \LWR@loadafter{relsize} @@ -732,6 +731,8 @@ \LWR@notmemoirloadafter{tabularx} \LWR@loadafter{tabulary} \LWR@loadafter{tagpdf} +\LWR@loadafter{tagpdf-mc-code-generic} +\LWR@loadafter{tagpdf-mc-code-lua} \LWR@loadafter{tascmac} \LWR@loadafter{tcolorbox} \LWR@loadafter{tensor} @@ -1033,6 +1034,7 @@ \let\LWRpercent\@percentchar \catcode`\$=12 \def\LWRdollar{$} +\def\LWRdollar{$}% syntax highlighting \catcode`\$=3 \catcode`\&=12 \def\LWRamp{&} @@ -1088,6 +1090,12 @@ \booltrue{warpingprint}% \boolfalse{warpingHTML}% \boolfalse{mathjax}% +\DeclareVoidOption{warpdisable}{% + \PackageInfo{lwarp}{Using option 'warpdisable'} + \boolfalse{warpingprint}% + \boolfalse{warpingHTML}% +} + \DeclareVoidOption{warpprint}{% \PackageInfo{lwarp}{Using option 'warpprint'} \booltrue{warpingprint}% @@ -1341,6 +1349,14 @@ {\LWR@includecomment{warpprint}{print}} {\LWR@excludecomment{warpprint}{print}} +\ifboolexpr{bool {warpingprint} or bool {warpingHTML}} + {} + { + \LWR@excludecomment{warpHTML}{html} + \LWR@excludecomment{warpprint}{print} + \LWR@excludecomment{warpMathJax}{mathjax} + } + \begin{warpprint} \LWR@excludecomment{warpMathJax}{mathjax} \end{warpprint} @@ -1835,6 +1851,17 @@ + +\begin{warpall} + +\newcommand*{\LWR@formatted}[1]{} +\newcommand*{\LWR@expandableformatted}[1]{} +\newcommand*{\LWR@formattedenv}[1]{} +\newcommand*{\LWR@expandableformattedenv}[1]{} + +\end{warpall} + + \begin{warpHTML} \newcommand*{\LWR@formatting}{HTML} \newcommand*{\LWR@formatted@checkname}[1]{% @@ -1877,7 +1904,7 @@ {Perhaps #1 is misspelled.} }{\relax}% } -\newcommand*{\LWR@formatted}[1]{% +\renewcommand*{\LWR@formatted}[1]{% \LWR@formatted@checkname{#1}% \ifcsundef{LWR@print@#1}{% \csNewCommandCopycs{LWR@print@#1}{#1}% @@ -1892,7 +1919,7 @@ }% }% } -\newcommand*{\LWR@expandableformatted}[1]{% +\renewcommand*{\LWR@expandableformatted}[1]{% \LWR@formatted@checkname{#1}% \ifcsundef{LWR@print@#1}{% \csNewCommandCopycs{LWR@print@#1}{#1}% @@ -1907,7 +1934,7 @@ }% }% } -\newcommand*{\LWR@formattedenv}[1]{% +\renewcommand*{\LWR@formattedenv}[1]{% \LWR@formatted@checkname{#1}% \LWR@formatted@checkendname{#1}% \ifcsundef{LWR@print@#1}{% @@ -1921,7 +1948,7 @@ \@nameuse{endLWR@\LWR@formatting @#1}% }% } -\newcommand*{\LWR@expandableformattedenv}[1]{% +\renewcommand*{\LWR@expandableformattedenv}[1]{% \LWR@formatted@checkname{#1}% \LWR@formatted@checkendname{#1}% \ifcsundef{LWR@print@#1}{% @@ -1937,15 +1964,6 @@ } \end{warpHTML} -\begin{warpprint} - -\newcommand*{\LWR@formatted}[1]{} -\newcommand*{\LWR@expandableformatted}[1]{} -\newcommand*{\LWR@formattedenv}[1]{} -\newcommand*{\LWR@expandableformattedenv}[1]{} - -\end{warpprint} - \begin{warpall} \newbool{FormatEPUB} \boolfalse{FormatEPUB} @@ -4850,7 +4868,7 @@ MathJax = { -- Copyright 2016-2022 Brian Dunn -printversion = "v0.908" +printversion = "v0.909" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -11011,7 +11029,6 @@ end -- not --version \LWR@htmltag{/a}% } -\LWR@absorbstar{ref}% \NewDocumentCommand{\LWR@HTML@ref}{s m}{% \LWR@traceinfo{LWR@HTML@ref !#2!}% \IfBooleanTF{#1}% @@ -13327,6 +13344,8 @@ end -- not --version \LWR@PreloadedPackage{graphics} \LWR@PreloadedPackage{graphicx} +\LWR@PreloadedPackage{tagpdf-base} + \LWR@PreloadedPackage{scalefnt} \LWR@PreloadedPackage{fontaxes} @@ -13345,6 +13364,8 @@ end -- not --version \LWR@PreloadedPackage{mathalpha} \LWR@PreloadedPackage{unicode-math} +\LWR@PreloadedPackage{realscripts} + \LWR@PreloadedPackage{nfssext-cfr} \LWR@PreloadedPackage{ulem} @@ -14934,7 +14955,8 @@ color:\LWR@origpound\LWR@tempcolor% {Keys/values are ignored in MathJax.\MessageBreak \protect\Cdots, etc. do not span multiple cells.\MessageBreak AutoNiceMatrix, etc. are not supported for MathJax.\MessageBreak - \protect\CodeBefore\space cannot be done with MathJax.\MessageBreak + \protect\CodeBefore, \protect\Body, and \protect\CodeAfter\MessageBreak + \space\space also are not supported for MathJax.\MessageBreak \LWR@forceSVGmessage{nicematrix}% } \LWR@nomathjaxwarn{pb-diagram}{\LWR@forceSVGmessage{pb-diagram}} |