From 3bbdd3af65aaba1e1e9b25e12eed598c032ac9b8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 17 Jun 2015 22:42:04 +0000 Subject: siunitx (17jun15) git-svn-id: svn://tug.org/texlive/trunk@37589 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 620938 -> 621161 bytes Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 69 +++++++++++++-------- .../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 | 36 +++++++---- 6 files changed, 68 insertions(+), 43 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf index 6c8178ac22e..b371afbc7fa 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 018ccbaf468..fa0525eeb9b 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -128,13 +128,14 @@ This work consists of the file siunitx.dtx \RequirePackage{expl3,xparse} % %<*driver> -\documentclass[german,french,english,UKenglish]{l3doc} +\documentclass[german,french,spanish,english,UKenglish]{l3doc} \usepackage[table]{xcolor} \usepackage{amsmath,babel,booktabs,cancel,caption,colortbl,csquotes} \usepackage{datatool,helvet,multirow,pgfplots,siunitx,xfrac,xtab} \usepackage[capitalise]{cleveref} \usepackage[final]{listings} \usepackage[osf]{mathpazo} +\AtBeginDocument{\shorthandoff{<>}} \crefformat{section}{#2Section~#1#3} \Crefformat{section}{#2Section~#1#3} \crefformat{subsection}{#2Section~#1#3} @@ -623,6 +624,9 @@ This work consists of the file siunitx.dtx % \enquote{short} uncertainty values with integer mantissas} % \changes{v2.6e}{2015/01/21}{Auto-detect some packages where \pkg{fontspec} % should not affect default symbol use} +% \changes{v2.6f}{2015/04/01}{Fix \opt{table-sign-exponent} and +% \opt{table-sign-mantissa} options when set \opt{false}} +% \changes{v2.6f}{2015/04/04}{Further work on \pkg{mathspec}} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -4029,7 +4033,7 @@ This work consists of the file siunitx.dtx %\end{LaTeXdemo} % If the current language is known to the \pkg{translator} package % then the result will be localised text. The preamble for this manual -% loads English, French and German as options, and also loads the +% loads English, French, German and Spanish as options, and also loads the % \pkg{babel} package: %\begin{LaTeXdemo} % % In English by default @@ -4041,6 +4045,9 @@ This work consists of the file siunitx.dtx % \selectlanguage{german}% % \SIlist{1;2;3}{\metre} \\ % \SIrange{1}{10}{\degreeCelsius} \\ +% \selectlanguage{spanish}% +% \SIlist{1;2;3}{\metre} \\ +% \SIrange{1}{10}{\degreeCelsius} \\ %\end{LaTeXdemo} % % Note that the in order for this to work correctly, languages should @@ -5106,19 +5113,13 @@ This work consists of the file siunitx.dtx % % Feedback can be sent in a range of ways. The development code % is hosted by -% \href{http://bitbucket.org/josephwright/siunitx}{BitBucket}, +% \href{https://github.com/josephwright/siunitx/}{GitHub}, % and the site includes an issue tracker. Adding feedback directly % to the database means that other users can see it, and also % ensures that it does not get forgotten. E-mailing directly % will also definitely get attention: % \href{mailto:joseph.wright@morningstar2.co.uk} -% {\texttt{joseph.wright@morningstar2.co.uk}}. I also keep an eye -% on various groups, for example -% \href{http://groups.google.com/group/comp.text.tex/topics} -% {\texttt{comp.text.tex}} and -% \href{http://www.latex-community.org/forum/}{The \LaTeX{} Community}. -% Sometimes I miss posts to these places, so it's useful if you also -% e-mail me pointing to the appropriate thread. +% {\texttt{joseph.wright@morningstar2.co.uk}}. % %\section{Thanks} % @@ -5149,7 +5150,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2015/01/21} {2.6e} +\ProvidesExplPackage {siunitx} {2015/06/16} {2.6f} {A comprehensive (SI) units package} % \end{macrocode} % @@ -5292,16 +5293,12 @@ This work consists of the file siunitx.dtx \AtBeginDocument { \@ifpackageloaded { fontspec } { - \@ifpackageloaded { mathspec } + \@ifpackageloaded { eulervm } { } { - \@ifpackageloaded { eulervm } - { } - { - \int_const:Nn \c_@@_minus_int { 8722 } - \tl_set:Nn \c_@@_minus_tl - { \tex_char:D \c_@@_minus_int } - } + \int_const:Nn \c_@@_minus_int { 8722 } + \tl_set:Nn \c_@@_minus_tl + { \tex_char:D \c_@@_minus_int } } } { } @@ -5678,11 +5675,19 @@ This work consists of the file siunitx.dtx % \end{macro} % % \begin{macro}{\@@_textsuperscript:n} +% \changes{v2.6f}{2015/06/15}{FUse private copy of \cs{textsuperscript}} % This function is set up here so that it can be redefined % elsewhere as expandable. That is used in the bookmark system so -% that \pkg{hyperref} does not raise any unnecessary warnings. +% that \pkg{hyperref} does not raise any unnecessary warnings. With +% \pkg{fontspec} loaded the kernel defintion for \cs{textsuperscript} +% may get altered so a private copy of the orignal code is used. (Yes, +% this really should be done like Con\TeX{}t % \begin{macrocode} -\cs_new_eq:NN \@@_textsuperscript:n \textsuperscript +\cs_new_protected:Npn \@@_textsuperscript:n #1 + { + \m@th + \ensuremath { ^ { \mbox { \fontsize \sf@size \z@ \selectfont #1 } } } + } % \end{macrocode} % \end{macro} % @@ -13676,7 +13681,7 @@ This work consists of the file siunitx.dtx { \cs_set_eq:NN \@@_table_collect_next: ##1 } } \tl_map_function:nN - { \cs:w \scan_stop: \@@_table_print: } + { \cs:w \@@_table_print: } \@@_table_collect_not_braced_aux_ii:N \token_if_eq_meaning:NNT \@@_table_collect_next: \@@_table_collect_get: @@ -14173,10 +14178,18 @@ This work consists of the file siunitx.dtx table-parse-only .bool_set:N = \l_@@_table_parse_only_bool, table-space-text-pre .tl_set:N = \l_@@_table_pre_tl, table-space-text-post .tl_set:N = \l_@@_table_post_tl, - table-sign-exponent .code:n = + table-sign-exponent .choice:, + table-sign-exponent / true .code:n = { \prop_put:Nnn \l_@@_table_model_prop { exponent-sign } { - } }, - table-sign-mantissa .code:n = + table-sign-exponent / false .code:n = + { \prop_remove:Nn \l_@@_table_model_prop { exponent-sign } }, + table-sign-exponent .default:n = true, + table-sign-mantissa .choice:, + table-sign-mantissa / true .code:n = { \prop_put:Nnn \l_@@_table_model_prop { mantissa-sign } { - } }, + table-sign-mantissa / false .code:n = + { \prop_remove:Nn \l_@@_table_model_prop { mantissa-sign } }, + table-sign-mantissa .default:n = true, } % \end{macrocode} % \end{variable} @@ -16529,6 +16542,8 @@ This work consists of the file siunitx.dtx { to~(numerical~range) } { \`a } \providetranslation [ to = German ] { to~(numerical~range) } { bis } + \providetranslation [ to = Spanish ] + { to~(numerical~range) } { a } \sisetup { list-final-separator = { ~ \translate { and } ~ }, @@ -16655,7 +16670,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2015/01/21} {2.6e} +\ProvidesExplFile {siunitx-version-1.cfg} {2015/06/16} {2.6f} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17597,7 +17612,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/01/21} {2.6e} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/06/16} {2.6f} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17779,7 +17794,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2015/01/21} {2.6e} +\ProvidesExplFile {siunitx-binary.cfg} {2015/06/16} {2.6f} {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 9c72465c64a..95bc183c0fe 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/01/21} {2.6e} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/06/16} {2.6f} {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 76d0cb496c3..a94c2fcfaf5 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/01/21} {2.6e} +\ProvidesExplFile {siunitx-binary.cfg} {2015/06/16} {2.6f} {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 acdf0c6c731..a4d731aff51 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/01/21} {2.6e} +\ProvidesExplFile {siunitx-version-1.cfg} {2015/06/16} {2.6f} {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 f314066fa01..51fd33ee737 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} {2015/01/21} {2.6e} +\ProvidesExplPackage {siunitx} {2015/06/16} {2.6f} {A comprehensive (SI) units package} \@ifpackagelater { expl3 } { 2012/11/21 } { } @@ -77,16 +77,12 @@ \AtBeginDocument { \@ifpackageloaded { fontspec } { - \@ifpackageloaded { mathspec } + \@ifpackageloaded { eulervm } { } { - \@ifpackageloaded { eulervm } - { } - { - \int_const:Nn \c__siunitx_minus_int { 8722 } - \tl_set:Nn \c__siunitx_minus_tl - { \tex_char:D \c__siunitx_minus_int } - } + \int_const:Nn \c__siunitx_minus_int { 8722 } + \tl_set:Nn \c__siunitx_minus_tl + { \tex_char:D \c__siunitx_minus_int } } } { } @@ -370,7 +366,11 @@ } { } } -\cs_new_eq:NN \__siunitx_textsuperscript:n \textsuperscript +\cs_new_protected:Npn \__siunitx_textsuperscript:n #1 + { + \m@th + \ensuremath { ^ { \mbox { \fontsize \sf@size \z@ \selectfont #1 } } } + } \bool_new:N \l__siunitx_display_math_bool \tex_everydisplay:D \exp_after:wN { @@ -5751,7 +5751,7 @@ { \cs_set_eq:NN \__siunitx_table_collect_next: ##1 } } \tl_map_function:nN - { \cs:w \scan_stop: \__siunitx_table_print: } + { \cs:w \__siunitx_table_print: } \__siunitx_table_collect_not_braced_aux_ii:N \token_if_eq_meaning:NNT \__siunitx_table_collect_next: \__siunitx_table_collect_get: @@ -6048,10 +6048,18 @@ table-parse-only .bool_set:N = \l__siunitx_table_parse_only_bool, table-space-text-pre .tl_set:N = \l__siunitx_table_pre_tl, table-space-text-post .tl_set:N = \l__siunitx_table_post_tl, - table-sign-exponent .code:n = + table-sign-exponent .choice:, + table-sign-exponent / true .code:n = { \prop_put:Nnn \l__siunitx_table_model_prop { exponent-sign } { - } }, - table-sign-mantissa .code:n = + table-sign-exponent / false .code:n = + { \prop_remove:Nn \l__siunitx_table_model_prop { exponent-sign } }, + table-sign-exponent .default:n = true, + table-sign-mantissa .choice:, + table-sign-mantissa / true .code:n = { \prop_put:Nnn \l__siunitx_table_model_prop { mantissa-sign } { - } }, + table-sign-mantissa / false .code:n = + { \prop_remove:Nn \l__siunitx_table_model_prop { mantissa-sign } }, + table-sign-mantissa .default:n = true, } \keys_define:nn { siunitx } { @@ -7564,6 +7572,8 @@ { to~(numerical~range) } { \`a } \providetranslation [ to = German ] { to~(numerical~range) } { bis } + \providetranslation [ to = Spanish ] + { to~(numerical~range) } { a } \sisetup { list-final-separator = { ~ \translate { and } ~ }, -- cgit v1.2.3