siunitx (15jan20)

git-svn-id: svn://tug.org/texlive/trunk@53414 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 65 insertions, 68 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
new file mode 100644
index 00000000000..17ca614c6c3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index e3b606a1fe2..affca61c32c 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index c7cdc34631e..bca4b099efd 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -81,7 +81,7 @@ See http://www.latex-project.org/lppl.txt
 
 \endpreamble
 \postamble
-Copyright (C) 2008-2019 by
+Copyright (C) 2008-2020 by
   Joseph Wright <joseph.wright@morningstar2.co.uk>
 
 It may be distributed and/or modified under the conditions of
@@ -125,7 +125,7 @@ This work consists of the file  siunitx.dtx
 \fi
 %</internal>
 %<*driver|package>
-\RequirePackage{expl3}[2015/09/11]
+\RequirePackage{expl3}[2020/01/12]
 \RequirePackage{xparse}
 %</driver|package>
 %<*driver>
@@ -690,6 +690,7 @@ This work consists of the file  siunitx.dtx
 % \changes{v2.7t}{2018/06/08}{Fix inclusion of sign in astronomy-style
 %   angles}
 % \changes{v2.7t}{2019/10/10}{Fix \opt{round-half} when \opt{even} at zero precision}
+% \changes{v2.7u}{2020/01/15}{Modified internals to track \pkg{expl3} changes}
 %
 %\begin{abstract}
 % Physical quantities have both numbers and units, and each physical
@@ -843,10 +844,11 @@ This work consists of the file  siunitx.dtx
 %
 %\subsection{Numbers}
 %
-%\DescribeMacro{\num}
-%\begin{syntax}
-%  \cs{num}\oarg{options}\marg{number}
-%\end{syntax}
+%\begin{function}{\num}
+%  \begin{syntax}
+%    \cs{num}\oarg{options}\marg{number}
+%  \end{syntax}
+%\end{function}
 % Numbers are automatically formatted by the \cs{num} macro.  This
 % takes one optional argument, \meta{options}, and one mandatory one,
 % \meta{number}.  The contents of \meta{number} are automatically
@@ -873,10 +875,11 @@ This work consists of the file  siunitx.dtx
 % of numerical input). The parser understands a range of input syntaxes,
 % as demonstrated above.
 %
-%\DescribeMacro{\numlist}
-%\begin{syntax}
-%  \cs{numlist}\oarg{options}\marg{numbers}
-%\end{syntax}
+%\begin{function}{\numlist}
+%  \begin{syntax}
+%    \cs{numlist}\oarg{options}\marg{numbers}
+%  \end{syntax}
+%\end{function}
 %\changes{v2.0}{2010/05/23}{Introduced \cs{numlist} and \cs{SIlist}
 %  functions}
 % Lists of numbers may be processed using the \cs{numlist} function.
@@ -891,10 +894,11 @@ This work consists of the file  siunitx.dtx
 %  \numlist{10;30;50;70}
 %\end{LaTeXdemo}
 %
-%\DescribeMacro{\numrange}
-%\begin{syntax}
-%  \cs{numrange}\oarg{options}\marg{number1}\marg{number2}
-%\end{syntax}
+%\begin{function}{\numrange}
+%  \begin{syntax}
+%    \cs{numrange}\oarg{options}\marg{number1}\marg{number2}
+%  \end{syntax}
+%\end{function}
 % Simple ranges of numbers can be handled using the \cs{numrange}
 % function. This acts in the same way as \cs{num}, but inserts a
 % phrase or other text between the two entries. This function should
@@ -903,10 +907,11 @@ This work consists of the file  siunitx.dtx
 %  \numrange{10}{30}
 %\end{LaTeXdemo}
 %
-%\DescribeMacro{\ang}
-%\begin{syntax}
-%  \cs{ang}\oarg{options}\marg{angle}
-%\end{syntax}
+%\begin{function}{\ang}
+%  \begin{syntax}
+%    \cs{ang}\oarg{options}\marg{angle}
+%  \end{syntax}
+%\end{function}
 % Angles can be typeset using the \cs{ang} command.  The
 % \meta{angle} can be given either as a decimal number or as a
 % semi-colon separated list of degrees, minutes and seconds, which
@@ -924,10 +929,11 @@ This work consists of the file  siunitx.dtx
 %
 %\subsection{Units}
 %
-%\DescribeMacro{\si}
-%\begin{syntax}
-%  \cs{si}\oarg{options}\marg{unit}
-%\end{syntax}
+%\begin{function}{\si}
+%  \begin{syntax}
+%    \cs{si}\oarg{options}\marg{unit}
+%  \end{syntax}
+%\end{function}
 % The symbol for a unit can be typeset using the \cs{si} macro: this
 % provides full control over output format for the unit. Like the
 % \cs{num} macro, \cs{si} takes  one optional and one mandatory
@@ -962,10 +968,11 @@ This work consists of the file  siunitx.dtx
 % formats. For example, the \cs{per} macro can give reciprocal powers,
 % slashes or be used to construct units as fractions.
 %
-%\DescribeMacro{\SI}
-%\begin{syntax}
-%  \cs{SI}\oarg{options}\marg{number}\oarg{preunit}\marg{unit}
-%\end{syntax}
+%\begin{function}{\SI}
+%  \begin{syntax}
+%    \cs{SI}\oarg{options}\marg{number}\oarg{preunit}\marg{unit}
+%  \end{syntax}
+%\end{function}
 % Very often, numbers and units are given together. Formally, the
 % value of a quantity is the product of the number and the unit, the
 % space being regarded as a multiplication sign \cite{SI:5.3.3}. The
@@ -988,10 +995,11 @@ This work consists of the file  siunitx.dtx
 % Full details of using \enquote{stand alone} units are found in
 % \cref{sec:units:creating}.
 %
-%\DescribeMacro{\SIlist}
-%\begin{syntax}
-%  \cs{SIlist}\oarg{options}\marg{numbers}\marg{unit}
-%\end{syntax}
+%\begin{function}{\SIlist}
+%  \begin{syntax}
+%    \cs{SIlist}\oarg{options}\marg{numbers}\marg{unit}
+%  \end{syntax}
+%\end{function}
 % Lists of numbers with units can be handled using the \cs{SIlist}
 % function. The behaviour of this function is similar to \cs{numlist},
 % but with the addition of a unit to each number.  This function should
@@ -1000,10 +1008,11 @@ This work consists of the file  siunitx.dtx
 %  \SIlist{10;30;45}{\metre}
 %\end{LaTeXdemo}
 %
-%\DescribeMacro{\SIrange}
-%\begin{syntax}
-%  \cs{SIrange}\oarg{options}\marg{number1}\marg{number2}\marg{unit}
-%\end{syntax}
+%\begin{function}{\SIrange}
+%  \begin{syntax}
+%    \cs{SIrange}\oarg{options}\marg{number1}\marg{number2}\marg{unit}
+%  \end{syntax}
+%\end{function}
 % Ranges of numbers with units can be handled using the \cs{SIrange}
 % function. The behaviour of this function is similar to \cs{numrange},
 % but with the addition of a unit to each number.  This function should
@@ -1020,7 +1029,6 @@ This work consists of the file  siunitx.dtx
 % names. Full details of units in the SI are available
 % on-line~\cite{BIPM}.
 %
-%\DescribeMacro{\meter}
 % The seven base SI units are always defined
 % (\cref{tab:unit:base}). In addition, the macro \cs{meter} is
 % available as an alias for \cs{metre}, for users of US spellings.
@@ -1045,7 +1053,6 @@ This work consists of the file  siunitx.dtx
 %  \end{tabular}
 %\end{table}
 %
-%\DescribeMacro{\celsius}
 % The SI also lists a number of units which have special names and
 % symbols \cite{SI:2.2.2}: these are listed in
 % \cref{tab:unit:derived}. As a short-cut for the degree Celsius,
@@ -1165,7 +1172,6 @@ This work consists of the file  siunitx.dtx
 %  \end{tabular}
 %\end{table}
 %
