summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-15 21:19:33 +0000
committerKarl Berry <karl@freefriends.org>2015-10-15 21:19:33 +0000
commit3407f3d41550bedf93b847580be3fadc6fe99325 (patch)
tree6dd9a82f1001845ec9ed730ec074cdd2ac13b79f
parent99fb070ba6190c34b58106fa0f84859114f955f2 (diff)
siunitx (15oct15)
git-svn-id: svn://tug.org/texlive/trunk@38653 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin613000 -> 613039 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx14
-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.sty7
6 files changed, 17 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index daf6bcd32d6..9d9d8d5b9af 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 91f4f8c0614..f50bfbf3400 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -640,6 +640,7 @@ This work consists of the file siunitx.dtx
% \opt{exponent-to-prefix} is set}
% \changes{v2.6k}{2015/09/12}{Track \pkg{expl3} changes}
% \changes{v2.6l}{2015/09/14}{Fix an internal error}
+% \changes{v2.6m}{2015/10/15}{Address an issue with \pkg{mwtab}}
%
%\begin{abstract}
% Physical quantities have both numbers and units, and each physical
@@ -5163,7 +5164,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2015/09/14} {2.6l}
+\ProvidesExplPackage {siunitx} {2015/10/15} {2.6m}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -13699,7 +13700,10 @@ This work consists of the file siunitx.dtx
\token_if_eq_meaning:NNF #1 \tex_unskip:D
{
\token_if_eq_meaning:NNF #1 \tab@setcr
- { \@@_table_collect_not_braced_aux_i:N #1 }
+ {
+ \token_if_eq_meaning:NNF #1 \@maybe@unskip
+ { \@@_table_collect_not_braced_aux_i:N #1 }
+ }
}
}
\@@_table_collect_next:
@@ -16712,7 +16716,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2015/09/14} {2.6l}
+\ProvidesExplFile {siunitx-version-1.cfg} {2015/10/15} {2.6m}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -17654,7 +17658,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/09/14} {2.6l}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/10/15} {2.6m}
{siunitx: Abbreviated units}
% \end{macrocode}
%
@@ -17836,7 +17840,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2015/09/14} {2.6l}
+\ProvidesExplFile {siunitx-binary.cfg} {2015/10/15} {2.6m}
{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 d5b1005927a..78e2219a582 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} {2015/09/14} {2.6l}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/10/15} {2.6m}
{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 24e0027f0f1..ab1b8e87eb4 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} {2015/09/14} {2.6l}
+\ProvidesExplFile {siunitx-binary.cfg} {2015/10/15} {2.6m}
{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 211aaa00843..5d693907923 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} {2015/09/14} {2.6l}
+\ProvidesExplFile {siunitx-version-1.cfg} {2015/10/15} {2.6m}
{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 46e40b70622..b29073d76b1 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} {2015/09/14} {2.6l}
+\ProvidesExplPackage {siunitx} {2015/10/15} {2.6m}
{A comprehensive (SI) units package}
\@ifpackagelater { expl3 } { 2015/09/11 }
{ }
@@ -5752,7 +5752,10 @@
\token_if_eq_meaning:NNF #1 \tex_unskip:D
{
\token_if_eq_meaning:NNF #1 \tab@setcr
- { \__siunitx_table_collect_not_braced_aux_i:N #1 }
+ {
+ \token_if_eq_meaning:NNF #1 \@maybe@unskip
+ { \__siunitx_table_collect_not_braced_aux_i:N #1 }
+ }
}
}
\__siunitx_table_collect_next: