diff options
16 files changed, 49 insertions, 29 deletions
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3dt/l3dt.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3dt/l3dt.pdf Binary files differindex b0f1e85648d..2628a77a1c6 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3dt/l3dt.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3dt/l3dt.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf Binary files differindex d4044fc0472..d363a7763b8 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf Binary files differindex 17efa980005..8f218b2b525 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf Binary files differindex f09fb1a01f0..958317e7c24 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf Binary files differindex 9c3c9998874..eff84967417 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str.pdf Binary files differindex fcb4377c251..2819b3abbea 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf Binary files differindex f4ee54d310d..a0e7eac5948 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf Binary files differindex 0dd9dece003..98aacf266bf 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf b/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf Binary files differindex bc5fc5f54d1..725966d3f30 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf b/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf Binary files differindex 6459492122d..fe76bc3ab11 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf diff --git a/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf b/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf Binary files differindex 27d8cb3baf7..ccbb6d5aca7 100644 --- a/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf +++ b/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx index 498036bdaa7..ce26a6098ba 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{expl3} -\GetIdInfo$Id: l3regex.dtx 3940 2012-07-09 00:41:44Z bruno $ +\GetIdInfo$Id: l3regex.dtx 4219 2012-09-09 13:28:51Z bruno $ {L3 Experimental regular expressions} %</driver|package> %<*driver> @@ -3085,7 +3085,7 @@ \@@_show_push:n { ~ } #1 \__tl_build_end: - \__msg_show_variable:x { > Compiled~regex~#2: \l_@@_internal_a_tl } + \__msg_show_variable:n { >~Compiled~regex~#2: \l_@@_internal_a_tl } } % \end{macrocode} % \end{macro} @@ -3099,7 +3099,7 @@ \int_incr:N \l_@@_show_lines_int \__tl_build_one:x { - \iow_newline: + \exp_not:N \\ \seq_map_function:NN \l_@@_show_prefix_seq \use:n #1 } diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx index 6cc38e6afd9..b6d28da057f 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx @@ -948,25 +948,35 @@ % % \subsection{Showing the results} % -% \begin{macro}{\tl_show_analysis:N} -% \begin{macro}{\tl_show_analysis:n} +% \begin{macro}{\tl_show_analysis:N, \tl_show_analysis:n} +% \begin{macro}[int]{\@@_show:N} % Add to \cs{@@:n} a third pass to display tokens to the terminal. % \begin{macrocode} \cs_new_protected:Npn \tl_show_analysis:N #1 { \exp_args:No \@@:n {#1} - \__msg_show_variable:Nnx #1 - { tl-analysis } - { - \exp_after:wN \@@_show_loop:wNw \g_@@_result_tl - \s__tl { ? \__prg_break: } \s__tl - \__prg_break_point: - } + \@@_show:N #1 } \cs_new_protected:Npn \tl_show_analysis:n #1 { + \@@:n {#1} \tl_set:Nn \l_@@_internal_tl {#1} - \tl_show_analysis:N \l_@@_internal_tl + \@@_show:N \l_@@_internal_tl + } +\cs_new_protected:Npn \@@_show:N #1 + { + \group_begin: + \use:x + { + \group_end: + \exp_not:n { \__msg_show_variable:Nnn #1 } + { tl-analysis } + { + \exp_after:wN \@@_show_loop:wNw \g_@@_result_tl + \s__tl { ? \__prg_break: } \s__tl + \__prg_break_point: + } + } } % \end{macrocode} % \end{macro} @@ -984,7 +994,7 @@ \cs_new:Npn \@@_show_loop:wNw #1 \s__tl #2 #3 \s__tl { \use_none:n #2 - \iow_newline: > \c_space_tl \c_space_tl + \exp_not:n { \\ > \ \ } \if_int_compare:w "#2 = \c_zero \exp_after:wN \@@_show_cs:n \else: 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 7b31ebc4613..156d2c1393f 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{expl3} -\GetIdInfo$Id: l3regex.dtx 3940 2012-07-09 00:41:44Z bruno $ +\GetIdInfo$Id: l3regex.dtx 4219 2012-09-09 13:28:51Z bruno $ {L3 Experimental regular expressions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -1349,14 +1349,14 @@ \__regex_show_push:n { ~ } #1 \__tl_build_end: - \__msg_show_variable:x { > Compiled~regex~#2: \l__regex_internal_a_tl } + \__msg_show_variable:n { >~Compiled~regex~#2: \l__regex_internal_a_tl } } \cs_new_protected:Npn \__regex_show_one:n #1 { \int_incr:N \l__regex_show_lines_int \__tl_build_one:x { - \iow_newline: + \exp_not:N \\ \seq_map_function:NN \l__regex_show_prefix_seq \use:n #1 } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty index 2ba86a82c86..eba57ade74e 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{expl3} -\GetIdInfo$Id: l3regex.dtx 3940 2012-07-09 00:41:44Z bruno $ +\GetIdInfo$Id: l3regex.dtx 4219 2012-09-09 13:28:51Z bruno $ {L3 Experimental regular expressions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -1347,14 +1347,14 @@ \__regex_show_push:n { ~ } #1 \__tl_build_end: - \__msg_show_variable:x { > Compiled~regex~#2: \l__regex_internal_a_tl } + \__msg_show_variable:n { >~Compiled~regex~#2: \l__regex_internal_a_tl } } \cs_new_protected:Npn \__regex_show_one:n #1 { \int_incr:N \l__regex_show_lines_int \__tl_build_one:x { - \iow_newline: + \exp_not:N \\ \seq_map_function:NN \l__regex_show_prefix_seq \use:n #1 } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty index 0dfd6401fae..eb4a612e028 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty @@ -361,23 +361,33 @@ \cs_new_protected:Npn \tl_show_analysis:N #1 { \exp_args:No \__tl_analysis:n {#1} - \__msg_show_variable:Nnx #1 - { tl-analysis } - { - \exp_after:wN \__tl_analysis_show_loop:wNw \g__tl_analysis_result_tl - \s__tl { ? \__prg_break: } \s__tl - \__prg_break_point: - } + \__tl_analysis_show:N #1 } \cs_new_protected:Npn \tl_show_analysis:n #1 { + \__tl_analysis:n {#1} \tl_set:Nn \l__tl_analysis_internal_tl {#1} - \tl_show_analysis:N \l__tl_analysis_internal_tl + \__tl_analysis_show:N \l__tl_analysis_internal_tl + } +\cs_new_protected:Npn \__tl_analysis_show:N #1 + { + \group_begin: + \use:x + { + \group_end: + \exp_not:n { \__msg_show_variable:Nnn #1 } + { tl-analysis } + { + \exp_after:wN \__tl_analysis_show_loop:wNw \g__tl_analysis_result_tl + \s__tl { ? \__prg_break: } \s__tl + \__prg_break_point: + } + } } \cs_new:Npn \__tl_analysis_show_loop:wNw #1 \s__tl #2 #3 \s__tl { \use_none:n #2 - \iow_newline: > \c_space_tl \c_space_tl + \exp_not:n { \\ > \ \ } \if_int_compare:w "#2 = \c_zero \exp_after:wN \__tl_analysis_show_cs:n \else: |