summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/xint/xintfrac.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-23 23:05:24 +0000
committerKarl Berry <karl@freefriends.org>2014-01-23 23:05:24 +0000
commit999f3351fc67fb9112cf91b9fe6fe469dee7b9b7 (patch)
treef9fa2d96629d8b1c2b0ffd723aa035f79c6b21eb /Master/texmf-dist/tex/generic/xint/xintfrac.sty
parentcce7ef6b16baffd93860a40a634d23f8447a4d7e (diff)
xint (23jan14)
git-svn-id: svn://tug.org/texlive/trunk@32768 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/xint/xintfrac.sty')
-rw-r--r--Master/texmf-dist/tex/generic/xint/xintfrac.sty37
1 files changed, 19 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/generic/xint/xintfrac.sty b/Master/texmf-dist/tex/generic/xint/xintfrac.sty
index 25d24fd4bcd..81b676eb21e 100644
--- a/Master/texmf-dist/tex/generic/xint/xintfrac.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintfrac.sty
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%%----------------------------------------------------------------
-%% The xint bundle (version 1.09j of January 9, 2014)
+%% The xint bundle (version 1.09k of January 21, 2014)
%% xintfrac: Expandable operations on fractions
%% Copyright (C) 2013-2014 by Jean-Francois Burnol
%%----------------------------------------------------------------
@@ -101,7 +101,7 @@
\XINTsetupcatcodes%
\XINT_providespackage
\ProvidesPackage{xintfrac}%
- [2014/01/09 v1.09j Expandable operations on fractions (jfB)]%
+ [2014/01/21 v1.09k Expandable operations on fractions (jfB)]%
\chardef\xint_c_vi 6
\chardef\xint_c_vii 7
\chardef\xint_c_xviii 18
@@ -1926,11 +1926,11 @@
}%
\def\XINT_fladd_noopt #1#2\Z #3%
{%
- #1[\XINTdigits]{\XINT_FL_Add {\XINTdigits+2}{#2}{#3}}%
+ #1[\XINTdigits]{\XINT_FL_Add {\XINTdigits+\xint_c_ii}{#2}{#3}}%
}%
\def\XINT_fladd_opt #1[\Z #2]#3#4%
{%
- #1[#2]{\XINT_FL_Add {#2+2}{#3}{#4}}%
+ #1[#2]{\XINT_FL_Add {#2+\xint_c_ii}{#3}{#4}}%
}%
\def\XINT_FL_Add #1#2%
{%
@@ -1951,13 +1951,14 @@
}%
\def\XINT_FL_Add_d #1[#2]#3[#4]#5%
{%
- \xintSgnFork {\ifnum \numexpr #2-#4-#5>1 \expandafter 1%
- \else\ifnum \numexpr #4-#2-#5>1
- \xint_afterfi {\expandafter-\expandafter1}%
- \else \expandafter\expandafter\expandafter0%
- \fi
- \fi}%
- {#3[#4]}{\xintAdd {#1[#2]}{#3[#4]}}{#1[#2]}%
+ \ifnum \numexpr #2-#4-#5>\xint_c_i
+ \expandafter \xint_secondofthree_thenstop
+ \else
+ \ifnum \numexpr #4-#2-#5>\xint_c_i
+ \expandafter\expandafter\expandafter\xint_thirdofthree_thenstop
+ \fi
+ \fi
+ \xintadd {#1[#2]}{#3[#4]}%
}%
\def\XINT_FL_Add_zero 0\XINT_FL_Add_c 0[0]#1[#2]#3{#1[#2]}%
\def\XINT_FL_Add_zerobis 0\XINT_FL_Add_d #1[#2]0[0]#3{#1[#2]}%
@@ -1973,11 +1974,11 @@
}%
\def\XINT_flsub_noopt #1#2\Z #3%
{%
- #1[\XINTdigits]{\XINT_FL_Add {\XINTdigits+2}{#2}{\xintOpp{#3}}}%
+ #1[\XINTdigits]{\XINT_FL_Add {\XINTdigits+\xint_c_ii}{#2}{\xintOpp{#3}}}%
}%
\def\XINT_flsub_opt #1[\Z #2]#3#4%
{%
- #1[#2]{\XINT_FL_Add {#2+2}{#3}{\xintOpp{#4}}}%
+ #1[#2]{\XINT_FL_Add {#2+\xint_c_ii}{#3}{\xintOpp{#4}}}%
}%
\def\xintFloatMul {\romannumeral0\xintfloatmul}%
\def\xintfloatmul #1{\XINT_flmul_chkopt \xintfloat #1\Z }%
@@ -1991,11 +1992,11 @@
}%
\def\XINT_flmul_noopt #1#2\Z #3%
{%
- #1[\XINTdigits]{\XINT_FL_Mul {\XINTdigits+2}{#2}{#3}}%
+ #1[\XINTdigits]{\XINT_FL_Mul {\XINTdigits+\xint_c_ii}{#2}{#3}}%
}%
\def\XINT_flmul_opt #1[\Z #2]#3#4%
{%
- #1[#2]{\XINT_FL_Mul {#2+2}{#3}{#4}}%
+ #1[#2]{\XINT_FL_Mul {#2+\xint_c_ii}{#3}{#4}}%
}%
\def\XINT_FL_Mul #1#2%
{%
@@ -2019,11 +2020,11 @@
}%
\def\XINT_fldiv_noopt #1#2\Z #3%
{%
- #1[\XINTdigits]{\XINT_FL_Div {\XINTdigits+2}{#2}{#3}}%
+ #1[\XINTdigits]{\XINT_FL_Div {\XINTdigits+\xint_c_ii}{#2}{#3}}%
}%
\def\XINT_fldiv_opt #1[\Z #2]#3#4%
{%
- #1[#2]{\XINT_FL_Div {#2+2}{#3}{#4}}%
+ #1[#2]{\XINT_FL_Div {#2+\xint_c_ii}{#3}{#4}}%
}%
\def\XINT_FL_Div #1#2%
{%
@@ -2185,7 +2186,7 @@
\def\XINT_flpow_III #1#2[#3]#4%
{%
\expandafter\XINT_flpow_IIIend\expandafter
- {\the\numexpr\if #41 -\fi#3\expandafter}%
+ {\the\numexpr\if #41-\fi#3\expandafter}%
\xint_UDzerofork
#4{{#2}}%
0{{1/#2}}%