siunitx (16may18)

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

4 files changed, 17 insertions, 5 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..a02c11d622e
--- /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 04e74c31fe8..9c21acecf97 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 b5af65bf6de..23929b12d8d 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -674,6 +674,7 @@ This work consists of the file  siunitx.dtx
 % \changes{v2.7n}{2018/04/27}{Fix issue with symbolic input
 %   and digit grouping}
 % \changes{v2.7q}{2018/05/11}{Patch \pkg{cellspace} only if required}
+% \changes{v2.7r}{2018/05/16}{Fix issue in tabulars when REV\TeX{} is in use}
 %
 %\begin{abstract}
 % Physical quantities have both numbers and units, and each physical
@@ -5227,7 +5228,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2018-05-11} {2.7q}
+\ProvidesExplPackage {siunitx} {2018-05-16} {2.7r}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -13533,6 +13534,7 @@ This work consists of the file  siunitx.dtx
 %\end{macro}
 %
 %\begin{macro}{\@@_table_collect_begin:Nn}
+%\begin{macro}{\@@_table_collect_begin:Nw}
 %\begin{macro}{\@@_table_collect_begin_s:}
 %\begin{macro}{\@@_table_collect_begin_S:}
 % The collector starts by setting up local options, then clears and
@@ -13540,12 +13542,19 @@ This work consists of the file  siunitx.dtx
 % \texttt{S} column happens here as this ensures that it is not inside
 % a box, which will give the wrong result for \opt{detect-mode}. The
 % |\use_i:nn| removes the |\ignorespaces| from the cell preamble.
+% In the basic \LaTeXe{} template there is only an |\ignorespaces|
+% before the content, but to deal with any other material we use
+% a delimited approach. It's important to grab everything up to the
+% end of the template-before-|#| to allow the Appendix~D trick to work
+% inside the |peek| code.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_table_collect_begin:Nn #1#2
   {
     \keys_set:nn { siunitx } {#2}
-    \use_i:nn { \use:c { @@_table_collect_begin_ #1 : } }
+    \@@_table_collect_begin:Nw #1
   }
+\cs_new_protected:Npn \@@_table_collect_begin:Nw #1#2 \ignorespaces
+  { \use:c { @@_table_collect_begin_ #1 : } #2 }
 \cs_new_protected:Npn \@@_table_collect_begin_s: {
   \cs_set_eq:NN \@@_table_collect_token:N
     \@@_table_collect_token_s:N
@@ -13567,6 +13576,7 @@ This work consists of the file  siunitx.dtx
 %\end{macro}
 %\end{macro}
 %\end{macro}
+%\end{macro}
 %
 %\begin{macro}{\@@_table_collect_braced:n}
 % The collection of braced items depends on the column type. So we
@@ -15173,7 +15183,7 @@ This work consists of the file  siunitx.dtx
 % \pkg{dcolumn} can be applied, which requires the decimal marker to
 % be made active in math mode.
 %
-% \begin{macro}{\@@_table_print_S_direct:N}
+% \begin{macro}{\@@_table_print_S_direct:}
 % \begin{macro}{\@@_table_print_S_direct_text:n}
 %   Test to see if the very first item
 %   in the cell is a |{|. If it is, then we use the same approach as for
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 6bc850c4a45..6a0c4b5f4c8 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} {2018-05-11} {2.7q}
+\ProvidesExplPackage {siunitx} {2018-05-16} {2.7r}
   {A comprehensive (SI) units package}
 \@ifpackagelater { expl3 } { 2015/11/15 }
   { }
@@ -5619,8 +5619,10 @@
 \cs_new_protected:Npn \__siunitx_table_collect_begin:Nn #1#2
   {
     \keys_set:nn { siunitx } {#2}
-    \use_i:nn { \use:c { __siunitx_table_collect_begin_ #1 : } }
+    \__siunitx_table_collect_begin:Nw #1
   }
+\cs_new_protected:Npn \__siunitx_table_collect_begin:Nw #1#2 \ignorespaces
+  { \use:c { __siunitx_table_collect_begin_ #1 : } #2 }
 \cs_new_protected:Npn \__siunitx_table_collect_begin_s: {
   \cs_set_eq:NN \__siunitx_table_collect_token:N
     \__siunitx_table_collect_token_s:N