From dad5d555511f1efe4370058c5c49baa1ab19a5bb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Aug 2011 23:14:54 +0000 Subject: l3packages (11aug11) git-svn-id: svn://tug.org/texlive/trunk@23525 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty | 2 +- Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty | 2 +- .../tex/latex/l3packages/xtemplate/xtemplate.sty | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3packages') diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty index 3a84d0e1d4f..364f473d372 100644 --- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty +++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty @@ -51,7 +51,7 @@ {LaTeX2e option processing using LaTeX3 keys} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} -\@ifpackagelater { l3token } { 2011/07/02 } +\@ifpackagelater { expl3 } { 2011/08/10 } { } { \PackageError { l3keys2e } { Support~package~l3kernel~too~old. } diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index be93d481af1..5aae56e65a0 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -56,7 +56,7 @@ \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \RequirePackage{expl3} -\@ifpackagelater { l3token } { 2011/07/02 } +\@ifpackagelater { expl3 } { 2011/08/10 } { } { \PackageError { xparse } { Support~package~l3kernel~too~old. } diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index 83be1411dad..f6740d5e714 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty @@ -51,11 +51,11 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{expl3} -\GetIdInfo$Id: xtemplate.dtx 2492 2011-07-02 13:40:38Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 2523 2011-08-08 22:11:50Z mittelba $ {L3 Experimental prototype document functions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} -\@ifpackagelater { l3token } { 2011/07/02 } +\@ifpackagelater { expl3 } { 2011/08/10 } { } { \PackageError { xtemplate } { Support~package~l3kernel~too~old. } @@ -145,14 +145,14 @@ } \prg_new_conditional:Npnn \xtemplate_if_key_value:n #1 { T } { - \str_if_eq:noTF { \KeyValue } { \tl_head:w #1 \q_stop } + \str_if_eq:noTF { \KeyValue } { \tl_head:w #1 \q_nil \q_stop } {\prg_return_true: } { \prg_return_false: } } \cs_generate_variant:Nn \xtemplate_if_key_value:nT { o } \prg_new_conditional:Npnn \xtemplate_if_eval_now:n #1 { TF } { - \str_if_eq:noTF { \EvaluateNow } { \tl_head:w #1 \q_stop } + \str_if_eq:noTF { \EvaluateNow } { \tl_head:w #1 \q_nil \q_stop } { \prg_return_true: } { \prg_return_false: } } @@ -165,7 +165,7 @@ } \prg_new_conditional:Npnn \xtemplate_if_use_template:n #1 { TF } { - \str_if_eq:noTF { \UseTemplate } { \tl_head:w #1 \q_stop } + \str_if_eq:noTF { \UseTemplate } { \tl_head:w #1 \q_nil \q_stop } { \prg_return_true: } { \prg_return_false: } } @@ -523,7 +523,7 @@ \l_xtemplate_key_name_tl {#1} } { - \str_if_eq:noTF {#1} { \tl_head:w #1 \q_stop } + \str_if_eq:noTF {#1} { \tl_head:w #1 \q_nil \q_stop } { \cs_if_exist:NTF #1 { @@ -551,7 +551,7 @@ { \tl_if_empty:nTF {#1} { - \str_if_eq:noTF {#2} { \tl_head:w #2 \q_stop } + \str_if_eq:noTF {#2} { \tl_head:w #2 \q_nil \q_stop } { \cs_if_exist:NTF #2 { -- cgit v1.2.3