From 2da7d143a3c5fa97ad562e2acfc3e487d53598d1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Jul 2013 23:25:47 +0000 Subject: siunitx (11jul13) git-svn-id: svn://tug.org/texlive/trunk@31167 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/siunitx/config/siunitx-abbreviations.cfg | 2 +- .../tex/latex/siunitx/config/siunitx-binary.cfg | 2 +- .../tex/latex/siunitx/config/siunitx-version-1.cfg | 82 +++++++++++----------- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 2 +- 4 files changed, 44 insertions(+), 44 deletions(-) (limited to 'Master/texmf-dist/tex/latex/siunitx') diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg index ac817958a77..d0df03363f9 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/03/11} {2.5q} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/07/11} {2.5r} {siunitx: Abbreviated units} \DeclareSIUnit \A { \ampere } \DeclareSIUnit \pA { \pico \ampere } diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg index 11f85bd1a5e..08e73b97cbd 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesExplFile {siunitx-binary.cfg} {2013/03/11} {2.5q} +\ProvidesExplFile {siunitx-binary.cfg} {2013/07/11} {2.5r} {siunitx: Binary units} \DeclareBinaryPrefix \kibi { Ki } { 10 } \DeclareBinaryPrefix \mebi { Mi } { 20 } diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg index f6cc25df5d1..b3dbbb3ec65 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesExplFile {siunitx-version-1.cfg} {2013/03/11} {2.5q} +\ProvidesExplFile {siunitx-version-1.cfg} {2013/07/11} {2.5r} {siunitx: Version 1 settings} \keys_define:nn { siunitx } { addsign .choice: , @@ -220,8 +220,8 @@ mathminute .meta:n = { math-arcminute = #1 }, mathmu .meta:n = { math-micro = #1 }, mathringA .meta:n = { math-angstrom = #1 }, - mathrm .meta:x = - { math-rm = \exp_not:c {#1} }, + mathrm .code:n = + { \use:x { \keys_set:nn { siunitx } { math-rm = \exp_not:c {#1} } } }, mathsOmega .meta:n = { math-ohm = #1 }, mathscelsius .meta:n = { math-celsius = #1 }, mathsdegree .meta:n = { math-degree = #1 }, @@ -231,15 +231,15 @@ mathsminute .meta:n = { math-arcminute = #1 }, mathsmu .meta:n = { math-micro = #1 }, mathsringA .meta:n = { math-angstrom = #1 }, - mathsrm .meta:x = - { math-rm = \exp_not:c {#1} }, + mathsrm .code:n = + { \use:x { \keys_set:nn { siunitx } { math-rm= \exp_not:c {#1} } } }, mathssecond .meta:n = { math-arcsecond = #1 }, - mathssf .meta:x = - { math-sf = \exp_not:c {#1} }, - mathstt .meta:x = - { math-tt = \exp_not:c {#1} }, - mathtt .meta:x = - { math-tt = \exp_not:c {#1} }, + mathssf .code:n = + { \use:x { \keys_set:nn { siunitx } { math-sf = \exp_not:c {#1} } } }, + mathstt .code:n = + { \use:x { \keys_set:nn { siunitx } { math-tt = \exp_not:c {#1} } } }, + mathtt .code:n = + { \use:x { \keys_set:nn { siunitx } { math-tt = \exp_not:c {#1} } } }, negcolor .meta:n = { negative-color = #1 }, negcolour .meta:n = { negative-color = #1 }, noload .code:n = , @@ -475,13 +475,13 @@ textmode .default:n = { true }, textmu .meta:n = { text-micro = #1 }, textringA .meta:n = { text-angstrom = #1 }, - textrm .meta:x = - { text-rm = \exp_not:c {#1} }, + textrm .code:n = + { \use:x { \keys_set:nn { siunitx } { text-rm = \exp_not:c {#1} } } }, textsecond .meta:n = { text-arcsecond = #1 }, - textsf .meta:x = - { text-sf = \exp_not:c {#1} }, - texttt .meta:x = - { text-tt = \exp_not:c {#1} }, + textsf .code:n = + { \use:x { \keys_set:nn { siunitx } { text-sf = \exp_not:c {#1} } } }, + texttt .code:n = + { \use:x { \keys_set:nn { siunitx } { text-tt = \exp_not:c {#1} } } }, tightpm .meta:n = { tight-spacing = #1 }, tightpm .default:n = { true }, tophrase .meta:n = { range-phrase = #1 }, @@ -501,18 +501,18 @@ trapambigrange .default:n = { true }, unitcolor .meta:n = { unit-color = #1 }, unitcolour .meta:n = { unit-color = #1 }, - unitmathrm .meta:x = - { unit-math-rm = \exp_not:c {#1} }, - unitmathsf .meta:x = - { unit-math-sf = \exp_not:c {#1} }, - unitmathsrm .meta:x = - { unit-math-rm = \exp_not:c {#1} }, - unitmathssf .meta:x = - { unit-math-sf = \exp_not:c {#1} }, - unitmathstt .meta:x = - { unit-math-tt = \exp_not:c {#1} }, - unitmathtt .meta:x = - { unit-math-tt = \exp_not:c {#1} }, + unitmathrm .code:n = + { \use:x { \keys_set:nn { siunitx } { unit-math-rm = \exp_not:c {#1} } } }, + unitmathsf .code:n = + { \use:x { \keys_set:nn { siunitx } { unit-math-sf = \exp_not:c {#1} } } }, + unitmathsrm .code:n = + { \use:x { \keys_set:nn { siunitx } { unit-math-rm = \exp_not:c {#1} } } }, + unitmathssf .code:n = + { \use:x { \keys_set:nn { siunitx } { unit-math-sf = \exp_not:c {#1} } } }, + unitmathstt .code:n = + { \use:x { \keys_set:nn { siunitx } { unit-math-tt = \exp_not:c {#1} } } }, + unitmathtt .code:n = + { \use:x { \keys_set:nn { siunitx } { unit-math-tt = \exp_not:c {#1} } } }, unitmode .meta:n = { unit-mode = #1 }, unitsep .choice: , unitsep / @@ -565,18 +565,18 @@ unknown .meta:n = { inter-unit-product = \ensuremath {#1} }, valuecolor .meta:n = { number-color = #1 }, valuecolour .meta:n = { number-color = #1 }, - valuemathrm .meta:x = - { number-math-rm = \exp_not:c {#1} }, - valuemathsf .meta:x = - { number-math-sf = \exp_not:c {#1} }, - valuemathsrm .meta:x = - { number-math-rm = \exp_not:c {#1} }, - valuemathssf .meta:x = - { number-math-sf = \exp_not:c {#1} }, - valuemathstt .meta:x = - { number-math-tt = \exp_not:c {#1} }, - valuemathtt .meta:x = - { number-math-tt = \exp_not:c {#1} }, + valuemathrm .code:n = + { \use:x { \keys_set:nn { siunitx } { number-math-rm = \exp_not:c {#1} } } }, + valuemathsf .code:n = + { \use:x { \keys_set:nn { siunitx } { number-math-sf = \exp_not:c {#1} } } }, + valuemathsrm .code:n = + { \use:x { \keys_set:nn { siunitx } { number-math-rm = \exp_not:c {#1} } } }, + valuemathssf .code:n = + { \use:x { \keys_set:nn { siunitx } { number-math-sf = \exp_not:c {#1} } } }, + valuemathstt .code:n = + { \use:x { \keys_set:nn { siunitx } { number-math-tt = \exp_not:c {#1} } } }, + valuemathtt .code:n = + { \use:x { \keys_set:nn { siunitx } { number-math-tt = \exp_not:c {#1} } } }, valuemode .meta:n = { number-mode = #1 }, valuesep .choice: , valuesep / diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index e66935d8d4f..8f4df716d18 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} {2013/03/11} {2.5q} +\ProvidesExplPackage {siunitx} {2013/07/11} {2.5r} {A comprehensive (SI) units package} \@ifpackagelater { expl3 } { 2012/11/21 } { } -- cgit v1.2.3