summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-22 23:10:41 +0000
committerKarl Berry <karl@freefriends.org>2009-09-22 23:10:41 +0000
commitc1792da9fa440897dcd52010203fd995e6c338cd (patch)
tree4f244ae6e93e5f6adf049963e7ab0352b8f975df /Master/texmf-dist/source
parent9fcb8f37751f3020ad273b8cfc596e37e99fe91b (diff)
expl3 1550 (22sep09)
git-svn-id: svn://tug.org/texlive/trunk@15425 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/expl3/l3prg.dtx6
-rw-r--r--Master/texmf-dist/source/latex/expl3/l3token.dtx6
2 files changed, 7 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/latex/expl3/l3prg.dtx b/Master/texmf-dist/source/latex/expl3/l3prg.dtx
index d2b34c96024..7e6f3f72e42 100644
--- a/Master/texmf-dist/source/latex/expl3/l3prg.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3prg.dtx
@@ -36,7 +36,7 @@
\RequirePackage{l3names}
%</driver|package>
%\fi
-\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}
%\iffalse
%<*driver>
@@ -1714,7 +1714,7 @@
% \begin{macrocode}
\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 {
@@ -1727,7 +1727,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/source/latex/expl3/l3token.dtx b/Master/texmf-dist/source/latex/expl3/l3token.dtx
index 7d0e3110d60..3c283052e6f 100644
--- a/Master/texmf-dist/source/latex/expl3/l3token.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3token.dtx
@@ -35,7 +35,7 @@
\RequirePackage{l3names}
%</driver|package>
%\fi
-\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}
%\iffalse
%<*driver>
@@ -1666,11 +1666,13 @@
% test for both of these and if one of them is found we just execute
% the false result directly since no one should ever try to use the
% |charcode| function for searching for |\c_group_begin_token| or
-% |\c_space_token|.
+% |\c_space_token|. The same is true for |\c_group_end_token|, as this
+% can only occur if the function is at the end of a group.
% \begin{macrocode}
\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 }