From 72dbd4d80e11169509a086e144cc416f4df8f1a4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Apr 2012 23:34:39 +0000 Subject: l3experimental 3570 (23apr12) git-svn-id: svn://tug.org/texlive/trunk@26109 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/l3experimental/l3str/l3regex-trace.sty | 6 +++--- .../texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty | 6 +++--- .../tex/latex/l3experimental/xcoffins/xcoffins.sty | 15 +++------------ 3 files changed, 9 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3experimental') 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 60abf42cd5d..0208088744a 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 3463 2012-02-26 15:05:14Z bruno $ +\GetIdInfo$Id: l3regex.dtx 3488 2012-03-03 19:49:03Z bruno $ {L3 Experimental Regular Expressions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -1133,7 +1133,7 @@ { \token_if_eq_meaning:NNTF #1 \regex_compile_raw:N { - \cs_if_exist:cTF { c_regex_catcode_#2_int } + \int_if_exist:cTF { c_regex_catcode_#2_int } { \int_set_eq:Nc \l_regex_catcodes_int { c_regex_catcode_#2_int } \l_regex_mode_int @@ -1166,7 +1166,7 @@ { \token_if_eq_meaning:NNTF #1 \regex_compile_raw:N { - \cs_if_exist:cTF { c_regex_catcode_#2_int } + \int_if_exist:cTF { c_regex_catcode_#2_int } { \exp_args:Nc \regex_compile_c_lbrack_add:N { c_regex_catcode_#2_int } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty index 17480334049..d6babc2b1b7 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 3463 2012-02-26 15:05:14Z bruno $ +\GetIdInfo$Id: l3regex.dtx 3488 2012-03-03 19:49:03Z bruno $ {L3 Experimental Regular Expressions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -1131,7 +1131,7 @@ { \token_if_eq_meaning:NNTF #1 \regex_compile_raw:N { - \cs_if_exist:cTF { c_regex_catcode_#2_int } + \int_if_exist:cTF { c_regex_catcode_#2_int } { \int_set_eq:Nc \l_regex_catcodes_int { c_regex_catcode_#2_int } \l_regex_mode_int @@ -1164,7 +1164,7 @@ { \token_if_eq_meaning:NNTF #1 \regex_compile_raw:N { - \cs_if_exist:cTF { c_regex_catcode_#2_int } + \int_if_exist:cTF { c_regex_catcode_#2_int } { \exp_args:Nc \regex_compile_c_lbrack_add:N { c_regex_catcode_#2_int } diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty index ab210356d5c..0c88f04de5e 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty @@ -47,7 +47,7 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{xparse} -\GetIdInfo$Id: xcoffins.dtx 3385 2012-02-12 20:37:09Z bruno $ +\GetIdInfo$Id: xcoffins.dtx 3483 2012-03-03 18:56:29Z bruno $ {L3 Experimental design-level coffins} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -155,19 +155,10 @@ \NewDocumentCommand \CoffinWidth { m } { \coffin_wd:N #1 } \NewDocumentCommand \DisplayCoffinHandles { m m } - { - \cs_if_exist:cTF { l_coffin_poles_ \int_value:w #1 _prop } - { \coffin_display_handles:Nn #1 {#2} } - { \msg_kernel_error:nx { unknown-coffin } { \token_to_str:N #1 } } - } + { \coffin_if_exist:NT #1 { \coffin_display_handles:Nn #1 {#2} } } \NewDocumentCommand \MarkCoffinHandle { m > { \SplitArgument { 1 } { , } } O { H , l } m } - { - \cs_if_exist:cTF { l_coffin_poles_ \int_value:w #1 _prop } - { \coffin_mark_handle:Nnnn #1 #2 {#3} } - { \msg_kernel_error:nx { unknown-coffin } { \token_to_str:N #1 } - } -} + { \coffin_if_exist:NT #1 { \coffin_mark_handle:Nnnn #1 #2 {#3} } } \NewDocumentCommand \ShowCoffinStructure { m } { \coffin_show_structure:N #1 } %% -- cgit v1.2.3