summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/siunitx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-09-27 22:34:58 +0000
committerKarl Berry <karl@freefriends.org>2014-09-27 22:34:58 +0000
commit7ee96447e722ea395c966552247faee63fa71276 (patch)
tree2564611b076fcd8f096d11816450aafbf13e7648 /Master/texmf-dist/tex/latex/siunitx
parent38d864133ced256355012fc8762963833b82d432 (diff)
siunitx (27sep14)
git-svn-id: svn://tug.org/texlive/trunk@35273 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx')
-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.sty17
4 files changed, 12 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
index 2b6ca7b464b..2cd3fa722e9 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} {2014/09/15} {2.6a}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2014/09/27} {2.6b}
{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 2abb0634268..9a4cd074859 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} {2014/09/15} {2.6a}
+\ProvidesExplFile {siunitx-binary.cfg} {2014/09/27} {2.6b}
{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 a2ed8929d68..3309e16e8fd 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} {2014/09/15} {2.6a}
+\ProvidesExplFile {siunitx-version-1.cfg} {2014/09/27} {2.6b}
{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 483514cba27..49f7de6f47f 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -14,7 +14,7 @@
%% ---------------------------------------------------------------
%%
\RequirePackage{expl3,xparse}
-\ProvidesExplPackage {siunitx} {2014/09/15} {2.6a}
+\ProvidesExplPackage {siunitx} {2014/09/27} {2.6b}
{A comprehensive (SI) units package}
\@ifpackagelater { expl3 } { 2012/11/21 }
{ }
@@ -572,12 +572,13 @@
\tl_if_eq:NNT \f@family \c__siunitx_texttt_tl
{ \tl_set:Nn \l__siunitx_font_family_tl { tt } }
}
-\cs_new_protected:Npn \__siunitx_detect_font_shape: {
- \str_if_eq:VnT \f@shape { it }
- { \cs_set:Npn \__siunitx_font_shape: { \itshape } }
- \str_if_eq:VnT \f@shape { sl }
- { \cs_set:Npn \__siunitx_font_shape: { \slshape } }
-}
+\cs_new_protected:Npn \__siunitx_detect_font_shape:
+ {
+ \cs_if_exist:cT { \f@shape shape }
+ {
+ \cs_set:Npx \__siunitx_font_shape: { \exp_not:c { \f@shape shape } }
+ }
+ }
\cs_new_protected:Npn \__siunitx_detect_font_mode: {
\mode_if_math:F
{
@@ -1022,7 +1023,7 @@
input-digits = 0123456789,
input-exponent-markers = dDeE,
input-open-uncertainty = (, % )
- input-protect-tokens = \approx\dots\ge\geq\gg\le\leg\ll\mp\pi\pm\sim,
+ input-protect-tokens = \approx\dots\ge\geq\gg\le\leq\ll\mp\pi\pm\sim,
input-signs = +-\mp\pm,
input-symbols = \dots\pi,
input-uncertainty-signs = \pm,