-%\DescribeMacro{\deka}
 % In addition to the units themselves, \pkg{siunitx} provides
 % pre-defined macros for all of the SI prefixes
 % (\cref{tab:unit:prefix}, \cite{SI:3.1}). The spelling
@@ -1204,10 +1210,6 @@ This work consists of the file  siunitx.dtx
 %  \end{tabular}
 %\end{table}
 %
-%\DescribeMacro{\square}
-%\DescribeMacro{\squared}
-%\DescribeMacro{\cubic}
-%\DescribeMacro{\cubed}
 % A small number of pre-defined powers are provided as macros.
 % \cs{square} and \cs{cubic} are intended for use before units, with
 % \cs{squared} and \cs{cubed} going after the unit.
@@ -1216,8 +1218,6 @@ This work consists of the file  siunitx.dtx
 %  \si{\joule\squared\per\lumen} \\
 %  \si{\cubic\lux\volt\tesla\cubed}
 %\end{LaTeXdemo}
-%\DescribeMacro{\tothe}
-%\DescribeMacro{\raiseto}
 % Generic powers can be inserted on a one-off basis using the \cs{tothe}
 % and \cs{raiseto} macros. These are the only macros for units which
 % take an argument:
@@ -1225,7 +1225,6 @@ This work consists of the file  siunitx.dtx
 %  \si{\henry\tothe{5}} \\
 %  \si{\raiseto{4.5}\radian}
 %\end{LaTeXdemo}
-%\DescribeMacro{\per}
 % Reciprocal powers are indicated using the \cs{per} macro. This applies
 % to the next unit only, unless the \opt{sticky-per} option
 % is turned on.
@@ -1235,7 +1234,6 @@ This work consists of the file  siunitx.dtx
 %  \si{\per\henry\tothe{5}} \\
 %  \si{\per\square\becquerel}
 %\end{LaTeXdemo}
-%\DescribeMacro{\of}
 %\changes{v2.0i}{2010/06/29}{Correct behaviour of \cs{of} function
 %  so it actually works (bug introduced in v2.0d)}
 % As for generic powers, generic qualifiers are also available using
@@ -1246,8 +1244,6 @@ This work consists of the file  siunitx.dtx
 %    {0.1}{\milli\mole\of{cat}\per\kilogram\of{prod}}
 %\end{LaTeXdemo}
 %
-%\DescribeMacro{\cancel}
-%\DescribeMacro{\highlight}
 %\changes{v2.2}{2011/04/05}{Support use of \cs{cancel} macro in units}
 %\changes{v2.2}{2011/04/06}{New \cs{highlight} macro for selective
 %  colour in units}
@@ -1428,10 +1424,11 @@ This work consists of the file  siunitx.dtx
 %  \end{table}
 %\end{LaTeXdemo}
 %
-%\DescribeMacro{\tablenum}
-%\begin{syntax}
-%  \cs{tablenum}\oarg{options}\marg{number}
-%\end{syntax}
+%\begin{function}{\tablenum}
+%  \begin{syntax}
+%    \cs{tablenum}\oarg{options}\marg{number}
+%  \end{syntax}
+%\end{function}
 %\changes{v2.2}{2011/03/20}{Add new \cs{tablenum} macro to allow
 %  complex table alignments}
 %\changes{v2.2g}{2011/06/02}{Ensure \cs{tablenum} works correctly when
@@ -5224,7 +5221,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2019/10/10} {2.7t}
+\ProvidesExplPackage {siunitx} {2020/01/15} {2.7u}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -5232,7 +5229,7 @@ This work consists of the file  siunitx.dtx
 % This will also trap any problems with \pkg{l3packages} (as the two are now
 % tied together, version-wise).
 %    \begin{macrocode}
