diff options
author | Karl Berry <karl@freefriends.org> | 2009-09-22 23:10:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-09-22 23:10:41 +0000 |
commit | c1792da9fa440897dcd52010203fd995e6c338cd (patch) | |
tree | 4f244ae6e93e5f6adf049963e7ab0352b8f975df /Master/texmf-dist/tex/latex/expl3 | |
parent | 9fcb8f37751f3020ad273b8cfc596e37e99fe91b (diff) |
expl3 1550 (22sep09)
git-svn-id: svn://tug.org/texlive/trunk@15425 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3')
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3prg.sty | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3token.sty | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3prg.sty b/Master/texmf-dist/tex/latex/expl3/l3prg.sty index d81bd2095b1..ef18cc597ef 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3prg.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3prg.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3prg.dtx 1541 2009-09-17 07:31:55Z joseph $ +\GetIdInfo$Id: l3prg.dtx 1545 2009-09-20 06:57:55Z joseph $ {L3 Experimental control structures} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -429,7 +429,7 @@ \cs_set:Npn \prg_quicksort_compare:nnTF {\ERROR} \group_begin: \tex_lccode:D `\& = `\g \tex_relax:D - \tex_catcode:D \& = \c_twelve \tex_relax:D + \tex_catcode:D `\& = \c_twelve \tex_relax:D \tl_to_lowercase:n { \group_end: \cs_new_nopar:Nn \prg_variable_get_scope:N { @@ -442,7 +442,7 @@ } \group_begin: \tex_lccode:D `\& = `\_ \tex_relax:D - \tex_catcode:D \& = \c_twelve \tex_relax:D + \tex_catcode:D `\& = \c_twelve \tex_relax:D \tl_to_lowercase:n { \group_end: \cs_new_nopar:Nn \prg_variable_get_type:N { diff --git a/Master/texmf-dist/tex/latex/expl3/l3token.sty b/Master/texmf-dist/tex/latex/expl3/l3token.sty index 034312a4707..e90b3aa472d 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3token.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3token.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3token.dtx 1365 2009-05-31 17:26:17Z mittelba $ +\GetIdInfo$Id: l3token.dtx 1550 2009-09-22 06:06:25Z joseph $ {L3 Experimental token investigation and manipulation} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -463,6 +463,7 @@ \cs_new_nopar:Npn \peek_execute_branches_charcode: { \bool_if:nTF { \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token || + \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token || \token_if_eq_meaning_p:NN \l_peek_token \c_space_token } { \l_peek_false_tl } |