diff options
author | Karl Berry <karl@freefriends.org> | 2008-03-24 23:37:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-03-24 23:37:37 +0000 |
commit | e996780144392d1f7a4f820e9ba64b75f50bf30c (patch) | |
tree | 1a6e87f8ff69e65aa170e8a64d2625fd96c8196b /Master/texmf-dist/tex/latex/xargs | |
parent | 7bdb10a58dfbc89f6d492904dbb9b346215191f4 (diff) |
xargs update (24mar08)
git-svn-id: svn://tug.org/texlive/trunk@7129 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/xargs')
-rw-r--r-- | Master/texmf-dist/tex/latex/xargs/xargs.sty | 77 |
1 files changed, 38 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/xargs/xargs.sty b/Master/texmf-dist/tex/latex/xargs/xargs.sty index c278511889c..a523e8abc62 100644 --- a/Master/texmf-dist/tex/latex/xargs/xargs.sty +++ b/Master/texmf-dist/tex/latex/xargs/xargs.sty @@ -11,7 +11,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{xargs} - [2008/03/08 1.09 \space extended macro definitions \space (mpg)] + [2008/03/22 v1.1 \space extended macro definitions \space (mpg)] \RequirePackage{xkeyval} \@ifdefinable\xargs@max{\newcount\xargs@max} \@ifdefinable\xargs@temp\relax @@ -82,7 +82,7 @@ \@ifdefinable\xargs@xifnch{% \expandafter\def\expandafter\xargs@xifnch\space{% \futurelet\@let@token\xargs@ifnch}} -\@ifdefinable\xargs@key@prefix{% +\@ifdefinable\xargs@key@addprefix{% \define@key[xargs]{key}{addprefix}[]{% \global\expandafter\def\expandafter\xargs@prefix\expandafter{% \xargs@prefix#1}% @@ -146,10 +146,11 @@ \ifx\XKV@rm\empty \else \xargs@toksa\expandafter{\XKV@rm}% \PackageError{xargs}{% - Illegal argument label in\MessageBreak + Illegal key or argument label in\MessageBreak optional arguments description% }{% You can only use non-zero digits as argument labels.\MessageBreak + Other allowed keys are usedefault and addprefix.\MessageBreak You wrote: "\the\xargs@toksa".\MessageBreak I can't understand this and I'm going to ignore it.}% \fi} @@ -171,7 +172,8 @@ \xargs@toksa{}\xargs@toksb{}% \@ifundefined{xargs@default@flag}{}{% \xargs@toksa\expandafter{% - \expandafter\xargs@set@defflag\expandafter{\xargs@default@flag}}} + \expandafter\xargs@set@defflag\expandafter{% + \xargs@default@flag}}} \count@\z@ \@whilenum\xargs@max>\count@ \do{% \advance\count@\@ne @@ -186,7 +188,6 @@ \csname xargs@action@1\endcsname}% \fi \fi - \xargs@drc@hook \edef\xargs@temp{% \ifxargs@otheropt@ \noexpand\xargs@xargsdef \else \ifxargs@firstopt@ \noexpand\xargs@xargdef \else @@ -196,6 +197,7 @@ \expandafter\noexpand\csname\string#1\endcsname {\the\xargs@toksa}{\the\xargs@toksb}}% \expandafter\endgroup + \expandafter\xargs@drc@hook \xargs@temp}} \newcommand\xargs@argdef[5]{% \@ifdefinable#1{% @@ -225,13 +227,11 @@ \xargs@max0 \fi \xargs@process@keys} -\@ifdefinable\CheckCommandx{% - \def\CheckCommandx{% - \xargs@star@or@long\xargs@CheckC}} +\newcommand\CheckCommandx{% + \xargs@star@or@long\xargs@CheckC} \@onlypreamble\CheckCommandx -\@ifdefinable\xargs@CheckC{% - \def\xargs@CheckC#1{% - \@testopt{\xargs@check@a#1}0}} +\newcommand\xargs@CheckC[1]{% + \@testopt{\xargs@check@a#1}0} \@onlypreamble\xargs@CheckC \@ifdefinable\xargs@check@a{% \def\xargs@check@a#1[#2]{% @@ -239,7 +239,7 @@ {\xargs@check@b#1[#2]}% {\xargs@check@c#1{[#2]}}}} \@onlypreamble\xargs@check@a -\@ifdefinable\xargs@chech@b{% +\@ifdefinable\xargs@check@b{% \def\xargs@check@b#1[#2][#3]{% \xargs@check@c{#1}{[#2][{#3}]}}} \@onlypreamble\xargs@check@b @@ -264,10 +264,9 @@ \expandafter\xargs@toksa\expandafter{\meaning\xargs@temp} \def\xargs@temp#1 {\def\xargs@temp{#1}} \expandafter\xargs@temp\the\xargs@toksa -\@ifdefinable\xargs@check@d{% - \expandafter\newcommand\expandafter\xargs@check@d\expandafter{% - \expandafter\expandafter\expandafter\xargs@check@e - \expandafter\meaning\expandafter\reserved@a\xargs@temp\@nil}} +\expandafter\newcommand\expandafter\xargs@check@d\expandafter{% + \expandafter\expandafter\expandafter\xargs@check@e + \expandafter\meaning\expandafter\reserved@a\xargs@temp\@nil} \@onlypreamble\xargs@check@d \@ifdefinable\xargs@check@e{% \expandafter\def\expandafter\xargs@check@e @@ -280,29 +279,6 @@ \PackageWarningNoLine{xargs}{Command \the\xargs@toksa has changed. \MessageBreak Check if current package is valid}} \@onlypreamble\xargs@check@complain -\newcommand\renewcommandx{% - \xargs@star@or@long\xargs@renewc} -\newcommand*\xargs@renewc[1]{% - \begingroup\escapechar\m@ne - \xdef\@gtempa{{\string#1}}% - \endgroup - \expandafter\@ifundefined\@gtempa{% - \PackageError{xargs}{\noexpand#1undefined}{% - Try typing \space <return> \space to proceed.\MessageBreak - If that doesn't work, type \space X <return> \space to quit.}}% - \relax - \let\@ifdefinable\@rc@ifdefinable - \xargs@newc#1} -\newcommand\providecommandx{% - \xargs@star@or@long\xargs@providec} -\newcommand*\xargs@providec[1]{% - \begingroup\escapechar\m@ne - \xdef\@gtempa{{\string#1}}% - \endgroup - \expandafter\@ifundefined\@gtempa - {\def\reserved@a{\xargs@newc#1}}% - {\def\reserved@a{\renew@command\reserved@a}}% - \reserved@a} \newcommand\DeclareRobustCommandx{% \xargs@star@or@long\xargs@DRC} \newcommand*\xargs@DRC[1]{% @@ -326,6 +302,29 @@ \expandafter\xargs@newc\csname \expandafter\@gobble\string#1 \endcsname} \let\xargs@drc@hook\relax +\newcommand\renewcommandx{% + \xargs@star@or@long\xargs@renewc} +\newcommand*\xargs@renewc[1]{% + \begingroup\escapechar\m@ne + \xdef\@gtempa{{\string#1}}% + \endgroup + \expandafter\@ifundefined\@gtempa{% + \PackageError{xargs}{\noexpand#1undefined}{% + Try typing \space <return> \space to proceed.\MessageBreak + If that doesn't work, type \space X <return> \space to quit.}}% + \relax + \let\@ifdefinable\@rc@ifdefinable + \xargs@newc#1} +\newcommand\providecommandx{% + \xargs@star@or@long\xargs@providec} +\newcommand*\xargs@providec[1]{% + \begingroup\escapechar\m@ne + \xdef\@gtempa{{\string#1}}% + \endgroup + \expandafter\@ifundefined\@gtempa + {\def\reserved@a{\xargs@newc#1}}% + {\def\reserved@a{\renew@command\reserved@a}}% + \reserved@a} \newcommand\newenvironmentx{% \xargs@star@or@long\xargs@newenv} \newcommand*\xargs@newenv[1]{% |