diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3quark.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3quark.sty | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty index e22e215617a..deaf7d4699d 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty @@ -46,11 +46,11 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3quark.dtx 3384 2012-02-12 13:13:11Z will $ - {L3 Experimental quarks} +\GetIdInfo$Id: l3quark.dtx 3986 2012-07-15 19:23:51Z joseph $ + {L3 Quarks} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} -\package_check_loaded_expl: +\__expl_package_check: \cs_new_protected:Npn \quark_new:N #1 { \tl_const:Nn #1 {#1} } \quark_new:N \q_nil \quark_new:N \q_mark @@ -90,17 +90,17 @@ } \cs_generate_variant:Nn \quark_if_recursion_tail_stop:n { o } \cs_generate_variant:Nn \quark_if_recursion_tail_stop_do:nn { o } -\cs_new:Npn \quark_if_recursion_tail_break:N #1 +\cs_new:Npn \__quark_if_recursion_tail_break:NN #1#2 { \if_meaning:w \q_recursion_tail #1 - \exp_after:wN \prg_map_break: + \exp_after:wN #2 \fi: } -\cs_new:Npn \quark_if_recursion_tail_break:n #1 +\cs_new:Npn \__quark_if_recursion_tail_break:nN #1#2 { \if_int_compare:w \pdftex_strcmp:D { \exp_not:N \q_recursion_tail } { \exp_not:n {#1} } = \c_zero - \exp_after:wN \prg_map_break: + \exp_after:wN #2 \fi: } \prg_new_conditional:Nnn \quark_if_nil:N { p, T , F , TF } @@ -145,23 +145,27 @@ \cs_generate_variant:Nn \quark_if_nil:nTF { V , o } \cs_generate_variant:Nn \quark_if_nil:nT { V , o } \cs_generate_variant:Nn \quark_if_nil:nF { V , o } -\quark_new:N \q_tl_act_mark -\quark_new:N \q_tl_act_stop -\tl_new:N \g_scan_marks_tl -\cs_new_protected:Npn \scan_new:N #1 +\quark_new:N \q__tl_act_mark +\quark_new:N \q__tl_act_stop +\tl_new:N \g__scan_marks_tl +\cs_new_protected:Npn \__scan_new:N #1 { - \tl_if_in:NnTF \g_scan_marks_tl { #1 } + \tl_if_in:NnTF \g__scan_marks_tl { #1 } { - \msg_kernel_error:nnx { scan } { already-defined } + \__msg_kernel_error:nnx { kernel } { scanmark-already-defined } { \token_to_str:N #1 } } { - \tl_gput_right:Nn \g_scan_marks_tl {#1} + \tl_gput_right:Nn \g__scan_marks_tl {#1} \cs_new_eq:NN #1 \scan_stop: } } -\scan_new:N \s_stop -\cs_new:Npn \use_none_delimit_by_s_stop:w #1 \s_stop { } +\__scan_new:N \s__stop +\cs_new:Npn \__use_none_delimit_by_s__stop:w #1 \s__stop { } +\cs_new:Npn \quark_if_recursion_tail_break:N #1 + { \__quark_if_recursion_tail_break:NN #1 \prg_break: } +\cs_new:Npn \quark_if_recursion_tail_break:n #1 + { \__quark_if_recursion_tail_break:nN {#1} \prg_break: } %% %% %% End of file `l3quark.sty'. |