diff options
author | Karl Berry <karl@freefriends.org> | 2014-07-20 22:14:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-07-20 22:14:30 +0000 |
commit | 6c2678db440b5260ec13602bde6efebdd00f8549 (patch) | |
tree | ed93fc7244f4e5ef1baf86ccb157597dabf6ac1e /Master/texmf-dist/tex/latex/l3experimental | |
parent | 9790eead4cceaffc951c93887d06de70c02e196a (diff) |
l3
git-svn-id: svn://tug.org/texlive/trunk@34671 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental')
3 files changed, 23 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty index ec8dc8bce52..2fb5cfe9b27 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3regex.dtx Copyright (C) 2011-2013 The LaTeX3 Project +%% File: l3regex.dtx Copyright (C) 2011-2014 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{expl3} -\GetIdInfo$Id: l3regex.dtx 5067 2014-06-06 16:51:35Z bruno $ +\GetIdInfo$Id: l3regex.dtx 5218 2014-07-17 14:23:10Z bruno $ {L3 Experimental regular expressions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -67,6 +67,7 @@ { \__regex_class:NnnnN \c_true_bool { } { 1 } { 0 } \c_true_bool } } \int_new:N \l__regex_balance_int +\tl_new:N \l__regex_cs_name_tl \cs_new_protected:Npn \__regex_break_true:w #1 \__regex_break_point:TF #2 #3 {#2} \cs_new_protected:Npn \__regex_break_point:TF #1 #2 { #2 } @@ -183,16 +184,17 @@ \int_compare:nNnT \l__regex_current_catcode_int = \c_zero { \group_begin: - \__regex_single_match: - \__regex_disable_submatches: - \__regex_build_for_cs:n {#1} - \bool_set_eq:NN \l__regex_saved_success_bool \g__regex_success_bool - \exp_args:Nx \__regex_match:n + \tl_set:Nx \l__regex_cs_name_tl { \exp_after:wN \exp_after:wN \exp_after:wN \cs_to_str:N \tex_the:D \tex_toks:D \l__regex_current_pos_int } + \__regex_single_match: + \__regex_disable_submatches: + \__regex_build_for_cs:n {#1} + \bool_set_eq:NN \l__regex_saved_success_bool \g__regex_success_bool + \exp_args:NV \__regex_match:n \l__regex_cs_name_tl \if_meaning:w \c_true_bool \g__regex_success_bool \group_insert_after:N \__regex_break_true:w \fi: @@ -2138,7 +2140,7 @@ \if_int_compare:w \c_one < 1#1 \exp_stop_f: \__regex_replacement_put_submatch:n {#1} \else: - \__tl_build_one:n #1 + \__tl_build_one:o { \token_to_str:N #1 } \fi: } } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty index 55bd0e1464c..c66adca5c64 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3regex.dtx Copyright (C) 2011-2013 The LaTeX3 Project +%% File: l3regex.dtx Copyright (C) 2011-2014 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{expl3} -\GetIdInfo$Id: l3regex.dtx 5067 2014-06-06 16:51:35Z bruno $ +\GetIdInfo$Id: l3regex.dtx 5218 2014-07-17 14:23:10Z bruno $ {L3 Experimental regular expressions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -67,6 +67,7 @@ { \__regex_class:NnnnN \c_true_bool { } { 1 } { 0 } \c_true_bool } } \int_new:N \l__regex_balance_int +\tl_new:N \l__regex_cs_name_tl \cs_new_protected:Npn \__regex_break_true:w #1 \__regex_break_point:TF #2 #3 {#2} \cs_new_protected:Npn \__regex_break_point:TF #1 #2 { #2 } @@ -183,16 +184,17 @@ \int_compare:nNnT \l__regex_current_catcode_int = \c_zero { \group_begin: - \__regex_single_match: - \__regex_disable_submatches: - \__regex_build_for_cs:n {#1} - \bool_set_eq:NN \l__regex_saved_success_bool \g__regex_success_bool - \exp_args:Nx \__regex_match:n + \tl_set:Nx \l__regex_cs_name_tl { \exp_after:wN \exp_after:wN \exp_after:wN \cs_to_str:N \tex_the:D \tex_toks:D \l__regex_current_pos_int } + \__regex_single_match: + \__regex_disable_submatches: + \__regex_build_for_cs:n {#1} + \bool_set_eq:NN \l__regex_saved_success_bool \g__regex_success_bool + \exp_args:NV \__regex_match:n \l__regex_cs_name_tl \if_meaning:w \c_true_bool \g__regex_success_bool \group_insert_after:N \__regex_break_true:w \fi: @@ -2111,7 +2113,7 @@ \if_int_compare:w \c_one < 1#1 \exp_stop_f: \__regex_replacement_put_submatch:n {#1} \else: - \__tl_build_one:n #1 + \__tl_build_one:o { \token_to_str:N #1 } \fi: } } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty index 05fff62dae9..70ef981eba3 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% l3str.dtx (with options: `package') +%% l3str-expl.dtx (with options: `package') %% %% EXPERIMENTAL CODE %% @@ -46,8 +46,9 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{expl3} -\GetIdInfo$Id: l3str.dtx 4889 2014-05-26 19:59:25Z joseph $ +\GetIdInfo$Id: l3str-expl.dtx 5226 2014-07-18 18:08:01Z joseph $ {L3 Experimental strings} +\def\ExplSyntaxName{l3str} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \cs_new_eq:NN \str_new:N \tl_new:N |