From 70f7efc1e0d5452cb21eb12ad1207da4267d6b73 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 28 Mar 2009 00:39:28 +0000 Subject: xiftehn update (27mar09) git-svn-id: svn://tug.org/texlive/trunk@12546 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xifthen/README | 5 ++++ Master/texmf-dist/doc/latex/xifthen/xifthen.pdf | Bin 509483 -> 516449 bytes Master/texmf-dist/doc/latex/xifthen/xifthen.tex | 9 +++++-- Master/texmf-dist/tex/latex/xifthen/xifthen.sty | 30 ++++++++++++++++++++---- 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/Master/texmf-dist/doc/latex/xifthen/README b/Master/texmf-dist/doc/latex/xifthen/README index f65b578bf24..6414475f51a 100644 --- a/Master/texmf-dist/doc/latex/xifthen/README +++ b/Master/texmf-dist/doc/latex/xifthen/README @@ -7,9 +7,14 @@ package requires the e-TEX features. What's new +v.1. - \cnttest and \dimtest now accept <= and >= comparisons. - I renames \terminateswith in \endswith. +v1.2 + +- Corrected a bug with \newtest + This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. diff --git a/Master/texmf-dist/doc/latex/xifthen/xifthen.pdf b/Master/texmf-dist/doc/latex/xifthen/xifthen.pdf index 0c6f238745c..40792c980bb 100644 Binary files a/Master/texmf-dist/doc/latex/xifthen/xifthen.pdf and b/Master/texmf-dist/doc/latex/xifthen/xifthen.pdf differ diff --git a/Master/texmf-dist/doc/latex/xifthen/xifthen.tex b/Master/texmf-dist/doc/latex/xifthen/xifthen.tex index 0dda3e6eab4..3778ef1af14 100644 --- a/Master/texmf-dist/doc/latex/xifthen/xifthen.tex +++ b/Master/texmf-dist/doc/latex/xifthen/xifthen.tex @@ -81,9 +81,14 @@ \section{What's new} \begin{itemize} -% $Date: 2007-04-21 17:08:15 +0200 (Sat, 21 Apr 2007) $ -\item Now \cmd{cnttest} and \cmd{dimtest} accept \tex{<=} and \tex{>=}. +\item [1.1] Now \cmd{cnttest} and \cmd{dimtest} accept \tex{<=} and \tex{>=}. \item I~renamed \cmd{terminateswith} in \cmd{endswith}. + +\addvspace{\baselineskip} + +\item [1.2] Corrected a~bug related to a~bad interaction between + new~tests and ifthen's replacement macro (credits go to MPG \& + P.~Albar\`ede). \end{itemize} \section{\pack{ifthen}'s interface} diff --git a/Master/texmf-dist/tex/latex/xifthen/xifthen.sty b/Master/texmf-dist/tex/latex/xifthen/xifthen.sty index ba973cd60ab..9a456251790 100644 --- a/Master/texmf-dist/tex/latex/xifthen/xifthen.sty +++ b/Master/texmf-dist/tex/latex/xifthen/xifthen.sty @@ -1,7 +1,5 @@ -% $Date: 2007-04-21 17:11:50 +0200 (Sat, 21 Apr 2007) $ -% $Revision: 28 $ -\def \filedate {2007/04/21}% -\def \fileversion {v1.1}% +\def \filedate {2009/03/23}% +\def \fileversion {v1.2}% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{xifthen}% [\filedate \space \fileversion \space Extended ifthen features] @@ -11,6 +9,30 @@ \RequirePackage{ifthen} \RequirePackage{ifmtarg} +% First of all, \TE@repl (ifthen) needs to be patched. (v1.2) +% (viz. \newtest{\superlogique}[1]{\(\NOT#1\AND\boolean{true}\)}) +% Pointed out by MPG and Pierre Albar\`ede [19 Mar 2009] + +\def \TE@repl #1#2{% + \long \def \@tempc ##1#1##2{% + \def \@tempb{\@tempc}% + \begingroup % Thanks MPG + \toks@ {##2}% + \edef \@tempa {\the \toks@} + \expandafter \endgroup + \ifx \@tempa \@tempb + \toks@ \expandafter {\the \toks@ ##1}% + \expandafter \@gobble + \else + \toks@ \expandafter {\the \toks@ ##1#2}% + \expandafter \@tempc + \fi + ##2% + }% + \toks@ \expandafter {\expandafter}% + \expandafter \@tempc \the \toks@ #1\@tempc +} + % \cnttest {} {} {} % \newcommand*{\TE@cnttest}[4]{% -- cgit v1.2.3