summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/boolexpr
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-12 23:01:47 +0000
committerKarl Berry <karl@freefriends.org>2010-04-12 23:01:47 +0000
commitec3b36ac4b0d269a8025f9dad9b4f70c61a46556 (patch)
tree5e576b462b0522197652638eeef64f4edbeb9071 /Master/texmf-dist/tex/latex/boolexpr
parent277b30bec6f5fcfa16446c7a912d1268fa798be0 (diff)
boolexpr update (12apr10)
git-svn-id: svn://tug.org/texlive/trunk@17830 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/boolexpr')
-rw-r--r--Master/texmf-dist/tex/latex/boolexpr/boolexpr.sty8
1 files changed, 7 insertions, 1 deletions
diff --git a/Master/texmf-dist/tex/latex/boolexpr/boolexpr.sty b/Master/texmf-dist/tex/latex/boolexpr/boolexpr.sty
index 1acae56abd9..7836e6d25e7 100644
--- a/Master/texmf-dist/tex/latex/boolexpr/boolexpr.sty
+++ b/Master/texmf-dist/tex/latex/boolexpr/boolexpr.sty
@@ -24,7 +24,7 @@
%%
%% boolexpr : a purely expandable boolean expressions and switch (eTeX)
\ProvidesPackage{boolexpr}
- [2009/09/30 v3.1 Purely expandable boolean expressions and switch (eTeX)]
+ [2010/04/15 v3.14 Purely expandable boolean expressions and switch (eTeX)]
% Make a colon (:) of catcode 4 (used as delimiter)
\let\bex@AtEnd\@empty
@@ -120,7 +120,13 @@
\newcommand\boolexpr[1]{\bex@nbk #1//{\numexpr\bex@OR#1\OR:}{+1}//}
% \ifboolexpr: the LaTeX form of \boolexpr tests
+\ifdefined\ifboolexpr% etoolbox defines ifboolexpr...
+\PackageWarning{boolexpr}{\string\ifboolexpr\space has been defined before\MessageBreak
+ by etoolbox (I suppose) - Overwritting}
+\renewcommand\ifboolexpr[1]{\bex@true_or_false{\boolexpr{#1}=0}}
+\else
\newcommand\ifboolexpr[1]{\bex@true_or_false{\boolexpr{#1}=0}}
+\fi
\long\def \switch#1\endswitch {\bex@nbk#1//{\bex@switch_opt#1\endswitch}{}//}
\long\def \bex@switch_opt#1#2\endswitch{\bex@ifoptchar#1/[/