From 26a0070af35fa5652128c74fa1f126ec51def209 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 10 Oct 2011 21:52:54 +0000
Subject: l3kernel 2900 (10oct11)

git-svn-id: svn://tug.org/texlive/trunk@24256 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/l3kernel/l3prg.sty | 29 +++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/l3kernel/l3prg.sty')

diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
index 250d46a77af..9fdb0cb4006 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3prg.dtx 2827 2011-09-15 19:37:32Z joseph $
+\GetIdInfo$Id: l3prg.dtx 2896 2011-10-09 20:36:50Z joseph $
   {L3 Experimental control structures}
 %%
 \ProvidesExplPackage
@@ -271,9 +271,12 @@
     #2
     \bool_if:nF {#1} { \bool_do_until:nn {#1} {#2}  }
   }
-\cs_new_eq:NN \prg_case_end:nw \use_i_delimit_by_q_recursion_stop:nw
+\cs_new:Npn \prg_case_end:nw #1 #2 \q_recursion_stop { \c_zero #1 }
 \cs_new:Npn \prg_case_int:nnn #1
-  { \exp_args:Nf \prg_case_int_aux:nnn { \int_eval:n {#1} } }
+  {
+    \tex_romannumeral:D
+    \exp_args:Nf \prg_case_int_aux:nnn { \int_eval:n {#1} }
+  }
 \cs_new:Npn \prg_case_int_aux:nnn #1 #2 #3
   { \prg_case_int_aux:nw {#1} #2 {#1} {#3} \q_recursion_stop }
 \cs_new:Npn \prg_case_int_aux:nw #1#2#3
@@ -283,7 +286,10 @@
       { \prg_case_int_aux:nw {#1} }
   }
 \cs_new:Npn \prg_case_dim:nnn #1
-  { \exp_args:Nf \prg_case_dim_aux:nnn { \dim_eval:n {#1} } }
+  {
+    \tex_romannumeral:D
+    \exp_args:Nf \prg_case_dim_aux:nnn { \dim_eval:n {#1} }
+  }
 \cs_new:Npn \prg_case_dim_aux:nnn #1 #2 #3
   { \prg_case_dim_aux:nw {#1} #2 {#1} {#3} \q_recursion_stop }
 \cs_new:Npn \prg_case_dim_aux:nw #1#2#3
@@ -293,7 +299,10 @@
       { \prg_case_dim_aux:nw {#1} }
   }
 \cs_new:Npn \prg_case_str:nnn #1#2#3
-  { \prg_case_str_aux:nw {#1} #2 {#1} {#3} \q_recursion_stop }
+  {
+    \tex_romannumeral:D
+    \prg_case_str_aux:nw {#1} #2 {#1} {#3} \q_recursion_stop
+  }
 \cs_new:Npn \prg_case_str_aux:nw #1#2#3
   {
     \str_if_eq:nnTF {#1} {#2}
@@ -302,7 +311,10 @@
   }
 \cs_generate_variant:Nn \prg_case_str:nnn { o }
 \cs_new:Npn \prg_case_str:xxn #1#2#3
-  { \prg_case_str_x_aux:nw {#1} #2 {#1} {#3} \q_recursion_stop }
+  {
+    \tex_romannumeral:D
+    \prg_case_str_x_aux:nw {#1} #2 {#1} {#3} \q_recursion_stop
+  }
 \cs_new:Npn \prg_case_str_x_aux:nw #1#2#3
   {
     \str_if_eq:xxTF {#1} {#2}
@@ -310,7 +322,10 @@
       { \prg_case_str_x_aux:nw {#1} }
   }
 \cs_new:Npn \prg_case_tl:Nnn #1#2#3
-  { \prg_case_tl_aux:Nw #1 #2 #1 {#3} \q_recursion_stop }
+  {
+    \tex_romannumeral:D
+    \prg_case_tl_aux:Nw #1 #2 #1 {#3} \q_recursion_stop
+  }
 \cs_new:Npn \prg_case_tl_aux:Nw #1#2#3
   {
     \tl_if_eq:NNTF #1 #2
-- 
cgit v1.2.3

