diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/xifthen/README | 9 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xifthen/xifthen.pdf | bin | 313393 -> 509483 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/xifthen/xifthen.tex | 509 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/xifthen/xifthen.sty | 104 | ||||
| -rw-r--r-- | Master/texmf-dist/tpm/xifthen.tpm | 6 |
5 files changed, 512 insertions, 116 deletions
diff --git a/Master/texmf-dist/doc/latex/xifthen/README b/Master/texmf-dist/doc/latex/xifthen/README index 56478335291..f65b578bf24 100644 --- a/Master/texmf-dist/doc/latex/xifthen/README +++ b/Master/texmf-dist/doc/latex/xifthen/README @@ -4,3 +4,12 @@ defined or equivalent to another. It includes also the possibility to make use of the complex expressions introduced by the package calc, together with the ability of defining new commands to handle complex tests. This package requires the e-TEX features. + +What's new + +- \cnttest and \dimtest now accept <= and >= comparisons. +- I renames \terminateswith in \endswith. + +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 Binary files differindex 4ba6100024b..0c6f238745c 100644 --- a/Master/texmf-dist/doc/latex/xifthen/xifthen.pdf +++ b/Master/texmf-dist/doc/latex/xifthen/xifthen.pdf diff --git a/Master/texmf-dist/doc/latex/xifthen/xifthen.tex b/Master/texmf-dist/doc/latex/xifthen/xifthen.tex index ee6549dff24..0dda3e6eab4 100644 --- a/Master/texmf-dist/doc/latex/xifthen/xifthen.tex +++ b/Master/texmf-dist/doc/latex/xifthen/xifthen.tex @@ -1,4 +1,3 @@ -% $Id: xifthen.tex,v 1.1.1.1 2006/03/25 01:24:34 noirel Exp $ \documentclass{article} \usepackage{etex} @@ -6,174 +5,480 @@ \usepackage[ascii]{inputenc} \usepackage[T1]{fontenc} \usepackage[warn]{textcomp} -\usepackage{fourier} - \renewcommand*{\sfdefault}{lmss} - \renewcommand*{\ttdefault}{lmtt} - \renewcommand*{\textcompsubstdefault}{lmr} -\usepackage{microtype} +\usepackage[a4paper, pdftex, margin=1.5in]{geometry} +\usepackage{lmodern} \usepackage{typetex} +\usepackage{microtype} +\usepackage{xcolor} +\usepackage{url} +\usepackage[bottom,hang]{footmisc} \usepackage[babel]{csquotes} \usepackage[british]{babel} +\usepackage{hyperref} + +\setcounter{secnumdepth}{-\maxdimen} \makeatletter +\newcommand*{\1}{$_1\m@th$} +\newcommand*{\2}{$_2\m@th$} + +% Borrowed from doc.sty +\newcommand*{\getfileinfo}[1]{% + \def \filename {#1}% + \def \@tempb ##1 ##2 ##3\relax ##4\relax {% + \def \filedate {##1}% + \def \fileversion {##2}% + \def \fileinfo {##3}% + }% + \edef \@tempa {\csname ver@#1\endcsname}% + \expandafter \@tempb \@tempa \relax ? ? \relax \relax +} +\makeatother + \newenvironment*{texdescription}{% \list{}{% - \labelwidth\z@ - \itemindent-\leftmargin - \itemsep = 0pt - \def \makelabel ##1{\hspace{\labelsep}\normalfont\tex{##1}}% + \setlength{\labelwidth}{0pt}% + \setlength{\itemindent}{-\leftmargin}% + \setlength{\itemsep}{0pt}% + \renewcommand*{\makelabel}[1]% + {\hspace{\labelsep}\normalfont\tex{\texmonospaces ##1}}% }% }{% \endlist } -\makeatother \newcommand*{\pack}{\textsf} \newcommand*{\true}{\emph{true}} \newcommand*{\false}{\emph{false}} -\newtest \sillytest [2]{% +\newtest \condition [2]{% \cnttest{(#1)*(#2)}>{100}% \AND \cnttest{((#1)+(#2))*2}<{60}% } -\texsetup {% - meta-left-char = {\textlangle}, - meta-right-char = {\textrangle} -} - +\getfileinfo{xifthen.sty} \title {The \pack{xifthen} package} -\author {Josselin Noirel} +\author {Josselin Noirel\footnote{This document corresponds to version + \fileversion\ (\filedate) of \pack{\filename}.}\\\url{http://www.jnoirel.fr/}} \begin{document} \maketitle \begin{abstract} - This package implements new commands to go within the first argument of - \cmd{ifthenelse} to test whether a string is void or not, if a command - is defined or equivalent to another. It includes also the possibility - to make use of the complex expressions introduced by the - package~\pack{calc}, together with the ability of defining new commands - to handle complex tests. This package requires the \eTeX{} features. + This package implements new commands that can be used within the + first argument of \pack{ifthen}'s \cmd{ifthenelse} to test whether a + string is void or not, if a command is defined or equivalent to + another. It includes also the possibility to make use of the + complex expressions introduced by the package~\pack{calc}, together + with the ability of defining new commands to handle complex tests. + This package requires the \eTeX{} features. \end{abstract} -\section{General syntax} +\tableofcontents + +\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 I~renamed \cmd{terminateswith} in \cmd{endswith}. +\end{itemize} + +\section{\pack{ifthen}'s interface} + +\subsection{Declaring and setting booleans} + +You can declare boolean (presumably in the preamble of your document) with +% +\begin{texcode} +\cmd[syntax,1]{newboolean}{boolean} +\end{texcode} +% +where \meta{boolean} is a name made up of alphanumeric characters. +For instance, +% +\begin{texcode} +\cmd[1]{newboolean}{appendix} \newline +\cmd[1]{newboolean}{first} +\end{texcode} +% +Then your boolean is ready to be set with +% +\begin{texcode} +\cmd[syntax,2]{setboolean}{boolean}{truth value} +\end{texcode} +% +where \meta{truth value} can be \tex{true} or \tex{false}. + +\subsection{Executing conditional code} The general syntax is inherited of that of the package~\pack{ifthen}: % -\begin{displaytex} - \cmdsyntax[3]{ifthenelse}{test expression}{true code}{false code} -\end{displaytex} +\begin{texcode} + \cmd[syntax,3]{ifthenelse}{test expression}{true code}{false code} +\end{texcode} % Evaluates the \meta{test expression} and executes \meta{true code} if the test turns out to be true and \meta{false code} otherwise. \pack{ifthen} -provides the following tests: +provides the tests explained in the next paragraphs. + +\paragraph{Value of a~boolean} + +You can use the value of a~boolean you declared, or the value of +a~primitive boolean of \TeX\footnote{The primitive booleans include: + \tex{mmode} (Are we in math mode?), \tex{hmode} (Are we in + horizontal mode?), \tex{vmode} (Are we in vertical mode?),~etc.} % -\begin{texdescription} -\item [\meta{value $1$} = \meta{value $2$}] -\item [\meta{value $1$} < \meta{value $2$}] -\item [\meta{value $1$} > \meta{value $2$}] - Simple tests on integer comparisons. +\begin{texcode} + \cmd[syntax,1]{boolean}{boolean} +\end{texcode} + +\paragraph{Tests on integers} -\item [{\cmdsyntax[1]{isodd}{number}}] - Is \meta{number} odd? +To test whether an~integer is equal to, strictly less than, or +strictly greater than, you write the expression straightforwardly. +% +\begin{texlist} +\item \meta{value\1} = \meta{value\2} +\item \meta{value\1} < \meta{value\2} +\item \meta{value\1} > \meta{value\2} +\item \cmd[syntax,1]{isodd}{number} +\end{texlist} -\item [\cmd{isundefined}\meta{command}] - Id \meta{command} undefined? +\paragraph{Tests on lengths} -\item [{\cmdsyntax[2]{equal}{string $1$}{string $2$}}] - Are \meta{string $1$} and \meta{string $2$} equivalent (after - expansion)? +There exist similar tests for the lengths, but you need in this case +to surround the whole expression with \cmd{lengthtest}. +% +\begin{texlist} +\item \cmd[1]{lengthtest}{\meta{dimen\1} = \meta{dimen\2}} +\item \cmd[1]{lengthtest}{\meta{dimen\1} < \meta{dimen\2}} +\item \cmd[1]{lengthtest}{\meta{dimen\1} > \meta{dimen\2}} +\end{texlist} -\item [{\cmdsyntax[1]{boolean}{boolean}}] - Does the boolean \meta{boolean} hold the value \true{} or \false{}? +\paragraph{Tests on commands} + +You can test if a command is undefined\footnote{This test differs from + \cmd{@ifundefined} in that it takes a~real command---and not + a~command name---as argument, and also in that command which is let + equal to \cmd{relax} is not considered undefined.}. +% +\begin{texcode} +\cmd{isundefined} \meta{command} +\end{texcode} -\item [{\cmd[1]{lengthtest}{\meta{dimen $1$} = \meta{dimen $2$}}}] -\item [{\cmd[1]{lengthtest}{\meta{dimen $1$} < \meta{dimen $2$}}}] -\item [{\cmd[1]{lengthtest}{\meta{dimen $1$} > \meta{dimen $2$}}}] - Simple dimension comparisons. +\paragraph{Tests on character strings} -\item [\cmd{(}\dots\cmd{)}] - Parenthesis. +You want to know whether two character strings are equal? Use: +% +\begin{texcode} +\cmd[syntax,2]{equal}{string\1}{string\2} +\end{texcode} +% +Remark that the two arguments are fully expanded. In other words, it +is the result of the expansion of the macros that is compared. This +behaviour also entails a~moving argument and you should protect +fragile command to avoid bizarre errors.\footnote{Practically, the + fact that the content is expanded, means that if the macro \cmd{bar} + is defined as \cmd[1]{baz}{o}, and the command \cmd{baz} is defined + as \tex{f\#1\#1}, then \cmd[2]{equal}{\cmd{bar}}{foo} turns out to + be true, because \cmd{bar} eventually leads to \tex{foo}. This is + usually the wanted behaviour.} -\item [\cmd{AND}] -\item [\cmd{OR}] -\item [\cmd{NOT}] - Conjunction, disjunction, negation. -\end{texdescription} +\paragraph{Building more elaborated expressions} + +You can build more sophisticated expressing using the \cmd{AND} +(conjunction), \cmd{OR} (disjunction), and \cmd{NOT} (negation) +operators\footnote{Lowercase versions of these commands also exist but + we advise the user to stick to the uppercase ones because \cmd{or} + is part of \TeX's syntax.}. +% +\begin{texlist} +\item \meta{expression\1} \cmd{AND} \meta{expression\2} +\item \meta{expression\1} \cmd{OR} \ \meta{expression\2} +\item \cmd{NOT} \meta{expression} +\end{texlist} +% +The evaluation is lazy, meaning that if you write +% +\begin{texcode} +\meta{expression\1} \cmd{AND} \meta{expression\2} +\end{texcode} +% +then \meta{expression\2} won't be evaluated if \meta{expression\1} is +true\footnote{The evil is in the details: \pack{ifthen} works by + reading its argument twice. The tests are evaluated on the second + pass, but and expansion is performed on the first one, regardless of + the truth value. So that, quite surprisingly, the following test + fails: + % + \begin{texcode} + \cmd{NOT} \cmd[1]{isundefined}{\cmd{foo}} \cmd{AND} + \cmd[2]{equal}{\cmd{foo}}{\<string\>} + \end{texcode} +}. + +There is not precedence rules: the argument is read from left to right +and \cmd{NOT} applies to the very next test. When the precedence must +be changed you can use the parentheses: +% +\begin{texcode} +\cmd{(}\meta{expression}\cmd{)} +\end{texcode} \section{New tests} -\begin{displaytex} - \cmdsyntax[1]{isnamedefined}{command name} -\end{displaytex} +After this brief review of \pack{ifthen}'s principles, we introduce +the new tests provided by \pack{xifthen}. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\paragraph{Tests on integers} + +One of the drawback of \TeX's tests and of \cmd{ifthen}'s as well, is +the impossibility to use \pack{calc}'s syntax in it. The +\cmd{numexpr} primitive of \eTeX\ somehow allows to overcome this +difficulty but it is not well documented and normal users are +certainly more familiar with the capabilities offered by \pack{calc}. +The \pack{xifthen} package allows to use \pack{calc}-valid expressions +via the new test \cmd{cnttest}. The syntax is as follows: +% +\begin{texcode} + \cmd{cnttest}\marg{counter expression\1}\marg{comparison}% + \marg{counter expression\2} +\end{texcode} % -Returns \true{} if the command \cmd{\meta{command name}} is defined. +It evaluates the two counter expressions, compares them, and returns +the value of the test. The comparison can be one of the following +sequences \tex{<}, \tex{>}, \tex{=}, \tex{<=},~or~\tex{>=}. -\begin{displaytex} - \cmdsyntax[1]{isempty}{content} -\end{displaytex} +\paragraph{Tests on lengths} + +The similar test has been designed for the lengths and dimensions: % -Returns \true{} is \meta{content} is empty (in the sense used by -\pack{ifmtarg} which is used internally). It is essentially equivalent to -\tex{\cmd[2]{equal}{\meta{content}}{}} except that the argument of -\cmd{isempty} isn't expanded and therefore isn't affected by fragile -commands. +\begin{texcode} + \cmd{dimtest}\marg{dimen expression\1}\marg{comparison}% + \marg{dimen expression\2} +\end{texcode} +% +It evaluates the two dimension expressions, compares them, and returns +the value of the test. The comparison can be one of the following +sequences \tex{<}, \tex{>}, \tex{=}, \tex{<=},~or~\tex{>=}. + +\paragraph{Tests on commands} -\begin{displaytex} - \cmdsyntax[2]{isequivalentto}{command~$1$}{command~$2$} -\end{displaytex} +We define a~companion of \cmd{isundefined} that uses a~command name +rather than a~command\footnote{If you are stuck with the distinction + between `command' and `command name', let me explain it further with + an example: the command name of the command \cmd{foo} is \tex{foo}. + This is sometimes more convenient to use the command name than the + name. Still, this functionality is probably intended more for + experienced programmers who want to use the niceties of + \pack{ifthen} and \pack{xifthen}.}. % -Corresponds to the \cmd{ifx} test: it returns \true{} when the two +\begin{texcode} + \cmd[1,syntax]{isnamedefined}{command name} +\end{texcode} +% +Returns \true\ if the command \cmd{\meta{command name}} is defined\footnote{% + Uses \tex{\cmd{ifcsname}\dots\allowbreak\cmd{endcsname}} internally + and not \cmd{@ifundefined}.}. + +Sometimes, you need to compare two macros \cmd{foo} and \cmd{bar} and +test whether they are actually the same macro. +% +\begin{texcode} + \cmd[syntax,2]{isequivalentto}{command\1}{command\2} +\end{texcode} +% +Corresponds to the \cmd{ifx} test: it returns \true\ when the two commands are exactly equivalent (same definition, same number of -arguments, etc., otherwise \false{} is returned. +arguments, same prefixes, etc., otherwise \false\ is returned). + +\paragraph{Tests on character strings} + +Very often, we see people using \cmd[2]{equal}{\#1}{} in their command +definitions (for instance, to test whether an optional argument had +been passed to their macro). A~more efficient test can be used: +% +\begin{texcode} + \cmd[syntax,1]{isempty}{content} +\end{texcode} +% +Returns \true\ if \meta{content} is empty. It is essentially equivalent to +\tex{\cmd[2]{equal}{\meta{content}}{}} except that the argument of +\cmd{isempty} isn't expanded and therefore isn't affected by fragile +commands\footnote{Internally, it uses \cmd{unexpanded} and \pack{ifmtarg}.}. -\begin{displaytex} - \cmd{cnttest}\marg{counter expression $1$}\meta{comparison}% - \marg{counter expression $2$} -\end{displaytex} +It is possible to test whether a~substring appears within another +string\footnote{Uses \cmd{in@} and \cmd{ifin@} internally.}. % -Compares the two counter expressions (having the usual syntax of the -package \pack{calc}) and returns the value of the test. The comparison -can be one of the following characters \tex{<}, \tex{>},~and~\tex{=}. +\begin{texcode} + \cmd[syntax,2]{isin}{substring}{string} +\end{texcode} -\begin{displaytex} - \cmd{dimtest}\marg{dimen expression $1$}\meta{comparison}% - \marg{dimen expression $2$} -\end{displaytex} +Sometimes, you need to check whether a~string ends with a particular +substring. This can be achieved using\footnote{For compatibility + reasons, there exist a~command unfortunately called + \cmd{terminateswith} that performs the same test but it is + deprecated.}: % -Compares the two dimension expressions (having the usual syntax of the -package \pack{calc}) and returns the value of the test. The comparison -can be one of the following characters \tex{<}, \tex{>},~and~\tex{=}. +\begin{texcode} + \cmd[syntax,2]{endswith}{string}{substring} +\end{texcode} -\section{Defining new complex test commands} +\paragraph{Building more elaborated expressions} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{displaytex} - \cmdsyntax[3]{newtest}{command}[$n$]{test expression} -\end{displaytex} +It is then possible to create new tests with: % -Defines a command named \meta{command} taking $n$~arguments (no optional -argument is allowed) consisting of the test as specified by \meta{test - expression} that can be used in the argument of \cmd{ifthenelse}. For -instance, if we want to test whether a rectangle having dimensions -$l$~and~$L$ meets the two following conditions: $S = l \times L > 100$ -and~$P = 2 (l +\nobreak L) < 60$: +\begin{texcode} + \cmd[syntax,3]{newtest}{command}[$n$]{test expression} +\end{texcode} % -\begin{displaytex} -\cmd{newtest}\{\cmd{sillytest}\}[2]\{\%\newline +Surprisingly, a~simple \cmd{newcommand} would not work. The +\cmd{newtest} macro defines a command \meta{command} taking +$n$~arguments (no optional argument is allowed\footnote{No optional + argument is allowed because the macro needs to be expanded in the + first pass and that optional arguments avoid that.} consisting of +the test as specified by \meta{test expression} that can be used in +the argument of \cmd{ifthenelse}. + +\section{Examples} + +Let's illustrate the most important features of \pack{xifthen} with +the following problem: if we want to test whether a rectangle having +dimensions $l$~and~$L$ meets the two following conditions: $S = l +\times\nobreak L > 100$ and~$P = 2 (l +\nobreak L) < 60$\footnote{Note + that, because within the arguments of \cmd{cnttest} the \pack{calc} + is used, you must use real parentheses \tex{(}~and~\tex{)} and not + \cmd{(}~and~\cmd{)}.}: +% +\begin{texcode} +\cmd{newtest}\{\cmd{condition}\}[2]\{\%\newline \ \ \cmd{cnttest}\{(\#1)*(\#2)\}>\{100\}\%\newline \ \ \cmd{AND}\newline \ \ \cmd{cnttest}\{((\#1)+(\#2))*2\}<\{60\}\%\newline \} -\end{displaytex} +\end{texcode} % -Then \tex{\cmd{ifthenelse}\{\cmd{sillytest}\{14\}\{7\}\}\{TRUE\}\{FALSE\}} -returns \ifthenelse{\sillytest{14}{7}}{TRUE}{FALSE} because $14\times 7 = +Then \tex{\cmd{ifthenelse}\{\cmd{condition}\{14\}\{7\}\}\{TRUE\}\{FALSE\}} +returns \ifthenelse{\condition{14}{7}}{TRUE}{FALSE} because $14\times 7 = 98$ and $2\times (14 +\nobreak 7) = 42$, while -\tex{\cmd{ifthenelse}\{\cmd{sillytest}\{11\}\{11\}\}\{TRUE\}\allowbreak - \{FALSE\}} returns \ifthenelse{\sillytest{11}{11}}{TRUE}{FALSE} because +\tex{\cmd{ifthenelse}\{\cmd{condition}\{11\}\{11\}\}\{TRUE\}\allowbreak + \{FALSE\}} returns \ifthenelse{\condition{11}{11}}{TRUE}{FALSE} because $11 \times 11 = 121$ and $2\times (11 +\nobreak 11) = 44$. +\bigbreak + +Now a~list of typical uses of \pack{xifthen}'s capabilities: + +\small +\begin{list}{}{\setlength{\leftmargin}{0pt}% + \setlength{\rightmargin}{-\oddsidemargin}% + \setlength{\partopsep}{0pt}% + \setlength{\topsep}{\medskipamount}% + \setlength{\parsep}{0pt}}% +\item \newcommand*{\TRUE}{% + \ifthenelse{\equal{\csname f@family\endcsname}{lmtt}}{true}% + {\makebox[\widthof{false}][l]{\bfseries true}}% + } + \newcommand*{\FALSE}{false} + \newcommand*{\pt}{\ifmmode \,\mathrm{pt}\else pt\fi} + +$4 - 1< 4$: \ifthenelse{\cnttest{4 - 1}{<}{4}}{\TRUE}{\FALSE}\quad +$4< 4$: \ifthenelse{\cnttest{4}{<}{4}}{\TRUE}{\FALSE}\quad +$4 + 1< 4$: \ifthenelse{\cnttest{4 + 1}{<}{4}}{\TRUE}{\FALSE} + +$4 - 1\leq 4$: \ifthenelse{\cnttest{4 - 1}{<=}{4}}{\TRUE}{\FALSE}\quad +$4\leq 4$: \ifthenelse{\cnttest{4}{<=}{4}}{\TRUE}{\FALSE}\quad +$4 + 1\leq 4$: \ifthenelse{\cnttest{4 + 1}{<=}{4}}{\TRUE}{\FALSE} + +$4 - 1= 4$: \ifthenelse{\cnttest{4 - 1}{=}{4}}{\TRUE}{\FALSE}\quad +$4= 4$: \ifthenelse{\cnttest{4}{=}{4}}{\TRUE}{\FALSE}\quad +$4 + 1= 4$: \ifthenelse{\cnttest{4 + 1}{=}{4}}{\TRUE}{\FALSE} + +$4 - 1\geq 4$: \ifthenelse{\cnttest{4 - 1}{>=}{4}}{\TRUE}{\FALSE}\quad +$4\geq 4$: \ifthenelse{\cnttest{4}{>=}{4}}{\TRUE}{\FALSE}\quad +$4 + 1\geq 4$: \ifthenelse{\cnttest{4 + 1}{>=}{4}}{\TRUE}{\FALSE} + +$4 - 1> 4$: \ifthenelse{\cnttest{4 - 1}{>}{4}}{\TRUE}{\FALSE}\quad +$4> 4$: \ifthenelse{\cnttest{4}{>}{4}}{\TRUE}{\FALSE}\quad +$4 + 1> 4$: \ifthenelse{\cnttest{4 + 1}{>}{4}}{\TRUE}{\FALSE} + +\medskip + +$4\pt - 1\pt< 4\pt$: \ifthenelse{\dimtest{4\pt - 1\pt}{<}{4\pt}}{\TRUE}{\FALSE}\quad +$4\pt< 4\pt$: \ifthenelse{\dimtest{4\pt}{<}{4\pt}}{\TRUE}{\FALSE}\quad +$4\pt + 1\pt< 4\pt$: \ifthenelse{\dimtest{4\pt + 1\pt}{<}{4\pt}}{\TRUE}{\FALSE} + +$4\pt - 1\pt\leq 4\pt$: \ifthenelse{\dimtest{4\pt - 1\pt}{<=}{4\pt}}{\TRUE}{\FALSE}\quad +$4\pt\leq 4\pt$: \ifthenelse{\dimtest{4\pt}{<=}{4\pt}}{\TRUE}{\FALSE}\quad +$4\pt + 1\pt\leq 4\pt$: \ifthenelse{\dimtest{4\pt + 1\pt}{<=}{4\pt}}{\TRUE}{\FALSE} + +$4\pt - 1\pt= 4\pt$: \ifthenelse{\dimtest{4\pt - 1\pt}{=}{4\pt}}{\TRUE}{\FALSE}\quad +$4\pt= 4\pt$: \ifthenelse{\dimtest{4\pt}{=}{4\pt}}{\TRUE}{\FALSE}\quad +$4\pt + 1\pt= 4\pt$: \ifthenelse{\dimtest{4\pt + 1\pt}{=}{4\pt}}{\TRUE}{\FALSE} + +$4\pt - 1\pt\geq 4\pt$: \ifthenelse{\dimtest{4\pt - 1\pt}{>=}{4\pt}}{\TRUE}{\FALSE}\quad +$4\pt\geq 4\pt$: \ifthenelse{\dimtest{4\pt}{>=}{4\pt}}{\TRUE}{\FALSE}\quad +$4\pt + 1\pt\geq 4\pt$: \ifthenelse{\dimtest{4\pt + 1\pt}{>=}{4\pt}}{\TRUE}{\FALSE} + +$4\pt - 1\pt> 4\pt$: \ifthenelse{\dimtest{4\pt - 1\pt}{>}{4\pt}}{\TRUE}{\FALSE}\quad +$4\pt> 4\pt$: \ifthenelse{\dimtest{4\pt}{>}{4\pt}}{\TRUE}{\FALSE}\quad +$4\pt + 1\pt> 4\pt$: \ifthenelse{\dimtest{4\pt + 1\pt}{>}{4\pt}}{\TRUE}{\FALSE} + +\medskip + +\tex{\cmd{ifthenelse}\{\cmd{isempty}\{\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\isempty{}}{\TRUE}{\FALSE} + +\tex{\cmd{ifthenelse}\{\cmd{isempty}\{ \}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\isempty{ }}{\TRUE}{\FALSE} + +\tex{\cmd{ifthenelse}\{\cmd{isempty}\{ foo \}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\isempty{ foo }}{\TRUE}{\FALSE} + +\medskip + +\tex{\cmd{ifthenelse}\{\cmd{endswith}\{foo.\}\{.\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\endswith{foo.}{.}}{\TRUE}{\FALSE} + +\tex{\cmd{ifthenelse}\{\cmd{endswith}\{foo!\}\{.\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\endswith{foo!}{.}}{\TRUE}{\FALSE} + +\medskip + +\tex{\cmd{ifthenelse}\{\cmd{isin}\{foo\}\{foobar\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\isin{foo}{foobar}}{\TRUE}{\FALSE} + +\tex{\cmd{ifthenelse}\{\cmd{isin}\{Foo\}\{foobar\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\isin{Foo}{foobar}}{\TRUE}{\FALSE} + +\medskip + +\tex{\cmd{ifthenelse}\{\cmd{cnttest}\{10 * 10 + 1\}>\{100\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\cnttest{10 * 10 + 1}>{100}}{\TRUE}{\FALSE} + +\tex{\cmd{ifthenelse}\{\cmd{cnttest}\{10 * 10 + 1\}>\{100 * 100\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\cnttest{10 * 10 + 1}>{100 * 100}}{\TRUE}{\FALSE} + +\medskip + +\tex{\cmd{ifthenelse}\{\cmd{isequivalentto}\{\cmd{usepackage}\}\{\cmd{RequirePackage}\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\isequivalentto{\usepackage}{\RequirePackage}}{\TRUE}{\FALSE} + +\tex{\cmd{ifthenelse}\{\cmd{isequivalentto}\{\cmd{usepackage}\}\{\cmd{textit}\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\isequivalentto{\usepackage}{\textit}}{\TRUE}{\FALSE} + +\medskip + +\tex{\cmd{ifthenelse}\{\cmd{isnamedefined}\{@foo\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\isnamedefined{@foo}}{\TRUE}{\FALSE} + +\tex{\cmd{ifthenelse}\{\cmd{isnamedefined}\{@for\}\}\{\TRUE\}\{\FALSE\}} +\ifthenelse{\isnamedefined{@for}}{\TRUE}{\FALSE} +\end{list} + \end{document} diff --git a/Master/texmf-dist/tex/latex/xifthen/xifthen.sty b/Master/texmf-dist/tex/latex/xifthen/xifthen.sty index 081ac3ab696..ba973cd60ab 100644 --- a/Master/texmf-dist/tex/latex/xifthen/xifthen.sty +++ b/Master/texmf-dist/tex/latex/xifthen/xifthen.sty @@ -1,8 +1,7 @@ -\def \@tempa $#1 #2 #3 #4 #5 #6 #7 ${% - \def \filedate {#4}% - \def \fileversion {v#3}% -} -\@tempa $Id: xifthen.sty,v 1.1.1.1 2006/03/25 01:24:34 noirel Exp $ +% $Date: 2007-04-21 17:11:50 +0200 (Sat, 21 Apr 2007) $ +% $Revision: 28 $ +\def \filedate {2007/04/21}% +\def \fileversion {v1.1}% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{xifthen}% [\filedate \space \fileversion \space Extended ifthen features] @@ -12,28 +11,86 @@ \RequirePackage{ifthen} \RequirePackage{ifmtarg} +% \cnttest {<counter expression>} {<relation>} {<counter expression>} +% \newcommand*{\TE@cnttest}[4]{% \TE@throw \noexpand \calc@assign@count{\@tempcnta}{\unexpanded{#1}}% \noexpand \calc@assign@count{\@tempcntb}{\unexpanded{#3}}% - \noexpand \ifnum \@tempcnta#2\@tempcntb + \noexpand \if \noexpand \TE@cnttest@ {#2}% #4% } +\newcommand*{\TE@cnttest@}[1]{% + \ifcsname TE@cnttest@@#1\endcsname + \csname TE@cnttest@@#1\expandafter\expandafter\expandafter \endcsname + \expandafter \@gobble + \else + \expandafter \@firstofone + \fi + {FF\PackageError{xifthen}{Not a valid comparison operator "#1"}% + {Valid comparisons are <, =, >, <=, and =>.}}% +} + +\@namedef{TE@cnttest@@<}{\ifnum \@tempcnta<\@tempcntb AA\else AB\fi} +\@namedef{TE@cnttest@@>}{\ifnum \@tempcnta>\@tempcntb AA\else AB\fi} +\@namedef{TE@cnttest@@=}{\ifnum \@tempcnta=\@tempcntb AA\else AB\fi} +\@namedef{TE@cnttest@@<=}{% + \ifnum \@tempcnta<\@tempcntb AA\else + \ifnum \@tempcnta=\@tempcntb AA\else AB\fi + \fi +} +\@namedef{TE@cnttest@@>=}{% + \ifnum \@tempcnta>\@tempcntb AA\else + \ifnum \@tempcnta=\@tempcntb AA\else AB\fi + \fi +} + +% \dimtest {<dimension expression>} {<relation>} {<dimension expression>} +% \newcommand*{\TE@dimtest}[4]{% \TE@throw \noexpand \calc@assign@skip{\@tempskipa}{\unexpanded{#1}}% \noexpand \calc@assign@skip{\@tempskipb}{\unexpanded{#3}}% - \noexpand \ifdim \@tempskipa#2\@tempskipb + \noexpand \if \noexpand \TE@dimtest@ {#2}% #4% } +\newcommand*{\TE@dimtest@}[1]{% + \ifcsname TE@dimtest@@#1\endcsname + \csname TE@dimtest@@#1\expandafter\expandafter\expandafter \endcsname + \expandafter \@gobble + \else + \expandafter \@firstofone + \fi + {FF\PackageError{xifthen}{Not a valid comparison operator "#1"}% + {Valid comparisons are <, =, >, <=, and =>.}}% +} + +\@namedef{TE@dimtest@@<}{\ifdim \@tempskipa<\@tempskipb AA\else AB\fi} +\@namedef{TE@dimtest@@>}{\ifdim \@tempskipa>\@tempskipb AA\else AB\fi} +\@namedef{TE@dimtest@@=}{\ifdim \@tempskipa=\@tempskipb AA\else AB\fi} +\@namedef{TE@dimtest@@<=}{% + \ifdim \@tempskipa<\@tempskipb AA\else + \ifdim \@tempskipa=\@tempskipb AA\else AB\fi + \fi +} +\@namedef{TE@dimtest@@>=}{% + \ifdim \@tempskipa>\@tempskipb AA\else + \ifdim \@tempskipa=\@tempskipb AA\else AB\fi + \fi +} + +% \isnamedefined {<command name>} +% \newcommand*{\TE@isnamedefined}[2]{% \TE@throw \noexpand \ifcsname #1\endcsname #2% } +% \isempty {<content>} +% \newcommand*{\TE@isempty}[2]{% \TE@throw \noexpand \if FF\noexpand \@nameuse{fi}% @@ -45,12 +102,34 @@ #2% } +% \isequivalentto {<command>} {<command>} +% \newcommand*{\TE@isequivalentto}[3]{% \TE@throw \noexpand \ifx \noexpand #1\noexpand#2% #3% } +% \isin {<substring>} {<string>} +% +\newcommand*{\TE@isin}[3]{% + \TE@throw + \unexpanded {\in@{#1}{#2}}% + \noexpand \ifin@ + #3% +} + +% \endswith {<string>} {<substring>} +% +\newcommand*{\TE@endswith}[3]{% + \TE@throw + \unexpanded {\in@{#2\@nil}{#1\@nil}}% + \noexpand \ifin@ + #3% +} + +% \newtest <command> [<number>] {<definition>} +% \newcommand*{\newtest}[1]{% \@ifnextchar[{% \@newtest{#1}% @@ -76,10 +155,13 @@ \newcommand*{\TE@hook}{% \let \isequivalentto = \TE@isequivalentto - \let \isnamedefined = \TE@isnamedefined - \let \isempty = \TE@isempty - \let \cnttest = \TE@cnttest - \let \dimtest = \TE@dimtest + \let \terminateswith = \TE@endswith % For compability reasons (deprecated) + \let \endswith = \TE@endswith + \let \isnamedefined = \TE@isnamedefined + \let \isempty = \TE@isempty + \let \cnttest = \TE@cnttest + \let \dimtest = \TE@dimtest + \let \isin = \TE@isin } \renewcommand{\ifthenelse}[1]{% diff --git a/Master/texmf-dist/tpm/xifthen.tpm b/Master/texmf-dist/tpm/xifthen.tpm index 0f66cdd19ed..bf30ba7841c 100644 --- a/Master/texmf-dist/tpm/xifthen.tpm +++ b/Master/texmf-dist/tpm/xifthen.tpm @@ -3,7 +3,7 @@ <rdf:Description about="http://texlive.dante.de/texlive/Package/xifthen.zip"> <TPM:Name>xifthen</TPM:Name> <TPM:Type>Package</TPM:Type> - <TPM:Date>2006/07/14 22:41:04</TPM:Date> + <TPM:Date>2007/04/21 15:25:00</TPM:Date> <TPM:Version></TPM:Version> <TPM:Creator>karl</TPM:Creator> <TPM:Title>The xifthen package.</TPM:Title> @@ -12,11 +12,11 @@ <TPM:Size>323039</TPM:Size> <TPM:License></TPM:License> <TPM:Build/> - <TPM:RunFiles size="3666"> + <TPM:RunFiles size="6025"> texmf-dist/tex/latex/xifthen/xifthen.sty texmf-dist/tpm/xifthen.tpm </TPM:RunFiles> - <TPM:DocFiles size="319373"> + <TPM:DocFiles size="527210"> texmf-dist/doc/latex/xifthen/README texmf-dist/doc/latex/xifthen/xifthen.pdf texmf-dist/doc/latex/xifthen/xifthen.tex |