-\@ifpackagelater { expl3 } { 2015/11/15 }
+\@ifpackagelater { expl3 } { 2020/01/12 }
   { }
   {
     \PackageError { siunitx } { Support~package~expl3~too~old }
@@ -5676,8 +5673,8 @@ This work consists of the file  siunitx.dtx
       {
         \tl_if_empty_p:f
           {
-            \token_get_prefix_spec:N #1
-            \token_get_arg_spec:N    #1
+            \cs_prefix_spec:N   #1
+            \cs_argument_spec:N #1
           }
       }
       { \bool_not_p:n { \cs_if_exist_p:c { \cs_to_str:N #1 ~ } } }
@@ -11641,7 +11638,7 @@ This work consists of the file  siunitx.dtx
 \cs_new_protected:Npn \@@_protect_symbols:N #1 {
   \cs_if_exist:NT #1
     {
-      \tl_if_empty:fT { \token_get_prefix_spec:N #1 }
+      \tl_if_empty:fT { \cs_prefix_spec:N #1 }
         { \cs_set_protected:Npx #1 { \exp_not:V #1 } }
     }
 }
@@ -15537,7 +15534,7 @@ This work consists of the file  siunitx.dtx
          \use:c
            {
              l__@@_
-             \str_fold_case:n {#1}
+             \str_foldcase:n {#1}
              _
              \mode_if_math:TF { math } { text }
              _tl
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
index 56a021e1632..6504f82de4c 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
@@ -104,7 +104,7 @@
 \DeclareSIUnit \ns { \nano  \second }
 \DeclareSIUnit \us { \micro \second }
 \DeclareSIUnit \ms { \milli \second }
-%% Copyright (C) 2008-2019 by
+%% Copyright (C) 2008-2020 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
index 4f0e063cc9c..26c51e45e58 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
@@ -25,7 +25,7 @@
 \DeclareBinaryPrefix \yobi { Yi } { 80 }
 \DeclareSIUnit \bit  { bit }
 \DeclareSIUnit \byte { B }
-%% Copyright (C) 2008-2019 by
+%% Copyright (C) 2008-2020 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
index 2a3daa7927b..af6739c766c 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
@@ -727,7 +727,7 @@
 \DeclareSIUnit \yb        { \yocto \barn }
 \NewDocumentCommand \requiresiconfigs { m }
   { \keys_set:nn { siunitx } { version-1-compatibility } }
-%% Copyright (C) 2008-2019 by
+%% Copyright (C) 2008-2020 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 15ac4bdfc36..704f67ec8bf 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -13,11 +13,11 @@
 %% See http://www.latex-project.org/lppl.txt
 %% ---------------------------------------------------------------
 %% 
-\RequirePackage{expl3}[2015/09/11]
+\RequirePackage{expl3}[2020/01/12]
 \RequirePackage{xparse}
-\ProvidesExplPackage {siunitx} {2019/10/10} {2.7t}
+\ProvidesExplPackage {siunitx} {2020/01/15} {2.7u}
   {A comprehensive (SI) units package}
-\@ifpackagelater { expl3 } { 2015/11/15 }
+\@ifpackagelater { expl3 } { 2020/01/12 }
   { }
   {
     \PackageError { siunitx } { Support~package~expl3~too~old }
@@ -327,8 +327,8 @@
       {
         \tl_if_empty_p:f
           {
-            \token_get_prefix_spec:N #1
-            \token_get_arg_spec:N    #1
+            \cs_prefix_spec:N   #1
+            \cs_argument_spec:N #1
           }
       }
       { \bool_not_p:n { \cs_if_exist_p:c { \cs_to_str:N #1 ~ } } }
@@ -4396,7 +4396,7 @@
 \cs_new_protected:Npn \__siunitx_protect_symbols:N #1 {
   \cs_if_exist:NT #1
     {
-      \tl_if_empty:fT { \token_get_prefix_spec:N #1 }
+      \tl_if_empty:fT { \cs_prefix_spec:N #1 }
         { \cs_set_protected:Npx #1 { \exp_not:V #1 } }
     }
 }
@@ -6955,7 +6955,7 @@
          \use:c
            {
              l__siunitx_
-             \str_fold_case:n {#1}
+             \str_foldcase:n {#1}
              _
              \mode_if_math:TF { math } { text }
              _tl
@@ -7724,7 +7724,7 @@
     { \__siunitx_unit_create_functions: }
     { \__siunitx_unit_create_empty_functions: }
 }
-%% Copyright (C) 2008-2019 by
+%% Copyright (C) 2008-2020 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of