summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/xint/xintexpr.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-08-30 23:00:58 +0000
committerKarl Berry <karl@freefriends.org>2017-08-30 23:00:58 +0000
commit96aac111c7824c49a05e48fdbb2a1eba6313d062 (patch)
tree4294864efc6bba2c700ba4c6d537132b89aa596d /Master/texmf-dist/tex/generic/xint/xintexpr.sty
parentf3fd3b4467cd76a039a199abe6944cfb00fea1e0 (diff)
xint (30aug17)
git-svn-id: svn://tug.org/texlive/trunk@45177 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/xint/xintexpr.sty')
-rw-r--r--Master/texmf-dist/tex/generic/xint/xintexpr.sty26
1 files changed, 13 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/generic/xint/xintexpr.sty b/Master/texmf-dist/tex/generic/xint/xintexpr.sty
index c9a92005f23..15789f2d24e 100644
--- a/Master/texmf-dist/tex/generic/xint/xintexpr.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintexpr.sty
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% ---------------------------------------------------------------
-%% The xint bundle 1.2n 2017/08/06
+%% The xint bundle 1.2o 2017/08/29
%% Copyright (C) 2013-2017 by Jean-Francois Burnol
%% xintexpr: Expandable expression parser
%% ---------------------------------------------------------------
@@ -81,7 +81,7 @@
\XINTsetupcatcodes%
\XINT_providespackage
\ProvidesPackage{xintexpr}%
- [2017/08/06 1.2n Expandable expression parser (JFB)]%
+ [2017/08/29 1.2o Expandable expression parser (JFB)]%
\catcode`! 11
\let\XINT_Cmp \xintiiCmp
\def\xint_gob_til_! #1!{}% ! with catcode 11
@@ -737,9 +737,9 @@
\XINT_expr_defbin_b {expr} {>=} {v}{vi} {xintGtorEq}%
\XINT_expr_defbin_b {flexpr}{>=} {v}{vi} {xintGtorEq}%
\XINT_expr_defbin_b {iiexpr}{>=} {v}{vi} {xintiiGtorEq}%
-\XINT_expr_defbin_b {expr} {!=} {v}{vi} {xintNeq}%
-\XINT_expr_defbin_b {flexpr}{!=} {v}{vi} {xintNeq}%
-\XINT_expr_defbin_b {iiexpr}{!=} {v}{vi} {xintiiNeq}%
+\XINT_expr_defbin_b {expr} {!=} {v}{vi} {xintNotEq}%
+\XINT_expr_defbin_b {flexpr}{!=} {v}{vi} {xintNotEq}%
+\XINT_expr_defbin_b {iiexpr}{!=} {v}{vi} {xintiiNotEq}%
\XINT_expr_defbin_b {expr} {..} {iii}{vi} {xintSeq::csv}%
\XINT_expr_defbin_b {flexpr}{..} {iii}{vi} {xintSeq::csv}%
\XINT_expr_defbin_b {iiexpr}{..} {iii}{vi} {xintiiSeq::csv}%
@@ -1360,7 +1360,7 @@
}%
\let\XINT_expr_precedence_! \xint_c_x
\def\XINT_expr_op_! #1{\expandafter\XINT_expr_getop
- \csname .=\xintiFac{\XINT_expr_unlock #1}\endcsname }%
+ \csname .=\xintFac{\XINT_expr_unlock #1}\endcsname }%
\def\XINT_flexpr_op_! #1{\expandafter\XINT_expr_getop
\csname .=\XINTinFloatFac{\XINT_expr_unlock #1}\endcsname }%
\def\XINT_iiexpr_op_! #1{\expandafter\XINT_expr_getop
@@ -2062,7 +2062,7 @@
{%
\expandafter #1\expandafter #2\csname .=%
\expandafter\XINT_expr_argandopt
- \romannumeral`&&@\XINT_expr_unlock#3,,.\xintiFac\XINTinFloatFac
+ \romannumeral`&&@\XINT_expr_unlock#3,,.\xintFac\XINTinFloatFac
\endcsname
}%
\def\XINT_flexpr_func_factorial #1#2#3%
@@ -2150,7 +2150,7 @@
\def\XINT_expr_func_binomial #1#2#3%
{%
\expandafter #1\expandafter #2\csname .=%
- \expandafter\expandafter\expandafter\xintiBinomial
+ \expandafter\expandafter\expandafter\xintBinomial
\expandafter\XINT_expr_twoargs
\romannumeral`&&@\XINT_expr_unlock #3,\endcsname
}%
@@ -2171,7 +2171,7 @@
\def\XINT_expr_func_pfactorial #1#2#3%
{%
\expandafter #1\expandafter #2\csname .=%
- \expandafter\expandafter\expandafter\xintiPFactorial
+ \expandafter\expandafter\expandafter\xintPFactorial
\expandafter\XINT_expr_twoargs
\romannumeral`&&@\XINT_expr_unlock #3,\endcsname
}%
@@ -2568,8 +2568,8 @@
\xintFor #1 in
{DivTrunc,Mod,Round,Trunc,iRound,iTrunc,iQuo,iRem,
iiDivTrunc,iiDivRound,iiMod,iiQuo,iiRem,%
- Lt,Gt,Eq,LtorEq,GtorEq,Neq,%
- iiLt,iiGt,iiEq,iiLtorEq,iiGtorEq,iiNeq,%
+ Lt,Gt,Eq,LtorEq,GtorEq,NotEq,%
+ iiLt,iiGt,iiEq,iiLtorEq,iiGtorEq,iiNotEq,%
Add,Sub,Mul,Div,Pow,E,%
iiAdd,iiSub,iiMul,iiPow,iiE,%
AND,OR,XOR,%
@@ -2585,8 +2585,8 @@
}%
\xintFor #1 in {Num,Irr,Abs,iiAbs,Sgn,iiSgn,TFrac,Floor,iFloor,Ceil,iCeil,%
Sqr,iiSqr,iiSqrt,iiSqrtR,iiIsZero,iiIsNotZero,iiifNotZero,iiifSgn,%
- Odd,Even,iiOdd,iiEven,Opp,iiOpp,iiifZero,iFac,iBinomial,%
- iPFactorial,iiFac,iiBinomial,iiPFactorial,Bool,Toggle}\do
+ Odd,Even,iiOdd,iiEven,Opp,iiOpp,iiifZero,Fac,Binomial,%
+ PFactorial,iiFac,iiBinomial,iiPFactorial,Bool,Toggle}\do
{\toks0 \expandafter{\the\toks0%
\expandafter\let\csname xint#1NE\expandafter\endcsname\csname
xint#1\expandafter