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.sty75
1 files changed, 38 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/generic/xint/xintcfrac.sty b/Master/texmf-dist/tex/generic/xint/xintcfrac.sty
index 561738a7b02..87eabb785ed 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.07a of May 26, 2013)
+%% The xint bundle (version 1.08b of June 14, 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 % [
+ \catcode94=\the\catcode94 % ^
\catcode96=\the\catcode96 % `
\catcode47=\the\catcode47 % /
\catcode41=\the\catcode41 % )
@@ -138,7 +139,7 @@
\catcode61=\the\catcode61\relax % =
\noexpand\endinput
}%
- \XINT_setcatcodes
+ \XINT_setcatcodes % defined in xint.sty
\catcode91=12 % [
\catcode93=12 % ]
}%
@@ -164,7 +165,7 @@
\fi
\expandafter\x\csname ver@xintcfrac.sty\endcsname
\ProvidesPackage{xintcfrac}%
- [2013/05/26 v1.07a Expandable continued fractions with xint package (jfB)]%
+ [2013/06/14 v1.08b Expandable continued fractions with xint package (jfB)]%
\def\xintCFrac {\romannumeral0\xintcfrac }%
\def\xintcfrac #1%
{%
@@ -172,7 +173,7 @@
}%
\def\XINT_cfrac_opt_a #1%
{%
- \ifx#1[\XINT_cfrac_opt_b\fi \XINT_cfrac_noopt #1%
+ \ifx[#1\XINT_cfrac_opt_b\fi \XINT_cfrac_noopt #1%
}%
\def\XINT_cfrac_noopt #1\Z
{%
@@ -232,18 +233,18 @@
{\XINT_cfrac_T #5#6{#2}#4\Z }%
\def\XINT_cfrac_T #1#2#3#4%
{%
- \xint_gob_til_z #4\XINT_cfrac_end\Z\XINT_cfrac_T #1#2{#4+\cfrac{#11#2}{#3}}%
+ \xint_gob_til_Z #4\XINT_cfrac_end\Z\XINT_cfrac_T #1#2{#4+\cfrac{#11#2}{#3}}%
}%
\def\XINT_cfrac_end\Z\XINT_cfrac_T #1#2#3%
{%
- \XINT_cfrac__end #3%
+ \XINT_cfrac_end_b #3%
}%
-\def\XINT_cfrac__end \Z+\cfrac#1#2{ #2}%
+\def\XINT_cfrac_end_b \Z+\cfrac#1#2{ #2}%
\def\xintGCFrac {\romannumeral0\xintgcfrac }%
\def\xintgcfrac #1{\XINT_gcfrac_opt_a #1\Z }%
\def\XINT_gcfrac_opt_a #1%
{%
- \ifx#1[\XINT_gcfrac_opt_b\fi \XINT_gcfrac_noopt #1%
+ \ifx[#1\XINT_gcfrac_opt_b\fi \XINT_gcfrac_noopt #1%
}%
\def\XINT_gcfrac_noopt #1\Z
{%
@@ -272,7 +273,7 @@
\def\XINT_gcfrac_enter {\XINT_gcfrac_loop {}}%
\def\XINT_gcfrac_loop #1#2+#3/%
{%
- \xint_gob_til_w #3\XINT_gcfrac_endloop\W
+ \xint_gob_til_W #3\XINT_gcfrac_endloop\W
\XINT_gcfrac_loop {{#3}{#2}#1}%
}%
\def\XINT_gcfrac_endloop\W\XINT_gcfrac_loop #1#2#3%
@@ -282,7 +283,7 @@
\def\XINT_gcfrac_T #1#2#3#4{\XINT_gcfrac_U #1#2{\xintFrac{#4}}}%
\def\XINT_gcfrac_U #1#2#3#4#5%
{%
- \xint_gob_til_z #5\XINT_gcfrac_end\Z\XINT_gcfrac_U
+ \xint_gob_til_Z #5\XINT_gcfrac_end\Z\XINT_gcfrac_U
#1#2{\xintFrac{#5}%
\ifcase\xintSgn{#4}
+\or+\else-\fi
@@ -290,9 +291,9 @@
}%
\def\XINT_gcfrac_end\Z\XINT_gcfrac_U #1#2#3%
{%
- \XINT_gcfrac__end #3%
+ \XINT_gcfrac_end_b #3%
}%
-\def\XINT_gcfrac__end #1\cfrac#2#3{ #3}%
+\def\XINT_gcfrac_end_b #1\cfrac#2#3{ #3}%
\def\xintGCtoGCx {\romannumeral0\xintgctogcx }%
\def\xintgctogcx #1#2#3%
{%
@@ -301,7 +302,7 @@
\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/%
{%
- \xint_gob_til_w #5\XINT_gctgcx_end\W
+ \xint_gob_til_W #5\XINT_gctgcx_end\W
\XINT_gctgcx_loop_b {#1{#4}}{#2{#5}#3}{#2}{#3}%
}%
\def\XINT_gctgcx_loop_b #1#2%
@@ -475,7 +476,7 @@
}%
\def\XINT_cstf_loop_a #1#2#3#4#5,%
{%
- \xint_gob_til_w #5\XINT_cstf_end\W
+ \xint_gob_til_W #5\XINT_cstf_end\W
\expandafter\XINT_cstf_loop_b
\romannumeral0\xintrawwithzeros {#5}.{#1}{#2}{#3}{#4}%
}%
@@ -511,7 +512,7 @@
}%
\def\XINT_icstf_loop_a #1#2#3#4#5,%
{%
- \xint_gob_til_w #5\XINT_icstf_end\W
+ \xint_gob_til_W #5\XINT_icstf_end\W
\expandafter
\XINT_icstf_loop_b \romannumeral-`0#5.{#1}{#2}{#3}{#4}%
}%
@@ -563,7 +564,7 @@
}%
\def\XINT_gctf_loop_f #1#2/%
{%
- \xint_gob_til_w #2\XINT_gctf_end\W
+ \xint_gob_til_W #2\XINT_gctf_end\W
\expandafter\XINT_gctf_loop_g
\romannumeral0\xintrawwithzeros {#2}.#1%
}%
@@ -615,7 +616,7 @@
}%
\def\XINT_igctf_loop_f #1#2#3#4/%
{%
- \xint_gob_til_w #4\XINT_igctf_end\W
+ \xint_gob_til_W #4\XINT_igctf_end\W
\expandafter\XINT_igctf_loop_g
\romannumeral-`0#4.{#2}{#3}#1%
}%
@@ -645,7 +646,7 @@
}%
\def\XINT_cstcv_loop_a #1#2#3#4#5#6,%
{%
- \xint_gob_til_w #6\XINT_cstcv_end\W
+ \xint_gob_til_W #6\XINT_cstcv_end\W
\expandafter\XINT_cstcv_loop_b
\romannumeral0\xintrawwithzeros {#6}.{#2}{#3}{#4}{#5}{#1}%
}%
@@ -687,7 +688,7 @@
}%
\def\XINT_icstcv_loop_a #1#2#3#4#5#6,%
{%
- \xint_gob_til_w #6\XINT_icstcv_end\W
+ \xint_gob_til_W #6\XINT_icstcv_end\W
\expandafter
\XINT_icstcv_loop_b \romannumeral-`0#6.{#2}{#3}{#4}{#5}{#1}%
}%
@@ -754,7 +755,7 @@
}%
\def\XINT_gctcv_loop_h #1#2#3/%
{%
- \xint_gob_til_w #3\XINT_gctcv_end\W
+ \xint_gob_til_W #3\XINT_gctcv_end\W
\expandafter\XINT_gctcv_loop_i
\romannumeral0\xintrawwithzeros {#3}.#2{#1}%
}%
@@ -807,7 +808,7 @@
}%
\def\XINT_igctcv_loop_f #1#2#3#4/%
{%
- \xint_gob_til_w #4\XINT_igctcv_end_a\W
+ \xint_gob_til_W #4\XINT_igctcv_end_a\W
\expandafter\XINT_igctcv_loop_g
\romannumeral-`0#4.#1#2{#3}%
}%
@@ -842,13 +843,13 @@
}%
\def\XINT_cntf #1#2%
{%
- \ifnum #1>0
+ \ifnum #1>\xint_c_
\xint_afterfi {\expandafter\XINT_cntf_loop\expandafter
{\the\numexpr #1-1\expandafter}\expandafter
{\romannumeral-`0#2{#1}}{#2}}%
\else
\xint_afterfi
- {\ifnum #1=0
+ {\ifnum #1=\xint_c_
\xint_afterfi {\expandafter\space \romannumeral-`0#2{0}}%
\else \xint_afterfi { 0/1[0]}%
\fi}%
@@ -856,7 +857,7 @@
}%
\def\XINT_cntf_loop #1#2#3%
{%
- \ifnum #1>0 \else \XINT_cntf_exit \fi
+ \ifnum #1>\xint_c_ \else \XINT_cntf_exit \fi
\expandafter\XINT_cntf_loop\expandafter
{\the\numexpr #1-1\expandafter }\expandafter
{\romannumeral0\xintadd {\xintDiv {1[0]}{#2}}{#3{#1}}}%
@@ -875,13 +876,13 @@
}%
\def\XINT_gcntf #1#2#3%
{%
- \ifnum #1>0
+ \ifnum #1>\xint_c_
\xint_afterfi {\expandafter\XINT_gcntf_loop\expandafter
{\the\numexpr #1-1\expandafter}\expandafter
{\romannumeral-`0#2{#1}}{#2}{#3}}%
\else
\xint_afterfi
- {\ifnum #1=0
+ {\ifnum #1=\xint_c_
\xint_afterfi {\expandafter\space\romannumeral-`0#2{0}}%
\else \xint_afterfi { 0/1[0]}%
\fi}%
@@ -889,7 +890,7 @@
}%
\def\XINT_gcntf_loop #1#2#3#4%
{%
- \ifnum #1>0 \else \XINT_gcntf_exit \fi
+ \ifnum #1>\xint_c_ \else \XINT_gcntf_exit \fi
\expandafter\XINT_gcntf_loop\expandafter
{\the\numexpr #1-1\expandafter }\expandafter
{\romannumeral0\xintadd {\xintDiv {#4{#1}}{#2}}{#3{#1}}}%
@@ -927,9 +928,9 @@
\expandafter\XINT_cntcs_loop\expandafter
#1\expandafter #2#3%
{%
- \fi\XINT_cntcs__exit #2%
+ \fi\XINT_cntcs_exit_b #2%
}%
-\def\XINT_cntcs__exit #1,{ }%
+\def\XINT_cntcs_exit_b #1,{ }%
\def\xintCntoGC {\romannumeral0\xintcntogc }%
\def\xintcntogc #1%
{%
@@ -956,9 +957,9 @@
\expandafter\XINT_cntgc_loop\expandafter
#1\expandafter #2#3%
{%
- \fi\XINT_cntgc__exit #2%
+ \fi\XINT_cntgc_exit_b #2%
}%
-\def\XINT_cntgc__exit #1+1/{ }%
+\def\XINT_cntgc_exit_b #1+1/{ }%
\def\xintGCntoGC {\romannumeral0\xintgcntogc }%
\def\xintgcntogc #1%
{%
@@ -989,9 +990,9 @@
\def\XINT_gcntgc_exit \fi
\expandafter\XINT_gcntgc_loop_b\expandafter #1#2#3#4#5%
{%
- \fi\XINT_gcntgc__exit #1%
+ \fi\XINT_gcntgc_exit_b #1%
}%
-\def\XINT_gcntgc__exit #1/{ }%
+\def\XINT_gcntgc_exit_b #1/{ }%
\def\xintCstoGC {\romannumeral0\xintcstogc }%
\def\xintcstogc #1%
{%
@@ -1000,7 +1001,7 @@
\def\XINT_cstc_prep #1,{\XINT_cstc_loop_a {{#1}}}%
\def\XINT_cstc_loop_a #1#2,%
{%
- \xint_gob_til_w #2\XINT_cstc_end\W
+ \xint_gob_til_W #2\XINT_cstc_end\W
\XINT_cstc_loop_b {#1}{#2}%
}%
\def\XINT_cstc_loop_b #1#2{\XINT_cstc_loop_a {#1+1/{#2}}}%
@@ -1013,7 +1014,7 @@
\def\XINT_gctgc_start {\XINT_gctgc_loop_a {}}%
\def\XINT_gctgc_loop_a #1#2+#3/%
{%
- \xint_gob_til_w #3\XINT_gctgc_end\W
+ \xint_gob_til_W #3\XINT_gctgc_end\W
\expandafter\XINT_gctgc_loop_b\expandafter
{\romannumeral-`0#2}{#3}{#1}%
}%
@@ -1028,9 +1029,9 @@
}%
\def\XINT_gctgc_end\W\expandafter\XINT_gctgc_loop_b
{%
- \expandafter\XINT_gctgc__end
+ \expandafter\XINT_gctgc_end_b
}%
-\def\XINT_gctgc__end #1#2#3{ #3{#1}}%
+\def\XINT_gctgc_end_b #1#2#3{ #3{#1}}%
\XINT_cfrac_restorecatcodes_endinput%
\endinput
%%