siunitx (12mar18)

git-svn-id: svn://tug.org/texlive/trunk@46935 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 347 insertions, 351 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
new file mode 100644
index 00000000000..9d22da33595
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index c36a5bf7930..92d33c6902e 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index fae88570501..9a2e08afbcc 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -81,7 +81,7 @@ See http://www.latex-project.org/lppl.txt
 
 \endpreamble
 \postamble
-Copyright (C) 2008-2017 by
+Copyright (C) 2008-2018 by
   Joseph Wright <joseph.wright@morningstar2.co.uk>
 
 It may be distributed and/or modified under the conditions of
@@ -669,6 +669,7 @@ This work consists of the file  siunitx.dtx
 % \changes{v2.7h}{2017/06/12}{Internal changes}
 % \changes{v2.7i}{2017/07/23}{Rename an incorrect variable}
 % \changes{v2.7k}{2017/11/01}{Fix issues when units are not parsed}
+% \changes{v2.7l}{2018/03/11}{Track \pkg{unicode-math} changes}
 %
 %\begin{abstract}
 % Physical quantities have both numbers and units, and each physical
@@ -2776,6 +2777,8 @@ This work consists of the file  siunitx.dtx
 %      \DescribeNamedUnit{megawatt}{MW}           \\
 %      \DescribeNamedUnit{gigawatt}{GW}           \\
 %      \DescribeNamedUnit{joule}{J}               \\
+%      \DescribeNamedUnit{microjoule}{uJ}         \\
+%      \DescribeNamedUnit{millijoule}{mJ}         \\
 %      \DescribeNamedUnit{kilojoule}{kJ}          \\
 %      \DescribeNamedUnit{electronvolt}{eV}       \\
 %      \DescribeNamedUnit{millielectronvolt}{meV} \\
@@ -5214,7 +5217,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2017/11/26} {2.7k}
+\ProvidesExplPackage {siunitx} {2018-03-11} {2.7l}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -5384,15 +5387,15 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %\end{macro}
 %
-%\begin{macro}{\c_@@_omega_tl}
+%\begin{macro}{\g_@@_omega_tl}
 % Some package redefine \cs{Omega} to be slanted and move the original
 % symbol to \cs{upOmega}. This is handled here.
 %    \begin{macrocode}
-\tl_new:N \c_@@_omega_tl
-\tl_set:Nn \c_@@_omega_tl { \Omega }
+\tl_new:N \g_@@_omega_tl
+\tl_gset:Nn \g_@@_omega_tl { \Omega }
 \AtBeginDocument {
   \cs_if_exist:NT \upOmega
-    { \tl_set:Nn \c_@@_omega_tl { \upOmega } }
+    { \tl_set:Nn \g_@@_omega_tl { \upOmega } }
 }
 %    \end{macrocode}
 %\end{macro}
@@ -5413,152 +5416,154 @@ This work consists of the file  siunitx.dtx
 %\begin{macro}{\c_@@_old_options_seq}
 % To pick up old options, all of the names need to be known.
 %    \begin{macrocode}
