diff options
author | Karl Berry <karl@freefriends.org> | 2021-05-24 20:17:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-05-24 20:17:39 +0000 |
commit | a2e8db962fb55454d719b1b2659b748b43424841 (patch) | |
tree | 36f54e44fe16037bf9e2ac85d255c217510833da /Master/texmf-dist/tex/latex | |
parent | 6817402334ba1ac1d3602301cd96216af854adf4 (diff) |
lwarp (24may21)
git-svn-id: svn://tug.org/texlive/trunk@59329 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-centerlastline.sty | 23 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-decorule.sty | 30 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-fancypar.sty | 57 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty | 3 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-froufrou.sty | 39 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-pbalance.sty | 24 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty | 616 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty | 611 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 281 |
12 files changed, 998 insertions, 718 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-centerlastline.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-centerlastline.sty new file mode 100644 index 00000000000..b9c7afa2c0e --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-centerlastline.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-centerlastline.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `centerlastline') +%% 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{centerlastline}[2020/10/12] +\providecommand{\centerlastline}{} +\def\endcenterlastline{\par} +\endinput +%% +%% End of file `lwarp-centerlastline.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-decorule.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-decorule.sty new file mode 100644 index 00000000000..dad605de16f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-decorule.sty @@ -0,0 +1,30 @@ +%% +%% This is file `lwarp-decorule.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `decorule') +%% 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{decorule}[2020/04/01] +\xpretocmd{\decorule} + {\begin{lateximage}*[decorule]} + {} + {\LWR@patcherror{decorule}{decorule A}} + +\xapptocmd{\decorule} + {\end{lateximage}} + {} + {\LWR@patcherror{decorule}{decorule B}} +\endinput +%% +%% End of file `lwarp-decorule.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancypar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancypar.sty new file mode 100644 index 00000000000..8fa743bbc46 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancypar.sty @@ -0,0 +1,57 @@ +%% +%% This is file `lwarp-fancypar.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fancypar') +%% 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{fancypar}[2019/01/18] +\begin{warpHTML} +\makeatletter + +\newcommand{\LWR@fancypar}[2]{% + \begin{BlockClass}{#1Par} + #2 + \end{BlockClass} +} + +\newcommand{\LWR@HTML@NotebookPar}[2][]{\LWR@fancypar{Notebook}{#2}} +\LWR@formatted{NotebookPar} + +\newcommand{\LWR@HTML@ZebraPar}[2][]{\LWR@fancypar{Zebra}{#2}} +\LWR@formatted{ZebraPar} + +\newcommand{\LWR@HTML@DashedPar}[2][]{\LWR@fancypar{Dashed}{#2}} +\LWR@formatted{DashedPar} + +\newcommand{\LWR@HTML@MarkedPar}[2][]{\LWR@fancypar{Marked}{#2}} +\LWR@formatted{MarkedPar} + +\newcommand{\LWR@HTML@UnderlinedPar}[2][]{\LWR@fancypar{Underlined}{#2}} +\LWR@formatted{UnderlinedPar} + +\newcommand{\LWR@HTML@add@fancy@format}{} +\LWR@formatted{add@fancy@format} + +\newcommand{\AddFancyparClass}[1]{% + \expandafter\newcommand\csname LWR@HTML@#1Par\endcsname[2][]{% + \LWR@fancypar{#1}{##2}% + } + \LWR@formatted{#1Par} +} + +\makeatother +\end{warpHTML} +\endinput +%% +%% End of file `lwarp-fancypar.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty index bc50d1db38f..36bfb5d7c38 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.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{fixme}[2017/03/05] +\LWR@ProvidesPackagePass{fixme}[2019/01/03] \let\@wrindex\LWR@wrindex \newcommand{\ext@fixme}{lox} @@ -25,33 +25,37 @@ {\LWR@nameref{\BaseJobname-autopage-\arabic{LWR@nextautopage}} --- #1}% {#2} } +\AtBeginDocument{ + \def\FXFaceInlineHTMLStyle{font-weight:bold} -\renewcommand*\FXLayoutInline[3]{ % -\InlineClass[\FXFaceInlineHTMLStyle]{fixmeinline}% - {\@fxtextstd{#1}{#2}{#3}}% +\renewcommand*\FXLayoutInline[3]{ % space + \InlineClass[\FXFaceInlineHTMLStyle]{fixmeinline}% + {\@fxtextstd{#1}{#2}{#3}}% } \def\FXFaceEnvHTMLStyle{font-weight:bold} \renewcommand*\FXEnvLayoutPlainBegin[2]{% -\BlockClass[\FXFaceEnvHTMLStyle]{fixmebold} -\ignorespaces#2 \fxnotename{#1}: \ignorespaces} + \BlockClass[\FXFaceEnvHTMLStyle]{fixmebold} + \ignorespaces#2 \fxnotename{#1}: \ignorespaces% +} \renewcommand*\FXEnvLayoutPlainEnd[2]{\endBlockClass} \renewcommand*\FXEnvLayoutSignatureBegin[2]{% -\BlockClass[\FXFaceEnvHTMLStyle]{fixmebold} -\fxnotename{#1}: \ignorespaces} + \BlockClass[\FXFaceEnvHTMLStyle]{fixmebold} + \fxnotename{#1}: \ignorespaces% +} \renewcommand*\FXEnvLayoutSignatureEnd[2]{\@fxsignature{#2}\endBlockClass} \def\FXFaceSignatureHTMLStyle{font-style:italic} \DeclareRobustCommand*\@fxsignature[1]{% -\ifthenelse{\equal{#1}{}}% - {}% - { -- {\InlineClass[\FXFaceSignatureHTMLStyle]{fixmesignature}{#1}}}% + \ifthenelse{\equal{#1}{}}% + {}% + { -- {\InlineClass[\FXFaceSignatureHTMLStyle]{fixmesignature}{#1}}}% } \def\FXFaceTargetHTMLStyle{font-style:italic} @@ -60,6 +64,8 @@ \InlineClass[\FXFaceTargetHTMLStyle]{fixmetarget}{#2}% } +}% \AtBeginDocument + \endinput %% %% End of file `lwarp-fixme.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty index add1c1bf03f..4486c628cc9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty @@ -45,12 +45,13 @@ \newcommand{\floatstyle}[1]{% \def\LWR@floatstyle{#1}% -} +}% \NewDocumentCommand{\restylefloat}{s m}{% \csedef{LWR@floatstyle@#2}{\LWR@floatstyle}% } +\newcommand{\listof}{\LWR@listof} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-froufrou.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-froufrou.sty new file mode 100644 index 00000000000..c6456376ca9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-froufrou.sty @@ -0,0 +1,39 @@ +%% +%% This is file `lwarp-froufrou.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `froufrou') +%% 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{froufrou}[2020/12/22] +\ExplSyntaxOn +\xpretocmd{\setfroufrou} + {\edef\LWR@latestfroufrou{\detokenize{#1}}} + {} + {\LWR@patcherror{froufrou}{setfroufrou}} +\ExplSyntaxOff + +\xpatchcmd{\@realfroufrou} + {\@froufrouOrnament} + {% + \begin{center} + \begin{lateximage}*[froufrou][\LWR@latestfroufrou]% + \@froufrouOrnament% + \end{lateximage} + \end{center} + } + {} + {\LWR@patcherror{froufrou}{@realfroufrou}} +\endinput +%% +%% End of file `lwarp-froufrou.sty'. 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 54127dc6423..6907679f15d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -687,7 +687,7 @@ \@ifundefined{c@#3depth}{\newcounter{#3depth}}{}% \setcounter{#3depth}{1}% \@namedef{#3mark}{}% - \@namedef{#2}{\listof{#2}{#4}}% + \@namedef{#2}{\LWR@listof{#2}{#4}}% \@namedef{@cftmake#3title}{}% \@ifundefined{cftbefore#3titleskip}{% \expandafter\newlength\csname cftbefore#3titleskip\endcsname% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pbalance.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbalance.sty new file mode 100644 index 00000000000..9f8a28e08b5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbalance.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-pbalance.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pbalance') +%% 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. +\RequirePackage{balance} + +\LWR@ProvidesPackageDrop{pbalance}[2020/12/16] +\newcommand\shrinkLastPage[1]{} +\endinput +%% +%% End of file `lwarp-pbalance.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty new file mode 100644 index 00000000000..5009c7e3032 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty @@ -0,0 +1,616 @@ +%% +%% This is file `lwarp-siunitx-v2.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `siunitx-v2') +%% 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. + +\RequirePackage{xcolor}% for \convertcolorspec + +\LWR@ProvidesPackagePass{siunitx-v2}[2021-04-17] + +\AtBeginDocument{% in case textcomp was not loaded + \DeclareSIUnit\bohr{\textit{a}\textsubscript{0}} + \DeclareSIUnit\clight{\textit{c}\textsubscript{0}} + \DeclareSIUnit\elementarycharge{\textit{e}} + \DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}} + \DeclareSIUnit\hartree{\textit{E}\textsubscript{h}} + \DeclareSIUnit\planckbar{\LWR@siunitx@textplanckbar} +}% AtBeginDocument + +\ExplSyntaxOn +\cs_set_protected:Npn \__siunitx_print_aux: + { + \text + { + \__siunitx_ensure_ltr:n + { + \begingroup% lwarp + \__siunitx_print_color: + \__siunitx_font_shape: + \__siunitx_font_weight: + \use:c + { + __siunitx_ \l__siunitx_print_type_tl _ + text \l__siunitx_font_family_tl : + } + { + \LWR@findcurrenttextcolor% lwarp + \ifdefstring{\LWR@tempcolor}{000000}% lwarp + {\__siunitx_print_text:}% lwarp + {% lwarp + \LWR@textcurrentcolor{% lwarp + \__siunitx_print_text: + }% lwarp + }% lwarp + } + \endgroup% lwarp + } + } + } + +\cs_set_protected:Npn \__siunitx_set_math_fam:n #1 { + \group_begin: + \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp + \LetLtxMacro\mbox\LWR@print@mbox% lwarp + \hbox_set:Nn \l__siunitx_tmp_box + { + \ensuremath + { + \use:c { math #1 } + { + \int_const:cn { c__siunitx_math #1 _int } { \fam } + } + } + } + \group_end: +} + +\cs_set_protected:Npn \__siunitx_combined_output:n #1 { + \group_begin:% lwarp + \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp + \LetLtxMacro\mbox\LWR@print@mbox% lwarp + \bool_if:NTF \l__siunitx_number_parse_bool + { + \tl_clear:N \l__siunitx_number_out_tl + \bool_set_false:N \l__siunitx_number_compound_bool + \__siunitx_number_output_parse:n {#1} + } + { + \__siunitx_unit_output_pre_print: + \begingroup% lwarp + \boolfalse{mathjax}% lwarp + \LWR@subsingledollar{% lwarp + \textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp + }{siunitx}{% + \__siunitx_print:nn { number } {% + \LWR@origensuredmath{#1}% + }% + }% lwarp + \endgroup% lwarp + \__siunitx_unit_output_print: + } + \group_end:% lwarp +} +\cs_set_protected:Npn \__siunitx_range_numbers_aux:n #1 + { + \bool_if:NTF \l__siunitx_number_parse_bool + { + \tl_clear:N \l__siunitx_number_out_tl + \tl_clear:N \l__siunitx_number_out_saved_tl + \bool_set_false:N \l__siunitx_number_compound_bool + \__siunitx_number_output_parse:n {#1} + \bool_if:NT \l__siunitx_number_compound_bool + { \msg_error:nnx { siunitx } { multi-part-range } {#1} } + } + { + \__siunitx_unit_output_pre_print: + \begingroup% lwarp + \boolfalse{mathjax}% lwarp + \LWR@subsingledollar{% lwarp + \textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp + }{siunitx}{% + \__siunitx_print:nn { number } {% + \LWR@origensuredmath{#1}% + } % lwarp + }% lwarp + \endgroup% lwarp + \__siunitx_unit_output_print: + } + } +\cs_set_protected:Npn \__siunitx_angle_print_direct_aux:nn #1#2 { + \tl_if_empty:nF {#1} + { + \tl_set:Nn \l__siunitx_unit_tl {#2} + \begingroup% lwarp + \boolfalse{mathjax}% lwarp + \LWR@subsingledollar{% lwarp + \textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp + }{siunitx}{% + \__siunitx_print:nn { number } { + \LWR@origensuredmath{#1}% + }% lwarp + }% lwarp + \endgroup% lwarp + \__siunitx_unit_output_print: + } +} +\cs_set_protected:Npn \__siunitx_number_output_quotient_fraction: { + \bool_set_true:N \l__siunitx_number_compound_bool + \__siunitx_number_output_quotient_aux_i: + \tl_set_eq:NN \l__siunitx_number_out_tl + \l__siunitx_number_numerator_tl + \tl_put_right:NV \l__siunitx_number_out_tl \l__siunitx_output_quotient_tl + \tl_put_right:NV \l__siunitx_number_out_tl + \l__siunitx_number_denominator_tl + \__siunitx_number_output_single_aux: +} +\cs_set_protected:Npn \__siunitx_unit_format_fraction_fraction: { + \__siunitx_unit_format_fraction_symbol_aux: + \int_compare:nNnT { \l__siunitx_unit_denominator_int } > { 1 } + { + \bool_if:NT \l__siunitx_unit_denominator_bracket_bool + { + \tl_put_left:NV \l__siunitx_unit_denominator_tl \l__siunitx_bracket_open_tl + \tl_put_right:NV \l__siunitx_unit_denominator_tl \l__siunitx_bracket_close_tl + } + } + \tl_set_eq:NN \l__siunitx_unit_tl \l__siunitx_unit_numerator_tl + \tl_put_right:NV \l__siunitx_unit_tl \l__siunitx_per_symbol_tl + \tl_put_right:NV \l__siunitx_unit_tl \l__siunitx_unit_denominator_tl +} +\cs_set_protected:Npn \__siunitx_angle_print_astronomy_aux: { + \prop_get:NnNT \l__siunitx_number_out_prop { mantissa-integer } + \l__siunitx_tmpa_tl + { \__siunitx_print:nV { number } \l__siunitx_tmpa_tl } + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% lwarp + {% lateximage + \hbox_set:Nn \l__siunitx_angle_marker_box + { + \__siunitx_print:nn { number } { { \l__siunitx_output_decimal_tl } } + } + \hbox_set:Nn \l__siunitx_angle_unit_box + { + \__siunitx_print:nV { unit } \l__siunitx_unit_tl + \skip_horizontal:n { -\scriptspace } + } + \__siunitx_angle_print_astronomy_aux:n { marker } + \__siunitx_angle_print_astronomy_aux:n { unit } + \hbox_set:Nn \l__siunitx_angle_marker_box + { + \box_use:N \l__siunitx_angle_marker_box + \box_use:N \l__siunitx_angle_unit_box + } + \dim_compare:nNnTF + { \l__siunitx_angle_marker_dim } > { \l__siunitx_angle_unit_dim } + { \__siunitx_angle_print_astronomy_marker: } + { \__siunitx_angle_print_astronomy_unit: } + }% lateximage + {% not a lateximage + \__siunitx_print:nV { unit } \l__siunitx_unit_tl + \__siunitx_print:nn { number } { { \l__siunitx_output_decimal_tl } } + }% not a lateximage + \prop_get:NnNT \l__siunitx_number_out_prop { mantissa-decimal } + \l__siunitx_tmpa_tl + { \__siunitx_print:nV { number } \l__siunitx_tmpa_tl } +} +\cs_set_protected:Npn \__siunitx_textsuperscript:n #1 {\textsuperscript{#1}} +\RenewDocumentCommand \num { o m } { + \leavevmode + \group_begin:% lwarp + \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp + \LetLtxMacro\mbox\LWR@print@mbox% lwarp + \bool_set_false:N \l__siunitx_font_set_bool + \IfNoValueF {#1} + { \keys_set:nn { siunitx } {#1} } + \__siunitx_number_output:n {#2} + \group_end:% lwarp +} +\RenewDocumentCommand \numrange { o m m } { + \leavevmode + \group_begin:% lwarp + \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp + \LetLtxMacro\mbox\LWR@print@mbox% lwarp + \bool_set_false:N \l__siunitx_font_set_bool + \IfNoValueF {#1} + { \keys_set:nn { siunitx } {#1} } + \__siunitx_range_numbers:nn {#2} {#3} + \group_end:% lwarp +} +\RenewDocumentCommand \ang { o > { \SplitArgument { 2 } { ; } } m } { + \group_begin:% lwarp + \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp + \LetLtxMacro\mbox\LWR@print@mbox% lwarp + \IfNoValueF {#1} + { \keys_set:nn { siunitx } {#1} } + \__siunitx_angle_output:nnn #2 + \group_end:% lwarp +} +\RenewDocumentCommand \si { o m } { + \leavevmode + \group_begin:% lwarp + \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp + \LetLtxMacro\mbox\LWR@print@mbox% lwarp + \bool_set_false:N \l__siunitx_font_set_bool + \IfNoValueTF {#1} + { \__siunitx_unit_output:nn {#2} { } } + { + \keys_set:nn { siunitx } {#1} + \__siunitx_unit_output:nn {#2} {#1} + } + \group_end:% lwarp +} +\RenewDocumentCommand{\SIrange}{o m m m} +{% + \leavevmode + \group_begin:% lwarp + \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp + \LetLtxMacro\mbox\LWR@print@mbox% lwarp + \bool_set_false:N \l__siunitx_font_set_bool + \IfNoValueTF {#1} + { \__siunitx_range_unit:nnnn {#4} { } {#2} {#3} } + { + \keys_set:nn { siunitx } {#1} + \__siunitx_range_unit:nnnn {#4} {#1} {#2} {#3} + } + \group_end:% lwarp +} +\ExplSyntaxOff + +\begin{warpMathJax} +\LWR@infoprocessingmathjax{siunitx} +\CustomizeMathJax{\newcommand{\tothe}[1]{^{#1}}} +\CustomizeMathJax{\newcommand{\raiseto}[2]{{#2}^{#1}}} +\CustomizeMathJax{\newcommand{\LWRsiunitxEND}{}} +\CustomizeMathJax{\def\LWRsiunitxang#1;#2;#3;#4\LWRsiunitxEND{% + \ifblank{#1}{}{\num{#1}\degree}% + \ifblank{#2}{}{\num{#2}^{\unicode{x2032}}}% \prime + \ifblank{#3}{}{\num{#3}^{\unicode{x2033}}}% \dblprime +}} +\CustomizeMathJax{\newcommand{\ang}[2][]{\LWRsiunitxang#2;;;\LWRsiunitxEND}} +\CustomizeMathJax{\newcommand{\LWRsiunitxnumscientific}[2]{% + \ifblank{#1}% + {}% + {% + \ifstrequal{#1}{-}% + {-}% + {\LWRsiunitxprintdecimal{#1}\times}% + }% + 10^{\LWRsiunitxprintdecimal{#2}} +}} +\ExplSyntaxOn +\AtBeginDocument{ +\ifdefstring{\l__siunitx_output_decimal_tl}{{,}} + {% Use decimal comma + \CustomizeMathJax{\def\LWRsiunitxprintdecimalsub#1.#2.#3\LWRsiunitxEND{% + \mathrm{#1}% + \ifblank{#2} + {}% + {,\mathrm{#2}} + }} + + \CustomizeMathJax{\newcommand{\LWRsiunitxprintdecimal}[1]{% + \LWRsiunitxprintdecimalsub#1...\LWRsiunitxEND% + }} + } + {% Use decimal point + \CustomizeMathJax{\def\LWRsiunitxprintdecimalsub#1,#2,#3\LWRsiunitxEND{% + \mathrm{#1}% + \ifblank{#2} + {}% + {.\mathrm{#2}} + }} + + \CustomizeMathJax{\newcommand{\LWRsiunitxprintdecimal}[1]{% + \LWRsiunitxprintdecimalsub#1,,,\LWRsiunitxEND% + }} + } +} +\ExplSyntaxOff +\CustomizeMathJax{\def\LWRsiunitxnumplus#1+#2+#3\LWRsiunitxEND{% + \ifblank{#2} + {\LWRsiunitxprintdecimal{#1}}% no plus + {% + \ifblank{#1}% + {\LWRsiunitxprintdecimal{#2}}% leading plus, ignore + {% a+b + \LWRsiunitxprintdecimal{#1}% + \unicode{x02B}% plus sign + \LWRsiunitxprintdecimal{#2}% + }% + }% +}} + +\CustomizeMathJax{\def\LWRsiunitxnumminus#1-#2-#3\LWRsiunitxEND{% + \ifblank{#2} + {\LWRsiunitxnumplus#1+++\LWRsiunitxEND}% + {% + \LWRsiunitxprintdecimal{#1}% + \unicode{x02212}% mathematical minus sign + \LWRsiunitxprintdecimal{#2}% + }% +}} + +\CustomizeMathJax{\def\LWRsiunitxnumpm#1+-#2+-#3\LWRsiunitxEND{% + \ifblank{#2}% + {\LWRsiunitxnumminus#1---\LWRsiunitxEND}% + {% + \LWRsiunitxprintdecimal{#1}% + \unicode{x0B1}% \pm + \LWRsiunitxprintdecimal{#2}% + }% +}} + +\CustomizeMathJax{\def\LWRsiunitxnumx#1x#2x#3x#4\LWRsiunitxEND{% + \ifblank{#2}% + {\LWRsiunitxnumpm#1+-+-\LWRsiunitxEND}% + {% + \ifblank{#3}% + {% + \LWRsiunitxprintdecimal{#1}% + \times% + \LWRsiunitxprintdecimal{#2}% + }% + {% + \LWRsiunitxprintdecimal{#1}% + \times% + \LWRsiunitxprintdecimal{#2}% + \times% + \LWRsiunitxprintdecimal{#3}% + }% + }% +}} + +\CustomizeMathJax{\def\LWRsiunitxnumD#1D#2D#3\LWRsiunitxEND{% + \ifblank{#2}% + {\LWRsiunitxnumx#1xxxxx\LWRsiunitxEND}% + {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% +}} + +\CustomizeMathJax{\def\LWRsiunitxnumd#1d#2d#3\LWRsiunitxEND{% + \ifblank{#2}% + {\LWRsiunitxnumD#1DDD\LWRsiunitxEND}% + {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% +}} + +\CustomizeMathJax{\def\LWRsiunitxnumE#1E#2E#3\LWRsiunitxEND{% + \ifblank{#2}% + {\LWRsiunitxnumd#1ddd\LWRsiunitxEND}% + {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% +}} + +\CustomizeMathJax{\def\LWRsiunitxnume#1e#2e#3\LWRsiunitxEND{% + \ifblank{#2}% + {\LWRsiunitxnumE#1EEE\LWRsiunitxEND}% + {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% +}} + +\CustomizeMathJax{\def\LWRsiunitxnumcomma#1,#2,#3\LWRsiunitxEND{% + \ifblank{#2} + {\LWRsiunitxnume#1eee\LWRsiunitxEND} + {\LWRsiunitxnume#1.#2eee\LWRsiunitxEND} +}} + +\CustomizeMathJax{\newcommand{\num}[2][]{\LWRsiunitxnumcomma#2,,,\LWRsiunitxEND}} +\CustomizeMathJax{\newcommand{\si}[2][]{\mathrm{#2}}} +\CustomizeMathJax{\def\LWRsiunitxSIopt#1[#2]#3{% + {#2}\num{#1}{#3}% +}} + +\CustomizeMathJax{\newcommand{\LWRsiunitxSI}[2]{% + \num{#1}\,{#2}% +}} +\CustomizeMathJax{\newcommand{\SI}[2][]{% + \ifnextchar[% + {\LWRsiunitxSIopt{#2}}% + {\LWRsiunitxSI{#2}}% +}} +\CustomizeMathJax{\newcommand{\numlist}[2][]{\mathrm{#2}}} +\CustomizeMathJax{\newcommand{\numrange}[3][]{\num{#2}\,\unicode{x2013}\,\num{#3}}} +\CustomizeMathJax{\newcommand{\SIlist}[3][]{\mathrm{#2\,#3}}} +\CustomizeMathJax{\newcommand{\SIrange}[4][]{\num{#2}\,#4\,\unicode{x2013}\,\num{#3}\,#4}} +\CustomizeMathJax{\newcommand{\tablenum}[2][]{\mathrm{#2}}} +\CustomizeMathJax{\newcommand{\ampere}{\mathrm{A}}} +\CustomizeMathJax{\newcommand{\candela}{\mathrm{cd}}} +\CustomizeMathJax{\newcommand{\kelvin}{\mathrm{K}}} +\CustomizeMathJax{\newcommand{\kilogram}{\mathrm{kg}}} +\CustomizeMathJax{\newcommand{\metre}{\mathrm{m}}} +\CustomizeMathJax{\newcommand{\mole}{\mathrm{mol}}} +\CustomizeMathJax{\newcommand{\second}{\mathrm{s}}} +\CustomizeMathJax{\newcommand{\becquerel}{\mathrm{Bq}}} +\CustomizeMathJax{\newcommand{\degreeCelsius}{\unicode{x2103}}} +\CustomizeMathJax{\newcommand{\coulomb}{\mathrm{C}}} +\CustomizeMathJax{\newcommand{\farad}{\mathrm{F}}} +\CustomizeMathJax{\newcommand{\gray}{\mathrm{Gy}}} +\CustomizeMathJax{\newcommand{\hertz}{\mathrm{Hz}}} +\CustomizeMathJax{\newcommand{\henry}{\mathrm{H}}} +\CustomizeMathJax{\newcommand{\joule}{\mathrm{J}}} +\CustomizeMathJax{\newcommand{\katal}{\mathrm{kat}}} +\CustomizeMathJax{\newcommand{\lumen}{\mathrm{lm}}} +\CustomizeMathJax{\newcommand{\lux}{\mathrm{lx}}} +\CustomizeMathJax{\newcommand{\newton}{\mathrm{N}}} +\CustomizeMathJax{\newcommand{\ohm}{\mathrm{\Omega}}} +\CustomizeMathJax{\newcommand{\pascal}{\mathrm{Pa}}} +\CustomizeMathJax{\newcommand{\radian}{\mathrm{rad}}} +\CustomizeMathJax{\newcommand{\siemens}{\mathrm{S}}} +\CustomizeMathJax{\newcommand{\sievert}{\mathrm{Sv}}} +\CustomizeMathJax{\newcommand{\steradian}{\mathrm{sr}}} +\CustomizeMathJax{\newcommand{\tesla}{\mathrm{T}}} +\CustomizeMathJax{\newcommand{\volt}{\mathrm{V}}} +\CustomizeMathJax{\newcommand{\watt}{\mathrm{W}}} +\CustomizeMathJax{\newcommand{\weber}{\mathrm{Wb}}} +\CustomizeMathJax{\newcommand{\day}{\mathrm{d}}} +\CustomizeMathJax{\newcommand{\degree}{\mathrm{^\circ}}} +\CustomizeMathJax{\newcommand{\hectare}{\mathrm{ha}}} +\CustomizeMathJax{\newcommand{\hour}{\mathrm{h}}} +\CustomizeMathJax{\newcommand{\litre}{\mathrm{l}}} +\CustomizeMathJax{\newcommand{\liter}{\mathrm{L}}} +\CustomizeMathJax{\newcommand{\arcminute}{^\prime}} +\CustomizeMathJax{\newcommand{\minute}{\mathrm{min}}} +\CustomizeMathJax{\newcommand{\arcsecond}{^{\prime\prime}}} +\CustomizeMathJax{\newcommand{\tonne}{\mathrm{t}}} +\CustomizeMathJax{\newcommand{\astronomicalunit}{au}} +\CustomizeMathJax{\newcommand{\atomicmassunit}{u}} +\CustomizeMathJax{\newcommand{\bohr}{\mathit{a}_0}} +\CustomizeMathJax{\newcommand{\clight}{\mathit{c}_0}} +\CustomizeMathJax{\newcommand{\dalton}{\mathrm{D}_\mathrm{a}}} +\CustomizeMathJax{\newcommand{\electronmass}{\mathit{m}_{\mathrm{e}}}} +\CustomizeMathJax{\newcommand{\electronvolt}{\mathrm{eV}}} +\CustomizeMathJax{\newcommand{\elementarycharge}{\mathit{e}}} +\CustomizeMathJax{\newcommand{\hartree}{\mathit{E}_{\mathrm{h}}}} +\CustomizeMathJax{\newcommand{\planckbar}{\mathit{\unicode{x210F}}}} +\CustomizeMathJax{\newcommand{\angstrom}{\mathrm{\unicode{x212B}}}} +\CustomizeMathJax{\let\LWRorigbar\bar} +\CustomizeMathJax{\newcommand{\bar}{\mathrm{bar}}} +\CustomizeMathJax{\newcommand{\barn}{\mathrm{b}}} +\CustomizeMathJax{\newcommand{\bel}{\mathrm{B}}} +\CustomizeMathJax{\newcommand{\decibel}{\mathrm{dB}}} +\CustomizeMathJax{\newcommand{\knot}{\mathrm{kn}}} +\CustomizeMathJax{\newcommand{\mmHg}{\mathrm{mmHg}}} +\CustomizeMathJax{\newcommand{\nauticalmile}{\mathrm{M}}} +\CustomizeMathJax{\newcommand{\neper}{\mathrm{Np}}} +\CustomizeMathJax{\newcommand{\yocto}{\mathrm{y}}} +\CustomizeMathJax{\newcommand{\zepto}{\mathrm{z}}} +\CustomizeMathJax{\newcommand{\atto}{\mathrm{a}}} +\CustomizeMathJax{\newcommand{\femto}{\mathrm{f}}} +\CustomizeMathJax{\newcommand{\pico}{\mathrm{p}}} +\CustomizeMathJax{\newcommand{\nano}{\mathrm{n}}} +\CustomizeMathJax{\newcommand{\micro}{\mathrm{\unicode{x00B5}}}} +\CustomizeMathJax{\newcommand{\milli}{\mathrm{m}}} +\CustomizeMathJax{\newcommand{\centi}{\mathrm{c}}} +\CustomizeMathJax{\newcommand{\deci}{\mathrm{d}}} +\CustomizeMathJax{\newcommand{\deca}{\mathrm{da}}} +\CustomizeMathJax{\newcommand{\hecto}{\mathrm{h}}} +\CustomizeMathJax{\newcommand{\kilo}{\mathrm{k}}} +\CustomizeMathJax{\newcommand{\mega}{\mathrm{M}}} +\CustomizeMathJax{\newcommand{\giga}{\mathrm{G}}} +\CustomizeMathJax{\newcommand{\tera}{\mathrm{T}}} +\CustomizeMathJax{\newcommand{\peta}{\mathrm{P}}} +\CustomizeMathJax{\newcommand{\exa}{\mathrm{E}}} +\CustomizeMathJax{\newcommand{\zetta}{\mathrm{Z}}} +\CustomizeMathJax{\newcommand{\yotta}{\mathrm{Y}}} +\CustomizeMathJax{\newcommand{\percent}{\mathrm{\%}}} +\CustomizeMathJax{\newcommand{\meter}{\mathrm{m}}} +\CustomizeMathJax{\newcommand{\metre}{\mathrm{m}}} +\CustomizeMathJax{\newcommand{\gram}{\mathrm{g}}} +\CustomizeMathJax{\newcommand{\kg}{\kilo\gram}} +\CustomizeMathJax{\newcommand{\of}[1]{_{\mathrm{#1}}}} +\CustomizeMathJax{\newcommand{\squared}{^2}} +\CustomizeMathJax{\newcommand{\square}[1]{\mathrm{#1}^2}} +\CustomizeMathJax{\newcommand{\cubed}{^3}} +\CustomizeMathJax{\newcommand{\cubic}[1]{\mathrm{#1}^3}} +\CustomizeMathJax{\newcommand{\per}{/}} +\CustomizeMathJax{\newcommand{\celsius}{\unicode{x2103}}} +\CustomizeMathJax{\newcommand{\fg}{\femto\gram}} +\CustomizeMathJax{\newcommand{\pg}{\pico\gram}} +\CustomizeMathJax{\newcommand{\ng}{\nano\gram}} +\CustomizeMathJax{\newcommand{\ug}{\micro\gram}} +\CustomizeMathJax{\newcommand{\mg}{\milli\gram}} +\CustomizeMathJax{\newcommand{\g}{\gram}} +\CustomizeMathJax{\newcommand{\kg}{\kilo\gram}} +\CustomizeMathJax{\newcommand{\amu}{\mathrm{u}}} +\CustomizeMathJax{\newcommand{\pm}{\pico\metre}} +\CustomizeMathJax{\newcommand{\nm}{\nano\metre}} +\CustomizeMathJax{\newcommand{\um}{\micro\metre}} +\CustomizeMathJax{\newcommand{\mm}{\milli\metre}} +\CustomizeMathJax{\newcommand{\cm}{\centi\metre}} +\CustomizeMathJax{\newcommand{\dm}{\deci\metre}} +\CustomizeMathJax{\newcommand{\m}{\metre}} +\CustomizeMathJax{\newcommand{\km}{\kilo\metre}} +\CustomizeMathJax{\newcommand{\as}{\atto\second}} +\CustomizeMathJax{\newcommand{\fs}{\femto\second}} +\CustomizeMathJax{\newcommand{\ps}{\pico\second}} +\CustomizeMathJax{\newcommand{\ns}{\nano\second}} +\CustomizeMathJax{\newcommand{\us}{\micro\second}} +\CustomizeMathJax{\newcommand{\ms}{\milli\second}} +\CustomizeMathJax{\newcommand{\s}{\second}} +\CustomizeMathJax{\newcommand{\fmol}{\femto\mol}} +\CustomizeMathJax{\newcommand{\pmol}{\pico\mol}} +\CustomizeMathJax{\newcommand{\nmol}{\nano\mol}} +\CustomizeMathJax{\newcommand{\umol}{\micro\mol}} +\CustomizeMathJax{\newcommand{\mmol}{\milli\mol}} +\CustomizeMathJax{\newcommand{\mol}{\mol}} +\CustomizeMathJax{\newcommand{\kmol}{\kilo\mol}} +\CustomizeMathJax{\newcommand{\pA}{\pico\ampere}} +\CustomizeMathJax{\newcommand{\nA}{\nano\ampere}} +\CustomizeMathJax{\newcommand{\uA}{\micro\ampere}} +\CustomizeMathJax{\newcommand{\mA}{\milli\ampere}} +\CustomizeMathJax{\newcommand{\A}{\ampere}} +\CustomizeMathJax{\newcommand{\kA}{\kilo\ampere}} +\CustomizeMathJax{\newcommand{\ul}{\micro\litre}} +\CustomizeMathJax{\newcommand{\ml}{\milli\litre}} +\CustomizeMathJax{\newcommand{\l}{\litre}} +\CustomizeMathJax{\newcommand{\hl}{\hecto\litre}} +\CustomizeMathJax{\newcommand{\uL}{\micro\liter}} +\CustomizeMathJax{\newcommand{\mL}{\milli\liter}} +\CustomizeMathJax{\newcommand{\L}{\liter}} +\CustomizeMathJax{\newcommand{\hL}{\hecto\liter}} +\CustomizeMathJax{\newcommand{\mHz}{\milli\hertz}} +\CustomizeMathJax{\newcommand{\Hz}{\hertz}} +\CustomizeMathJax{\newcommand{\kHz}{\kilo\hertz}} +\CustomizeMathJax{\newcommand{\MHz}{\mega\hertz}} +\CustomizeMathJax{\newcommand{\GHz}{\giga\hertz}} +\CustomizeMathJax{\newcommand{\THz}{\tera\hertz}} +\CustomizeMathJax{\newcommand{\mN}{\milli\newton}} +\CustomizeMathJax{\newcommand{\N}{\newton}} +\CustomizeMathJax{\newcommand{\kN}{\kilo\newton}} +\CustomizeMathJax{\newcommand{\MN}{\mega\newton}} +\CustomizeMathJax{\newcommand{\Pa}{\pascal}} +\CustomizeMathJax{\newcommand{\kPa}{\kilo\pascal}} +\CustomizeMathJax{\newcommand{\MPa}{\mega\pascal}} +\CustomizeMathJax{\newcommand{\GPa}{\giga\pascal}} +\CustomizeMathJax{\newcommand{\mohm}{\milli\ohm}} +\CustomizeMathJax{\newcommand{\kohm}{\kilo\ohm}} +\CustomizeMathJax{\newcommand{\Mohm}{\mega\ohm}} +\CustomizeMathJax{\newcommand{\pV}{\pico\volt}} +\CustomizeMathJax{\newcommand{\nV}{\nano\volt}} +\CustomizeMathJax{\newcommand{\uV}{\micro\volt}} +\CustomizeMathJax{\newcommand{\mV}{\milli\volt}} +\CustomizeMathJax{\newcommand{\V}{\volt}} +\CustomizeMathJax{\newcommand{\kV}{\kilo\volt}} +\CustomizeMathJax{\newcommand{\W}{\watt}} +\CustomizeMathJax{\newcommand{\uW}{\micro\watt}} +\CustomizeMathJax{\newcommand{\mW}{\milli\watt}} +\CustomizeMathJax{\newcommand{\kW}{\kilo\watt}} +\CustomizeMathJax{\newcommand{\MW}{\mega\watt}} +\CustomizeMathJax{\newcommand{\GW}{\giga\watt}} +\CustomizeMathJax{\newcommand{\J}{\joule}} +\CustomizeMathJax{\newcommand{\uJ}{\micro\joule}} +\CustomizeMathJax{\newcommand{\mJ}{\milli\joule}} +\CustomizeMathJax{\newcommand{\kJ}{\kilo\joule}} +\CustomizeMathJax{\newcommand{\eV}{\electronvolt}} +\CustomizeMathJax{\newcommand{\meV}{\milli\electronvolt}} +\CustomizeMathJax{\newcommand{\keV}{\kilo\electronvolt}} +\CustomizeMathJax{\newcommand{\MeV}{\mega\electronvolt}} +\CustomizeMathJax{\newcommand{\GeV}{\giga\electronvolt}} +\CustomizeMathJax{\newcommand{\TeV}{\tera\electronvolt}} +\CustomizeMathJax{\newcommand{\kWh}{\kilo\watt\hour}} +\CustomizeMathJax{\newcommand{\F}{\farad}} +\CustomizeMathJax{\newcommand{\fF}{\femto\farad}} +\CustomizeMathJax{\newcommand{\pF}{\pico\farad}} +\CustomizeMathJax{\newcommand{\K}{\mathrm{K}}} +\CustomizeMathJax{\newcommand{\dB}{\mathrm{dB}}} +\CustomizeMathJax{\newcommand{\kibi}{\mathrm{Ki}}} +\CustomizeMathJax{\newcommand{\mebi}{\mathrm{Mi}}} +\CustomizeMathJax{\newcommand{\gibi}{\mathrm{Gi}}} +\CustomizeMathJax{\newcommand{\tebi}{\mathrm{Ti}}} +\CustomizeMathJax{\newcommand{\pebi}{\mathrm{Pi}}} +\CustomizeMathJax{\newcommand{\exbi}{\mathrm{Ei}}} +\CustomizeMathJax{\newcommand{\zebi}{\mathrm{Zi}}} +\CustomizeMathJax{\newcommand{\yobi}{\mathrm{Yi}}} +\end{warpMathJax} + +\endinput +%% +%% End of file `lwarp-siunitx-v2.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty index b57c67a0fce..53152fd41ed 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty @@ -16,610 +16,25 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\RequirePackage{xcolor}% for \convertcolorspec - -\LWR@ProvidesPackagePass{siunitx}[2018/05/17] - -\AtBeginDocument{% in case textcomp was not loaded -\DeclareSIUnit\bohr{\textit{a}\textsubscript{0}} -\DeclareSIUnit\clight{\textit{c}\textsubscript{0}} -\DeclareSIUnit\elementarycharge{\textit{e}} -\DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}} -\DeclareSIUnit\hartree{\textit{E}\textsubscript{h}} -\DeclareSIUnit\planckbar{\LWR@siunitx@textplanckbar} -}% AtBeginDocument +\providecommand\DeclareRelease[3]{} +\providecommand\DeclareCurrentRelease[2]{} -\ExplSyntaxOn -\cs_undefine:N \__siunitx_print_aux: -\cs_new_protected:Npn \__siunitx_print_aux: - { - \text - { - \__siunitx_ensure_ltr:n - { - \color@begingroup - \__siunitx_print_color: - \__siunitx_font_shape: - \__siunitx_font_weight: - \use:c - { - @@_ \l__siunitx_print_type_tl _ - text \l__siunitx_font_family_tl : - } - \bool_if:NTF \l__siunitx_font_math_mode_bool - { \__siunitx_print_math: } - { - \LWR@findcurrenttextcolor% lwarp - \ifdefstring{\LWR@tempcolor}{000000}% lwarp - {\__siunitx_print_text:}% lwarp - {% lwarp - \LWR@textcurrentcolor{% lwarp - \__siunitx_print_text: - }% lwarp - }% lwarp - } - \color@endgroup - } - } - } +\DeclareRelease{2}{2010-05-23}{lwarp-siunitx-v2.sty} +\DeclareRelease{v2}{2010-05-23}{lwarp-siunitx-v2.sty} +\DeclareCurrentRelease{}{2021-05-17} -\cs_undefine:N \__siunitx_set_math_fam:n -\cs_new_protected:Npn \__siunitx_set_math_fam:n #1 { - \int_new:c { c__siunitx_math #1 _int } - \group_begin:% lwarp - \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp - \LetLtxMacro\mbox\LWR@print@mbox% lwarp - \hbox_set:Nn \l__siunitx_tmp_box - { - \ensuremath - { - \use:c { math #1 } - { - \int_gset:cn { c__siunitx_math #1 _int } { \fam } - } - } - } - \group_end:% lwarp -} - -\cs_undefine:N \__siunitx_combined_output:n -\cs_new_protected:Npn \__siunitx_combined_output:n #1 { - \group_begin:% lwarp - \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp - \LetLtxMacro\mbox\LWR@print@mbox% lwarp - \bool_if:NTF \l__siunitx_number_parse_bool - { - \tl_clear:N \l__siunitx_number_out_tl - \bool_set_false:N \l__siunitx_number_compound_bool - \__siunitx_number_output_parse:n {#1} - } - { - \__siunitx_unit_output_pre_print: - \begingroup% lwarp - \boolfalse{mathjax}% lwarp - \LWR@subsingledollar{% lwarp - \textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp - }{siunitx}{% - \__siunitx_print:nn { number } {% - \LWR@origensuredmath{#1}% - }% - }% lwarp - \endgroup% lwarp - \__siunitx_unit_output_print: - } - \group_end:% lwarp -} -\cs_set_protected:Npn \__siunitx_range_numbers_aux:n #1 - { - \bool_if:NTF \l__siunitx_number_parse_bool - { - \tl_clear:N \l__siunitx_number_out_tl - \tl_clear:N \l__siunitx_number_out_saved_tl - \bool_set_false:N \l__siunitx_number_compound_bool - \__siunitx_number_output_parse:n {#1} - \bool_if:NT \l__siunitx_number_compound_bool - { \msg_error:nnx { siunitx } { multi-part-range } {#1} } - } - { - \__siunitx_unit_output_pre_print: - \begingroup% lwarp - \boolfalse{mathjax}% lwarp - \LWR@subsingledollar{% lwarp - \textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp - }{siunitx}{% - \__siunitx_print:nn { number } { - \LWR@origensuredmath{#1}% - } % lwarp - }% lwarp - \endgroup% lwarp - \__siunitx_unit_output_print: - } - } -\cs_set_protected:Npn \__siunitx_angle_print_direct_aux:nn #1#2 { - \tl_if_empty:nF {#1} - { - \tl_set:Nn \l__siunitx_unit_tl {#2} - \begingroup% lwarp - \boolfalse{mathjax}% lwarp - \LWR@subsingledollar{% lwarp - \textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp - }{siunitx}{% - \__siunitx_print:nn { number } { - \LWR@origensuredmath{#1}% - } % lwarp - }% lwarp - \endgroup% lwarp - \__siunitx_unit_output_print: +\PackageWarningNoLine{lwarp} + {% + **************\MessageBreak + Siunitx version 3 is not yet supported by Lwarp.\MessageBreak + V2 emulation is used here.\MessageBreak + ************** } -} -\cs_undefine:N \__siunitx_number_output_quotient_fraction: -\cs_new_protected:Npn \__siunitx_number_output_quotient_fraction: { - \bool_set_true:N \l__siunitx_number_compound_bool - \__siunitx_number_output_quotient_aux_i: - \tl_set_eq:NN \l__siunitx_number_out_tl - \l__siunitx_number_numerator_tl - \tl_put_right:NV \l__siunitx_number_out_tl \l__siunitx_output_quotient_tl - \tl_put_right:NV \l__siunitx_number_out_tl - \l__siunitx_number_denominator_tl - \__siunitx_number_output_single_aux: -} -\cs_undefine:N \__siunitx_unit_format_fraction_fraction: -\cs_new_protected:Npn \__siunitx_unit_format_fraction_fraction: { - \__siunitx_unit_format_fraction_symbol_aux: - \int_compare:nNnT { \l__siunitx_unit_denominator_int } > { 1 } - { - \bool_if:NT \l__siunitx_unit_denominator_bracket_bool - { - \tl_put_left:NV \l__siunitx_unit_denominator_tl \l__siunitx_bracket_open_tl - \tl_put_right:NV \l__siunitx_unit_denominator_tl \l__siunitx_bracket_close_tl - } - } - \tl_set_eq:NN \l__siunitx_unit_tl \l__siunitx_unit_numerator_tl - \tl_put_right:NV \l__siunitx_unit_tl \l__siunitx_per_symbol_tl - \tl_put_right:NV \l__siunitx_unit_tl \l__siunitx_unit_denominator_tl -} -\cs_undefine:N \__siunitx_angle_print_astronomy_aux: -\cs_new_protected:Npn \__siunitx_angle_print_astronomy_aux: { - \prop_get:NnNT \l__siunitx_number_out_prop { mantissa-integer } - \l__siunitx_tmpa_tl - { \__siunitx_print:nV { number } \l__siunitx_tmpa_tl } - \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% lwarp - {% lateximage - \hbox_set:Nn \l__siunitx_angle_marker_box - { - \__siunitx_print:nn { number } { { \l__siunitx_output_decimal_tl } } - } - \hbox_set:Nn \l__siunitx_angle_unit_box - { - \__siunitx_print:nV { unit } \l__siunitx_unit_tl - \skip_horizontal:n { -\scriptspace } - } - \__siunitx_angle_print_astronomy_aux:n { marker } - \__siunitx_angle_print_astronomy_aux:n { unit } - \hbox_set:Nn \l__siunitx_angle_marker_box - { - \box_use:N \l__siunitx_angle_marker_box - \box_use:N \l__siunitx_angle_unit_box - } - \dim_compare:nNnTF - { \l__siunitx_angle_marker_dim } > { \l__siunitx_angle_unit_dim } - { \__siunitx_angle_print_astronomy_marker: } - { \__siunitx_angle_print_astronomy_unit: } - }% lateximage - {% not a lateximage - \__siunitx_print:nV { unit } \l__siunitx_unit_tl - \__siunitx_print:nn { number } { { \l__siunitx_output_decimal_tl } } - }% not a lateximage - \prop_get:NnNT \l__siunitx_number_out_prop { mantissa-decimal } - \l__siunitx_tmpa_tl - { \__siunitx_print:nV { number } \l__siunitx_tmpa_tl } -} -\cs_undefine:N \__siunitx_textsuperscript:n -\cs_new_protected:Npn \__siunitx_textsuperscript:n #1 {\textsuperscript{#1}} -\RenewDocumentCommand \num { o m } { - \leavevmode - \group_begin:% lwarp - \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp - \LetLtxMacro\mbox\LWR@print@mbox% lwarp - \bool_set_false:N \l__siunitx_font_set_bool - \IfNoValueF {#1} - { \keys_set:nn { siunitx } {#1} } - \__siunitx_number_output:n {#2} - \group_end:% lwarp -} -\RenewDocumentCommand \numrange { o m m } { - \leavevmode - \group_begin:% lwarp - \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp - \LetLtxMacro\mbox\LWR@print@mbox% lwarp - \bool_set_false:N \l__siunitx_font_set_bool - \IfNoValueF {#1} - { \keys_set:nn { siunitx } {#1} } - \__siunitx_range_numbers:nn {#2} {#3} - \group_end:% lwarp -} -\RenewDocumentCommand \ang { o > { \SplitArgument { 2 } { ; } } m } { - \group_begin:% lwarp - \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp - \LetLtxMacro\mbox\LWR@print@mbox% lwarp - \IfNoValueF {#1} - { \keys_set:nn { siunitx } {#1} } - \__siunitx_angle_output:nnn #2 - \group_end:% lwarp -} -\RenewDocumentCommand \si { o m } { - \leavevmode - \group_begin:% lwarp - \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp - \LetLtxMacro\mbox\LWR@print@mbox% lwarp - \bool_set_false:N \l__siunitx_font_set_bool - \IfNoValueTF {#1} - { \__siunitx_unit_output:nn {#2} { } } - { - \keys_set:nn { siunitx } {#1} - \__siunitx_unit_output:nn {#2} {#1} - } - \group_end:% lwarp -} -\RenewDocumentCommand{\SIrange}{o m m m} -{% - \leavevmode - \group_begin:% lwarp - \LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp - \LetLtxMacro\mbox\LWR@print@mbox% lwarp - \bool_set_false:N \l__siunitx_font_set_bool - \IfNoValueTF {#1} - { \__siunitx_range_unit:nnnn {#4} { } {#2} {#3} } - { - \keys_set:nn { siunitx } {#1} - \__siunitx_range_unit:nnnn {#4} {#1} {#2} {#3} - } - \group_end:% lwarp -} -\ExplSyntaxOff - -\begin{warpMathJax} -\LWR@infoprocessingmathjax{siunitx} -\CustomizeMathJax{\newcommand{\tothe}[1]{^{#1}}} -\CustomizeMathJax{\newcommand{\raiseto}[2]{{#2}^{#1}}} -\CustomizeMathJax{\newcommand{\LWRsiunitxEND}{}} -\CustomizeMathJax{\def\LWRsiunitxang#1;#2;#3;#4\LWRsiunitxEND{% - \ifblank{#1}{}{\num{#1}\degree}% - \ifblank{#2}{}{\num{#2}^{\unicode{x2032}}}% \prime - \ifblank{#3}{}{\num{#3}^{\unicode{x2033}}}% \dblprime -}} -\CustomizeMathJax{\newcommand{\ang}[2][]{\LWRsiunitxang#2;;;\LWRsiunitxEND}} -\CustomizeMathJax{\newcommand{\LWRsiunitxnumscientific}[2]{% - \ifblank{#1}% - {}% - {% - \ifstrequal{#1}{-}% - {-}% - {\LWRsiunitxprintdecimal{#1}\times}% - }% - 10^{\LWRsiunitxprintdecimal{#2}} -}} -\ExplSyntaxOn -\AtBeginDocument{ -\ifdefstring{\l__siunitx_output_decimal_tl}{{,}} - {% Use decimal comma - \CustomizeMathJax{\def\LWRsiunitxprintdecimalsub#1.#2.#3\LWRsiunitxEND{% - \mathrm{#1}% - \ifblank{#2} - {}% - {,\mathrm{#2}} - }} - \CustomizeMathJax{\newcommand{\LWRsiunitxprintdecimal}[1]{% - \LWRsiunitxprintdecimalsub#1...\LWRsiunitxEND% - }} - } - {% Use decimal point - \CustomizeMathJax{\def\LWRsiunitxprintdecimalsub#1,#2,#3\LWRsiunitxEND{% - \mathrm{#1}% - \ifblank{#2} - {}% - {.\mathrm{#2}} - }} - - \CustomizeMathJax{\newcommand{\LWRsiunitxprintdecimal}[1]{% - \LWRsiunitxprintdecimalsub#1,,,\LWRsiunitxEND% - }} - } -} -\ExplSyntaxOff -\CustomizeMathJax{\def\LWRsiunitxnumplus#1+#2+#3\LWRsiunitxEND{% - \ifblank{#2} - {\LWRsiunitxprintdecimal{#1}}% no plus - {% - \ifblank{#1}% - {\LWRsiunitxprintdecimal{#2}}% leading plus, ignore - {% a+b - \LWRsiunitxprintdecimal{#1}% - \unicode{x02B}% plus sign - \LWRsiunitxprintdecimal{#2}% - }% - }% -}} - -\CustomizeMathJax{\def\LWRsiunitxnumminus#1-#2-#3\LWRsiunitxEND{% - \ifblank{#2} - {\LWRsiunitxnumplus#1+++\LWRsiunitxEND}% - {% - \LWRsiunitxprintdecimal{#1}% - \unicode{x02212}% mathematical minus sign - \LWRsiunitxprintdecimal{#2}% - }% -}} - -\CustomizeMathJax{\def\LWRsiunitxnumpm#1+-#2+-#3\LWRsiunitxEND{% - \ifblank{#2}% - {\LWRsiunitxnumminus#1---\LWRsiunitxEND}% - {% - \LWRsiunitxprintdecimal{#1}% - \unicode{x0B1}% \pm - \LWRsiunitxprintdecimal{#2}% - }% -}} - -\CustomizeMathJax{\def\LWRsiunitxnumx#1x#2x#3x#4\LWRsiunitxEND{% - \ifblank{#2}% - {\LWRsiunitxnumpm#1+-+-\LWRsiunitxEND}% - {% - \ifblank{#3}% - {% - \LWRsiunitxprintdecimal{#1}% - \times% - \LWRsiunitxprintdecimal{#2}% - }% - {% - \LWRsiunitxprintdecimal{#1}% - \times% - \LWRsiunitxprintdecimal{#2}% - \times% - \LWRsiunitxprintdecimal{#3}% - }% - }% -}} - -\CustomizeMathJax{\def\LWRsiunitxnumD#1D#2D#3\LWRsiunitxEND{% - \ifblank{#2}% - {\LWRsiunitxnumx#1xxxxx\LWRsiunitxEND}% - {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% -}} - -\CustomizeMathJax{\def\LWRsiunitxnumd#1d#2d#3\LWRsiunitxEND{% - \ifblank{#2}% - {\LWRsiunitxnumD#1DDD\LWRsiunitxEND}% - {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% -}} - -\CustomizeMathJax{\def\LWRsiunitxnumE#1E#2E#3\LWRsiunitxEND{% - \ifblank{#2}% - {\LWRsiunitxnumd#1ddd\LWRsiunitxEND}% - {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% -}} - -\CustomizeMathJax{\def\LWRsiunitxnume#1e#2e#3\LWRsiunitxEND{% - \ifblank{#2}% - {\LWRsiunitxnumE#1EEE\LWRsiunitxEND}% - {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% -}} - -\CustomizeMathJax{\def\LWRsiunitxnumcomma#1,#2,#3\LWRsiunitxEND{% - \ifblank{#2} - {\LWRsiunitxnume#1eee\LWRsiunitxEND} - {\LWRsiunitxnume#1.#2eee\LWRsiunitxEND} -}} +\RequirePackage{xcolor}% for \convertcolorspec -\CustomizeMathJax{\newcommand{\num}[2][]{\LWRsiunitxnumcomma#2,,,\LWRsiunitxEND}} -\CustomizeMathJax{\newcommand{\si}[2][]{\mathrm{#2}}} -\CustomizeMathJax{\def\LWRsiunitxSIopt#1[#2]#3{% - {#2}\num{#1}{#3}% -}} -\CustomizeMathJax{\newcommand{\LWRsiunitxSI}[2]{% - \num{#1}\,{#2}% -}} -\CustomizeMathJax{\newcommand{\SI}[2][]{% - \ifnextchar[% - {\LWRsiunitxSIopt{#2}}% - {\LWRsiunitxSI{#2}}% -}} -\CustomizeMathJax{\newcommand{\numlist}[2][]{\mathrm{#2}}} -\CustomizeMathJax{\newcommand{\numrange}[3][]{\num{#2}\,\unicode{x2013}\,\num{#3}}} -\CustomizeMathJax{\newcommand{\SIlist}[3][]{\mathrm{#2\,#3}}} -\CustomizeMathJax{\newcommand{\SIrange}[4][]{\num{#2}\,#4\,\unicode{x2013}\,\num{#3}\,#4}} -\CustomizeMathJax{\newcommand{\tablenum}[2][]{\mathrm{#2}}} -\CustomizeMathJax{\newcommand{\ampere}{\mathrm{A}}} -\CustomizeMathJax{\newcommand{\candela}{\mathrm{cd}}} -\CustomizeMathJax{\newcommand{\kelvin}{\mathrm{K}}} -\CustomizeMathJax{\newcommand{\kilogram}{\mathrm{kg}}} -\CustomizeMathJax{\newcommand{\metre}{\mathrm{m}}} -\CustomizeMathJax{\newcommand{\mole}{\mathrm{mol}}} -\CustomizeMathJax{\newcommand{\second}{\mathrm{s}}} -\CustomizeMathJax{\newcommand{\becquerel}{\mathrm{Bq}}} -\CustomizeMathJax{\newcommand{\degreeCelsius}{\unicode{x2103}}} -\CustomizeMathJax{\newcommand{\coulomb}{\mathrm{C}}} -\CustomizeMathJax{\newcommand{\farad}{\mathrm{F}}} -\CustomizeMathJax{\newcommand{\gray}{\mathrm{Gy}}} -\CustomizeMathJax{\newcommand{\hertz}{\mathrm{Hz}}} -\CustomizeMathJax{\newcommand{\henry}{\mathrm{H}}} -\CustomizeMathJax{\newcommand{\joule}{\mathrm{J}}} -\CustomizeMathJax{\newcommand{\katal}{\mathrm{kat}}} -\CustomizeMathJax{\newcommand{\lumen}{\mathrm{lm}}} -\CustomizeMathJax{\newcommand{\lux}{\mathrm{lx}}} -\CustomizeMathJax{\newcommand{\newton}{\mathrm{N}}} -\CustomizeMathJax{\newcommand{\ohm}{\mathrm{\Omega}}} -\CustomizeMathJax{\newcommand{\pascal}{\mathrm{Pa}}} -\CustomizeMathJax{\newcommand{\radian}{\mathrm{rad}}} -\CustomizeMathJax{\newcommand{\siemens}{\mathrm{S}}} -\CustomizeMathJax{\newcommand{\sievert}{\mathrm{Sv}}} -\CustomizeMathJax{\newcommand{\steradian}{\mathrm{sr}}} -\CustomizeMathJax{\newcommand{\tesla}{\mathrm{T}}} -\CustomizeMathJax{\newcommand{\volt}{\mathrm{V}}} -\CustomizeMathJax{\newcommand{\watt}{\mathrm{W}}} -\CustomizeMathJax{\newcommand{\weber}{\mathrm{Wb}}} -\CustomizeMathJax{\newcommand{\day}{\mathrm{d}}} -\CustomizeMathJax{\newcommand{\degree}{\mathrm{^\circ}}} -\CustomizeMathJax{\newcommand{\hectare}{\mathrm{ha}}} -\CustomizeMathJax{\newcommand{\hour}{\mathrm{h}}} -\CustomizeMathJax{\newcommand{\litre}{\mathrm{l}}} -\CustomizeMathJax{\newcommand{\liter}{\mathrm{L}}} -\CustomizeMathJax{\newcommand{\arcminute}{^\prime}} -\CustomizeMathJax{\newcommand{\minute}{\mathrm{min}}} -\CustomizeMathJax{\newcommand{\arcsecond}{^{\prime\prime}}} -\CustomizeMathJax{\newcommand{\tonne}{\mathrm{t}}} -\CustomizeMathJax{\newcommand{\astronomicalunit}{au}} -\CustomizeMathJax{\newcommand{\atomicmassunit}{u}} -\CustomizeMathJax{\newcommand{\bohr}{\mathit{a}_0}} -\CustomizeMathJax{\newcommand{\clight}{\mathit{c}_0}} -\CustomizeMathJax{\newcommand{\dalton}{\mathrm{D}_\mathrm{a}}} -\CustomizeMathJax{\newcommand{\electronmass}{\mathit{m}_{\mathrm{e}}}} -\CustomizeMathJax{\newcommand{\electronvolt}{\mathrm{eV}}} -\CustomizeMathJax{\newcommand{\elementarycharge}{\mathit{e}}} -\CustomizeMathJax{\newcommand{\hartree}{\mathit{E}_{\mathrm{h}}}} -\CustomizeMathJax{\newcommand{\planckbar}{\mathit{\unicode{x210F}}}} -\CustomizeMathJax{\newcommand{\angstrom}{\mathrm{\unicode{x212B}}}} -\CustomizeMathJax{\let\LWRorigbar\bar} -\CustomizeMathJax{\newcommand{\bar}{\mathrm{bar}}} -\CustomizeMathJax{\newcommand{\barn}{\mathrm{b}}} -\CustomizeMathJax{\newcommand{\bel}{\mathrm{B}}} -\CustomizeMathJax{\newcommand{\decibel}{\mathrm{dB}}} -\CustomizeMathJax{\newcommand{\knot}{\mathrm{kn}}} -\CustomizeMathJax{\newcommand{\mmHg}{\mathrm{mmHg}}} -\CustomizeMathJax{\newcommand{\nauticalmile}{\mathrm{M}}} -\CustomizeMathJax{\newcommand{\neper}{\mathrm{Np}}} -\CustomizeMathJax{\newcommand{\yocto}{\mathrm{y}}} -\CustomizeMathJax{\newcommand{\zepto}{\mathrm{z}}} -\CustomizeMathJax{\newcommand{\atto}{\mathrm{a}}} -\CustomizeMathJax{\newcommand{\femto}{\mathrm{f}}} -\CustomizeMathJax{\newcommand{\pico}{\mathrm{p}}} -\CustomizeMathJax{\newcommand{\nano}{\mathrm{n}}} -\CustomizeMathJax{\newcommand{\micro}{\mathrm{\unicode{x00B5}}}} -\CustomizeMathJax{\newcommand{\milli}{\mathrm{m}}} -\CustomizeMathJax{\newcommand{\centi}{\mathrm{c}}} -\CustomizeMathJax{\newcommand{\deci}{\mathrm{d}}} -\CustomizeMathJax{\newcommand{\deca}{\mathrm{da}}} -\CustomizeMathJax{\newcommand{\hecto}{\mathrm{h}}} -\CustomizeMathJax{\newcommand{\kilo}{\mathrm{k}}} -\CustomizeMathJax{\newcommand{\mega}{\mathrm{M}}} -\CustomizeMathJax{\newcommand{\giga}{\mathrm{G}}} -\CustomizeMathJax{\newcommand{\tera}{\mathrm{T}}} -\CustomizeMathJax{\newcommand{\peta}{\mathrm{P}}} -\CustomizeMathJax{\newcommand{\exa}{\mathrm{E}}} -\CustomizeMathJax{\newcommand{\zetta}{\mathrm{Z}}} -\CustomizeMathJax{\newcommand{\yotta}{\mathrm{Y}}} -\CustomizeMathJax{\newcommand{\percent}{\mathrm{\%}}} -\CustomizeMathJax{\newcommand{\meter}{\mathrm{m}}} -\CustomizeMathJax{\newcommand{\metre}{\mathrm{m}}} -\CustomizeMathJax{\newcommand{\gram}{\mathrm{g}}} -\CustomizeMathJax{\newcommand{\kg}{\kilo\gram}} -\CustomizeMathJax{\newcommand{\of}[1]{_{\mathrm{#1}}}} -\CustomizeMathJax{\newcommand{\squared}{^2}} -\CustomizeMathJax{\newcommand{\square}[1]{\mathrm{#1}^2}} -\CustomizeMathJax{\newcommand{\cubed}{^3}} -\CustomizeMathJax{\newcommand{\cubic}[1]{\mathrm{#1}^3}} -\CustomizeMathJax{\newcommand{\per}{/}} -\CustomizeMathJax{\newcommand{\celsius}{\unicode{x2103}}} -\CustomizeMathJax{\newcommand{\fg}{\femto\gram}} -\CustomizeMathJax{\newcommand{\pg}{\pico\gram}} -\CustomizeMathJax{\newcommand{\ng}{\nano\gram}} -\CustomizeMathJax{\newcommand{\ug}{\micro\gram}} -\CustomizeMathJax{\newcommand{\mg}{\milli\gram}} -\CustomizeMathJax{\newcommand{\g}{\gram}} -\CustomizeMathJax{\newcommand{\kg}{\kilo\gram}} -\CustomizeMathJax{\newcommand{\amu}{\mathrm{u}}} -\CustomizeMathJax{\newcommand{\pm}{\pico\metre}} -\CustomizeMathJax{\newcommand{\nm}{\nano\metre}} -\CustomizeMathJax{\newcommand{\um}{\micro\metre}} -\CustomizeMathJax{\newcommand{\mm}{\milli\metre}} -\CustomizeMathJax{\newcommand{\cm}{\centi\metre}} -\CustomizeMathJax{\newcommand{\dm}{\deci\metre}} -\CustomizeMathJax{\newcommand{\m}{\metre}} -\CustomizeMathJax{\newcommand{\km}{\kilo\metre}} -\CustomizeMathJax{\newcommand{\as}{\atto\second}} -\CustomizeMathJax{\newcommand{\fs}{\femto\second}} -\CustomizeMathJax{\newcommand{\ps}{\pico\second}} -\CustomizeMathJax{\newcommand{\ns}{\nano\second}} -\CustomizeMathJax{\newcommand{\us}{\micro\second}} -\CustomizeMathJax{\newcommand{\ms}{\milli\second}} -\CustomizeMathJax{\newcommand{\s}{\second}} -\CustomizeMathJax{\newcommand{\fmol}{\femto\mol}} -\CustomizeMathJax{\newcommand{\pmol}{\pico\mol}} -\CustomizeMathJax{\newcommand{\nmol}{\nano\mol}} -\CustomizeMathJax{\newcommand{\umol}{\micro\mol}} -\CustomizeMathJax{\newcommand{\mmol}{\milli\mol}} -\CustomizeMathJax{\newcommand{\mol}{\mol}} -\CustomizeMathJax{\newcommand{\kmol}{\kilo\mol}} -\CustomizeMathJax{\newcommand{\pA}{\pico\ampere}} -\CustomizeMathJax{\newcommand{\nA}{\nano\ampere}} -\CustomizeMathJax{\newcommand{\uA}{\micro\ampere}} -\CustomizeMathJax{\newcommand{\mA}{\milli\ampere}} -\CustomizeMathJax{\newcommand{\A}{\ampere}} -\CustomizeMathJax{\newcommand{\kA}{\kilo\ampere}} -\CustomizeMathJax{\newcommand{\ul}{\micro\litre}} -\CustomizeMathJax{\newcommand{\ml}{\milli\litre}} -\CustomizeMathJax{\newcommand{\l}{\litre}} -\CustomizeMathJax{\newcommand{\hl}{\hecto\litre}} -\CustomizeMathJax{\newcommand{\uL}{\micro\liter}} -\CustomizeMathJax{\newcommand{\mL}{\milli\liter}} -\CustomizeMathJax{\newcommand{\L}{\liter}} -\CustomizeMathJax{\newcommand{\hL}{\hecto\liter}} -\CustomizeMathJax{\newcommand{\mHz}{\milli\hertz}} -\CustomizeMathJax{\newcommand{\Hz}{\hertz}} -\CustomizeMathJax{\newcommand{\kHz}{\kilo\hertz}} -\CustomizeMathJax{\newcommand{\MHz}{\mega\hertz}} -\CustomizeMathJax{\newcommand{\GHz}{\giga\hertz}} -\CustomizeMathJax{\newcommand{\THz}{\tera\hertz}} -\CustomizeMathJax{\newcommand{\mN}{\milli\newton}} -\CustomizeMathJax{\newcommand{\N}{\newton}} -\CustomizeMathJax{\newcommand{\kN}{\kilo\newton}} -\CustomizeMathJax{\newcommand{\MN}{\mega\newton}} -\CustomizeMathJax{\newcommand{\Pa}{\pascal}} -\CustomizeMathJax{\newcommand{\kPa}{\kilo\pascal}} -\CustomizeMathJax{\newcommand{\MPa}{\mega\pascal}} -\CustomizeMathJax{\newcommand{\GPa}{\giga\pascal}} -\CustomizeMathJax{\newcommand{\mohm}{\milli\ohm}} -\CustomizeMathJax{\newcommand{\kohm}{\kilo\ohm}} -\CustomizeMathJax{\newcommand{\Mohm}{\mega\ohm}} -\CustomizeMathJax{\newcommand{\pV}{\pico\volt}} -\CustomizeMathJax{\newcommand{\nV}{\nano\volt}} -\CustomizeMathJax{\newcommand{\uV}{\micro\volt}} -\CustomizeMathJax{\newcommand{\mV}{\milli\volt}} -\CustomizeMathJax{\newcommand{\V}{\volt}} -\CustomizeMathJax{\newcommand{\kV}{\kilo\volt}} -\CustomizeMathJax{\newcommand{\W}{\watt}} -\CustomizeMathJax{\newcommand{\uW}{\micro\watt}} -\CustomizeMathJax{\newcommand{\mW}{\milli\watt}} -\CustomizeMathJax{\newcommand{\kW}{\kilo\watt}} -\CustomizeMathJax{\newcommand{\MW}{\mega\watt}} -\CustomizeMathJax{\newcommand{\GW}{\giga\watt}} -\CustomizeMathJax{\newcommand{\J}{\joule}} -\CustomizeMathJax{\newcommand{\uJ}{\micro\joule}} -\CustomizeMathJax{\newcommand{\mJ}{\milli\joule}} -\CustomizeMathJax{\newcommand{\kJ}{\kilo\joule}} -\CustomizeMathJax{\newcommand{\eV}{\electronvolt}} -\CustomizeMathJax{\newcommand{\meV}{\milli\electronvolt}} -\CustomizeMathJax{\newcommand{\keV}{\kilo\electronvolt}} -\CustomizeMathJax{\newcommand{\MeV}{\mega\electronvolt}} -\CustomizeMathJax{\newcommand{\GeV}{\giga\electronvolt}} -\CustomizeMathJax{\newcommand{\TeV}{\tera\electronvolt}} -\CustomizeMathJax{\newcommand{\kWh}{\kilo\watt\hour}} -\CustomizeMathJax{\newcommand{\F}{\farad}} -\CustomizeMathJax{\newcommand{\fF}{\femto\farad}} -\CustomizeMathJax{\newcommand{\pF}{\pico\farad}} -\CustomizeMathJax{\newcommand{\K}{\mathrm{K}}} -\CustomizeMathJax{\newcommand{\dB}{\mathrm{dB}}} -\CustomizeMathJax{\newcommand{\kibi}{\mathrm{Ki}}} -\CustomizeMathJax{\newcommand{\mebi}{\mathrm{Mi}}} -\CustomizeMathJax{\newcommand{\gibi}{\mathrm{Gi}}} -\CustomizeMathJax{\newcommand{\tebi}{\mathrm{Ti}}} -\CustomizeMathJax{\newcommand{\pebi}{\mathrm{Pi}}} -\CustomizeMathJax{\newcommand{\exbi}{\mathrm{Ei}}} -\CustomizeMathJax{\newcommand{\zebi}{\mathrm{Zi}}} -\CustomizeMathJax{\newcommand{\yobi}{\mathrm{Yi}}} -\end{warpMathJax} +\RequirePackage{siunitx-v2} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty index 96e7bc7f004..15de354d818 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty @@ -246,7 +246,7 @@ \@ifundefined{c@#3depth}{\newcounter{#3depth}}{}% \setcounter{#3depth}{1}% \@namedef{cftmark#3}{}% - \@namedef{listof#2}{\listof{#2}{#4}}% + \@namedef{listof#2}{\LWR@listof{#2}{#4}}% \@namedef{@cftmake#3title}{}% \expandafter\newlength\csname cftbefore#3titleskip\endcsname% \expandafter\newlength\csname cftafter#3titleskip\endcsname% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 92c34938bbb..ea5b75cec51 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} - [2021/04/08 v0.896 Allows LaTeX to directly produce HTML5 output.] + [2021/05/24 v0.897 Allows LaTeX to directly produce HTML5 output.] @@ -97,9 +97,8 @@ } } -\newcommand*{\LWR@checkloadbefore}[2]{% - \edef\LWR@tempone{#1}% - \ifdefstring{\LWR@tempone}{#2}{% +\newcommand*{\LWR@checkloadbefore}[1]{% + \ifdefstring{\LWR@tempone}{#1}{% \LWR@loadbefore{#1}% }{}% } @@ -107,22 +106,27 @@ \newcommand*{\LWR@loadnever}[2]{% \PackageError{lwarp} {% - Package #1 is not supported\MessageBreak - by lwarp's HTML conversion.\MessageBreak - Package(s)\MessageBreak - \space\space#2\MessageBreak - may be useful instead% + Package #1 is not yet supported\MessageBreak + by lwarp's HTML conversion% + \ifblank{#2}{}{% + .\MessageBreak + Package(s)\MessageBreak + \space\space#2\MessageBreak + may be useful instead% + }% } {% Package #1 might conflict with lwarp in some way,\MessageBreak - or is superceded by another package.\MessageBreak - For a possible alternative, see package(s) #2. + or is superceded by another package.% + \ifblank{#2}{}{% + \MessageBreak + For possible alternatives, see package(s) #2.% + }% } } -\newcommand*{\LWR@checkloadnever}[3]{% - \edef\LWR@tempone{#1}% - \ifdefstring{\LWR@tempone}{#2}{% - \LWR@loadnever{#2}{#3}% +\newcommand*{\LWR@afterloadnever}[2]{% + \ifdefstring{\LWR@tempone}{#1}{% + \LWR@loadnever{#1}{#2}% }{}% } \newcommand*{\LWR@earlyloadnever}[2]{% @@ -135,55 +139,142 @@ \PackageError{lwarp} {% Class #1 is not supported\MessageBreak - by lwarp's HTML conversion.\MessageBreak - Class(es) #2 may be useful instead + by lwarp's HTML conversion% + \ifblank{#2}{}{% + .\MessageBreak + Class(es) #2 may be useful instead% + }% } {% Class #1 might conflict with lwarp in some way,\MessageBreak - or is superceded by another class.\MessageBreak - For a possible alternative, see class(es) #2. + or is superceded by another class.% + \ifblank{#2}{}{% + \MessageBreak + For a possible alternative, see class(es) #2.% + }% } }{\relax}% } +\newcommand*{\LWR@checkloadnevers}{ +\LWR@checkloadnever{ae}{cm-super, lmodern} +\LWR@checkloadnever{aecompl}{cm-super, lmodern} +\LWR@checkloadnever{aecc}{cm-super, lmodern} +\LWR@checkloadnever{alg}{algorithm2e, algorithmicx} +\LWR@checkloadnever{algorithmic}{algorithm2e, algorithmicx} +\LWR@checkloadnever{bitfield}{bytefield} +\LWR@checkloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle} +\LWR@checkloadnever{caption2}{caption} +\LWR@checkloadnever{colortab}{colortbl} +\LWR@checkloadnever{csvtools}{datatool} +\LWR@checkloadnever{doublespace}{setspace} +\LWR@checkloadnever{fancyheadings}{fancyhdr} +\LWR@checkloadnever{fncylab}{cleveref} +\LWR@checkloadnever{formula}{siunitx} +\LWR@checkloadnever{glossary}{glossaries} +\LWR@checkloadnever{hangul}{kotex, xetexko, luatexko} +\LWR@checkloadnever{hyper}{hyperref} +\LWR@checkloadnever{libgreek}{libertinust1math, newtx} +\LWR@checkloadnever{newthm}{ntheorem} +\LWR@checkloadnever{pdfcprot}{microtype} +\LWR@checkloadnever{picins}{floatflt, wrapfig} +\LWR@checkloadnever{rplain}{fancyhdr} +\LWR@checkloadnever{si}{siunitx} +\LWR@checkloadnever{sistyle}{siunitx} +\LWR@checkloadnever{slashbox}{diagbox} +\LWR@checkloadnever{statex}{statex2} +\LWR@checkloadnever{t1enc}{fontenc, inputenc, inputenx} +\LWR@checkloadnever{ucs}{inputenc, inputencx} +\LWR@checkloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol} +\LWR@checkloadnever{animate}{} +\LWR@checkloadnever{auto-pst-pdf}{} +\LWR@checkloadnever{auto-pst-pdf-lua}{} +\LWR@checkloadnever{algorithms}{} +\LWR@checkloadnever{arraycols}{} +\LWR@checkloadnever{beamer}{} +\LWR@checkloadnever{bidi}{} +\LWR@checkloadnever{cals}{} +\LWR@checkloadnever{cellspace}{} +\LWR@checkloadnever{cgloss4e}{} +\LWR@checkloadnever{colophon}{} +\LWR@checkloadnever{cooltooltips}{} +\LWR@checkloadnever{covington}{} +\LWR@checkloadnever{crbox}{} +\LWR@checkloadnever{decision-table}{} +\LWR@checkloadnever{dvgloss}{} +\LWR@checkloadnever{ednotes}{} +\LWR@checkloadnever{edfnotes}{} +\LWR@checkloadnever{eledform}{} +\LWR@checkloadnever{eledmac}{} +\LWR@checkloadnever{embedfile}{} +\LWR@checkloadnever{endnotes-hy}{endnotes} +\LWR@checkloadnever{expex}{} +\LWR@checkloadnever{fancytooltips}{} +\LWR@checkloadnever{fixocgx}{} +\LWR@checkloadnever{flowfram}{} +\LWR@checkloadnever{gb4e}{} +\LWR@checkloadnever{gmverse}{} +\LWR@checkloadnever{graphbox}{} +\LWR@checkloadnever{graphicxbox}{} +\LWR@checkloadnever{hvfloat}{} +\LWR@checkloadnever{inline-images}{} +\LWR@checkloadnever{isorot}{rotating} +\LWR@checkloadnever{ledmac}{} +\LWR@checkloadnever{linguex}{} +\LWR@checkloadnever{longdiv}{} +\LWR@checkloadnever{longfigure}{} +\LWR@checkloadnever{longtabu}{} +\LWR@checkloadnever{mdwenv}{} +\LWR@checkloadnever{mdwlist}{} +\LWR@checkloadnever{mdwtab}{} +\LWR@checkloadnever{navigator}{} +\LWR@checkloadnever{nccpic}{} +\LWR@checkloadnever{nccsect}{} +\LWR@checkloadnever{newvbtm}{} +\LWR@checkloadnever{ocg-p}{} +\LWR@checkloadnever{ocgtools}{} +\LWR@checkloadnever{ocgx}{} +\LWR@checkloadnever{ocgx2}{} +\LWR@checkloadnever{parrun}{} +\LWR@checkloadnever{poemscol}{} +\LWR@checkloadnever{poetry}{} +\LWR@checkloadnever{program}{} +\LWR@checkloadnever{proofread}{} +\LWR@checkloadnever{pst-pdf}{} +\LWR@checkloadnever{refstyle}{} +\LWR@checkloadnever{robustindex}{} +\LWR@checkloadnever{robustglossary}{} +\LWR@checkloadnever{semioneside}{} +\LWR@checkloadnever{slemph}{} +\LWR@checkloadnever{snotez}{sidenotes} +\LWR@checkloadnever{spacingtricks}{} +\LWR@checkloadnever{sverb}{verbatim, fancyvrb} +\LWR@checkloadnever{syntax}{} +\LWR@checkloadnever{tablists}{} +\LWR@checkloadnever{tabto}{} +\LWR@checkloadnever{tabu}{} +\LWR@checkloadnever{tabularht}{} +\LWR@checkloadnever{tabularkv}{} +\LWR@checkloadnever{thumby}{} +\LWR@checkloadnever{titles}{} +\LWR@checkloadnever{typehtml}{} +\LWR@checkloadnever{unicode-bidi}{} +\LWR@checkloadnever{vcell}{} +\LWR@checkloadnever{xhfill}{} +} +\LetLtxMacro\LWR@checkloadnever\LWR@earlyloadnever +\LWR@checkloadnevers +\@ifpackageloaded{xeCJK}{}{ + \LWR@checkloadnever{CJK}{ctex, xeCJK} + \LWR@checkloadnever{CJKutf8}{ctex, xeCJK} +} \LWR@earlyclassloadnever{jarticle}{ujarticle} \LWR@earlyclassloadnever{jbook}{ujbook} \LWR@earlyclassloadnever{jreport}{ujreport} \LWR@earlyclassloadnever{tarticle}{utarticle} \LWR@earlyclassloadnever{tbook}{utbook} \LWR@earlyclassloadnever{treport}{utreport} -\LWR@earlyloadnever{ae}{cm-super, lmodern} -\LWR@earlyloadnever{aecompl}{cm-super, lmodern} -\LWR@earlyloadnever{aecc}{cm-super, lmodern} -\LWR@earlyloadnever{alg}{algorithm2e, algorithmicx} -\LWR@earlyloadnever{algorithmic}{algorithm2e, algorithmicx} -\LWR@earlyloadnever{bitfield}{bytefield} -\LWR@earlyloadnever{caption2}{caption} -\LWR@earlyloadnever{colortab}{colortbl} -\LWR@earlyloadnever{csvtools}{datatool} -\LWR@earlyloadnever{doublespace}{setspace} -\LWR@earlyloadnever{fancyheadings}{fancyhdr} -\LWR@earlyloadnever{fncylab}{cleveref} -\LWR@earlyloadnever{formula}{siunitx} -\LWR@earlyloadnever{glossary}{glossaries} -\LWR@earlyloadnever{hyper}{hyperref} -\LWR@earlyloadnever{libgreek}{libertinust1math, newtx} -\LWR@earlyloadnever{newthm}{ntheorem} -\LWR@earlyloadnever{pdfcprot}{microtype} -\LWR@earlyloadnever{picins}{floatflt, wrapfig} -\LWR@earlyloadnever{rplain}{fancyhdr} -\LWR@earlyloadnever{si}{siunitx} -\LWR@earlyloadnever{sistyle}{siunitx} -\LWR@earlyloadnever{slashbox}{diagbox} -\LWR@earlyloadnever{statex}{statex2} -\LWR@earlyloadnever{t1enc}{fontenc, inputenc, inputenx} -\LWR@earlyloadnever{ucs}{inputenc, inputencx} -\LWR@earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol} -\@ifpackageloaded{xeCJK}{}{ - \LWR@earlyloadnever{CJK}{ctex, xeCJK} - \LWR@earlyloadnever{CJKutf8}{ctex, xeCJK} -} -\LWR@earlyloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle} -\LWR@earlyloadnever{hangul}{kotex, xetexko, luatexko} +\LWR@earlyclassloadnever{novel}{} +\LWR@earlyclassloadnever{powerdot}{} \LWR@loadafter{2in1} \LWR@loadafter{2up} \LWR@loadafter{a4} @@ -251,6 +342,7 @@ \LWR@loadafter{caption2} \LWR@loadafter{caption3} \LWR@loadafter{cases} +\LWR@loadafter{centerlastline} \LWR@loadafter{changebar} \LWR@loadafter{changelayout} \LWR@notmemoirloadafter{changepage} @@ -282,6 +374,7 @@ \LWR@loadafter{dblfnote} \LWR@notmemoirloadafter{dcolumn} \LWR@loadafter{decimal} +\LWR@loadafter{decorule} \LWR@loadafter{diagbox} \LWR@loadafter{dingbat} \LWR@loadafter{DotArrow} @@ -322,6 +415,7 @@ \LWR@loadafter{extramarks} \LWR@loadafter{fancybox} \LWR@loadafter{fancyhdr} +\LWR@loadafter{fancypar} \LWR@loadafter{fancyref} \LWR@loadafter{fancytabs} \LWR@loadafter{fancyvrb} @@ -359,6 +453,7 @@ \LWR@loadafter{forest} \LWR@loadafter{fouridx} \LWR@loadafter{framed} +\LWR@loadafter{froufrou} \LWR@loadafter{ftcap} \LWR@loadafter{ftnright} \LWR@loadafter{fullminipage} @@ -505,6 +600,7 @@ \LWR@loadafter{parcolumns} \LWR@loadafter{parnotes} \LWR@notmemoirloadafter{parskip} +\LWR@loadafter{pbalance} \LWR@loadafter{pbox} \LWR@loadafter{pdfcol} \LWR@loadafter{pdfcolfoot} @@ -592,6 +688,7 @@ \LWR@loadafter{simplebnf} \LWR@loadafter{SIunits} \LWR@loadafter{siunitx} +\LWR@loadafter{siunitx-v2} \LWR@loadafter{skmath} \LWR@loadafter{slantsc} \LWR@loadafter{slashed} @@ -1433,57 +1530,29 @@ \newcommand*\LWR@findword[3][,]{% \StrBetween[#3,\numexpr#3+1]{#1#2#1}{#1}{#1}% } - +\LetLtxMacro\LWR@checkloadnever\LWR@afterloadnever \newcommand*{\LWR@checkloadfilename}[1]{% -\LWR@checkloadnever{#1}{ae}{cm-super, lmodern} -\LWR@checkloadnever{#1}{aecc}{cm-super, lmodern} -\LWR@checkloadnever{#1}{aecompl}{cm-super, lmodern} -\LWR@checkloadnever{#1}{alg}{algorithm2e, algorithmicx} -\LWR@checkloadnever{#1}{algorithmic}{algorithm2e, algorithmicx} -\LWR@checkloadnever{#1}{bitfield}{bytefield} -\LWR@checkloadnever{#1}{caption2}{caption} -\LWR@checkloadnever{#1}{ccaption}{caption}% might be preloaded by memoir -\LWR@checkloadnever{#1}{colortab}{colortbl} -\LWR@checkloadnever{#1}{csvtools}{datatool} -\LWR@checkloadnever{#1}{doublespace}{setspace} -\LWR@checkloadnever{#1}{fancyheadings}{fancyhdr} -\LWR@checkloadnever{#1}{fncylab}{cleveref} -\LWR@checkloadnever{#1}{formula}{siunitx} -\LWR@checkloadnever{#1}{glossary}{glossaries} -\LWR@checkloadnever{#1}{hyper}{hyperref} -\LWR@checkloadnever{#1}{libgreek}{libertinust1math, newtx} -\LWR@checkloadnever{#1}{newthm}{ntheorem} -\LWR@checkloadnever{#1}{pdfcprot}{microtype} -\LWR@checkloadnever{#1}{picins}{floatflt, wrapfig} -\LWR@checkloadnever{#1}{rplain}{fancyhdr} -\LWR@checkloadnever{#1}{si}{siunitx} -\LWR@checkloadnever{#1}{sistyle}{siunitx} -\LWR@checkloadnever{#1}{slashbox}{diagbox} -\LWR@checkloadnever{#1}{statex}{statex2} -\LWR@checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx} -\LWR@checkloadnever{#1}{ucs}{inputenc, inputencx} -\LWR@checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol} -\LWR@checkloadnever{#1}{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle} -\LWR@checkloadnever{#1}{hangul}{kotex, xetexko, luatexko} -\LWR@checkloadbefore{#1}{ctex} -\LWR@checkloadbefore{#1}{fontspec} -\LWR@checkloadbefore{#1}{inputenc} -\LWR@checkloadbefore{#1}{inputenx} -\LWR@checkloadbefore{#1}{nfssext-cfr} -\LWR@checkloadbefore{#1}{fontaxes} -\LWR@checkloadbefore{#1}{kotex} -\LWR@checkloadbefore{#1}{kpfonts}% textcomp option clash -\LWR@checkloadbefore{#1}{luatexja} -\LWR@checkloadbefore{#1}{luatexja-fontspec} -\LWR@checkloadbefore{#1}{luatexko} -\LWR@checkloadbefore{#1}{morewrites} -\LWR@checkloadbefore{#1}{newclude} -\LWR@checkloadbefore{#1}{newunicodechar} -\LWR@checkloadbefore{#1}{plext} -\LWR@checkloadbefore{#1}{xeCJK} -\LWR@checkloadbefore{#1}{xetexko} -\LWR@checkloadbefore{#1}{zxjatype} + \edef\LWR@tempone{#1}% + \LWR@checkloadnevers + \LWR@checkloadbefore{ctex} + \LWR@checkloadbefore{fontspec} + \LWR@checkloadbefore{inputenc} + \LWR@checkloadbefore{inputenx} + \LWR@checkloadbefore{nfssext-cfr} + \LWR@checkloadbefore{fontaxes} + \LWR@checkloadbefore{kotex} + \LWR@checkloadbefore{kpfonts}% textcomp option clash + \LWR@checkloadbefore{luatexja} + \LWR@checkloadbefore{luatexja-fontspec} + \LWR@checkloadbefore{luatexko} + \LWR@checkloadbefore{morewrites} + \LWR@checkloadbefore{newclude} + \LWR@checkloadbefore{newunicodechar} + \LWR@checkloadbefore{plext} + \LWR@checkloadbefore{xeCJK} + \LWR@checkloadbefore{xetexko} + \LWR@checkloadbefore{zxjatype} } \newcommand*{\LWR@lookforpackagename}[1]{% @@ -1547,11 +1616,11 @@ {% \PackageError{lwarp}{% You used:\MessageBreak - \protect\requirepackage[#1]{#2}\MessageBreak + \protect\usepackage[#1]{#2}\MessageBreak Braces in the package options will fail with Lwarp.\MessageBreak Instead, use:\MessageBreak \protect\PassOptionsToPackage{#1}{#2}\MessageBreak - \protect\requirepackage{#2}\MessageBreak + \protect\usepackage{#2}\MessageBreak near the line number given below.\MessageBreak Enter 'h' for more info% }% @@ -4677,7 +4746,7 @@ MathJax = { -- Copyright 2016-2021 Brian Dunn -printversion = "v0.896" +printversion = "v0.897" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -11168,7 +11237,7 @@ end -- not --version } -\NewDocumentCommand{\listof}{m +m}{% +\NewDocumentCommand{\LWR@listof}{m +m}{% \@ifundefined{l@#1}{% \csdef{l@#1}##1##2{\hypertocfloat{1}{#1}{\@nameuse{ext@#1}}{##1}{##2}}% }{}% @@ -12967,7 +13036,7 @@ end -- not --version text-degree = {\LWR@siunitx@textdegree}, text-arcminute = {\LWR@siunitx@textprime} , text-arcsecond = {\LWR@siunitx@textdblprime} , -}{siunitx} +}{siunitx-v2} \end{warpHTML} |