diff options
author | Karl Berry <karl@freefriends.org> | 2017-12-07 23:16:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-12-07 23:16:26 +0000 |
commit | 1fed4553e07e0372e12d6a1ac32f29b3c7a2a538 (patch) | |
tree | 1cbfce535eaa4ad401f88e70d29998b9ffe4d2ec /Master/texmf-dist/tex/latex/l3experimental/l3str | |
parent | a1e3748b2a855f1a0c875df7f9585e1a01c44d9a (diff) |
l3experimental+l3build (7dec17)
git-svn-id: svn://tug.org/texlive/trunk@46013 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3str')
3 files changed, 9 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty index 4edbc93f067..a21d8bb3936 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty @@ -20,7 +20,7 @@ %% %% File: l3str-convert.dtx Copyright (C) 2013-2017 The LaTeX3 Project \RequirePackage{expl3} -\ProvidesExplPackage{l3str-convert}{2017/11/14}{} +\ProvidesExplPackage{l3str-convert}{2017/12/05}{} {L3 Experimental string encoding conversions} \cs_if_exist:NF \use_ii_i:nn { \cs_new:Npn \use_ii_i:nn #1#2 { #2 #1 } } @@ -425,7 +425,7 @@ \group_end: \cs_new_protected:Npn \__str_convert_decode_clist: { - \clist_set:No \g__str_result_tl \g__str_result_tl + \clist_gset:No \g__str_result_tl \g__str_result_tl \tl_gset:Nx \g__str_result_tl { \exp_args:No \clist_map_function:nN diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-string.def b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-string.def index b2c8c75fbd0..34fc37267e9 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-string.def +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-esc-string.def @@ -20,10 +20,9 @@ %% %% File: l3str-convert.dtx Copyright (C) 2013-2017 The LaTeX3 Project \group_begin: - \char_set_lccode:nn {`\*} {`\\} \char_set_catcode_other:N \^^J \char_set_catcode_other:N \^^M - \tex_lowercase:D + \cs_set_protected:Npn \__str_tmp:w #1 { \cs_new_protected:Npn \__str_convert_unescape_string: { @@ -40,15 +39,17 @@ \tl_gset:Nx \g__str_result_tl { \exp_after:wN \__str_unescape_string_loop:wNNN - \g__str_result_tl * ?? { ? \__prg_break: } + \g__str_result_tl #1 ?? { ? \__prg_break: } \__prg_break_point: } \__str_if_flag_error:nnx { str_byte } { non-byte } { string } \__str_if_flag_error:nnx { str_error } { unescape-string } { } \group_end: } - \cs_new:Npn \__str_unescape_string_loop:wNNN #1 *#2#3#4 } + \exp_args:No \__str_tmp:w { \c_backslash_str } + \exp_last_unbraced:NNNNo + \cs_new:Npn \__str_unescape_string_loop:wNNN #1 \c_backslash_str #2#3#4 { \__str_filter_bytes:n {#1} \use_none:n #4 diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty index aa80b2781e1..8b645158d2a 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty @@ -18,11 +18,10 @@ %% This file is part of the "l3experimental bundle" (The Work in LPPL) %% and all files in that bundle must be distributed together. %% -%% File: l3str-format.dtx Copyright (C) 2012-2013,2015-2017 The LaTeX3 Project +%% File: l3str-format.dtx Copyright (C) 2012-2017 The LaTeX3 Project \RequirePackage{expl3} -\ProvidesExplPackage{l3str-format}{2017/11/14}{} +\ProvidesExplPackage{l3str-format}{2017/12/05}{} {L3 Experimental string formatting} -\RequirePackage{l3str} \cs_generate_variant:Nn \use:nn { nf } \cs_generate_variant:Nn \use:nnn { fnf } \cs_generate_variant:Nn \tl_to_str:n { f } @@ -374,7 +373,6 @@ \__str_format_put:fw { \use_i:nnnn #4 . } \use_none:n \s__stop } - } \cs_new:Npn \__str_format_fp_f:wn \s__fp \__fp_chk:w #1#2#3 ; #4 { \int_case:nnF {#1} |