From ec3b36ac4b0d269a8025f9dad9b4f70c61a46556 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 12 Apr 2010 23:01:47 +0000 Subject: boolexpr update (12apr10) git-svn-id: svn://tug.org/texlive/trunk@17830 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/boolexpr/boolexpr.dtx | 29 +++++++++++++++------- .../texmf-dist/source/latex/boolexpr/boolexpr.ins | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/source/latex/boolexpr') diff --git a/Master/texmf-dist/source/latex/boolexpr/boolexpr.dtx b/Master/texmf-dist/source/latex/boolexpr/boolexpr.dtx index 508e81aa350..c217b4ea29a 100644 --- a/Master/texmf-dist/source/latex/boolexpr/boolexpr.dtx +++ b/Master/texmf-dist/source/latex/boolexpr/boolexpr.dtx @@ -1,5 +1,5 @@ % \iffalse meta-comment -% boolexpr : purely expandable boolean expressions and switch (eTeX) [v3.1 2009/09/30] +% boolexpr : purely expandable boolean expressions and switch (eTeX) [v3.14 2010/04/15] % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -38,7 +38,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: boolexpr 2009/09/30 v3.1 provides purely expandable boolean expressions and switch (eTeX)} +\Msg{* Package: boolexpr 2010/04/15 v3.14 provides purely expandable boolean expressions and switch (eTeX)} \Msg{************************************************************************} \keepsilent @@ -96,8 +96,8 @@ boolexpr : a purely expandable boolean expressions and switch (eTeX) \listfiles \edef\thisfile{\jobname} \def\thisinfo{Purely expandable boolean expressions and switch (\eTeX).} -\def\thisversion{v3.1} -\def\thisdate{2009/09/30} +\def\thisversion{v3.14} +\def\thisdate{2010/04/15} \let\loadclass\LoadClass \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}} \documentclass[a4paper,oneside]{ltxdoc} @@ -124,7 +124,7 @@ boolexpr : a purely expandable boolean expressions and switch (eTeX) % % \fi % -% \CheckSum{383} +% \CheckSum{396} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -789,7 +789,7 @@ boolexpr : a purely expandable boolean expressions and switch (eTeX) % \begin{macrocode} %<*package> \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)] % \end{macrocode} % \iffalse % @@ -846,7 +846,7 @@ boolexpr : a purely expandable boolean expressions and switch (eTeX) \long\def\bex@nbk#1#2/#3#4#5//{#4} % \end{macrocode} % \end{macro} -% +% % \begin{macro}{\bex@ifoptchar} % \cs{bex@ifoptchar} checks if a character is a single opening bracket `\,\textbf{[}\,`. % \begin{macrocode} @@ -1020,7 +1020,13 @@ boolexpr : a purely expandable boolean expressions and switch (eTeX) %% \ifboolexpr: the LaTeX form of \boolexpr tests % \fi % \begin{macrocode} +\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 % \end{macrocode} % \end{macro} % \iffalse @@ -1059,7 +1065,7 @@ boolexpr : a purely expandable boolean expressions and switch (eTeX) \long\def\bex@pdfmatch#1#2{\ifnum\pdfmatch{#2}{#1}=0 1\else0\fi} % \end{macrocode} %\end{macro} -% +% % \begin{macro}{\bex@ifempty} % \begin{macrocode} \long\def\bex@ifempty#1{\if\relax\detokenize{#1}\relax0\else1\fi} @@ -1114,10 +1120,15 @@ boolexpr : a purely expandable boolean expressions and switch (eTeX) % May be build a ``real'' |\NOT| operator. % % \begin{History} +% \begin{Version}{2010/04/15 v3.14} +% \item \xpackage{etoolbox} now defines a \cs{ifboolexpr} macro (not purely expandable). \\ +% Fix has been done (with a warning) to be able to use \cs{ifboolexpr} from \thispackage. +% \end{Version} +% % \begin{Version}{2009/09/30 v3.1} % \item Support of |\pdfmatch| added (|\bex@pdfmatch|) \\ % \end{Version} -% +% % \begin{Version}{2009/09/03 v3.0 -- \eTeX{}- and Xe\TeX{}- stable} % \item % Many bug fixed in \cmdref{switch}. Tested on \LaTeX, pdf\LaTeX{} and Xe\LaTeX. diff --git a/Master/texmf-dist/source/latex/boolexpr/boolexpr.ins b/Master/texmf-dist/source/latex/boolexpr/boolexpr.ins index 29d0280e35d..12b391e4a35 100644 --- a/Master/texmf-dist/source/latex/boolexpr/boolexpr.ins +++ b/Master/texmf-dist/source/latex/boolexpr/boolexpr.ins @@ -26,7 +26,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: boolexpr 2009/09/30 v3.1 provides purely expandable boolean expressions and switch (eTeX)} +\Msg{* Package: boolexpr 2010/04/15 v3.14 provides purely expandable boolean expressions and switch (eTeX)} \Msg{************************************************************************} \keepsilent -- cgit v1.2.3