From c846a8f775f5b14d4ec9ddf488de8577f9c8a32d Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Thu, 6 Jun 2019 05:41:22 +0900 Subject: [PATCH] Fix #39300 --- src/patches/lltjp-siunitx.sty | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/patches/lltjp-siunitx.sty b/src/patches/lltjp-siunitx.sty index 3c7569e..09a2ad9 100644 --- a/src/patches/lltjp-siunitx.sty +++ b/src/patches/lltjp-siunitx.sty @@ -1,5 +1,5 @@ % -% lltjp-siunitx.sty 2018-11-02 +% lltjp-siunitx.sty 2019-06-06 % \NeedsTeXFormat{LaTeX2e} @@ -29,9 +29,25 @@ } %%%% new table column: S and s +\bool_new:N \l__ltj_siunitx_table_collect_relax_bool +\cs_set_protected:Npn \__siunitx_table_collect_begin_s: { + \bool_set_false:N \l__ltj_siunitx_table_collect_relax_bool + \cs_set_eq:NN \__siunitx_table_collect_token:N + \__siunitx_table_collect_token_s:N + \cs_set_eq:NN \__siunitx_table_print: \__siunitx_table_print_s: + \__siunitx_table_collect_init_s: + \__siunitx_table_collect_get: +} + \cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1 { - \token_if_eq_meaning:NNF #1 \relax { + \token_if_eq_meaning:NNTF #1 \tex_relax:D { + \bool_if:NTF \l__ltj_siunitx_table_collect_relax_bool { + \__siunitx_table_collect_not_braced_aux_i:N #1 + } { + \bool_set_true:N \l__ltj_siunitx_table_collect_relax_bool + } + } { \token_if_eq_meaning:NNF #1 \ltjfakeboxbdd { \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue { \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D @@ -48,8 +64,14 @@ \@ifpackageloaded { mdwtab } { \cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1 - { - \token_if_eq_meaning:NNF #1 \relax { + { + \token_if_eq_meaning:NNTF #1 \tex_relax:D { + \bool_if:NTF \l__ltj_siunitx_table_collect_relax_bool { + \__siunitx_table_collect_not_braced_aux_i:N #1 + } { + \bool_set_true:N \l__ltj_siunitx_table_collect_relax_bool + } + } { \token_if_eq_meaning:NNF #1 \ltjfakeboxbdd { \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue { \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D -- 2.11.0