summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/xint/xintcfrac.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/xint/xintcfrac.sty')
-rw-r--r--Master/texmf-dist/tex/generic/xint/xintcfrac.sty170
1 files changed, 63 insertions, 107 deletions
diff --git a/Master/texmf-dist/tex/generic/xint/xintcfrac.sty b/Master/texmf-dist/tex/generic/xint/xintcfrac.sty
index d94a3b73381..04ca2542311 100644
--- a/Master/texmf-dist/tex/generic/xint/xintcfrac.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintcfrac.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
%%
%%----------------------------------------------------------------
-%% The xint bundle (version 1.05a of May 2nd, 2013)
+%% The xint bundle (version 1.06 of May 7th, 2013)
%% xintcfrac: Expandable continued fractions with xint package
%% Copyright (C) 2013 by Jean-Francois Burnol
%%----------------------------------------------------------------
@@ -116,6 +116,7 @@
{%
\catcode93=\the\catcode93 % ]
\catcode91=\the\catcode91 % [
+ \catcode96=\the\catcode96 % `
\catcode47=\the\catcode47 % /
\catcode41=\the\catcode41 % )
\catcode40=\the\catcode40 % (
@@ -162,7 +163,7 @@
\fi
\expandafter\x\csname ver@xintcfrac.sty\endcsname
\ProvidesPackage{xintcfrac}%
- [2013/05/02 v1.05a Expandable continued fractions with xint package (jfB)]%
+ [2013/05/07 v1.06 Expandable continued fractions with xint package (jfB)]%
\def\xintCFrac {\romannumeral0\xintcfrac }%
\def\xintcfrac #1%
{%
@@ -268,7 +269,7 @@
}%
\def\XINT@gcfrac
{%
- \expandafter\expandafter\expandafter\XINT@gcfrac@enter
+ \expandafter\XINT@gcfrac@enter\romannumeral-`0%
}%
\def\XINT@gcfrac@enter {\XINT@gcfrac@loop {}}%
\def\XINT@gcfrac@loop #1#2+#3/%
@@ -296,8 +297,7 @@
\def\xintGCtoGCx {\romannumeral0\xintgctogcx }%
\def\xintgctogcx #1#2#3%
{%
- \expandafter\expandafter\expandafter\XINT@gctgcx@start
- \expandafter\expandafter\expandafter {#3}{#1}{#2}%
+ \expandafter\XINT@gctgcx@start\expandafter {\romannumeral-`0#3}{#1}{#2}%
}%
\def\XINT@gctgcx@start #1#2#3{\XINT@gctgcx@loop@a {}{#2}{#3}#1+\W/}%
\def\XINT@gctgcx@loop@a #1#2#3#4+#5/%
@@ -468,7 +468,7 @@
\def\xintCstoF {\romannumeral0\xintcstof }%
\def\xintcstof #1%
{%
- \expandafter\expandafter\expandafter\XINT@cstf@prep #1,\W,%
+ \expandafter\XINT@cstf@prep \romannumeral-`0#1,\W,%
}%
\def\XINT@cstf@prep
{%
@@ -503,7 +503,7 @@
\def\xintiCstoF {\romannumeral0\xinticstof }%
\def\xinticstof #1%
{%
- \expandafter\expandafter\expandafter\XINT@icstf@prep #1,\W,%
+ \expandafter\XINT@icstf@prep \romannumeral-`0#1,\W,%
}%
\def\XINT@icstf@prep
{%
@@ -512,8 +512,8 @@
\def\XINT@icstf@loop@a #1#2#3#4#5,%
{%
\xint@w #5\XINT@icstf@end\W
- \expandafter\expandafter\expandafter
- \XINT@icstf@loop@b #5.{#1}{#2}{#3}{#4}%
+ \expandafter
+ \XINT@icstf@loop@b \romannumeral-`0#5.{#1}{#2}{#3}{#4}%
}%
\def\XINT@icstf@loop@b #1.#2#3#4#5%
{%
@@ -530,7 +530,7 @@
\def\xintGCtoF {\romannumeral0\xintgctof }%
\def\xintgctof #1%
{%
- \expandafter\expandafter\expandafter\XINT@gctf@prep #1+\W/%
+ \expandafter\XINT@gctf@prep \romannumeral-`0#1+\W/%
}%
\def\XINT@gctf@prep
{%
@@ -590,7 +590,7 @@
\def\xintiGCtoF {\romannumeral0\xintigctof }%
\def\xintigctof #1%
{%
- \expandafter\expandafter\expandafter\XINT@igctf@prep #1+\W/%
+ \expandafter\XINT@igctf@prep \romannumeral-`0#1+\W/%
}%
\def\XINT@igctf@prep
{%
@@ -598,8 +598,8 @@
}%
\def\XINT@igctf@loop@a #1#2#3#4#5+%
{%
- \expandafter\expandafter\expandafter\XINT@igctf@loop@b
- #5.{#1}{#2}{#3}{#4}%
+ \expandafter\XINT@igctf@loop@b
+ \romannumeral-`0#5.{#1}{#2}{#3}{#4}%
}%
\def\XINT@igctf@loop@b #1.#2#3#4#5%
{%
@@ -615,8 +615,8 @@
\def\XINT@igctf@loop@f #1#2#3#4/%
{%
\xint@w #4\XINT@igctf@end\W
- \expandafter\expandafter\expandafter\XINT@igctf@loop@g
- #4.{#2}{#3}#1%
+ \expandafter\XINT@igctf@loop@g
+ \romannumeral-`0#4.{#2}{#3}#1%
}%
\def\XINT@igctf@loop@g #1.#2#3%
{%
@@ -636,7 +636,7 @@
\def\xintCstoCv {\romannumeral0\xintcstocv }%
\def\xintcstocv #1%
{%
- \expandafter\expandafter\expandafter\XINT@cstcv@prep #1,\W,%
+ \expandafter\XINT@cstcv@prep \romannumeral-`0#1,\W,%
}%
\def\XINT@cstcv@prep
{%
@@ -678,7 +678,7 @@
\def\xintiCstoCv {\romannumeral0\xinticstocv }%
\def\xinticstocv #1%
{%
- \expandafter\expandafter\expandafter\XINT@icstcv@prep #1,\W,%
+ \expandafter\XINT@icstcv@prep \romannumeral-`0#1,\W,%
}%
\def\XINT@icstcv@prep
{%
@@ -687,8 +687,8 @@
\def\XINT@icstcv@loop@a #1#2#3#4#5#6,%
{%
\xint@w #6\XINT@icstcv@end\W
- \expandafter\expandafter\expandafter
- \XINT@icstcv@loop@b #6.{#2}{#3}{#4}{#5}{#1}%
+ \expandafter
+ \XINT@icstcv@loop@b \romannumeral-`0#6.{#2}{#3}{#4}{#5}{#1}%
}%
\def\XINT@icstcv@loop@b #1.#2#3#4#5%
{%
@@ -711,7 +711,7 @@
\def\xintGCtoCv {\romannumeral0\xintgctocv }%
\def\xintgctocv #1%
{%
- \expandafter\expandafter\expandafter\XINT@gctcv@prep #1+\W/%
+ \expandafter\XINT@gctcv@prep \romannumeral-`0#1+\W/%
}%
\def\XINT@gctcv@prep
{%
@@ -781,7 +781,7 @@
\def\xintiGCtoCv {\romannumeral0\xintigctocv }%
\def\xintigctocv #1%
{%
- \expandafter\expandafter\expandafter\XINT@igctcv@prep #1+\W/%
+ \expandafter\XINT@igctcv@prep \romannumeral-`0#1+\W/%
}%
\def\XINT@igctcv@prep
{%
@@ -789,8 +789,8 @@
}%
\def\XINT@igctcv@loop@a #1#2#3#4#5#6+%
{%
- \expandafter\expandafter\expandafter\XINT@igctcv@loop@b
- #6.{#2}{#3}{#4}{#5}{#1}%
+ \expandafter\XINT@igctcv@loop@b
+ \romannumeral-`0#6.{#2}{#3}{#4}{#5}{#1}%
}%
\def\XINT@igctcv@loop@b #1.#2#3#4#5%
{%
@@ -806,8 +806,8 @@
\def\XINT@igctcv@loop@f #1#2#3#4/%
{%
\xint@w #4\XINT@igctcv@end@a\W
- \expandafter\expandafter\expandafter\XINT@igctcv@loop@g
- #4.#1#2{#3}%
+ \expandafter\XINT@igctcv@loop@g
+ \romannumeral-`0#4.#1#2{#3}%
}%
\def\XINT@igctcv@loop@g #1.#2#3#4#5%
{%
@@ -836,24 +836,18 @@
\def\xintCntoF {\romannumeral0\xintcntof }%
\def\xintcntof #1%
{%
- \expandafter\expandafter\expandafter
- \XINT@cntf
- \expandafter\expandafter\expandafter
- {#1}%
+ \expandafter\XINT@cntf\expandafter {\the\numexpr #1}%
}%
\def\XINT@cntf #1#2%
{%
\ifnum #1>0
\xint@afterfi {\expandafter\XINT@cntf@loop\expandafter
- {\the\numexpr
- #1-1\expandafter\expandafter\expandafter}%
- \expandafter\expandafter\expandafter
- {#2{#1}}{#2}}%
+ {\the\numexpr #1-1\expandafter}\expandafter
+ {\romannumeral-`0#2{#1}}{#2}}%
\else
\xint@afterfi
{\ifnum #1=0
- \xint@afterfi {\expandafter\expandafter\expandafter
- \space #2{0}}%
+ \xint@afterfi {\expandafter\space \romannumeral-`0#2{0}}%
\else \xint@afterfi { 0[0]}%
\fi}%
\fi
@@ -870,29 +864,23 @@
\expandafter\XINT@cntf@loop\expandafter
#1\expandafter #2#3%
{%
- \fi\xint@gobble@two #2%
+ \fi\xint@gobble@ii #2%
}%
\def\xintGCntoF {\romannumeral0\xintgcntof }%
\def\xintgcntof #1%
{%
- \expandafter\expandafter\expandafter
- \XINT@gcntf
- \expandafter\expandafter\expandafter
- {#1}%
+ \expandafter\XINT@gcntf\expandafter {\the\numexpr #1}%
}%
\def\XINT@gcntf #1#2#3%
{%
\ifnum #1>0
\xint@afterfi {\expandafter\XINT@gcntf@loop\expandafter
- {\the\numexpr
- #1-1\expandafter\expandafter\expandafter}%
- \expandafter\expandafter\expandafter
- {#2{#1}}{#2}{#3}}%
+ {\the\numexpr #1-1\expandafter}\expandafter
+ {\romannumeral-`0#2{#1}}{#2}{#3}}%
\else
\xint@afterfi
{\ifnum #1=0
- \xint@afterfi {\expandafter\expandafter\expandafter
- \space #2{0}}%
+ \xint@afterfi {\expandafter\space\romannumeral-`0#2{0}}%
\else \xint@afterfi { 0[0]}%
\fi}%
\fi
@@ -909,15 +897,12 @@
\expandafter\XINT@gcntf@loop\expandafter
#1\expandafter #2#3#4%
{%
- \fi\xint@gobble@two #2%
+ \fi\xint@gobble@ii #2%
}%
\def\xintCntoCs {\romannumeral0\xintcntocs }%
\def\xintcntocs #1%
{%
- \expandafter\expandafter\expandafter
- \XINT@cntcs
- \expandafter\expandafter\expandafter
- {#1}%
+ \expandafter\XINT@cntcs\expandafter {\the\numexpr #1}%
}%
\def\XINT@cntcs #1#2%
{%
@@ -925,24 +910,20 @@
\xint@afterfi { 0[0]}%
\else
\xint@afterfi {\expandafter\XINT@cntcs@loop\expandafter
- {\the\numexpr
- #1-1\expandafter\expandafter\expandafter}%
- \expandafter\expandafter\expandafter
- {\expandafter\expandafter\expandafter
- {#2{#1}}}{#2}}%
+ {\the\numexpr #1-1\expandafter}\expandafter
+ {\expandafter{\romannumeral-`0#2{#1}}}{#2}}%
\fi
}%
\def\XINT@cntcs@loop #1#2#3%
{%
\ifnum #1>-1 \else \XINT@cntcs@exit \fi
\expandafter\XINT@cntcs@loop\expandafter
- {\the\numexpr #1-1\expandafter\expandafter\expandafter }%
- \expandafter\expandafter\expandafter
- {\expandafter\expandafter\expandafter{#3{#1}},#2}{#3}%
+ {\the\numexpr #1-1\expandafter }\expandafter
+ {\expandafter{\romannumeral-`0#3{#1}},#2}{#3}%
}%
\def\XINT@cntcs@exit \fi
\expandafter\XINT@cntcs@loop\expandafter
- #1\expandafter\expandafter\expandafter #2#3%
+ #1\expandafter #2#3%
{%
\fi\XINT@cntcs@@exit #2%
}%
@@ -950,10 +931,7 @@
\def\xintCntoGC {\romannumeral0\xintcntogc }%
\def\xintcntogc #1%
{%
- \expandafter\expandafter\expandafter
- \XINT@cntgc
- \expandafter\expandafter\expandafter
- {#1}%
+ \expandafter\XINT@cntgc\expandafter {\the\numexpr #1}%
}%
\def\XINT@cntgc #1#2%
{%
@@ -961,24 +939,20 @@
\xint@afterfi { 0[0]}%
\else
\xint@afterfi {\expandafter\XINT@cntgc@loop\expandafter
- {\the\numexpr
- #1-1\expandafter\expandafter\expandafter}%
- \expandafter\expandafter\expandafter
- {\expandafter\expandafter\expandafter
- {#2{#1}}}{#2}}%
+ {\the\numexpr #1-1\expandafter}\expandafter
+ {\expandafter{\romannumeral-`0#2{#1}}}{#2}}%
\fi
}%
\def\XINT@cntgc@loop #1#2#3%
{%
\ifnum #1>-1 \else \XINT@cntgc@exit \fi
\expandafter\XINT@cntgc@loop\expandafter
- {\the\numexpr #1-1\expandafter\expandafter\expandafter }%
- \expandafter\expandafter\expandafter
- {\expandafter\expandafter\expandafter{#3{#1}}+1/#2}{#3}%
+ {\the\numexpr #1-1\expandafter }\expandafter
+ {\expandafter{\romannumeral-`0#3{#1}}+1/#2}{#3}%
}%
\def\XINT@cntgc@exit \fi
\expandafter\XINT@cntgc@loop\expandafter
- #1\expandafter\expandafter\expandafter #2#3%
+ #1\expandafter #2#3%
{%
\fi\XINT@cntgc@@exit #2%
}%
@@ -986,10 +960,7 @@
\def\xintGCntoGC {\romannumeral0\xintgcntogc }%
\def\xintgcntogc #1%
{%
- \expandafter\expandafter\expandafter
- \XINT@gcntgc
- \expandafter\expandafter\expandafter
- {#1}%
+ \expandafter\XINT@gcntgc\expandafter {\the\numexpr #1}%
}%
\def\XINT@gcntgc #1#2#3%
{%
@@ -997,33 +968,24 @@
\xint@afterfi { {0[0]}}%
\else
\xint@afterfi {\expandafter\XINT@gcntgc@loop\expandafter
- {\the\numexpr
- #1-1\expandafter\expandafter\expandafter}%
- \expandafter\expandafter\expandafter
- {\expandafter\expandafter\expandafter
- {#2{#1}}}{#2}{#3}}%
+ {\the\numexpr #1-1\expandafter}\expandafter
+ {\expandafter{\romannumeral-`0#2{#1}}}{#2}{#3}}%
\fi
}%
\def\XINT@gcntgc@loop #1#2#3#4%
{%
\ifnum #1>-1 \else \XINT@gcntgc@exit \fi
- \expandafter\expandafter\expandafter
- \XINT@gcntgc@loop@b
- \expandafter\expandafter\expandafter
- {\expandafter\expandafter\expandafter
- {#4{#1}}/#2}{#3{#1}}{#1}{#3}{#4}%
+ \expandafter\XINT@gcntgc@loop@b\expandafter
+ {\expandafter{\romannumeral-`0#4{#1}}/#2}{#3{#1}}{#1}{#3}{#4}%
}%
\def\XINT@gcntgc@loop@b #1#2#3%
{%
\expandafter\XINT@gcntgc@loop\expandafter
- {\the\numexpr #3-1\expandafter\expandafter\expandafter}%
- \expandafter\expandafter\expandafter
- {\expandafter\expandafter\expandafter{#2}+#1}%
+ {\the\numexpr #3-1\expandafter}\expandafter
+ {\expandafter{\romannumeral-`0#2}+#1}%
}%
\def\XINT@gcntgc@exit \fi
- \expandafter\expandafter\expandafter
- \XINT@gcntgc@loop@b
- \expandafter\expandafter\expandafter #1#2#3#4#5%
+ \expandafter\XINT@gcntgc@loop@b\expandafter #1#2#3#4#5%
{%
\fi\XINT@gcntgc@@exit #1%
}%
@@ -1031,7 +993,7 @@
\def\xintCstoGC {\romannumeral0\xintcstogc }%
\def\xintcstogc #1%
{%
- \expandafter\expandafter\expandafter\XINT@cstc@prep #1,\W,%
+ \expandafter\XINT@cstc@prep \romannumeral-`0#1,\W,%
}%
\def\XINT@cstc@prep #1,{\XINT@cstc@loop@a {{#1}}}%
\def\XINT@cstc@loop@a #1#2,%
@@ -1043,32 +1005,26 @@
\def\xintGCtoGC {\romannumeral0\xintgctogc }%
\def\xintgctogc #1%
{%
- \expandafter\expandafter\expandafter\XINT@gctgc@start #1+\W/%
+ \expandafter\XINT@gctgc@start \romannumeral-`0#1+\W/%
}%
\def\XINT@gctgc@start {\XINT@gctgc@loop@a {}}%
\def\XINT@gctgc@loop@a #1#2+#3/%
{%
- \xint@w #3\XINT@gctgc@end\W
- \expandafter\expandafter\expandafter
- \XINT@gctgc@loop@b
- \expandafter\expandafter\expandafter
- {#2}{#3}{#1}%
+ \xint@w #3\XINT@gctgc@end\W\expandafter\XINT@gctgc@loop@b\expandafter
+ {\romannumeral-`0#2}{#3}{#1}%
}%
\def\XINT@gctgc@loop@b #1#2%
{%
- \expandafter\expandafter\expandafter
- \XINT@gctgc@loop@c
- \expandafter\expandafter\expandafter
- {#2}{#1}%
+ \expandafter\XINT@gctgc@loop@c\expandafter
+ {\romannumeral-`0#2}{#1}%
}%
\def\XINT@gctgc@loop@c #1#2#3%
{%
\XINT@gctgc@loop@a {#3{#2}+{#1}/}%
}%
-\def\XINT@gctgc@end\W
- \expandafter\expandafter\expandafter\XINT@gctgc@loop@b
+\def\XINT@gctgc@end\W\expandafter\XINT@gctgc@loop@b
{%
- \expandafter\expandafter\expandafter\XINT@gctgc@@end
+ \expandafter\XINT@gctgc@@end
}%
\def\XINT@gctgc@@end #1#2#3{ #3{#1}}%
\XINT@cfrac@restorecatcodes@endinput%