-\seq_new:N \c_@@_old_options_seq
-\cs_set_protected:Npn \@@_tmp:w #1 {
-  \seq_put_right:No \c_@@_old_options_seq { \tl_to_str:n {#1} }
-}
-\@@_tmp:w { addsign }
-\@@_tmp:w { allowlitunits }
-\@@_tmp:w { allowoptarg }
-\@@_tmp:w { allowzeroexp }
-\@@_tmp:w { alsoload }
-\@@_tmp:w { angformat }
-\@@_tmp:w { anglesep }
-\@@_tmp:w { astroang }
-\@@_tmp:w { closeerr }
-\@@_tmp:w { closrfrac }
-\@@_tmp:w { closerange }
-\@@_tmp:w { colour }
-\@@_tmp:w { colorall }
-\@@_tmp:w { colourall }
-\@@_tmp:w { colorneg }
-\@@_tmp:w { colourneg }
-\@@_tmp:w { colourunits }
-\@@_tmp:w { colourunits }
-\@@_tmp:w { colorvalues }
-\@@_tmp:w { colourvalues }
-\@@_tmp:w { decimalsymbol }
-\@@_tmp:w { debug }
-\@@_tmp:w { detectdisplay }
-\@@_tmp:w { digitsep }
-\@@_tmp:w { dp }
-\@@_tmp:w { emulate }
-\@@_tmp:w { errspace }
-\@@_tmp:w { eVcorra }
-\@@_tmp:w { eVcorrb }
-\@@_tmp:w { expbase }
-\@@_tmp:w { expproduct }
-\@@_tmp:w { fixdp }
-\@@_tmp:w { fixsf }
-\@@_tmp:w { fraction }
-\@@_tmp:w { inlinebold }
-\@@_tmp:w { loctolang }
-\@@_tmp:w { log }
-\@@_tmp:w { load }
-\@@_tmp:w { mathOmega }
-\@@_tmp:w { mathcelsius }
-\@@_tmp:w { mathdegree }
-\@@_tmp:w { mathminute }
-\@@_tmp:w { mathmu }
-\@@_tmp:w { mathringA }
-\@@_tmp:w { mathrm }
-\@@_tmp:w { mathsOmega }
-\@@_tmp:w { mathscelsius }
-\@@_tmp:w { mathsdegree }
-\@@_tmp:w { mathsecond }
-\@@_tmp:w { mathsf }
-\@@_tmp:w { mathsminute }
-\@@_tmp:w { mathsmu }
-\@@_tmp:w { mathsringA }
-\@@_tmp:w { mathsrm }
-\@@_tmp:w { mathssecond }
-\@@_tmp:w { mathssf }
-\@@_tmp:w { mathstt }
-\@@_tmp:w { mathtt }
-\@@_tmp:w { negcolor }
-\@@_tmp:w { negcolour }
-\@@_tmp:w { noload }
-\@@_tmp:w { numaddn }
-\@@_tmp:w { numcloseerr }
-\@@_tmp:w { numdecimal }
-\@@_tmp:w { numdigits }
-\@@_tmp:w { numdiv }
-\@@_tmp:w { numexp }
-\@@_tmp:w { numgobble }
-\@@_tmp:w { numopenerr }
-\@@_tmp:w { numprod }
-\@@_tmp:w { numsign }
-\@@_tmp:w { obeyall }
-\@@_tmp:w { obeybold }
-\@@_tmp:w { obeyfamily }
-\@@_tmp:w { obeymode }
-\@@_tmp:w { obeyitalic }
-\@@_tmp:w { openerr }
-\@@_tmp:w { openfrac }
-\@@_tmp:w { openrange }
-\@@_tmp:w { padangle }
-\@@_tmp:w { padnumber }
-\@@_tmp:w { per }
-\@@_tmp:w { prefixbase }
-\@@_tmp:w { prefixproduct }
-\@@_tmp:w { prefixsymbolic }
-\@@_tmp:w { prespace }
-\@@_tmp:w { redefsymbols }
-\@@_tmp:w { repeatunits }
-\@@_tmp:w { retainplus }
-\@@_tmp:w { seperr }
-\@@_tmp:w { sepfour }
-\@@_tmp:w { sf }
-\@@_tmp:w { sign }
-\@@_tmp:w { slash }
-\@@_tmp:w { stickyper }
-\@@_tmp:w { strictarc }
-\@@_tmp:w { tabalign }
-\@@_tmp:w { tabalignexp }
-\@@_tmp:w { tabautofit }
-\@@_tmp:w { tabexpalign }
-\@@_tmp:w { tabformat }
-\@@_tmp:w { tabnumalign }
-\@@_tmp:w { tabparseonly }
-\@@_tmp:w { tabtextalign }
-\@@_tmp:w { textOmega }
-\@@_tmp:w { textcelsius }
-\@@_tmp:w { textdegree }
-\@@_tmp:w { textminute }
-\@@_tmp:w { textmode }
-\@@_tmp:w { textmu }
-\@@_tmp:w { textringA }
-\@@_tmp:w { textrm }
-\@@_tmp:w { textsecond }
-\@@_tmp:w { textsf }
-\@@_tmp:w { texttt }
-\@@_tmp:w { tightpm }
-\@@_tmp:w { tophrase }
-\@@_tmp:w { trapamigerr }
-\@@_tmp:w { trapambigfrac }
-\@@_tmp:w { trapambigrange }
-\@@_tmp:w { unitcolor }
-\@@_tmp:w { unitcolour }
-\@@_tmp:w { unitmathrm }
-\@@_tmp:w { unitmathsf }
-\@@_tmp:w { unitmathsrm }
-\@@_tmp:w { unitmathssf }
-\@@_tmp:w { unitmathstt }
-\@@_tmp:w { unitmathtt }
-\@@_tmp:w { unitmode }
-\@@_tmp:w { unitsep }
-\@@_tmp:w { unitspace }
-\@@_tmp:w { valuecolor }
-\@@_tmp:w { valuecolour }
-\@@_tmp:w { valuemathrm }
-\@@_tmp:w { valuemathsf }
-\@@_tmp:w { valuemathsrm }
-\@@_tmp:w { valuemathssf }
-\@@_tmp:w { valuemathstt }
-\@@_tmp:w { valuemathtt }
-\@@_tmp:w { valuemode }
-\@@_tmp:w { valuesep }
-\@@_tmp:w { xpace }
+\exp_args:NNx \seq_const_from_clist:Nn \c_@@_old_options_seq
+  {
+    \tl_to_str:n
+      {
+        addsign ,
+        allowlitunits ,
+        allowoptarg ,
+        allowzeroexp ,
+        alsoload ,
+        angformat ,
+        anglesep ,
+        astroang ,
+        closeerr ,
+        closrfrac ,
+        closerange ,
+        colour ,
+        colorall ,
+        colourall ,
+        colorneg ,
+        colourneg ,
+        colourunits ,
+        colourunits ,
+        colorvalues ,
+        colourvalues ,
+        decimalsymbol ,
+        debug ,
+        detectdisplay ,
+        digitsep ,
+        dp ,
+        emulate ,
+        errspace ,
+        eVcorra ,
+        eVcorrb ,
+        expbase ,
+        expproduct ,
+        fixdp ,
+        fixsf ,
+        fraction ,
+        inlinebold ,
+        loctolang ,
+        log ,
+        load ,
+        mathOmega ,
+        mathcelsius ,
+        mathdegree ,
+        mathminute ,
+        mathmu ,
+        mathringA ,
+        mathrm ,
+        mathsOmega ,
+        mathscelsius ,
+        mathsdegree ,
+        mathsecond ,
+        mathsf ,
+        mathsminute ,
+        mathsmu ,
+        mathsringA ,
+        mathsrm ,
+        mathssecond ,
+        mathssf ,
+        mathstt ,
+        mathtt ,
+        negcolor ,
+        negcolour ,
+        noload ,
+        numaddn ,
+        numcloseerr ,
+        numdecimal ,
+        numdigits ,
+        numdiv ,
+        numexp ,
+        numgobble ,
+        numopenerr ,
+        numprod ,
+        numsign ,
+        obeyall ,
+        obeybold ,
+        obeyfamily ,
+        obeymode ,
+        obeyitalic ,
+        openerr ,
+        openfrac ,
+        openrange ,
+        padangle ,
+        padnumber ,
+        per ,
+        prefixbase ,
+        prefixproduct ,
+        prefixsymbolic ,
+        prespace ,
+        redefsymbols ,
+        repeatunits ,
+        retainplus ,
+        seperr ,
+        sepfour ,
+        sf ,
+        sign ,
+        slash ,
+        stickyper ,
+        strictarc ,
+        tabalign ,
+        tabalignexp ,
+        tabautofit ,
+        tabexpalign ,
+        tabformat ,
+        tabnumalign ,
+        tabparseonly ,
+        tabtextalign ,
+        textOmega ,
+        textcelsius ,
+        textdegree ,
+        textminute ,
+        textmode ,
+        textmu ,
+        textringA ,
+        textrm ,
+        textsecond ,
+        textsf ,
+        texttt ,
+        tightpm ,
+        tophrase ,
+        trapamigerr ,
+        trapambigfrac ,
+        trapambigrange ,
+        unitcolor ,
+        unitcolour ,
+        unitmathrm ,
+        unitmathsf ,
+        unitmathsrm ,
+        unitmathssf ,
+        unitmathstt ,
+        unitmathtt ,
+        unitmode ,
+        unitsep ,
+        unitspace ,
+        valuecolor ,
+        valuecolour ,
+        valuemathrm ,
+        valuemathsf ,
+        valuemathsrm ,
+        valuemathssf ,
+        valuemathstt ,
+        valuemathtt ,
+        valuemode ,
+        valuesep ,
+        xspace
+    }
+  }
 %    \end{macrocode}
 %\end{macro}
 %
@@ -5791,7 +5796,6 @@ This work consists of the file  siunitx.dtx
 % \pkg{fontspec} does (nasty errors arise otherwise).
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_set_math_fam:n #1 {
-  \int_new:c { c_@@_math #1 _int }
   \group_begin:
     \hbox_set:Nn \l_@@_tmp_box
       {
@@ -5799,7 +5803,7 @@ This work consists of the file  siunitx.dtx
           {
             \use:c { math #1 }
               {
-                \int_gset:cn { c_@@_math #1 _int } { \fam }
+                \int_const:cn { c_@@_math #1 _int } { \fam }
               }
           }
       }
@@ -5826,8 +5830,7 @@ This work consists of the file  siunitx.dtx
 % \cs{long}, whereas \cs{f@family} is not.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_set_text_fam:n #1 {
-  \tl_new:c { c_@@_text #1 _tl }
-  \tl_set:cx { c_@@_text #1 _tl } { \use:c { #1 default } }
+  \tl_const:cx { c_@@_text #1 _tl } { \use:c { #1 default } }
 }
 \AtBeginDocument {
   \@@_set_text_fam:n { sf }
@@ -6782,8 +6785,7 @@ This work consists of the file  siunitx.dtx
 % are done using stored text. To make them a little quicker, a
 % pre-stored version of the text is stored here.
 %    \begin{macrocode}
-\tl_new:N \c_@@_number_part_complex_tl
-\tl_set:Nn \c_@@_number_part_complex_tl { complex }
+\tl_const:Nn \c_@@_number_part_complex_tl { complex }
 %    \end{macrocode}
 %\end{macro}
 %
@@ -8551,8 +8553,7 @@ This work consists of the file  siunitx.dtx
         }
     }
 }
-\tl_new:N \c_@@_unity_tl
-\tl_set:Nn \c_@@_unity_tl { 1 }
+\tl_const:Nn \c_@@_unity_tl { 1 }
 %    \end{macrocode}
 %\end{macro}
 %\end{macro}
@@ -9238,8 +9239,7 @@ This work consists of the file  siunitx.dtx
       \prop_put:Nnn \l_@@_number_in_prop { #1 -had-sign } { true }
     }
 }
-\tl_new:N \c_@@_plus_tl
-\tl_set:Nn \c_@@_plus_tl { + }
+\tl_const:Nn \c_@@_plus_tl { + }
 %    \end{macrocode}
 %\end{macro}
 %\end{macro}
@@ -13876,8 +13876,7 @@ This work consists of the file  siunitx.dtx
 % \begin{variable}{\c_@@_one_fill_skip}
 %   A fixed skip of one \texttt{fill}.
 %    \begin{macrocode}
-\skip_new:N \c_@@_one_fill_skip
-\skip_set:Nn \c_@@_one_fill_skip { 0pt plus 1fill }
+\skip_const:Nn \c_@@_one_fill_skip { 0pt plus 1fill }
 %    \end{macrocode}
 % \end{variable}
 %
@@ -15410,7 +15409,7 @@ This work consists of the file  siunitx.dtx
                   { }
                   {
                     \@@_option_unchanged:Nnn \l_@@_ohm_text_tl
-                      { \ensuremath { \c_@@_omega_tl } }
+                      { \ensuremath { \g_@@_omega_tl } }
                       { \textohm }
                   }
               }
@@ -15428,7 +15427,7 @@ This work consists of the file  siunitx.dtx
         \@ifpackageloaded { upgreek }
           {
             \@@_option_unchanged:Nnn \l_@@_ohm_math_tl
-              { \text { \ensuremath { \c_@@_omega_tl } } }
+              { \text { \ensuremath { \g_@@_omega_tl } } }
               { \Upomega }
           }
           { }
@@ -15466,7 +15465,7 @@ This work consists of the file  siunitx.dtx
   math-celsius   = { } ^ { \circ } \kern - \scriptspace \@@_unit_mathrm:n { C } ,
   math-degree    = { } ^ { \circ },
   math-micro     = \text { \c_@@_mu_tl },
-  math-ohm       = \text { \ensuremath { \c_@@_omega_tl } },
+  math-ohm       = \text { \ensuremath { \g_@@_omega_tl } },
 }
 %    \end{macrocode}
 %\end{macro}
@@ -15502,7 +15501,7 @@ This work consists of the file  siunitx.dtx
     \ensuremath { { } ^ { \circ } } \kern -\scriptspace C ,
   text-degree    = \ensuremath { { } ^ { \circ } },
   text-micro     = \c_@@_mu_tl ,
-  text-ohm       = \ensuremath { \c_@@_omega_tl },
+  text-ohm       = \ensuremath { \g_@@_omega_tl },
 }
 %    \end{macrocode}
 %\end{macro}
@@ -15569,8 +15568,9 @@ This work consists of the file  siunitx.dtx
 %   }
 %   For UTF-8 engines, it may be possible to use better symbols than those set
 %   up as standard. Unicode normalises both the ohm and {\aa}ngstr{\"{o}}m
-%   symbols to the appropriate letters, so these are used directly. On the
-%   other hand, micro is distinct from mu, so the proper symbol is selected.
+%   symbols to the appropriate letters, so these are used directly.
+%   Technically, we should hae a different slot for micro than for a mu, but
+%   for the broadest compatibility we go with the latter.
 %   The single degree Celsius symbol is a compatibility character, and so
 %   the two separate glyphs \enquote{degree} and \enquote{C} are used.
 %    \begin{macrocode}
@@ -15579,9 +15579,7 @@ This work consists of the file  siunitx.dtx
     \@ifpackageloaded { fontspec }
       {
         \int_const:Nn \c_@@_degree_int    { 176 }
-        \@ifpackageloaded { unicode-math }
-          { \int_const:Nn \c_@@_micro_int { "003BC } }
-          { \int_const:Nn \c_@@_micro_int { "000B5 } }
+        \int_const:Nn \c_@@_micro_int     { "000B5 }
         \int_const:Nn \c_@@_angstrom_int  { "0212B }
         \int_const:Nn \c_@@_ohm_int       { "003A9 }
         \sys_if_engine_xetex:T
@@ -15603,7 +15601,7 @@ This work consists of the file  siunitx.dtx
           { \text { \c_@@_mu_tl } }
           { \tex_char:D \c_@@_micro_int }
         \@@_option_unchanged:Nnn \l_@@_ohm_math_tl
-          { \text { \ensuremath { \c_@@_omega_tl } } }
+          { \text { \ensuremath { \g_@@_omega_tl } } }
           { \tex_char:D \c_@@_ohm_int }
         \sys_if_engine_xetex:T
           {
@@ -15627,7 +15625,7 @@ This work consists of the file  siunitx.dtx
           { \c_@@_mu_tl }
           { \tex_char:D \c_@@_micro_int }
         \@@_option_unchanged:Nnn \l_@@_ohm_text_tl
-          { \ensuremath { \c_@@_omega_tl } }
+          { \ensuremath { \g_@@_omega_tl } }
           { \tex_char:D \c_@@_ohm_int }
       }
       { }
@@ -17840,7 +17838,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}
-%   {\W, \uW, \mW, \kW,\MW , \GW, \kJ, \J, \eV, \meV, \keV, \MeV, \GeV, \TeV, \kWh}
+%   {\W, \uW, \mW, \kW, \MW, \GW, \kJ, \J, \mJ, \uJ, \eV, \meV, \keV, \MeV, \GeV, \TeV, \kWh}
 %   Energies.
 %    \begin{macrocode}
 \DeclareSIUnit \W   {        \watt }
@@ -17850,6 +17848,8 @@ This work consists of the file  siunitx.dtx
 \DeclareSIUnit \MW  { \mega  \watt }
 \DeclareSIUnit \GW  { \giga  \watt }
 \DeclareSIUnit \J   { \joule }
+\DeclareSIUnit \uJ  { \micro \joule }
+\DeclareSIUnit \mJ  { \milli \joule }
 \DeclareSIUnit \kJ  { \kilo \joule }
 \DeclareSIUnit \eV  { \electronvolt }
 \DeclareSIUnit \meV { \milli \electronvolt }
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
index 32d30935b48..4586115a118 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
@@ -63,6 +63,8 @@
 \DeclareSIUnit \MW  { \mega  \watt }
 \DeclareSIUnit \GW  { \giga  \watt }
 \DeclareSIUnit \J   { \joule }
+\DeclareSIUnit \uJ  { \micro \joule }
+\DeclareSIUnit \mJ  { \milli \joule }
 \DeclareSIUnit \kJ  { \kilo \joule }
 \DeclareSIUnit \eV  { \electronvolt }
 \DeclareSIUnit \meV { \milli \electronvolt }
@@ -102,7 +104,7 @@
 \DeclareSIUnit \ns { \nano  \second }
 \DeclareSIUnit \us { \micro \second }
 \DeclareSIUnit \ms { \milli \second }
-%% Copyright (C) 2008-2017 by
+%% Copyright (C) 2008-2018 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
index ae0ef1a16fd..072a2ed4fd5 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
@@ -25,7 +25,7 @@
 \DeclareBinaryPrefix \yobi { Yi } { 80 }
 \DeclareSIUnit \bit  { bit }
 \DeclareSIUnit \byte { B }
-%% Copyright (C) 2008-2017 by
+%% Copyright (C) 2008-2018 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
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 e3723544387..aca4afbe1ba 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
@@ -727,7 +727,7 @@
 \DeclareSIUnit \yb        { \yocto \barn }
 \NewDocumentCommand \requiresiconfigs { m }
   { \keys_set:nn { siunitx } { version-1-compatibility } }
-%% Copyright (C) 2008-2017 by
+%% Copyright (C) 2008-2018 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index d0896794c12..0d4c256cc21 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -15,7 +15,7 @@
 %% 
 \RequirePackage{expl3}[2015/09/11]
 \RequirePackage{xparse}
-\ProvidesExplPackage {siunitx} {2017/11/26} {2.7k}
+\ProvidesExplPackage {siunitx} {2018-03-11} {2.7l}
   {A comprehensive (SI) units package}
 \@ifpackagelater { expl3 } { 2015/11/15 }
   { }
@@ -99,161 +99,163 @@
     }
     { }
 }
-\tl_new:N \c__siunitx_omega_tl
-\tl_set:Nn \c__siunitx_omega_tl { \Omega }
+\tl_new:N \g__siunitx_omega_tl
+\tl_gset:Nn \g__siunitx_omega_tl { \Omega }
 \AtBeginDocument {
   \cs_if_exist:NT \upOmega
-    { \tl_set:Nn \c__siunitx_omega_tl { \upOmega } }
+    { \tl_set:Nn \g__siunitx_omega_tl { \upOmega } }
 }
 \cs_new_protected:Npn \__siunitx_tl_put_left_math:Nn #1#2
   { \tl_put_left:Nn #1 { \ensuremath {#2} } }
 \cs_generate_variant:Nn \__siunitx_tl_put_left_math:Nn { NV }
-\seq_new:N \c__siunitx_old_options_seq
-\cs_set_protected:Npn \__siunitx_tmp:w #1 {
-  \seq_put_right:No \c__siunitx_old_options_seq { \tl_to_str:n {#1} }
-}
-\__siunitx_tmp:w { addsign }
-\__siunitx_tmp:w { allowlitunits }
-\__siunitx_tmp:w { allowoptarg }
-\__siunitx_tmp:w { allowzeroexp }
-\__siunitx_tmp:w { alsoload }
-\__siunitx_tmp:w { angformat }
-\__siunitx_tmp:w { anglesep }
-\__siunitx_tmp:w { astroang }
-\__siunitx_tmp:w { closeerr }
-\__siunitx_tmp:w { closrfrac }
-\__siunitx_tmp:w { closerange }
-\__siunitx_tmp:w { colour }
-\__siunitx_tmp:w { colorall }
-\__siunitx_tmp:w { colourall }
-\__siunitx_tmp:w { colorneg }
-\__siunitx_tmp:w { colourneg }
-\__siunitx_tmp:w { colourunits }
-\__siunitx_tmp:w { colourunits }
-\__siunitx_tmp:w { colorvalues }
-\__siunitx_tmp:w { colourvalues }
-\__siunitx_tmp:w { decimalsymbol }
-\__siunitx_tmp:w { debug }
-\__siunitx_tmp:w { detectdisplay }
-\__siunitx_tmp:w { digitsep }
-\__siunitx_tmp:w { dp }
-\__siunitx_tmp:w { emulate }
-\__siunitx_tmp:w { errspace }
-\__siunitx_tmp:w { eVcorra }
-\__siunitx_tmp:w { eVcorrb }
-\__siunitx_tmp:w { expbase }
-\__siunitx_tmp:w { expproduct }
-\__siunitx_tmp:w { fixdp }
-\__siunitx_tmp:w { fixsf }
-\__siunitx_tmp:w { fraction }
-\__siunitx_tmp:w { inlinebold }
-\__siunitx_tmp:w { loctolang }
-\__siunitx_tmp:w { log }
-\__siunitx_tmp:w { load }
-\__siunitx_tmp:w { mathOmega }
-\__siunitx_tmp:w { mathcelsius }
-\__siunitx_tmp:w { mathdegree }
-\__siunitx_tmp:w { mathminute }
-\__siunitx_tmp:w { mathmu }
-\__siunitx_tmp:w { mathringA }
-\__siunitx_tmp:w { mathrm }
-\__siunitx_tmp:w { mathsOmega }
-\__siunitx_tmp:w { mathscelsius }
-\__siunitx_tmp:w { mathsdegree }
-\__siunitx_tmp:w { mathsecond }
-\__siunitx_tmp:w { mathsf }
-\__siunitx_tmp:w { mathsminute }
-\__siunitx_tmp:w { mathsmu }
-\__siunitx_tmp:w { mathsringA }
-\__siunitx_tmp:w { mathsrm }
-\__siunitx_tmp:w { mathssecond }
-\__siunitx_tmp:w { mathssf }
-\__siunitx_tmp:w { mathstt }
-\__siunitx_tmp:w { mathtt }
-\__siunitx_tmp:w { negcolor }
-\__siunitx_tmp:w { negcolour }
-\__siunitx_tmp:w { noload }
-\__siunitx_tmp:w { numaddn }
-\__siunitx_tmp:w { numcloseerr }
-\__siunitx_tmp:w { numdecimal }
-\__siunitx_tmp:w { numdigits }
-\__siunitx_tmp:w { numdiv }
-\__siunitx_tmp:w { numexp }
-\__siunitx_tmp:w { numgobble }
-\__siunitx_tmp:w { numopenerr }
-\__siunitx_tmp:w { numprod }
-\__siunitx_tmp:w { numsign }
-\__siunitx_tmp:w { obeyall }
-\__siunitx_tmp:w { obeybold }
-\__siunitx_tmp:w { obeyfamily }
-\__siunitx_tmp:w { obeymode }
-\__siunitx_tmp:w { obeyitalic }
-\__siunitx_tmp:w { openerr }
-\__siunitx_tmp:w { openfrac }
-\__siunitx_tmp:w { openrange }
-\__siunitx_tmp:w { padangle }
-\__siunitx_tmp:w { padnumber }
-\__siunitx_tmp:w { per }
-\__siunitx_tmp:w { prefixbase }
-\__siunitx_tmp:w { prefixproduct }
-\__siunitx_tmp:w { prefixsymbolic }
-\__siunitx_tmp:w { prespace }
-\__siunitx_tmp:w { redefsymbols }
-\__siunitx_tmp:w { repeatunits }
-\__siunitx_tmp:w { retainplus }
-\__siunitx_tmp:w { seperr }
-\__siunitx_tmp:w { sepfour }
-\__siunitx_tmp:w { sf }
-\__siunitx_tmp:w { sign }
-\__siunitx_tmp:w { slash }
-\__siunitx_tmp:w { stickyper }
-\__siunitx_tmp:w { strictarc }
-\__siunitx_tmp:w { tabalign }
-\__siunitx_tmp:w { tabalignexp }
-\__siunitx_tmp:w { tabautofit }
-\__siunitx_tmp:w { tabexpalign }
-\__siunitx_tmp:w { tabformat }
-\__siunitx_tmp:w { tabnumalign }
-\__siunitx_tmp:w { tabparseonly }
-\__siunitx_tmp:w { tabtextalign }
-\__siunitx_tmp:w { textOmega }
-\__siunitx_tmp:w { textcelsius }
-\__siunitx_tmp:w { textdegree }
-\__siunitx_tmp:w { textminute }
-\__siunitx_tmp:w { textmode }
-\__siunitx_tmp:w { textmu }
-\__siunitx_tmp:w { textringA }
-\__siunitx_tmp:w { textrm }
-\__siunitx_tmp:w { textsecond }
-\__siunitx_tmp:w { textsf }
-\__siunitx_tmp:w { texttt }
-\__siunitx_tmp:w { tightpm }
-\__siunitx_tmp:w { tophrase }
-\__siunitx_tmp:w { trapamigerr }
-\__siunitx_tmp:w { trapambigfrac }
-\__siunitx_tmp:w { trapambigrange }
-\__siunitx_tmp:w { unitcolor }
-\__siunitx_tmp:w { unitcolour }
-\__siunitx_tmp:w { unitmathrm }
-\__siunitx_tmp:w { unitmathsf }
-\__siunitx_tmp:w { unitmathsrm }
-\__siunitx_tmp:w { unitmathssf }
-\__siunitx_tmp:w { unitmathstt }
-\__siunitx_tmp:w { unitmathtt }
-\__siunitx_tmp:w { unitmode }
-\__siunitx_tmp:w { unitsep }
-\__siunitx_tmp:w { unitspace }
-\__siunitx_tmp:w { valuecolor }
-\__siunitx_tmp:w { valuecolour }
-\__siunitx_tmp:w { valuemathrm }
-\__siunitx_tmp:w { valuemathsf }
-\__siunitx_tmp:w { valuemathsrm }
-\__siunitx_tmp:w { valuemathssf }
-\__siunitx_tmp:w { valuemathstt }
-\__siunitx_tmp:w { valuemathtt }
-\__siunitx_tmp:w { valuemode }
-\__siunitx_tmp:w { valuesep }
-\__siunitx_tmp:w { xpace }
+\exp_args:NNx \seq_const_from_clist:Nn \c__siunitx_old_options_seq
+  {
+    \tl_to_str:n
+      {
+        addsign ,
+        allowlitunits ,
+        allowoptarg ,
+        allowzeroexp ,
+        alsoload ,
+        angformat ,
+        anglesep ,
+        astroang ,
+        closeerr ,
+        closrfrac ,
+        closerange ,
+        colour ,
+        colorall ,
+        colourall ,
+        colorneg ,
+        colourneg ,
+        colourunits ,
+        colourunits ,
+        colorvalues ,
+        colourvalues ,
+        decimalsymbol ,
+        debug ,
+        detectdisplay ,
+        digitsep ,
+        dp ,
+        emulate ,
+        errspace ,
+        eVcorra ,
+        eVcorrb ,
+        expbase ,
+        expproduct ,
+        fixdp ,
+        fixsf ,
+        fraction ,
+        inlinebold ,
+        loctolang ,
+        log ,
+        load ,
+        mathOmega ,
+        mathcelsius ,
+        mathdegree ,
+        mathminute ,
+        mathmu ,
+        mathringA ,
+        mathrm ,
+        mathsOmega ,
+        mathscelsius ,
+        mathsdegree ,
+        mathsecond ,
+        mathsf ,
+        mathsminute ,
+        mathsmu ,
+        mathsringA ,
+        mathsrm ,
+        mathssecond ,
+        mathssf ,
+        mathstt ,
+        mathtt ,
+        negcolor ,
+        negcolour ,
+        noload ,
+        numaddn ,
+        numcloseerr ,
+        numdecimal ,
+        numdigits ,
+        numdiv ,
+        numexp ,
+        numgobble ,
+        numopenerr ,
+        numprod ,
+        numsign ,
+        obeyall ,
+        obeybold ,
+        obeyfamily ,
+        obeymode ,
+        obeyitalic ,
+        openerr ,
+        openfrac ,
+        openrange ,
+        padangle ,
+        padnumber ,
+        per ,
+        prefixbase ,
+        prefixproduct ,
+        prefixsymbolic ,
+        prespace ,
+        redefsymbols ,
+        repeatunits ,
+        retainplus ,
+        seperr ,
+        sepfour ,
+        sf ,
+        sign ,
+        slash ,
+        stickyper ,
+        strictarc ,
+        tabalign ,
+        tabalignexp ,
+        tabautofit ,
+        tabexpalign ,
+        tabformat ,
+        tabnumalign ,
+        tabparseonly ,
+        tabtextalign ,
+        textOmega ,
+        textcelsius ,
+        textdegree ,
+        textminute ,
+        textmode ,
+        textmu ,
+        textringA ,
+        textrm ,
+        textsecond ,
+        textsf ,
+        texttt ,
+        tightpm ,
+        tophrase ,
+        trapamigerr ,
+        trapambigfrac ,
+        trapambigrange ,
+        unitcolor ,
+        unitcolour ,
+        unitmathrm ,
+        unitmathsf ,
+        unitmathsrm ,
+        unitmathssf ,
+        unitmathstt ,
+        unitmathtt ,
+        unitmode ,
+        unitsep ,
+        unitspace ,
+        valuecolor ,
+        valuecolour ,
+        valuemathrm ,
+        valuemathsf ,
+        valuemathsrm ,
+        valuemathssf ,
+        valuemathstt ,
+        valuemathtt ,
+        valuemode ,
+        valuesep ,
+        xspace
+    }
+  }
 \tl_new:N  \l__siunitx_key_tl
 \keys_define:nn { siunitx } {
   unknown .code:n =
@@ -381,7 +383,6 @@
 \cs_generate_variant:Nn \prop_get:NnNF  { NV }
 \cs_generate_variant:Nn \prop_get:NnNTF { NV }
 \cs_new_protected:Npn \__siunitx_set_math_fam:n #1 {
-  \int_new:c { c__siunitx_math #1 _int }
   \group_begin:
     \hbox_set:Nn \l__siunitx_tmp_box
       {
@@ -389,7 +390,7 @@
           {
             \use:c { math #1 }
               {
-                \int_gset:cn { c__siunitx_math #1 _int } { \fam }
+                \int_const:cn { c__siunitx_math #1 _int } { \fam }
               }
           }
       }
@@ -402,8 +403,7 @@
     \ignorespaces
   }
 \cs_new_protected:Npn \__siunitx_set_text_fam:n #1 {
-  \tl_new:c { c__siunitx_text #1 _tl }
-  \tl_set:cx { c__siunitx_text #1 _tl } { \use:c { #1 default } }
+  \tl_const:cx { c__siunitx_text #1 _tl } { \use:c { #1 default } }
 }
 \AtBeginDocument {
   \__siunitx_set_text_fam:n { sf }
@@ -988,8 +988,7 @@
       \tl_map_break:
     }
 }
-\tl_new:N \c__siunitx_number_part_complex_tl
-\tl_set:Nn \c__siunitx_number_part_complex_tl { complex }
+\tl_const:Nn \c__siunitx_number_part_complex_tl { complex }
 \bool_new:N \l__siunitx_number_in_complex_bool
 \bool_new:N \l__siunitx_number_in_complex_root_bool
 \bool_new:N \l__siunitx_number_in_decimal_bool
@@ -2255,8 +2254,7 @@
         }
     }
 }
-\tl_new:N \c__siunitx_unity_tl
-\tl_set:Nn \c__siunitx_unity_tl { 1 }
+\tl_const:Nn \c__siunitx_unity_tl { 1 }
 \cs_new_protected:Npn \__siunitx_number_process_pad:n #1 {
   \prop_get:NnNT \l__siunitx_number_in_prop { #1 -decimal }
     \l__siunitx_tmpa_tl
@@ -2786,8 +2784,7 @@
       \prop_put:Nnn \l__siunitx_number_in_prop { #1 -had-sign } { true }
     }
 }
-\tl_new:N \c__siunitx_plus_tl
-\tl_set:Nn \c__siunitx_plus_tl { + }
+\tl_const:Nn \c__siunitx_plus_tl { + }
 \cs_new_protected:Npn \__siunitx_number_process_uncertainty: {
   \clist_map_function:nN { mantissa , complex }
     \__siunitx_number_process_uncertainty_aux:n
@@ -5831,8 +5828,7 @@
         { \__siunitx_table_collect_expand:N #1 }
     }
 }
-\skip_new:N \c__siunitx_one_fill_skip
-\skip_set:Nn \c__siunitx_one_fill_skip { 0pt plus 1fill }
+\skip_const:Nn \c__siunitx_one_fill_skip { 0pt plus 1fill }
 \AtBeginDocument
   {
     \@ifpackageloaded { colortbl }
@@ -6885,7 +6881,7 @@
                   { }
                   {
                     \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl
-                      { \ensuremath { \c__siunitx_omega_tl } }
+                      { \ensuremath { \g__siunitx_omega_tl } }
                       { \textohm }
                   }
               }
@@ -6903,7 +6899,7 @@
         \@ifpackageloaded { upgreek }
           {
             \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl
-              { \text { \ensuremath { \c__siunitx_omega_tl } } }
+              { \text { \ensuremath { \g__siunitx_omega_tl } } }
               { \Upomega }
           }
           { }
@@ -6925,7 +6921,7 @@
   math-celsius   = { } ^ { \circ } \kern - \scriptspace \__siunitx_unit_mathrm:n { C } ,
   math-degree    = { } ^ { \circ },
   math-micro     = \text { \c__siunitx_mu_tl },
-  math-ohm       = \text { \ensuremath { \c__siunitx_omega_tl } },
+  math-ohm       = \text { \ensuremath { \g__siunitx_omega_tl } },
 }
 \keys_define:nn { siunitx } {
   text-angstrom  .tl_set:N = \l__siunitx_angstrom_text_tl,
@@ -6944,7 +6940,7 @@
     \ensuremath { { } ^ { \circ } } \kern -\scriptspace C ,
   text-degree    = \ensuremath { { } ^ { \circ } },
   text-micro     = \c__siunitx_mu_tl ,
-  text-ohm       = \ensuremath { \c__siunitx_omega_tl },
+  text-ohm       = \ensuremath { \g__siunitx_omega_tl },
 }
 \cs_new_protected:Npn \__siunitx_symbol_new:n #1
   {
@@ -6972,9 +6968,7 @@
     \@ifpackageloaded { fontspec }
       {
         \int_const:Nn \c__siunitx_degree_int    { 176 }
-        \@ifpackageloaded { unicode-math }
-          { \int_const:Nn \c__siunitx_micro_int { "003BC } }
-          { \int_const:Nn \c__siunitx_micro_int { "000B5 } }
+        \int_const:Nn \c__siunitx_micro_int     { "000B5 }
         \int_const:Nn \c__siunitx_angstrom_int  { "0212B }
         \int_const:Nn \c__siunitx_ohm_int       { "003A9 }
         \sys_if_engine_xetex:T
@@ -6996,7 +6990,7 @@
           { \text { \c__siunitx_mu_tl } }
           { \tex_char:D \c__siunitx_micro_int }
         \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl
-          { \text { \ensuremath { \c__siunitx_omega_tl } } }
+          { \text { \ensuremath { \g__siunitx_omega_tl } } }
           { \tex_char:D \c__siunitx_ohm_int }
         \sys_if_engine_xetex:T
           {
@@ -7020,7 +7014,7 @@
           { \c__siunitx_mu_tl }
           { \tex_char:D \c__siunitx_micro_int }
         \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl
-          { \ensuremath { \c__siunitx_omega_tl } }
+          { \ensuremath { \g__siunitx_omega_tl } }
           { \tex_char:D \c__siunitx_ohm_int }
       }
       { }
@@ -7724,7 +7718,7 @@
     { \__siunitx_unit_create_functions: }
     { \__siunitx_unit_create_empty_functions: }
 }
-%% Copyright (C) 2008-2017 by
+%% Copyright (C) 2008-2018 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of