summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin621831 -> 621980 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx61
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty41
6 files changed, 58 insertions, 50 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 9c048f68bcc..75f16247b39 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 739d35751d2..23cc0e9a91e 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -2945,6 +2945,8 @@ This work consists of the file siunitx.dtx
%\changes{v2.2}{2011/04/05}{Include leading \( 1 \) when \opt{per-mode}
% is set to \opt{symbol} and there are no numerator units in \cs{si}
% arguments}
+% \changes{v2.7f}{2017/03/23}{Fix spacing with \opt{reciprocal-positive-first}
+% setting}
%\DescribeOption{per-symbol}
%\DescribeOption{bracket-unit-denominator}
% The handling of \cs{per} is altered using the \opt{per-mode} choice
@@ -5205,7 +5207,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2017/03/06} {2.7e}
+\ProvidesExplPackage {siunitx} {2017/03/23} {2.7f}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -12721,16 +12723,19 @@ This work consists of the file siunitx.dtx
% \begin{macrocode}
\cs_new_protected:Npn \@@_unit_format_sorted:
{
- \tl_set_eq:NN \l_@@_unit_tl \l_@@_unit_numerator_tl
- \tl_if_empty:NT \l_@@_unit_tl
+ \tl_set:Nx \l_@@_unit_tl
{
- \tl_if_empty:NF \l_@@_unit_denominator_tl
+ \exp_not:V \l_@@_unit_numerator_tl
+ \bool_if:nF
{
- \tl_put_right:NV \l_@@_unit_tl
- \l_@@_unit_product_tl
+ \tl_if_empty_p:N \l_@@_unit_numerator_tl ||
+ \tl_if_empty_p:N \l_@@_unit_denominator_tl
}
+ {
+ \exp_not:N \l_@@_unit_product_tl
+ }
+ \exp_not:V \l_@@_unit_denominator_tl
}
- \tl_put_right:NV \l_@@_unit_tl \l_@@_unit_denominator_tl
}
% \end{macrocode}
% \end{macro}
@@ -16179,12 +16184,12 @@ This work consists of the file siunitx.dtx
\cs_if_exist:NT \FB@fg
{ \cs_set_eq:NN \fg \FB@fg }
\msg_redirect_name:nnn { xparse } { redefine-command } { none }
- \cs_set_eq:NN \num \@@_bookmark_num:w
- \cs_set_eq:NN \numrange \@@_bookmark_numrange:w
- \cs_set_eq:NN \si \@@_bookmark_si:w
- \cs_set_eq:NN \SI \@@_bookmark_SI:w
- \cs_set_eq:NN \SIrange \@@_bookmark_SIrange:w
- \cs_set_eq:NN \si \@@_bookmark_si:w
+ \cs_set_eq:NN \num \numInBookmark
+ \cs_set_eq:NN \numrange \numrangeInBookmark
+ \cs_set_eq:NN \si \siInBookmark
+ \cs_set_eq:NN \SI \SIInBookmark
+ \cs_set_eq:NN \SIrange \SIrangeInBookmark
+ \cs_set_eq:NN \si \siInBookmark
\cs_set_eq:NN \highlight \use_ii:nn
\cs_set_eq:NN \@@_textsuperscript:n \use:n
\cs_set:Npn \SIUnitSymbolAngstrom { \AA }
@@ -16200,27 +16205,27 @@ This work consists of the file siunitx.dtx
%
% \begin{macro}
% {
-% \@@_bookmark_num:w ,
-% \@@_bookmark_numrange:w ,
-% \@@_bookmark_SIlist:w ,
-% \@@_bookmark_SIrange:w ,
-% \@@_bookmark_SI:w ,
-% \@@_bookmark_si:w
+% \numInBookmark ,
+% \numrangeInBookmark ,
+% \SIlistInBookmark ,
+% \SIrangeInBookmark ,
+% \SIInBookmark ,
+% \siInBookmark
% }
% To keep things fast, expandable versions of the document commands
% are created only once. These are then used if necessary to remove
% and re-order arguments in an expandable fashion.
% \begin{macrocode}
-\DeclareExpandableDocumentCommand \@@_bookmark_num:w { o m } {#2}
-\DeclareExpandableDocumentCommand \@@_bookmark_numrange:w { o m m }
+\DeclareExpandableDocumentCommand \numInBookmark { o m } {#2}
+\DeclareExpandableDocumentCommand \numrangeInBookmark { o m m }
{ #2 \l_@@_range_phrase_tl #3 }
-\DeclareExpandableDocumentCommand \@@_bookmark_SI:w { o m o m }
+\DeclareExpandableDocumentCommand \SIInBookmark { o m o m }
{ \IfNoValueF {#3} {#3} #2 ~ #4 }
-\DeclareExpandableDocumentCommand \@@_bookmark_SIlist:w
+\DeclareExpandableDocumentCommand \SIlistInBookmark
{ o m m } { \@@_bookmark_SIlist_map:nn {#1} {#2} }
-\DeclareExpandableDocumentCommand \@@_bookmark_SIrange:w
+\DeclareExpandableDocumentCommand \SIrangeInBookmark
{ o m m m } { #2 ~ #4 \l_@@_range_phrase_tl #3 ~ #4 }
-\DeclareExpandableDocumentCommand \@@_bookmark_si:w { o m } {#2}
+\DeclareExpandableDocumentCommand \siInBookmark { o m } {#2}
% \end{macrocode}
% \end{macro}
%
@@ -16829,7 +16834,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2017/03/06} {2.7e}
+\ProvidesExplFile {siunitx-version-1.cfg} {2017/03/23} {2.7f}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -17771,7 +17776,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2017/03/06} {2.7e}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2017/03/23} {2.7f}
{siunitx: Abbreviated units}
% \end{macrocode}
%
@@ -17953,7 +17958,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2017/03/06} {2.7e}
+\ProvidesExplFile {siunitx-binary.cfg} {2017/03/23} {2.7f}
{siunitx: Binary units}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
index 0d75f9cf30f..cb6fad4c7a9 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2017/03/06} {2.7e}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2017/03/23} {2.7f}
{siunitx: Abbreviated units}
\DeclareSIUnit \A { \ampere }
\DeclareSIUnit \pA { \pico \ampere }
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
index 1fea4f53c13..e36b7ba4a75 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-binary.cfg} {2017/03/06} {2.7e}
+\ProvidesExplFile {siunitx-binary.cfg} {2017/03/23} {2.7f}
{siunitx: Binary units}
\DeclareBinaryPrefix \kibi { Ki } { 10 }
\DeclareBinaryPrefix \mebi { Mi } { 20 }
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 6344b7853b5..b3f5bbfbe8f 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-version-1.cfg} {2017/03/06} {2.7e}
+\ProvidesExplFile {siunitx-version-1.cfg} {2017/03/23} {2.7f}
{siunitx: Version 1 settings}
\keys_define:nn { siunitx } {
addsign .choice: ,
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index cec270fad49..3794491ca28 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -15,7 +15,7 @@
%%
\RequirePackage{expl3}[2015/09/11]
\RequirePackage{xparse}
-\ProvidesExplPackage {siunitx} {2017/03/06} {2.7e}
+\ProvidesExplPackage {siunitx} {2017/03/23} {2.7f}
{A comprehensive (SI) units package}
\@ifpackagelater { expl3 } { 2015/09/11 }
{ }
@@ -5117,16 +5117,19 @@
}
\cs_new_protected:Npn \__siunitx_unit_format_sorted:
{
- \tl_set_eq:NN \l__siunitx_unit_tl \l__siunitx_unit_numerator_tl
- \tl_if_empty:NT \l__siunitx_unit_tl
+ \tl_set:Nx \l__siunitx_unit_tl
{
- \tl_if_empty:NF \l__siunitx_unit_denominator_tl
+ \exp_not:V \l__siunitx_unit_numerator_tl
+ \bool_if:nF
{
- \tl_put_right:NV \l__siunitx_unit_tl
- \l__siunitx_unit_product_tl
+ \tl_if_empty_p:N \l__siunitx_unit_numerator_tl ||
+ \tl_if_empty_p:N \l__siunitx_unit_denominator_tl
}
+ {
+ \exp_not:N \l__siunitx_unit_product_tl
+ }
+ \exp_not:V \l__siunitx_unit_denominator_tl
}
- \tl_put_right:NV \l__siunitx_unit_tl \l__siunitx_unit_denominator_tl
}
\cs_new_protected:Npn \__siunitx_unit_format_symbol: {
\tl_set:Nx \l__siunitx_tmpa_tl
@@ -7425,12 +7428,12 @@
\cs_if_exist:NT \FB@fg
{ \cs_set_eq:NN \fg \FB@fg }
\msg_redirect_name:nnn { xparse } { redefine-command } { none }
- \cs_set_eq:NN \num \__siunitx_bookmark_num:w
- \cs_set_eq:NN \numrange \__siunitx_bookmark_numrange:w
- \cs_set_eq:NN \si \__siunitx_bookmark_si:w
- \cs_set_eq:NN \SI \__siunitx_bookmark_SI:w
- \cs_set_eq:NN \SIrange \__siunitx_bookmark_SIrange:w
- \cs_set_eq:NN \si \__siunitx_bookmark_si:w
+ \cs_set_eq:NN \num \numInBookmark
+ \cs_set_eq:NN \numrange \numrangeInBookmark
+ \cs_set_eq:NN \si \siInBookmark
+ \cs_set_eq:NN \SI \SIInBookmark
+ \cs_set_eq:NN \SIrange \SIrangeInBookmark
+ \cs_set_eq:NN \si \siInBookmark
\cs_set_eq:NN \highlight \use_ii:nn
\cs_set_eq:NN \__siunitx_textsuperscript:n \use:n
\cs_set:Npn \SIUnitSymbolAngstrom { \AA }
@@ -7441,16 +7444,16 @@
\cs_set:Npn \SIUnitSymbolMicro { \textmu }
\cs_set:Npn \SIUnitSymbolOhm { [ohm] }
}
-\DeclareExpandableDocumentCommand \__siunitx_bookmark_num:w { o m } {#2}
-\DeclareExpandableDocumentCommand \__siunitx_bookmark_numrange:w { o m m }
+\DeclareExpandableDocumentCommand \numInBookmark { o m } {#2}
+\DeclareExpandableDocumentCommand \numrangeInBookmark { o m m }
{ #2 \l__siunitx_range_phrase_tl #3 }
-\DeclareExpandableDocumentCommand \__siunitx_bookmark_SI:w { o m o m }
+\DeclareExpandableDocumentCommand \SIInBookmark { o m o m }
{ \IfNoValueF {#3} {#3} #2 ~ #4 }
-\DeclareExpandableDocumentCommand \__siunitx_bookmark_SIlist:w
+\DeclareExpandableDocumentCommand \SIlistInBookmark
{ o m m } { \__siunitx_bookmark_SIlist_map:nn {#1} {#2} }
-\DeclareExpandableDocumentCommand \__siunitx_bookmark_SIrange:w
+\DeclareExpandableDocumentCommand \SIrangeInBookmark
{ o m m m } { #2 ~ #4 \l__siunitx_range_phrase_tl #3 ~ #4 }
-\DeclareExpandableDocumentCommand \__siunitx_bookmark_si:w { o m } {#2}
+\DeclareExpandableDocumentCommand \siInBookmark { o m } {#2}
\cs_new:Npn \__siunitx_bookmark_SIlist_map:nn #1#2 {
\__siunitx_bookmark_SIlist_map_aux:nw {#2} #1 ; \q_recursion_tail ;
\q_recursion_tail ; \q_recursion_stop
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 22:02:42 +0000