diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
38 files changed, 1020 insertions, 75 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty index 681b48fb836..b568a300ebc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty @@ -30,7 +30,7 @@ which must also be moved before mdframed.% } } -{} +{\relax} \RequirePackage{amsmath} \LWR@ProvidesPackagePass{amsthm}[2017/10/31] \newcommand{\LWR@newtheoremstyle}{plain} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty index 258fb7bf3b6..67fc8067a9b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty @@ -23,7 +23,7 @@ so authblk must be loaded first.% } } -{} +{\relax} \LWR@ProvidesPackagePass{authblk}[2001/02/27] \LetLtxMacro\LWRAB@affil\affil diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-braket.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-braket.sty index 59090f8472a..f6e156cd989 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-braket.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-braket.sty @@ -17,14 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{braket}% No date is provided by the file. \begin{warpMathJax} -\CustomizeMathJax{\newcommand{\bra}[1]{\langle#1\vert}} -\CustomizeMathJax{\newcommand{\Bra}[1]{\left\langle#1\right\vert}} -\CustomizeMathJax{\newcommand{\ket}[1]{\vert#1\rangle}} -\CustomizeMathJax{\newcommand{\Ket}[1]{\left\vert#1\right\rangle}} -\CustomizeMathJax{\newcommand{\braket}[1]{\langle#1\rangle}} -\CustomizeMathJax{\newcommand{\Braket}[1]{\left\langle#1\right\rangle}} -\CustomizeMathJax{\newcommand{\set}[1]{\{#1\}}} -\CustomizeMathJax{\newcommand{\Set}[1]{\left\{#1\right\}}} + \CustomizeMathJax{\require{braket}} \end{warpMathJax} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty index d5d2b20fc1b..9b6059c84b6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty @@ -24,7 +24,7 @@ \typeout{instead of: \protect\usepackage[options]\protect{caption\protect}.} \typeout{---} -\LWR@ProvidesPackagePass{caption}[2020/08/24] +\LWR@ProvidesPackagePass{caption}[2020/10/26] \long\def\caption@iibox@#1#2#3#4{% \caption@iiibox{#1}{#2}{#3}% []% lwarp diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty index f795d2ec1b9..57bbd7dc5e6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty @@ -16,7 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{caption3}[2020/08/23] +\LWR@ProvidesPackagePass{caption3}[2020/10/21] \@ifpackagelater{caption3}{2020/08/23}{ \renewcommand\caption@@@make[2]{% \LWR@traceinfo{caption@@@make}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-letters.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-letters.sty index d9d7c9604bd..13908ab2645 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-letters.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-letters.sty @@ -52,6 +52,7 @@ \NewDocumentCommand{\LWR@mathjax@addgreek@l@up}{s m m}{ \LWR@mathjax@addletter{#1}{#2}{#3}{alpha}{03B1} \LWR@mathjax@addletter{#1}{#2}{#3}{beta}{03B2} + \LWR@mathjax@addletter{#1}{#2}{#3}{varbeta}{03D0} \LWR@mathjax@addletter{#1}{#2}{#3}{gamma}{03B3} \LWR@mathjax@addletter{#1}{#2}{#3}{digamma}{03DD} \LWR@mathjax@addletter{#1}{#2}{#3}{delta}{03B4} @@ -115,6 +116,7 @@ \NewDocumentCommand{\LWR@mathjax@addgreek@l@it}{s m m}{ \LWR@mathjax@addletter{#1}{#2}{#3}{alpha}{1D6FC} \LWR@mathjax@addletter{#1}{#2}{#3}{beta}{1D6FD} + \LWR@mathjax@addletter{#1}{#2}{#3}{varbeta}{03D0} \LWR@mathjax@addletter{#1}{#2}{#3}{gamma}{1D6FE} \LWR@mathjax@addletter*{#1}{#2}{#3}{digamma}{03DD} \LWR@mathjax@addletter{#1}{#2}{#3}{delta}{1D6FF} @@ -177,6 +179,7 @@ \NewDocumentCommand{\LWR@mathjax@addgreek@l@bfit}{s m m}{ \LWR@mathjax@addletter{#1}{#2}{#3}{alpha}{1D736} \LWR@mathjax@addletter{#1}{#2}{#3}{beta}{1D737} + \LWR@mathjax@addletter{#1}{#2}{#3}{varbeta}{03D0} \LWR@mathjax@addletter{#1}{#2}{#3}{gamma}{1D738} \LWR@mathjax@addletter*{#1}{#2}{#3}{digamma}{03DD} \LWR@mathjax@addletter{#1}{#2}{#3}{delta}{1D739} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty index 3aadedf3d1f..b1263cdb885 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.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{epstopdf-base}[2016/05/15] +\LWR@ProvidesPackagePass{epstopdf-base}[2020-01-24] \newcommand*{\LWR@HTML@ETE@OrgGin@setfile}[3]{% \edef\LWR@tempone{#3}% \StrSubstitute{\LWR@tempone}{.pdf}{.svg}[\LWR@tempone]% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty index c0810186956..c40567c6be9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.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{epstopdf}[2016/05/15] +\LWR@ProvidesPackagePass{epstopdf}[2020-01-24] \endinput %% %% End of file `lwarp-epstopdf.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-esvect.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-esvect.sty new file mode 100644 index 00000000000..9163aec82a5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-esvect.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-esvect.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `esvect') +%% This is a generated file. +%% Copyright 2016-2020 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{esvect}% no date given +\begin{warpMathJax} +\CustomizeMathJax{\newcommand{\LWResvectvv}[1]{\overrightarrow{#1}}} +\CustomizeMathJax{\newcommand{\LWResvectvvstar}[2]{\overrightarrow{#1}\!_{#2}}} +\CustomizeMathJax{\newcommand{\vv}{\ifstar\LWResvectvvstar\LWResvectvv}} +\end{warpMathJax} +\endinput +%% +%% End of file `lwarp-esvect.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmath.sty new file mode 100644 index 00000000000..b85aab961bd --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmath.sty @@ -0,0 +1,29 @@ +%% +%% This is file `lwarp-fixmath.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fixmath') +%% This is a generated file. +%% Copyright 2016-2020 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{fixmath}[2000/04/11] +\LWR@origRequirePackage{lwarp-common-mathjax-letters} + +\begin{warpMathJax} +\LWR@mathjax@addgreek@u@it*{}{} +\LWR@mathjax@addletter{\BooleanTrue}{up}{}{delta}{0394} +\LWR@mathjax@addletter{\BooleanTrue}{up}{}{omega}{03A9} +\CustomizeMathJax{\newcommand{\mathbold}[1]{\boldsymbol{#1}}} +\end{warpMathJax} +\endinput +%% +%% End of file `lwarp-fixmath.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty index bcb14753da4..add1c1bf03f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty @@ -19,7 +19,6 @@ \LWR@ProvidesPackageDrop{float}[2001/11/08] - \newcommand*{\LWR@floatstyle}{plain} \NewDocumentCommand{\newfloat}{m m m o}{% @@ -52,6 +51,7 @@ \csedef{LWR@floatstyle@#2}{\LWR@floatstyle}% } + \endinput %% %% End of file `lwarp-float.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty index f870fde79cf..a93fbefb695 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty @@ -20,7 +20,7 @@ \newcommand{\LWR@HTML@swshape}{} \LWR@formatted{swshape} - \newcommand{\LWR@HTML@textsw}[1]{#1} + \newrobustcmd{\LWR@HTML@textsw}[1]{#1} \LWR@formatted{textsw} \FilenameNullify{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 49f6dac7470..6c038f7629c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{graphics}[2017/06/25] +\LWR@ProvidesPackagePass{graphics}[2020/08/30] \AtBeginDocument{ diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty index fbb2ae2390f..6ba7413de87 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{graphicx}[2017/06/01] +\LWR@ProvidesPackagePass{graphicx}[2020/09/09] \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-karnaugh-map.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-karnaugh-map.sty index 75a9ee855f3..4965d041476 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-karnaugh-map.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-karnaugh-map.sty @@ -109,7 +109,7 @@ }{% Existing templates have the following dimensions: 2x2x1, 2x4x1, 4x2x1, 4x4x1, 4x4x2, and 4x4x4. }% - }{}% lwarp + }{\relax}% lwarp \begin{tikzpicture} % grid % for all dimensions diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index aef7b681d0f..849e434c704 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -19,7 +19,7 @@ \LWR@ProvidesPackagePass{keyfloat}[2019/09/23] -\@ifpackagelater{keyfloat}{2019/09/23}{}{ +\@ifpackagelater{keyfloat}{2019/09/23}{\relax}{ \PackageError{lwarp-keyfloat} {% The keyfloat package is out of date.\MessageBreak diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keystroke.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keystroke.sty new file mode 100644 index 00000000000..7a60732468e --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keystroke.sty @@ -0,0 +1,70 @@ +%% +%% This is file `lwarp-keystroke.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `keystroke') +%% This is a generated file. +%% Copyright 2016-2020 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{keystroke}[2010/04/23] +\newcommand*{\LWR@HTML@keystroke}[1]{ + \InlineClass{keystroke}{#1} +} +\LWR@formatted{keystroke} + +\newcommand*{\LWR@HTML@Return}{\keystroke{\HTMLunicode{021A9}}} +\LWR@formatted{Return} + +\newcommand*{\LWR@HTML@BSpace}{\keystroke{\HTMLunicode{027FB}}} +\LWR@formatted{BSpace} + +\newcommand*{\LWR@HTML@Tab}{\keystroke{|\HTMLunicode{021C6}|}} +\LWR@formatted{Tab} + +\newcommand*{\LWR@HTML@UArrow}{\keystroke{\HTMLunicode{02191}}} +\LWR@formatted{UArrow} + +\newcommand*{\LWR@HTML@DArrow}{\keystroke{\HTMLunicode{02193}}} +\LWR@formatted{DArrow} + +\newcommand*{\LWR@HTML@LArrow}{\keystroke{\HTMLunicode{02190}}} +\LWR@formatted{LArrow} + +\newcommand*{\LWR@HTML@RArrow}{\keystroke{\HTMLunicode{02192}}} +\LWR@formatted{RArrow} + +\LetLtxMacro\LWR@HTML@Shift\Shift +\xpatchcmd{\LWR@HTML@Shift} + {$\Uparrow$} + {\HTMLunicode{21D1}} + {} + {} +\LWR@formatted{Shift} + +\LetLtxMacro\LWR@HTML@PgUp\PgUp +\xpatchcmd{\LWR@HTML@PgUp} + {$\uparrow$} + {\HTMLunicode{2191}} + {} + {} +\LWR@formatted{PgUp} + +\LetLtxMacro\LWR@HTML@PgDown\PgDown +\xpatchcmd{\LWR@HTML@PgDown} + {$\downarrow$} + {\HTMLunicode{2193}} + {} + {} +\LWR@formatted{PgDown} +\endinput +%% +%% End of file `lwarp-keystroke.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathastext.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathastext.sty new file mode 100644 index 00000000000..a83c5b4a69f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathastext.sty @@ -0,0 +1,62 @@ +%% +%% This is file `lwarp-mathastext.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `mathastext') +%% This is a generated file. +%% Copyright 2016-2020 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{mathastext}[2019/11/16] +\LWR@origRequirePackage{lwarp-common-mathjax-letters} + +\begin{warpMathJax} +\ifmst@itgreek +\else + \ifmst@upgreek + \LWR@mathjax@addgreek@l@up{}{} + \else + \ifmst@frenchmath + \LWR@mathjax@addgreek@l@up{}{} + \else + \ifmst@italic + \else + \LWR@mathjax@addgreek@l@up{}{} + \fi + \fi + \fi +\fi + +\ifcase\mst@greek@select + \or{\LWR@mathjax@addgreek@u@it*{}{}} +\fi + +\CustomizeMathJax{\newcommand{\mathnormalbold}[1]{\boldsymbol{#1}}} +\CustomizeMathJax{\newcommand{\MathEulerBold}[1]{\boldsymbol{#1}}} +\CustomizeMathJax{\newcommand{\MathEuler}[1]{{#1}}} +\CustomizeMathJax{\newcommand{\MathPSymbol}[1]{{#1}}} +\CustomizeMathJax{\let\fouriervec\vec} +\CustomizeMathJax{\let\pmvec\vec} +\CustomizeMathJax{\let\inodot\imath} +\CustomizeMathJax{\let\jnodot\jmath} +\CustomizeMathJax{\let\shortiff\iff} +\CustomizeMathJax{\let\longto\longrightarrow} +\CustomizeMathJax{\newcommand{\inftypsy}{\mathord{\unicode{x221E}}}} +\CustomizeMathJax{\newcommand{\proptopsy}{\mathrel{\unicode{x221D}}}} +\CustomizeMathJax{\let\prodpsy\prod} +\CustomizeMathJax{\let\sumpsy\sum} +\CustomizeMathJax{\let\MToriginalprod\prod} +\CustomizeMathJax{\let\MToriginalsum\sum} +\CustomizeMathJax{\newcommand{\DotTriangle}{\mathord{\unicode{x2234}}}} +\end{warpMathJax} +\endinput +%% +%% End of file `lwarp-mathastext.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathspec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathspec.sty new file mode 100644 index 00000000000..000e8c18b82 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathspec.sty @@ -0,0 +1,93 @@ +%% +%% This is file `lwarp-mathspec.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `mathspec') +%% This is a generated file. +%% Copyright 2016-2020 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{mathspec}[2016/12/22] +\LWR@origRequirePackage{lwarp-common-mathjax-letters} + +\begin{warpMathJax} +\booltrue{LWR@MathJax@silentquotes} +\AtBeginDocument{ +\ifcase\eu@GreekUppercase@@value %% If Greek Uppercase Regular + \LWR@mathjax@addgreek@u@up*{}{} +\or %% If Greek Uppercase Italic + \LWR@mathjax@addgreek@u@it*{}{} +\or %% If Greek Uppercase Plain + \LWR@mathjax@addgreek@u@up*{}{} +\fi +\ifcase\eu@GreekLowercase@@value %% If Greek Lowercase Regular + \LWR@mathjax@addgreek@l@up{}{} +\or %% If Greek Lowercase Italic + \LWR@mathjax@addgreek@l@it{}{} +\or %% If Greek Lowercase Plain + \LWR@mathjax@addgreek@l@it{}{} +\fi +} +\newcommand*{\LWR@mathspec@varforms}{% +\eu@ifbooltrue{GreekLowercase}{ + \eu@ifbooltrue{exchangebetaforms}{ + \CustomizeMathJax{\let\LWRorigbeta\beta} + \CustomizeMathJax{\let\beta\varbeta} + \CustomizeMathJax{\let\varbeta\LWRorigbeta} + } + \eu@ifbooltrue{exchangeepsilonforms}{ + \CustomizeMathJax{\let\LWRorigepsilon\epsilon} + \CustomizeMathJax{\let\epsilon\varepsilon} + \CustomizeMathJax{\let\varepsilon\LWRorigepsilon} + } + \eu@ifbooltrue{exchangethetaforms}{ + \CustomizeMathJax{\let\LWRorigtheta\theta} + \CustomizeMathJax{\let\theta\vartheta} + \CustomizeMathJax{\let\vartheta\LWRorigtheta} + } + \eu@ifbooltrue{exchangekappaforms}{ + \CustomizeMathJax{\let\LWRorigkappa\kappa} + \CustomizeMathJax{\let\kappa\varkappa} + \CustomizeMathJax{\let\varkappa\LWRorigkappa} + } + \eu@ifbooltrue{exchangepiforms}{ + \CustomizeMathJax{\let\LWRorigpi\pi} + \CustomizeMathJax{\let\pi\varpi} + \CustomizeMathJax{\let\varpi\LWRorigpi} + } + \eu@ifbooltrue{exchangerhoforms}{ + \CustomizeMathJax{\let\LWRorigrho\rho} + \CustomizeMathJax{\let\rho\varrho} + \CustomizeMathJax{\let\varrho\LWRorigrho} + } + \eu@ifbooltrue{exchangephiforms}{ + \CustomizeMathJax{\let\LWRorigphi\phi} + \CustomizeMathJax{\let\phi\varphi} + \CustomizeMathJax{\let\varphi\LWRorigphi} + } +} +\eu@ifbooltrue{GreekUppercase}{ + \eu@ifbooltrue{exhangeThetaforms}{ + \CustomizeMathJax{\let\LWRorigTheta\Theta} + \CustomizeMathJax{\let\Theta\varTheta} + \CustomizeMathJax{\let\varTheta\LWRorigTheta} + } +} +} +\xapptocmd{\exchangeforms} + {\AtBeginDocument{\LWR@mathspec@varforms}} + {} + {\LWR@patcherror{mathspec}{exchangeforms}} + +\end{warpMathJax} +\endinput +%% +%% End of file `lwarp-mathspec.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-menukeys.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-menukeys.sty new file mode 100644 index 00000000000..41448814439 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-menukeys.sty @@ -0,0 +1,41 @@ +%% +%% This is file `lwarp-menukeys.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `menukeys') +%% This is a generated file. +%% Copyright 2016-2020 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{menukeys}[2020/10/31] +\xpatchcmd{\tw@define@menu@macro} + {\@nameuse{tw@style@#4@pre}} + {% + \begin{lateximage}*[\detokenize{##2}]% + \@nameuse{tw@style@#4@pre}% + } + {} + {\LWR@patcherror{menukeys}{tw@define@menu@macro}} + +\xpatchcmd{\tw@define@menu@macro} + {\@nameuse{tw@style@#4@post}} + {% + \@nameuse{tw@style@#4@post}% + \end{lateximage}% + } + {} + {\LWR@patcherror{menukeys}{tw@define@menu@macro B}} +\renewmenumacro{\menu}[>]{menus} +\renewmenumacro{\directory}[/]{paths} +\renewmenumacro{\keys}[+]{roundedkeys} +\endinput +%% +%% End of file `lwarp-menukeys.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty index b3503f858b6..82a98f59ac9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty @@ -183,9 +183,9 @@ \newrobustcmd{\LWR@HTML@textin}[1]{#1} \newrobustcmd{\LWR@HTML@textsu}[1]{#1} \newrobustcmd{\LWR@HTML@textdf}[1]{#1} - -\ifdef{\LWR@HTML@swshape}{}{% duplicated by fontaxes +\ifdef{\LWR@HTML@textsw}{}{% duplicated by fontaxes \newrobustcmd{\LWR@HTML@textsw}[1]{#1} + \LWR@formatted{textsw} } \newrobustcmd{\LWR@HTML@textti}[1]{#1} @@ -234,7 +234,6 @@ \LWR@formatted{textin} \LWR@formatted{textsu} \LWR@formatted{textdf} -\LWR@formatted{textsw} \LWR@formatted{textti} \LWR@formatted{textlt} \LWR@formatted{textof} 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 4667530912d..643e96c138e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -726,7 +726,6 @@ \renewcommand*{\setFloatBlockFor}{} \renewcommand{\captiontitlefinal}[1]{} - \renewcommand{\flegtable}{\tablename} \renewcommand{\flegfigure}{\figurename} \renewcommand{\flegtoctable}{} @@ -1097,7 +1096,6 @@ \end{center} \@nameuse{flegtoc\@captype}{#1} } - \renewcommand{\newfixedcaption}[3][\caption]{% \renewcommand{#2}{\def\@captype{#3}#1}} \renewcommand{\renewfixedcaption}[3][\caption]{% @@ -1133,7 +1131,6 @@ \contcaption{#3}% \endgroup% } - \renewcommand{\@memsubbody}{% \bgroup \let\label=\memsub@label diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-picinpar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-picinpar.sty new file mode 100644 index 00000000000..c81ce6ad193 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-picinpar.sty @@ -0,0 +1,75 @@ +%% +%% This is file `lwarp-picinpar.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `picinpar') +%% This is a generated file. +%% Copyright 2016-2020 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{picinpar}% No date is assigned. +\long\def\LWR@HTML@window[#1,#2,#3,#4] {% + \if #2r% + \begin{BlockClass}[float:right]{marginblock}% + \else% + \begin{BlockClass}[float:left]{marginblock}% + \fi% + #3\par% + #4% + \end{BlockClass}% +} + +\def\endLWR@HTML@window{} + +\LWR@formattedenv{window} +\def\LWR@HTML@framepic#1{% + \begin{BlockClass}{framebox} + \expandafter\box\csname #1box\endcsname% + \end{BlockClass} +} +\LWR@formatted{framepic} +\def\LWR@HTML@wframepic#1{% + \begin{BlockClass}{framebox} + \expandafter\box\csname #1box\endcsname% + \end{BlockClass} +} +\LWR@formatted{wframepic} +\long\def\LWR@HTML@@makewincaption#1#2{% +\begin{BlockClass}{figurecaption} +#1: #2 +\end{BlockClass} +} +\LWR@formatted{@makewincaption} +\long\def\LWR@HTML@figwindow[#1,#2,#3,#4] {% + \window[#1,#2,{#3},{\def\@captype{figure}% + \wincaption#4\par}] } + +\def\endLWR@HTML@figwindow{\endwindow} + +\LWR@formattedenv{figwindow} +\long\def\LWR@HTML@subtabwindow[#1,#2,#3,#4] {% + \window[#1,#2,{#3},{\def\@captype{table}% + \wincaption#4\par}] } + +\newcommand*{\LWR@HTML@tabwindow}{% + \StartDefiningTabulars% + \LWR@HTML@subtabwindow% +} + +\def\endLWR@HTML@tabwindow{% + \endwindow% + \StopDefiningTabulars% +} + +\LWR@formattedenv{tabwindow} +\endinput +%% +%% End of file `lwarp-picinpar.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plimsoll.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plimsoll.sty new file mode 100644 index 00000000000..f486fdb0772 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plimsoll.sty @@ -0,0 +1,31 @@ +%% +%% This is file `lwarp-plimsoll.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `plimsoll') +%% This is a generated file. +%% Copyright 2016-2020 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{plimsoll}[2020/10/09] +\begin{warpMathJax} +\CustomizeMathJax{\newcommand{\plimsollroman}{\unicode{x029B5}}} + +\CustomizeMathJax{\let\plimsoll\plimsollroman} +\CustomizeMathJax{\let\plimsollsans\plimsoll} + +\ifdefstring{\stst}{^{\circ}} + {\CustomizeMathJax{\newcommand{\stst}{^{\circ}}}} + {\CustomizeMathJax{\newcommand{\stst}{^{\plimsoll}}}} +\end{warpMathJax} +\endinput +%% +%% End of file `lwarp-plimsoll.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty index ca0c15d59de..2f6b0bfc5e7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty @@ -20,6 +20,11 @@ \begin{lateximage}[pspicture]% } \AfterEndEnvironment{pspicture}{\end{lateximage}} + +\BeforeBeginEnvironment{pspicture*}{% + \begin{lateximage}[pspicture]% +} +\AfterEndEnvironment{pspicture*}{\end{lateximage}} \endinput %% %% End of file `lwarp-pstricks.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-repltext.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-repltext.sty new file mode 100644 index 00000000000..9027d7a7047 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-repltext.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-repltext.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `repltext') +%% This is a generated file. +%% Copyright 2016-2020 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@ProvidesPackageDrop{repltext}[2020/09/25] +\newcommand{\repltext}[2]{#2} +\newcommand*{\prevrepl}{} +\begin{warpMathJax} +\CustomizeMathJax{\newcommand{\repltext}[2]{#2}} +\end{warpMathJax} +\endinput +%% +%% End of file `lwarp-repltext.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty index 10aee32f114..6fedcbf7c19 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty @@ -16,23 +16,23 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{schemata}[2016/01/25] +\LWR@ProvidesPackagePass{schemata}[2020/11/23] \LetLtxMacro\LWR@schemata@origschema\schema \LetLtxMacro\LWR@schemata@origSchema\Schema \renewcommand{\schema}[3][open]{% -\begin{lateximage}% -\LWR@print@normalsize -\LWR@schemata@origschema[#1]{#2}{#3}% -\end{lateximage}% + \begin{lateximage}[-schemata-~\PackageDiagramAltText]% + \LWR@print@normalsize% + \LWR@schemata@origschema[#1]{#2}{#3}% + \end{lateximage}% } \renewcommand{\Schema}[5][open]{% -\begin{lateximage}% -\LWR@print@normalsize -\LWR@schemata@origSchema[#1]{#2}{#3}{#4}{#5}% -\end{lateximage}% + \begin{lateximage}[-schemata-~\PackageDiagramAltText]% + \LWR@print@normalsize% + \LWR@schemata@origSchema[#1]{#2}{#3}{#4}{#5}% + \end{lateximage}% } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-selectp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-selectp.sty new file mode 100644 index 00000000000..39e6a05df23 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-selectp.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-selectp.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `selectp') +%% This is a generated file. +%% Copyright 2016-2020 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@ProvidesPackageDrop{selectp}% no date given +\newcommand*{\outputonly}[1]{} +\endinput +%% +%% End of file `lwarp-selectp.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-seqsplit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-seqsplit.sty new file mode 100644 index 00000000000..1d0d24ab1ea --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-seqsplit.sty @@ -0,0 +1,44 @@ +%% +%% This is file `lwarp-seqsplit.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `seqsplit') +%% This is a generated file. +%% Copyright 2016-2020 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{seqsplit}[2006/08/07] +\begin{warpHTML} +\LetLtxMacro\LWR@orig@seqsplit\seqsplit + +\renewcommand*{\seqsplit}[1]{% + \ifmmode% + \begin{LWR@print@minipage}{6in}% + \LWR@orig@seqsplit{#1}% + \end{LWR@print@minipage}% + \else% + \InlineClass[word-wrap:break-word]{seqsplit}{\LWR@orig@seqsplit{#1}}% + \fi +} +\AtBeginDocument{ + \newcommand*{\LWR@HTML@seqinsert}{% + \LWR@htmlcomment{ }% + } + \LWR@formatted{seqinsert} +} +\end{warpHTML} + +\begin{warpMathJax} +\CustomizeMathJax{\newcommand{\seqsplit}[1]{#1}} +\end{warpMathJax} +\endinput +%% +%% End of file `lwarp-seqsplit.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-shuffle.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-shuffle.sty index dcba47efdcb..223428ca6b1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-shuffle.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-shuffle.sty @@ -45,7 +45,9 @@ } \begin{warpMathJax} \CustomizeMathJax{\newcommand{\shuffle}{\mathbin{\unicode{0x29E2}}}} -\CustomizeMathJax{\newcommand{\cshuffle}{\mathbin{\LWRoverlaysymbols{\raise{.6ex}{-}}{\unicode{0x29E2}}}}} +\CustomizeMathJax{\newcommand{\cshuffle}{% + \mathbin{\LWRoverlaysymbols{\raise{.6ex}{-}}{\unicode{0x29E2}}}% +}} \end{warpMathJax} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty new file mode 100644 index 00000000000..4347a1f73ce --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty @@ -0,0 +1,71 @@ +%% +%% This is file `lwarp-simplebnf.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `simplebnf') +%% This is a generated file. +%% Copyright 2016-2020 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{simplebnf}[2020/09/01] +\ExplSyntaxOn + +\RenewDocumentEnvironment { bnfgrammar } { +b } + { + %% \l__input_seq is a list of term definitions. + \regex_split:nnN { ;; } { #1 } \l__input_seq + \begin{center} + \begin{lateximage}[#1]% lwarp + \tl_set:Nn \l__table_tl + { + \begin{tabular}{lcll} + } + \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 + + \bool_if:NTF \l_tmp_first_term + { + \bool_set_false:N \l_tmp_first_term + } + { + \tl_put_right:Nn \l__table_tl { \\ } + } + \tl_put_right:Nx \l__table_tl + { + \bnfexpr { \l__term_tl } & \g__simplebnf_defeq_tl & + } + %% \l__keypairs_seq - (rhs:annot | rhs)... + \seq_set_split:NnV \l__keypairs_seq { | } \l__keypairs_tl + + \bool_set_true:N \l__first_rhs + \seq_map_function:NN \l__keypairs_seq \simplebnf_typeset_rhs:n + } + + \tl_put_right:Nn \l__table_tl { \end{tabular} } + \tl_use:N \l__table_tl + \end{lateximage}% lwarp + \end{center} + } + { } + +\ExplSyntaxOff +\endinput +%% +%% End of file `lwarp-simplebnf.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-statistics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-statistics.sty new file mode 100644 index 00000000000..0d474817ff8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-statistics.sty @@ -0,0 +1,268 @@ +%% +%% This is file `lwarp-statistics.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `statistics') +%% This is a generated file. +%% Copyright 2016-2020 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{statistics}[2019/09/29] +\ExplSyntaxOn +\StartDefiningTabulars% lwarp +\cs_set_protected_nopar:Nn \__statistics_table_make:nn { + \int_compare:nT + { 0 < \l__statistics_table_maxcols_int + = \l__statistics_nbvals_int } { + \__statistics_table_end: + \tl_use:N \l__statistics_table_sep_tl + \__statistics_table_start: + } + \int_incr:N \l__statistics_nbvals_int + \int_incr:N \l__statistics_currange_int + \fp_add:Nn \l__statistics_curtotal_fp { #2 } + \__statistics_set_if_shown:N \l_tmpa_bool + \tl_set:Nx \l_tmpa_tl { + \exp_not:n { & \tl_set:Nn \currentcolumn } { + \int_use:N \l__statistics_currange_int + } + } + \bool_if:NTF \l_tmpa_bool { + \tl_put_right:Nn \l_tmpa_tl + {\__statistics_table_shown_format:n} + }{ + \tl_put_right:Nn \l_tmpa_tl + {\__statistics_table_hidden_format:n} + } + \seq_put_right:Nn \l__statistics_store_values_seq { #1 } + \bool_if:NT \l__statistics_table_values_bool { + \tl_put_right:Nx \l__statistics_table_values_tl { + \exp_not:V \l_tmpa_tl { + \exp_not:n { + \__statistics_table_values_format:n { #1 } + } + } + } + } + \seq_put_right:Nx \l__statistics_store_counts_seq { \fp_eval:n {#2} } + \bool_if:NT \l__statistics_table_counts_bool { + \tl_put_right:Nx \l__statistics_table_counts_tl { + \exp_not:V \l_tmpa_tl { + \exp_not:n { + \__statistics_table_counts_format:n { + { \__statistics_table_allcounts_format:n { #2 } } + } + } + } + } + } + \bool_if:NT \l__statistics_table_icc_bool { + \tl_put_right:Nx \l__statistics_table_icc_tl { + \exp_not:V \l_tmpa_tl { + \exp_not:n { \__statistics_table_icc_format:n } + { + \exp_not:n{ \__statistics_table_allcounts_format:n } + { \fp_use:N \l__statistics_curtotal_fp } + } + } + } + } + \bool_if:NT \l__statistics_table_dcc_bool { + \tl_put_right:Nx \l__statistics_table_dcc_tl { + \exp_not:V \l_tmpa_tl { + \exp_not:n { \__statistics_table_dcc_format:n } + { + \exp_not:n{ \__statistics_table_allcounts_format:n } + { + \fp_eval:n { + \l__statistics_total_fp + - \l__statistics_curtotal_fp + + #2 + } + } + } + } + } + } + \fp_set:Nn \l__statistics_table_curICF_fp { + round(\l__statistics_curtotal_fp + / \l__statistics_total_fp, + \l__statistics_table_round_int) + } + \bool_if:NT \l__statistics_table_frequencies_bool { + \tl_put_right:Nx \l__statistics_table_frequencies_tl { + \exp_not:V \l_tmpa_tl { + \exp_not:n { \__statistics_table_frequencies_format:n } + { + \exp_not:n{ \__statistics_table_allfreqs_format:n } + { + \fp_eval:n { + \l__statistics_table_curICF_fp + - \l__statistics_table_prevICF_fp + } + } + } + } + } + } + \bool_if:NT \l__statistics_table_icf_bool { + \tl_put_right:Nx \l__statistics_table_icf_tl { + \exp_not:V \l_tmpa_tl { + \exp_not:n { \__statistics_table_icf_format:n } + { + \exp_not:n{ \__statistics_table_allfreqs_format:n } + { \fp_to_decimal:N \l__statistics_table_curICF_fp } + } + } + } + } + \bool_if:NT \l__statistics_table_dcf_bool { + \tl_put_right:Nx \l__statistics_table_dcf_tl { + \exp_not:V \l_tmpa_tl { + \exp_not:n { \__statistics_table_dcf_format:n } + { + \exp_not:n{ \__statistics_table_allfreqs_format:n } + { + \fp_eval:n { + 1 - \l__statistics_table_prevICF_fp + } + } + } + } + } + } + \fp_set_eq:NN + \l__statistics_table_prevICF_fp + \l__statistics_table_curICF_fp +} +\StopDefiningTabulars% lwarp + +\cs_set_protected_nopar:Nn \__statistics_table_end: { + \tl_set:Nx \l__statistics_table_preamble_tl { + \exp_not:n {\begin{tabular}[ }% lwarp + \exp_not:V \l__statistics_table_valign_tl + \exp_not:n { ] } + { \exp_not:V \l__statistics_table_headcoltype_tl + \prg_replicate:nn { \l__statistics_nbvals_int } + { \exp_not:V \l__statistics_table_coltype_tl } } + } + \seq_clear:N \l__statistics_table_contents_seq + \clist_map_inline:nn { values, counts, icc, dcc, frequencies, icf, dcf } { + \bool_if:cT { l__statistics_table_##1_bool } { + \seq_put_right:Nv + \l__statistics_table_contents_seq + { l__statistics_table_##1_tl } + } + } + \tl_use:N \l__statistics_table_preamble_tl + \hline% lwarp + \seq_use:Nn + \l__statistics_table_contents_seq + { \l__statistics_table_newline_tl } + \\ + \hline% lwarp + \end{tabular}% lwarp +} + +\cs_set_protected_nopar:Nn \__statistics_table_start: { + \int_zero:N \l__statistics_nbvals_int + \clist_pop:NNT \l__statistics_table_maxcols_clist \l_tmpa_tl { + \int_set:Nn \l__statistics_table_maxcols_int { \l_tmpa_tl } + } + \clist_map_inline:nn { values, counts, frequencies, icc, icf, dcc, dcf } { + \tl_set:cx { l__statistics_table_##1_tl } { + \exp_not:N \hbox { + \exp_not:c { l__statistics_table_##1_name_tl } + } + } + } +} + +\RenewDocumentCommand \__statistics_IN:w { m u{;} u{;} m } { + #1 #2 ; #3 #4% lwarp +} + +\__statistics_setup:nn { table } { + values/format = {#1},% lwarp +} +\RenewDocumentCommand \StatsGraph { +O{} +m +O{} } { + \group_begin: + \int_gincr:N \g__statistics_graph_last_int + \tl_set:Nx \l_tmpa_tl { + \exp_not:n { g__statistics_graph_xstep_ } + \int_use:N \g__statistics_graph_last_int + \exp_not:n { _tl } + } + \tl_if_exist:cTF { \l_tmpa_tl } { + \fp_gset:Nn \g__statistics_graph_xstep_fp + { \tl_use:c {\l_tmpa_tl} } + }{ + \fp_gset:Nn \g__statistics_graph_xstep_fp { \c_one_int } + } + \__statistics_setup:nn { graph } { #1, #3 } + \tl_if_single:nTF { #2 } { + \cs_if_exist:NF #2 { #2 } + \tl_set_eq:NN \l__statistics_data_tl #2 + }{ + \tl_set:Nn \l__statistics_data_tl { #2 } + } + \fp_zero:N \l__statistics_graph_maxheight_fp + \fp_set:Nn \l__statistics_graph_minvalue_fp {inf} + \fp_set:Nn \l__statistics_graph_maxvalue_fp {-inf} + \fp_zero:N \l__statistics_total_fp + \int_zero:N \l__statistics_nbvals_int + \bool_set_true:N \l__statistics_graph_allranges_bool + \keyval_parse:NNV + \__statistics_graph_prepare:n + \__statistics_graph_prepare:nn + \l__statistics_data_tl + \tl_clear:N \l__statistics_graph_tikzdata_tl + \tl_clear:N \l__statistics_graph_tikzinfo_tl + \int_zero:N \l__statistics_currange_int + \bool_if:NTF \l__statistics_graph_allranges_bool { + \bool_if:NTF \l__statistics_graph_cumulative_bool { + \ExplSyntaxOn% lwarp + \__statistics_graph_dopicture_cumulative: + \ExplSyntaxOff% lwarp + }{ + \ExplSyntaxOn% lwarp + \__statistics_graph_dopicture_hist: + \ExplSyntaxOff% lwarp + } + }{ + \ExplSyntaxOn% lwarp + \__statistics_graph_dopicture_comb: + \ExplSyntaxOff% lwarp + } + \iow_now:Nx \@auxout { + \exp_not:n { + \ExplSyntaxOn + \tl_gset:cn + } + { + \exp_not:n {g__statistics_graph_xstep_} + \int_use:N \g__statistics_graph_last_int + \exp_not:n {_tl} + } + { + \fp_to_decimal:N \g__statistics_graph_xstep_fp + } + \exp_not:n { + \ExplSyntaxOff + } + } + \group_end: +} + +\ExplSyntaxOff +\endinput +%% +%% End of file `lwarp-statistics.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty index 7bb1791ceab..afcaced4a41 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.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{struktex}[2018/06/04] +\LWR@ProvidesPackagePass{struktex} \BeforeBeginEnvironment{struktogramm}{% \begin{lateximage}[-struktex-~\PackageDiagramAltText]% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-svg.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-svg.sty index 4e5db978bcb..7ad7bd165d8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-svg.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-svg.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{svg}[2019/10/22] +\LWR@ProvidesPackagePass{svg}[2020/10/23] \xpretocmd{\includesvg}% {\begin{lateximage}}% {}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-swfigure.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-swfigure.sty new file mode 100644 index 00000000000..7be18e815af --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-swfigure.sty @@ -0,0 +1,32 @@ +%% +%% This is file `lwarp-swfigure.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `swfigure') +%% This is a generated file. +%% Copyright 2016-2020 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@ProvidesPackageDrop{swfigure}[2020-11-10] +\NewDocumentEnvironment{DFimage}% + {O{SW} m O{#4} m o D(){0.8} D<>{0} D||{0.25} D!!{}}% +{% + \begin{figure} + \centering + \includegraphics{#2} + \caption[#3]{#4} + \IfValueT{#5}{\label{#5}} + \end{figure} +}% +{}% +\endinput +%% +%% End of file `lwarp-swfigure.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty index 3cf73947475..63e303936c1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty @@ -101,7 +101,7 @@ \protect\tcbhighmath\space instead.\MessageBreak% (Inside math, you probably want to use these anyhow.)% } - }{} + }{\relax} \LWR@printpendingfootnotes \tcb@layer@inc \tcb@apply@box@options{#1} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty index 07a973fd0dc..a859df3535e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty @@ -39,21 +39,20 @@ \let\pgfutil@raggedleft\LWR@print@raggedleft \let\pgfutil@raggedright\LWR@print@raggedright - -\def\pgfutil@font@tiny{\LWR@printtiny} -\def\pgfutil@font@scriptsize{\LWR@printscriptsize} -\def\pgfutil@font@footnotesize{\LWR@printfootnotesize} +\def\pgfutil@font@tiny{\LWR@print@tiny} +\def\pgfutil@font@scriptsize{\LWR@print@scriptsize} +\def\pgfutil@font@footnotesize{\LWR@print@footnotesize} \def\pgfutil@font@small{\LWR@print@small} \def\pgfutil@font@normalsize{\LWR@print@normalsize} -\def\pgfutil@font@large{\LWR@printlarge} -\def\pgfutil@font@Large{\LWR@printLarge} -\def\pgfutil@font@huge{\LWR@printhuge} -\def\pgfutil@font@Huge{\LWR@printHuge} +\def\pgfutil@font@large{\LWR@print@large} +\def\pgfutil@font@Large{\LWR@print@Large} +\def\pgfutil@font@huge{\LWR@print@huge} +\def\pgfutil@font@Huge{\LWR@print@Huge} -\def\pgfutil@font@itshape{\LWR@origitshape} -\def\pgfutil@font@bfseries{\LWR@origbfseries} +\def\pgfutil@font@itshape{\LWR@print@itshape} +\def\pgfutil@font@bfseries{\LWR@print@bfseries} -\def\pgfutil@font@normalfont{\LWR@orignormalfont} +\def\pgfutil@font@normalfont{\LWR@print@normalfont} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index db987d7a549..6867615668c 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/10/07 v0.892 Allows LaTeX to directly produce HTML5 output.] + [2020/11/26 v0.893 Allows LaTeX to directly produce HTML5 output.] @@ -56,12 +56,14 @@ must be loaded after Lwarp.\MessageBreak Enter 'H' for possible solutions% } - {Move ``\protect\usepackage{#1}'' after - ``\protect\usepackage{lwarp}''.\MessageBreak - Package #1 may also be loaded by something else,\MessageBreak - which must also be moved after Lwarp.} + {% + Move ``\protect\usepackage{#1}'' after + ``\protect\usepackage{lwarp}''.\MessageBreak + Package #1 may also be loaded by something else,\MessageBreak + which must also be moved after Lwarp.% + } } -{} +{\relax} } \@ifclassloaded{memoir} @@ -84,7 +86,7 @@ \newcommand*{\LWR@loadbefore}[1]{% \@ifpackageloaded{#1} -{} +{\relax} { \PackageError{lwarp} {% @@ -141,7 +143,7 @@ or is superceded by another class.\MessageBreak For a possible alternative, see class(es) #2. } -}{}% +}{\relax}% } \LWR@earlyclassloadnever{jarticle}{ujarticle} \LWR@earlyclassloadnever{jbook}{ujbook} @@ -168,7 +170,6 @@ \LWR@earlyloadnever{libgreek}{libertinust1math, newtx} \LWR@earlyloadnever{newthm}{ntheorem} \LWR@earlyloadnever{pdfcprot}{microtype} -\LWR@earlyloadnever{picinpar}{floatflt, wrapfig} \LWR@earlyloadnever{picins}{floatflt, wrapfig} \LWR@earlyloadnever{rplain}{fancyhdr} \LWR@earlyloadnever{si}{siunitx} @@ -309,6 +310,7 @@ \LWR@loadafter{eqparbox} \LWR@loadafter{errata} \LWR@loadafter{eso-pic} +\LWR@loadafter{esvect} \LWR@loadafter{etoc} \LWR@loadafter{eurosym} \LWR@loadafter{everypage} @@ -325,6 +327,7 @@ \LWR@loadafter{figsize} \LWR@loadafter{fitbox} \LWR@loadafter{fix2col} +\LWR@loadafter{fixmath} \LWR@loadafter{fixme} \LWR@loadafter{fixmetodonotes} \LWR@loadafter{flafter} @@ -391,6 +394,7 @@ \LWR@loadafter{jurabib} \LWR@loadafter{karnaugh-map} \LWR@loadafter{keyfloat} +\LWR@loadafter{keystroke} \LWR@loadafter{layaureo} \LWR@loadafter{layout} \LWR@loadafter{layouts} @@ -421,17 +425,20 @@ \LWR@loadafter{marginfix} \LWR@loadafter{marginnote} \LWR@loadafter{marvosym} +\LWR@loadafter{mathastext} \LWR@loadafter{mathcomp} \LWR@loadafter{mathdesign} \LWR@loadafter{mathdots} \LWR@loadafter{mathfixs} \LWR@loadafter{mathpazo} \LWR@loadafter{mathptmx} +\LWR@loadafter{mathspec} \LWR@loadafter{mathtools} \LWR@loadafter{mcaption} \LWR@loadafter{mdframed} \LWR@loadafter{media9} \LWR@loadafter{memhfixc} +\LWR@loadafter{menukeys} \LWR@loadafter{metalogo} \LWR@loadafter{metalogox} \LWR@loadafter{mhchem} @@ -505,6 +512,7 @@ \LWR@loadafter{phfqit} \LWR@loadafter{physics} \LWR@loadafter{physunits} +\LWR@loadafter{picinpar} \LWR@loadafter{pifont} \LWR@loadafter{placeins} \LWR@loadafter{plarray} @@ -513,6 +521,7 @@ \LWR@loadafter{plextarydshln} \LWR@loadafter{plcolortbl} \LWR@loadafter{plextdelarray} +\LWR@loadafter{plimsoll} \LWR@loadafter{prelim2e} \LWR@loadafter{prettyref} \LWR@loadafter{preview} @@ -553,6 +562,7 @@ \LWR@loadafter{section} \LWR@loadafter{sectionbreak} \LWR@loadafter{sectsty} +\LWR@loadafter{selectp} \LWR@loadafter{semantic-markup} \LWR@notmemoirloadafter{setspace} \LWR@loadafter{shadow} @@ -563,6 +573,7 @@ \LWR@loadafter{shuffle} \LWR@loadafter{sidecap} \LWR@loadafter{sidenotes} +\LWR@loadafter{simplebnf} \LWR@loadafter{SIunits} \LWR@loadafter{siunitx} \LWR@loadafter{slantsc} @@ -578,6 +589,7 @@ \LWR@loadafter{stackengine} \LWR@loadafter{stackrel} \LWR@loadafter{statex2} +\LWR@loadafter{statistics} \LWR@loadafter{statmath} \LWR@loadafter{steinmetz} \LWR@notltjloadafter{stfloats} @@ -588,6 +600,7 @@ \LWR@loadafter{subsupscripts} \LWR@loadafter{supertabular} \LWR@loadafter{svg} +\LWR@loadafter{swfigure} \LWR@loadafter{syntonly} \LWR@loadafter{t1inc} \LWR@loadafter{tabfigures} @@ -1140,7 +1153,7 @@ from inside a\MessageBreak #1 environment.% }% - }{} + }{\relax} \csdef{LWR@#1commentused}{} \message{Including '#1' comment.}% \def\CommentCutFile{comment_#2.cut} @@ -1367,7 +1380,6 @@ \end{warpprint} \begin{warpall} - \LetLtxMacro\LWR@origRequirePackage\RequirePackage \LetLtxMacro\LWR@origRequirePackageWithOptions\RequirePackageWithOptions @@ -1386,6 +1398,7 @@ \StrBetween[#3,\numexpr#3+1]{#1#2#1}{#1}{#1}% } + \newcommand*{\LWR@checkloadfilename}[1]{% \LWR@checkloadnever{#1}{ae}{cm-super, lmodern} \LWR@checkloadnever{#1}{aecc}{cm-super, lmodern} @@ -1407,7 +1420,6 @@ \LWR@checkloadnever{#1}{libgreek}{libertinust1math, newtx} \LWR@checkloadnever{#1}{newthm}{ntheorem} \LWR@checkloadnever{#1}{pdfcprot}{microtype} -\LWR@checkloadnever{#1}{picinpar}{floatflt, wrapfig} \LWR@checkloadnever{#1}{picins}{floatflt, wrapfig} \LWR@checkloadnever{#1}{rplain}{fancyhdr} \LWR@checkloadnever{#1}{si}{siunitx} @@ -1508,6 +1520,8 @@ }% } \LetLtxMacro\usepackage\RequirePackage +\@onlypreamble\RequirePackage +\@onlypreamble\usepackage \end{warpall} @@ -1678,7 +1692,26 @@ \begin{warpHTML} \newcommand*{\LWR@formatting}{HTML} +\newcommand*{\LWR@formatted@checkname}[1]{% + \ifcsundef{LWR@HTML@#1}{% + \PackageError{lwarp} + {% + \protect\LWR@HTML@#1 is not defined% + } + {Perhaps it is misspelled.} + }{\relax}% +} +\newcommand*{\LWR@formatted@checkendname}[1]{% + \ifcsundef{endLWR@HTML@#1}{% + \PackageError{lwarp} + {% + \protect\endLWR@HTML@#1 is not defined% + } + {Perhaps it is misspelled.} + }{\relax}% +} \newcommand*{\LWR@formatted}[1]{% + \LWR@formatted@checkname{#1}% \ifcsundef{LWR@print@#1}{% \expandafter\LetLtxMacro\csname LWR@print@#1\expandafter\endcsname% \csname#1\endcsname% @@ -1694,6 +1727,7 @@ }% } \newcommand*{\LWR@expandableformatted}[1]{% + \LWR@formatted@checkname{#1}% \ifcsundef{LWR@print@#1}{% \expandafter\LetLtxMacro\csname LWR@print@#1\expandafter\endcsname% \csname#1\endcsname% @@ -1709,6 +1743,8 @@ }% } \newcommand*{\LWR@formattedenv}[1]{% + \LWR@formatted@checkname{#1}% + \LWR@formatted@checkendname{#1}% \ifcsundef{LWR@print@#1}{% \expandafter\LetLtxMacro\csname LWR@print@#1\expandafter\endcsname% \csname#1\endcsname% @@ -1723,6 +1759,8 @@ }% } \newcommand*{\LWR@expandableformattedenv}[1]{% + \LWR@formatted@checkname{#1}% + \LWR@formatted@checkendname{#1}% \ifcsundef{LWR@print@#1}{% \expandafter\LetLtxMacro\csname LWR@print@#1\expandafter\endcsname% \csname#1\endcsname% @@ -2469,7 +2507,7 @@ div.epigraph p, div.dictum p { padding: .5ex ; margin: 0ex ;} div.epigraphsource p, div.dictumauthor p { padding: .5ex 0ex 0ex 0ex ; margin: 0ex ;} div.dictumauthor { font-style:italic } -/* copyrightbox package */ +/* copyrightbox package: */ div.copyrightbox { margin: .5ex .5em } div.copyrightbox p {margin: 0px .5em ; padding: 0px} div.copyrightboxnote {text-align: left ; font-size: 60%} @@ -2530,6 +2568,12 @@ span.capsspacing { span.highlight { background: #F8E800 ; } +/* keystroke package: */ +span.keystroke { + border-style: outset ; + padding: 0pt .5em 0pt .5em ; +} + html body { margin: 0 ; line-height: 1.2; @@ -4546,7 +4590,7 @@ MathJax = { -- Copyright 2016-2020 Brian Dunn -printversion = "v0.892" +printversion = "v0.893" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -6109,13 +6153,17 @@ end -- not --version } \newcommand{\LWR@htmlcomment}[1]{% -\LWR@htmlopencomment{}% -{% - \LWR@print@normalfont% - \LWR@origttfamily% break ligatures - #1% -}% -\LWR@htmlclosecomment{}} +\ifmmode% +\else% + \LWR@htmlopencomment{}% + {% + \LWR@print@normalfont% + \LWR@origttfamily% break ligatures + #1% + }% + \LWR@htmlclosecomment{}% +\fi% +} \newcommand{\LWR@htmlblockcomment}[1] {\LWR@stoppars\LWR@htmlcomment{#1}\LWR@startpars} @@ -6907,6 +6955,9 @@ end -- not --version } \egroup +\newbool{LWR@MathJax@silentquotes} +\boolfalse{LWR@MathJax@silentquotes} + \catcode`\#=12 \catcode`\&=12 \newcommand{\LWR@subHTMLsanitize}{% @@ -6914,7 +6965,12 @@ end -- not --version \LWR@replacestrings{&}{&}% \LWR@replacestrings{<}{<}% \LWR@replacestrings{>}{>}% - \LWR@replacestrings{"}{"}% + \ifbool{LWR@MathJax@silentquotes} + {% + \expandafter\LWR@replacestrings\expandafter{\LWRbackslash"}{}% + \LWR@replacestrings{"}{}% + }% + {\LWR@replacestrings{"}{"}}% \LWR@replacestrings{'}{'}% \LWR@replacestrings{`}{`}% \LWR@replacestrings{##}{#}% @@ -7021,6 +7077,7 @@ end -- not --version \CustomizeMathJax{\newcommand{\footnote}[2][\LWRfootnote]{{}^{\mathrm{#1}}}} \CustomizeMathJax{\newcommand{\footnotemark}[1][\LWRfootnote]{{}^{\mathrm{#1}}}} +\CustomizeMathJax{\newcommand{\mathnormal}[1]{{#1}}} \CustomizeMathJax{\newcommand\ensuremath[1]{#1}} \CustomizeMathJax{% absorb two optional arguments \newcommand{\LWRframebox}[2][]{\fbox{#2}} @@ -10178,7 +10235,7 @@ end -- not --version }{}% \ifbool{LWR@usedmultirow}{% \ifbool{LWR@foundmrowcell}% - {}% + {\relax}% {% \PackageError{lwarp}% {% @@ -13898,7 +13955,6 @@ color:\LWR@origpound\LWR@tempcolor% \@ifpackageloaded{amsmath}{ \RequirePackage{lwarp-amsmath} }{} - \@ifpackageloaded{centernot}{ \RequirePackage{lwarp-centernot} }{} @@ -14100,7 +14156,8 @@ color:\LWR@origpound\LWR@tempcolor% and showonlyrefs options, the alignat environment,\MessageBreak and \protect\DeclarePairedDelimiter\space and related% } - \LWR@mathjaxwarn{mathspec}{} + \LWR@mathjaxwarn{mathspec} + {Double quotes are removed, even inside \protect\text} \LWR@mathjaxwarn{multirow} {Multirow works as expected in text mode, but\MessageBreak limited emulation is provided for MathJax math.\MessageBreak |