summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/siunitx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-05 00:25:17 +0000
committerKarl Berry <karl@freefriends.org>2011-02-05 00:25:17 +0000
commitf52fabc8a81f45adf6557d5f01aef7fd0f7fb64d (patch)
treedce571b3b93d6d13a05d2b1ba5161e888848eeda /Master/texmf-dist/source/latex/siunitx
parent5f2b824413a629645d9eff9df514aef4eac21b01 (diff)
siunix (2feb11)
git-svn-id: svn://tug.org/texlive/trunk@21303 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx43
1 files changed, 24 insertions, 19 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index c2e5f97ca03..ddac2e30e8f 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -528,6 +528,8 @@ This work consists of the file siunitx.dtx
%\changes{v2.1h}{2011/01/18}{Detect AMS display-like environments}
%\changes{v2.1i}{2011/01/27}{Improved logic for
% \opt{per-mode} setting \opt{symbol-or-fraction}}
+%\changes{v2.1j}{2011/02/01}{Allow for loading of \pkg{inputenc} package
+% with no options}
%
%\begin{abstract}
% Typesetting values with units requires care to ensure that the
@@ -4423,7 +4425,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2011/01/27} {2.1i}
+\ProvidesExplPackage {siunitx} {2011/02/01} {2.1j}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -10796,22 +10798,25 @@ This work consists of the file siunitx.dtx
}
}
\xetex_if_engine:F {
- \AtBeginDocument
- {
- \@ifpackageloaded { inputenc }
- {
- \tl_set:Nn \l_siunitx_tmpa_tl { latin1 , latin5 , latin9 }
- \clist_if_in:NVF \l_siunitx_tmpa_tl \inputencodingname
- {
- \cs_set_eq:NN \siunitx_unit_format_literal_extras:
- \scan_stop:
- }
- }
- {
- \cs_set_eq:NN \siunitx_unit_format_literal_extras:
- \scan_stop:
- }
- }
+ \luatex_if_engine:F
+ {
+ \AtBeginDocument
+ {
+ \cs_if_exist:NTF \inputencodingname
+ {
+ \tl_set:Nn \l_siunitx_tmpa_tl { latin1 , latin5 , latin9 }
+ \clist_if_in:NVF \l_siunitx_tmpa_tl \inputencodingname
+ {
+ \cs_set_eq:NN \siunitx_unit_format_literal_extras:
+ \scan_stop:
+ }
+ }
+ {
+ \cs_set_eq:NN \siunitx_unit_format_literal_extras:
+ \scan_stop:
+ }
+ }
+ }
}
% \end{macrocode}
%\end{macro}
@@ -14556,7 +14561,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2011/01/27} {2.1i}
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/02/01} {2.1j}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -15837,7 +15842,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2011/01/27} {2.1i}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/02/01} {2.1j}
{siunitx: Binary units}
% \end{macrocode}
%