From 58fc9c2dd30d4246b9cb2a6708d45b0eb7030ef9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 26 Oct 2019 20:38:48 +0000 Subject: scontents (26oct19) git-svn-id: svn://tug.org/texlive/trunk@52539 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/scontents/scontents-code.tex | 19 +++++++++++++------ Master/texmf-dist/tex/generic/scontents/scontents.tex | 6 +++--- 2 files changed, 16 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/generic/scontents') diff --git a/Master/texmf-dist/tex/generic/scontents/scontents-code.tex b/Master/texmf-dist/tex/generic/scontents/scontents-code.tex index ab8bbdb8a99..378e48aeff1 100644 --- a/Master/texmf-dist/tex/generic/scontents/scontents-code.tex +++ b/Master/texmf-dist/tex/generic/scontents/scontents-code.tex @@ -24,10 +24,10 @@ %% scontents.ins, %% and the derived files scontents.sty, %% scontents.tex, -%% t-scontents.mkvi and +%% t-scontents.mkiv and %% scontents-code.tex. %% -\def\ScontentsCoreFileDate{2019-10-24}% +\def\ScontentsCoreFileDate{2019-10-26}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -393,7 +393,8 @@ { \tl_if_blank_p:n {#2} } { \str_if_eq_p:ee {#2} { \c_percent_str } } { - \msg_warning:nnn { scontents } { rescanning-text } {#2} + \str_if_eq:VnF \c__scontents_hidden_space_str {#2} + { \msg_warning:nnn { scontents } { rescanning-text } {#2} } \__scontents_rescan_tokens:n {#2} } } @@ -534,8 +535,10 @@ \group_begin: \int_set:Nn \tex_newlinechar:D { `\^^J } \__scontents_rescan_tokens:x - { \__scontents_getfrom_seq:nn {#1} {#2} } - \group_end: + { + \endgroup % This assumes \catcode`\\=0... Things might go off otherwise. + \__scontents_getfrom_seq:nn {#1} {#2} + } } \cs_new_protected:Npn \__scontents_foreachsc_internal:nn #1 #2 { @@ -553,8 +556,12 @@ { \l__scontents_foreach_step_int } { \l__scontents_foreach_stop_int } \__scontents_foreach_add_body:n - \seq_use:Nn \l__scontents_foreach_print_seq { \tl_use:N \l__scontents_foreach_sep_tl } + \tl_gset:Nx \g__scontents_temp_tl + { \seq_use:Nn \l__scontents_foreach_print_seq { \tl_use:N \l__scontents_foreach_sep_tl } } \group_end: + \exp_after:wN \tl_gclear:N + \exp_after:wN \g__scontents_temp_tl + \g__scontents_temp_tl } \cs_new_protected:Npn \__scontents_foreach_add_body:n #1 { diff --git a/Master/texmf-dist/tex/generic/scontents/scontents.tex b/Master/texmf-dist/tex/generic/scontents/scontents.tex index 35fc8e406ec..9f295044168 100644 --- a/Master/texmf-dist/tex/generic/scontents/scontents.tex +++ b/Master/texmf-dist/tex/generic/scontents/scontents.tex @@ -24,11 +24,11 @@ %% scontents.ins, %% and the derived files scontents.sty, %% scontents.tex, -%% t-scontents.mkvi and +%% t-scontents.mkiv and %% scontents-code.tex. %% -\def\ScontentsFileDate{2019-10-24}% -\def\ScontentsFileVersion{1.5}% +\def\ScontentsFileDate{2019-10-26}% +\def\ScontentsFileVersion{1.6}% \def\ScontentsFileDescription{Stores LaTeX contents in memory or files}% \input expl3-generic.tex \ExplSyntaxOn -- cgit v1.2.3