From 7ee96447e722ea395c966552247faee63fa71276 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Sep 2014 22:34:58 +0000 Subject: siunitx (27sep14) git-svn-id: svn://tug.org/texlive/trunk@35273 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 620320 -> 620375 bytes Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 25 ++++++++++++--------- .../tex/latex/siunitx/siunitx-abbreviations.cfg | 2 +- .../tex/latex/siunitx/siunitx-binary.cfg | 2 +- .../tex/latex/siunitx/siunitx-version-1.cfg | 2 +- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 17 +++++++------- 6 files changed, 26 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf index 42fe079cef6..cc194bbb221 100644 Binary files a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf and b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf differ diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index a42a9983fa5..346035b7884 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -615,6 +615,8 @@ This work consists of the file siunitx.dtx % bookmarks when \pkg{babel} is loaded with the \opt{french} option} % \changes{v2.6a}{2014/09/15}{Better glyph selection when \pkg{fontspec} % is detected} +% \changes{v2.6b}{2014/09/27}{Extend range of font shapes which can be +% detected} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -5141,7 +5143,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2014/09/15} {2.6a} +\ProvidesExplPackage {siunitx} {2014/09/27} {2.6b} {A comprehensive (SI) units package} % \end{macrocode} % @@ -6033,12 +6035,13 @@ This work consists of the file siunitx.dtx %\begin{macro}{\@@_detect_font_shape:} % The shape test uses \cs{f@shape} as a handy indicator. % \begin{macrocode} -\cs_new_protected:Npn \@@_detect_font_shape: { - \str_if_eq:VnT \f@shape { it } - { \cs_set:Npn \@@_font_shape: { \itshape } } - \str_if_eq:VnT \f@shape { sl } - { \cs_set:Npn \@@_font_shape: { \slshape } } -} +\cs_new_protected:Npn \@@_detect_font_shape: + { + \cs_if_exist:cT { \f@shape shape } + { + \cs_set:Npx \@@_font_shape: { \exp_not:c { \f@shape shape } } + } + } % \end{macrocode} %\end{macro} % @@ -6825,7 +6828,7 @@ This work consists of the file siunitx.dtx 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, @@ -16635,7 +16638,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2014/09/15} {2.6a} +\ProvidesExplFile {siunitx-version-1.cfg} {2014/09/27} {2.6b} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17577,7 +17580,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2014/09/15} {2.6a} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2014/09/27} {2.6b} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17759,7 +17762,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2014/09/15} {2.6a} +\ProvidesExplFile {siunitx-binary.cfg} {2014/09/27} {2.6b} {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 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, -- cgit v1.2.3