summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/xint
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-04 22:24:03 +0000
committerKarl Berry <karl@freefriends.org>2013-10-04 22:24:03 +0000
commitbba0d5bf503da1006cde30ddc9cc8d114f477006 (patch)
tree4dee908e30c5ab1615b13685a9836411d2bd23cf /Master/texmf-dist/tex/generic/xint
parent623c6a6357c19020fb9ad6214494be225512ed67 (diff)
xint (4oct13)
git-svn-id: svn://tug.org/texlive/trunk@31834 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/xint')
-rw-r--r--Master/texmf-dist/tex/generic/xint/xint.sty95
-rw-r--r--Master/texmf-dist/tex/generic/xint/xintbinhex.sty67
-rw-r--r--Master/texmf-dist/tex/generic/xint/xintcfrac.sty87
-rw-r--r--Master/texmf-dist/tex/generic/xint/xintexpr.sty78
-rw-r--r--Master/texmf-dist/tex/generic/xint/xintfrac.sty90
-rw-r--r--Master/texmf-dist/tex/generic/xint/xintgcd.sty69
-rw-r--r--Master/texmf-dist/tex/generic/xint/xintseries.sty69
7 files changed, 122 insertions, 433 deletions
diff --git a/Master/texmf-dist/tex/generic/xint/xint.sty b/Master/texmf-dist/tex/generic/xint/xint.sty
index 3b0f6239b6d..ead0a68fb9c 100644
--- a/Master/texmf-dist/tex/generic/xint/xint.sty
+++ b/Master/texmf-dist/tex/generic/xint/xint.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
%%
%%----------------------------------------------------------------
-%% The xint bundle (version 1.09a of September 22, 2013)
+%% The xint bundle (version 1.09b of October 3, 2013)
%% xint: Expandable operations on long numbers
%% Copyright (C) 2013 by Jean-Francois Burnol
%%----------------------------------------------------------------
@@ -33,7 +33,7 @@
\catcode123=1 % {
\catcode125=2 % }
\catcode64=11 % @
- \catcode95=11 % _ (starting with 1.06b, used inside cs names)
+ \catcode95=11 % _
\catcode35=6 % #
\catcode44=12 % ,
\catcode45=12 % -
@@ -65,8 +65,16 @@
\def\ChangeCatcodesIfInputNotAborted
{%
\endgroup
- \edef\XINT_restorecatcodes_endinput
- {%
+ \def\XINT_storecatcodes
+ {% takes care of all, to allow more economical code in modules
+ \catcode63=\the\catcode63 % ? xintexpr
+ \catcode124=\the\catcode124 % | xintexpr
+ \catcode38=\the\catcode38 % & xintexpr
+ \catcode64=\the\catcode64 % @ xintexpr
+ \catcode33=\the\catcode33 % ! xintexpr
+ \catcode93=\the\catcode93 % ] -, xintfrac, xintseries, xintcfrac
+ \catcode91=\the\catcode91 % [ -, xintfrac, xintseries, xintcfrac
+ \catcode36=\the\catcode36 % $ xintgcd only
\catcode94=\the\catcode94 % ^
\catcode96=\the\catcode96 % `
\catcode47=\the\catcode47 % /
@@ -88,7 +96,10 @@
\catcode13=\the\catcode13 % ^^M
\catcode32=\the\catcode32 %
\catcode61=\the\catcode61\relax % =
- \noexpand\endinput
+ }%
+ \edef\XINT_restorecatcodes_endinput
+ {%
+ \XINT_storecatcodes\noexpand\endinput %
}%
\def\XINT_setcatcodes
{%
@@ -113,34 +124,39 @@
\catcode47=12 % /
\catcode96=12 % `
\catcode94=11 % ^
+ \catcode36=3 % $
+ \catcode91=12 % [
+ \catcode93=12 % ]
+ \catcode33=11 % !
+ \catcode64=11 % @
+ \catcode38=12 % &
+ \catcode124=12 % |
+ \catcode63=11 % ?
}%
\XINT_setcatcodes
}%
\ChangeCatcodesIfInputNotAborted
+\def\XINTsetupcatcodes {% for use by other modules
+ \edef\XINT_restorecatcodes_endinput
+ {%
+ \XINT_storecatcodes\noexpand\endinput %
+ }%
+ \XINT_setcatcodes
+}%
\begingroup
- \catcode64=11 % @
- \catcode91=12 % [
- \catcode93=12 % ]
- \catcode58=12 % : (does not really matter, was letter)
+ \catcode58=12 % : (does not matter, actually)
\expandafter\ifx\csname ProvidesPackage\endcsname\relax
- \def\x#1#2#3[#4]{\endgroup
- \immediate\write-1{Package: #3 #4}%
- \xdef#1{#4}%
- }%
+ \def\x{\endgroup
+ \def\XINT_providespackage ##1##2[##3]%
+ {\immediate\write-1{Package: ##2 ##3}%
+ \expandafter\xdef\csname ver@##2.sty\endcsname{##3}}}%
\else
- \def\x#1#2[#3]{\endgroup
- #2[{#3}]%
- \ifx#1\@undefined
- \xdef#1{#3}%
- \fi
- \ifx#1\relax
- \xdef#1{#3}%
- \fi
- }%
+ \def\x{\endgroup\let\XINT_providespackage\relax }%
\fi
-\expandafter\x\csname ver@xint.sty\endcsname
-\ProvidesPackage{xint}%
- [2013/09/24 v1.09a Expandable operations on long numbers (jfB)]%
+\x
+\XINT_providespackage
+\ProvidesPackage {xint}%
+ [2013/10/03 v1.09b Expandable operations on long numbers (jfB)]%
\def\xint_gobble_ {}%
\def\xint_gobble_i #1{}%
\def\xint_gobble_ii #1#2{}%
@@ -165,6 +181,7 @@
\def\xint_gob_til_zero #10{}%
\def\xint_gob_til_one #11{}%
\def\xint_gob_til_G #1G{}%
+\def\xint_gob_til_minus #1-{}% was missing since 1.06b, \xintDSR could not work.
\def\xint_gob_til_zeros_iii #1000{}%
\def\xint_gob_til_zeros_iv #10000{}%
\def\xint_gob_til_relax #1\relax {}%
@@ -394,20 +411,32 @@
\def\xintNthEltNoExpand {\romannumeral0\xintntheltnoexpand }%
\def\xintnthelt #1#2%
{%
- \expandafter\XINT_nthelt\expandafter {\romannumeral-`0#2}%
- {\numexpr #1\relax }%
+ \expandafter\XINT_nthelt_a\expandafter {\the\numexpr #1\expandafter}%
+ \expandafter {\romannumeral-`0#2}%
}%
\def\xintntheltnoexpand #1#2%
{%
- \XINT_nthelt {#2}{\numexpr #1\relax}%
+ \expandafter\XINT_nthelt_a\expandafter {\the\numexpr #1}{#2}%
}%
-\def\XINT_nthelt #1#2%
+\def\XINT_nthelt_a #1%
{%
- \ifnum #2>\xint_c_
- \xint_afterfi {\XINT_nthelt_loop_a {#2}}%
+ \ifnum #1<0
+ \expandafter\XINT_nthelt_b\else\expandafter\XINT_nthelt_c
+ \fi {#1}%
+}%
+\def\XINT_nthelt_b #1#2%
+{%
+ \expandafter\XINT_nthelt_c\expandafter
+ {\the\numexpr -#1\expandafter}\expandafter
+ {\romannumeral0\xintrevwithbraces {#2}}%
+}%
+\def\XINT_nthelt_c #1#2%
+{%
+ \ifnum #1>\xint_c_
+ \xint_afterfi {\XINT_nthelt_loop_a {#1}}%
\else
\xint_afterfi {\XINT_length_loop {0}}%
- \fi #1\xint_relax\xint_relax\xint_relax\xint_relax
+ \fi #2\xint_relax\xint_relax\xint_relax\xint_relax
\xint_relax\xint_relax\xint_relax\xint_relax\Z
}%
\def\XINT_nthelt_loop_a #1%
@@ -3214,7 +3243,7 @@
\def\XINT_dsr_b #1#2#3\Z
{%
\xint_gob_til_W #2\xint_dsr_onedigit\W
- \xint_minus #2\xint_dsr_onedigit-%
+ \xint_gob_til_minus #2\xint_dsr_onedigit-%
\expandafter\XINT_dsr_removew
\romannumeral0\XINT_rev {#2#3}%
}%
diff --git a/Master/texmf-dist/tex/generic/xint/xintbinhex.sty b/Master/texmf-dist/tex/generic/xint/xintbinhex.sty
index 8b9ab594cf3..79951c73605 100644
--- a/Master/texmf-dist/tex/generic/xint/xintbinhex.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintbinhex.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
%%
%%----------------------------------------------------------------
-%% The xint bundle (version 1.09a of September 22, 2013)
+%% The xint bundle (version 1.09b of October 3, 2013)
%% xintbinhex: Expandable binary and hexadecimal conversions
%% Copyright (C) 2013 by Jean-Francois Burnol
%%----------------------------------------------------------------
@@ -103,67 +103,10 @@
\aftergroup\endinput
\fi
\endgroup%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
- \catcode13=5 % ^^M
- \endlinechar=13 %
- \catcode123=1 % {
- \catcode125=2 % }
- \catcode95=11 % _
- \def\x
- {%
- \endgroup
- \edef\XINT_binhex_restorecatcodes_endinput
- {%
- \catcode94=\the\catcode94 % ^
- \catcode96=\the\catcode96 % `
- \catcode47=\the\catcode47 % /
- \catcode41=\the\catcode41 % )
- \catcode40=\the\catcode40 % (
- \catcode42=\the\catcode42 % *
- \catcode43=\the\catcode43 % +
- \catcode62=\the\catcode62 % >
- \catcode60=\the\catcode60 % <
- \catcode58=\the\catcode58 % :
- \catcode46=\the\catcode46 % .
- \catcode45=\the\catcode45 % -
- \catcode44=\the\catcode44 % ,
- \catcode35=\the\catcode35 % #
- \catcode95=\the\catcode95 % _
- \catcode125=\the\catcode125 % }
- \catcode123=\the\catcode123 % {
- \endlinechar=\the\endlinechar
- \catcode13=\the\catcode13 % ^^M
- \catcode32=\the\catcode32 %
- \catcode61=\the\catcode61\relax % =
- \noexpand\endinput
- }%
- \XINT_setcatcodes % defined in xint.sty
- }%
-\x
-\begingroup
- \catcode64=11 % @
- \catcode91=12 % [
- \catcode93=12 % ]
- \catcode58=12 % :
- \expandafter\ifx\csname ProvidesPackage\endcsname\relax
- \def\x#1#2#3[#4]{\endgroup
- \immediate\write-1{Package: #3 #4}%
- \xdef#1{#4}%
- }%
- \else
- \def\x#1#2[#3]{\endgroup
- #2[{#3}]%
- \ifx#1\@undefined
- \xdef#1{#3}%
- \fi
- \ifx#1\relax
- \xdef#1{#3}%
- \fi
- }%
- \fi
-\expandafter\x\csname ver@xintbinhex.sty\endcsname
+\XINTsetupcatcodes%
+\XINT_providespackage
\ProvidesPackage{xintbinhex}%
- [2013/09/24 v1.09a Expandable binary and hexadecimal conversions (jfB)]%
+ [2013/10/03 v1.09b Expandable binary and hexadecimal conversions (jfB)]%
\chardef\xint_c_xvi 16
\chardef\xint_c_ii^v 32
\chardef\xint_c_ii^vi 64
@@ -726,7 +669,7 @@
{%
\XINT_num_loop
}%
-\XINT_binhex_restorecatcodes_endinput%
+\XINT_restorecatcodes_endinput%
\endinput
%%
%% End of file `xintbinhex.sty'.
diff --git a/Master/texmf-dist/tex/generic/xint/xintcfrac.sty b/Master/texmf-dist/tex/generic/xint/xintcfrac.sty
index 139e4cb47f6..1e605256060 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.09a of September 22, 2013)
+%% The xint bundle (version 1.09b of October 3, 2013)
%% xintcfrac: Expandable continued fractions with xint package
%% Copyright (C) 2013 by Jean-Francois Burnol
%%----------------------------------------------------------------
@@ -103,69 +103,10 @@
\aftergroup\endinput
\fi
\endgroup%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
- \catcode13=5 % ^^M
- \endlinechar=13 %
- \catcode123=1 % {
- \catcode125=2 % }
- \catcode95=11 % _
- \def\x
- {%
- \endgroup
- \edef\XINT_cfrac_restorecatcodes_endinput
- {%
- \catcode93=\the\catcode93 % ]
- \catcode91=\the\catcode91 % [
- \catcode94=\the\catcode94 % ^
- \catcode96=\the\catcode96 % `
- \catcode47=\the\catcode47 % /
- \catcode41=\the\catcode41 % )
- \catcode40=\the\catcode40 % (
- \catcode42=\the\catcode42 % *
- \catcode43=\the\catcode43 % +
- \catcode62=\the\catcode62 % >
- \catcode60=\the\catcode60 % <
- \catcode58=\the\catcode58 % :
- \catcode46=\the\catcode46 % .
- \catcode45=\the\catcode45 % -
- \catcode44=\the\catcode44 % ,
- \catcode35=\the\catcode35 % #
- \catcode95=\the\catcode95 % _
- \catcode125=\the\catcode125 % }
- \catcode123=\the\catcode123 % {
- \endlinechar=\the\endlinechar
- \catcode13=\the\catcode13 % ^^M
- \catcode32=\the\catcode32 %
- \catcode61=\the\catcode61\relax % =
- \noexpand\endinput
- }%
- \XINT_setcatcodes % defined in xint.sty
- \catcode91=12 % [
- \catcode93=12 % ]
- }%
-\x
-\begingroup
- \catcode64=11 % @
- \catcode58=12 % :
- \expandafter\ifx\csname ProvidesPackage\endcsname\relax
- \def\x#1#2#3[#4]{\endgroup
- \immediate\write-1{Package: #3 #4}%
- \xdef#1{#4}%
- }%
- \else
- \def\x#1#2[#3]{\endgroup
- #2[{#3}]%
- \ifx#1\@undefined
- \xdef#1{#3}%
- \fi
- \ifx#1\relax
- \xdef#1{#3}%
- \fi
- }%
- \fi
-\expandafter\x\csname ver@xintcfrac.sty\endcsname
+\XINTsetupcatcodes%
+\XINT_providespackage
\ProvidesPackage{xintcfrac}%
- [2013/09/24 v1.09a Expandable continued fractions with xint package (jfB)]%
+ [2013/10/03 v1.09b Expandable continued fractions with xint package (jfB)]%
\def\xintCFrac {\romannumeral0\xintcfrac }%
\def\xintcfrac #1%
{%
@@ -500,7 +441,7 @@
{%
\expandafter\XINT_cstf_loop_a\expandafter{#2}#1%
}%
-\def\XINT_cstf_end #1.#2#3#4#5{\xintrawwithzeros {#2/#3}[0]}%
+\def\XINT_cstf_end #1.#2#3#4#5{\xintrawwithzeros {#2/#3}}% 1.09b removes [0]
\def\xintiCstoF {\romannumeral0\xinticstof }%
\def\xinticstof #1%
{%
@@ -527,7 +468,7 @@
{%
\expandafter\XINT_icstf_loop_a\expandafter {#2}{#1}%
}%
-\def\XINT_icstf_end#1.#2#3#4#5{\xintrawwithzeros {#2/#3}[0]}%
+\def\XINT_icstf_end#1.#2#3#4#5{\xintrawwithzeros {#2/#3}}% 1.09b removes [0]
\def\xintGCtoF {\romannumeral0\xintgctof }%
\def\xintgctof #1%
{%
@@ -588,7 +529,7 @@
{%
\expandafter\XINT_gctf_loop_a\expandafter {#2}#1%
}%
-\def\XINT_gctf_end #1.#2#3#4#5{\xintrawwithzeros {#2/#3}[0]}%
+\def\XINT_gctf_end #1.#2#3#4#5{\xintrawwithzeros {#2/#3}}% 1.09b removes [0]
\def\xintiGCtoF {\romannumeral0\xintigctof }%
\def\xintigctof #1%
{%
@@ -634,7 +575,7 @@
{%
\XINT_igctf_loop_a {#3}{#4}{#1}{#2}%
}%
-\def\XINT_igctf_end #1.#2#3#4#5{\xintrawwithzeros {#4/#5}[0]}%
+\def\XINT_igctf_end #1.#2#3#4#5{\xintrawwithzeros {#4/#5}}% 1.09b removes [0]
\def\xintCstoCv {\romannumeral0\xintcstocv }%
\def\xintcstocv #1%
{%
@@ -675,7 +616,7 @@
\expandafter\XINT_cstcv_loop_g\expandafter
{\romannumeral0\xintrawwithzeros {#1/#2}}{#5}{#1}{#2}{#3}{#4}%
}%
-\def\XINT_cstcv_loop_g #1#2{\XINT_cstcv_loop_a {#2{#1[0]}}}%
+\def\XINT_cstcv_loop_g #1#2{\XINT_cstcv_loop_a {#2{#1}}}% 1.09b removes [0]
\def\XINT_cstcv_end #1.#2#3#4#5#6{ #6}%
\def\xintiCstoCv {\romannumeral0\xinticstocv }%
\def\xinticstocv #1%
@@ -708,8 +649,8 @@
\expandafter\XINT_icstcv_loop_e\expandafter
{\romannumeral0\xintrawwithzeros {#1/#2}}{{#1}{#2}}%
}%
-\def\XINT_icstcv_loop_e #1#2#3#4{\XINT_icstcv_loop_a {#4{#1[0]}}#2#3}%
-\def\XINT_icstcv_end #1.#2#3#4#5#6{ #6}%
+\def\XINT_icstcv_loop_e #1#2#3#4{\XINT_icstcv_loop_a {#4{#1}}#2#3}%
+\def\XINT_icstcv_end #1.#2#3#4#5#6{ #6}% 1.09b removes [0]
\def\xintGCtoCv {\romannumeral0\xintgctocv }%
\def\xintgctocv #1%
{%
@@ -751,7 +692,7 @@
}%
\def\XINT_gctcv_loop_g #1#2#3#4%
{%
- \XINT_gctcv_loop_h {#4{#1[0]}}{#2#3}%
+ \XINT_gctcv_loop_h {#4{#1}}{#2#3}% 1.09b removes [0]
}%
\def\XINT_gctcv_loop_h #1#2#3/%
{%
@@ -835,7 +776,7 @@
\expandafter\XINT_igctcv_end_b\expandafter
{\romannumeral0\xintrawwithzeros {#2/#3}}%
}%
-\def\XINT_igctcv_end_b #1#2{ #2{#1[0]}}%
+\def\XINT_igctcv_end_b #1#2{ #2{#1}}% 1.09b removes [0]
\def\xintCntoF {\romannumeral0\xintcntof }%
\def\xintcntof #1%
{%
@@ -1032,7 +973,7 @@
\expandafter\XINT_gctgc_end_b
}%
\def\XINT_gctgc_end_b #1#2#3{ #3{#1}}%
-\XINT_cfrac_restorecatcodes_endinput%
+\XINT_restorecatcodes_endinput%
\endinput
%%
%% End of file `xintcfrac.sty'.
diff --git a/Master/texmf-dist/tex/generic/xint/xintexpr.sty b/Master/texmf-dist/tex/generic/xint/xintexpr.sty
index 3c1de7ed8a9..76b1537d209 100644
--- a/Master/texmf-dist/tex/generic/xint/xintexpr.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintexpr.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
%%
%%----------------------------------------------------------------
-%% The xint bundle (version 1.09a of September 22, 2013)
+%% The xint bundle (version 1.09b of October 3, 2013)
%% xintexpr: Expandable expression parser
%% Copyright (C) 2013 by Jean-Francois Burnol
%%----------------------------------------------------------------
@@ -103,78 +103,10 @@
\aftergroup\endinput
\fi
\endgroup%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
- \catcode13=5 % ^^M
- \endlinechar=13 %
- \catcode123=1 % {
- \catcode125=2 % }
- \catcode95=11 % _
- \def\x
- {%
- \endgroup
- \edef\XINT_expr_restorecatcodes_endinput
- {%
- \catcode63=\the\catcode63 % ?
- \catcode124=\the\catcode124 % |
- \catcode38=\the\catcode38 % &
- \catcode64=\the\catcode64 % @
- \catcode33=\the\catcode33 % !
- \catcode93=\the\catcode93 % ]
- \catcode91=\the\catcode91 % [
- \catcode94=\the\catcode94 % ^
- \catcode96=\the\catcode96 % `
- \catcode47=\the\catcode47 % /
- \catcode41=\the\catcode41 % )
- \catcode40=\the\catcode40 % (
- \catcode42=\the\catcode42 % *
- \catcode43=\the\catcode43 % +
- \catcode62=\the\catcode62 % >
- \catcode60=\the\catcode60 % <
- \catcode58=\the\catcode58 % :
- \catcode46=\the\catcode46 % .
- \catcode45=\the\catcode45 % -
- \catcode44=\the\catcode44 % ,
- \catcode35=\the\catcode35 % #
- \catcode95=\the\catcode95 % _
- \catcode125=\the\catcode125 % }
- \catcode123=\the\catcode123 % {
- \endlinechar=\the\endlinechar
- \catcode13=\the\catcode13 % ^^M
- \catcode32=\the\catcode32 %
- \catcode61=\the\catcode61\relax % =
- \noexpand\endinput
- }%
- \XINT_setcatcodes % defined in xint.sty
- \catcode91=12 % [
- \catcode93=12 % ]
- \catcode33=11 % !
- \catcode64=11 % @
- \catcode38=12 % &
- \catcode124=12 % |
- \catcode63=11 % ?
- }%
-\x
-\begingroup
- \catcode58=12 % : (but doesn't matter)
- \expandafter\ifx\csname ProvidesPackage\endcsname\relax
- \def\x#1#2#3[#4]{\endgroup
- \immediate\write-1{Package: #3 #4}%
- \xdef#1{#4}%
- }%
- \else
- \def\x#1#2[#3]{\endgroup
- #2[{#3}]%
- \ifx#1\@undefined
- \xdef#1{#3}%
- \fi
- \ifx#1\relax
- \xdef#1{#3}%
- \fi
- }%
- \fi
-\expandafter\x\csname ver@xintexpr.sty\endcsname
+\XINTsetupcatcodes%
+\XINT_providespackage
\ProvidesPackage{xintexpr}%
- [2013/09/24 v1.09a Expandable expression parser (jfB)]%
+ [2013/10/03 v1.09b Expandable expression parser (jfB)]%
\def\xint_gob_til_dot #1.{}%
\def\xint_gob_til_dot_andstop #1.{ }%
\def\xint_gob_til_! #1!{}% nota bene: ! is of catcode 11
@@ -1042,7 +974,7 @@
\catcode44=12 % ,
\catcode61=12 % =
}%
-\XINT_expr_restorecatcodes_endinput%
+\XINT_restorecatcodes_endinput%
\endinput
%%
%% End of file `xintexpr.sty'.
diff --git a/Master/texmf-dist/tex/generic/xint/xintfrac.sty b/Master/texmf-dist/tex/generic/xint/xintfrac.sty
index dc3c8ad2f9a..c5ea336f8a8 100644
--- a/Master/texmf-dist/tex/generic/xint/xintfrac.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintfrac.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
%%
%%----------------------------------------------------------------
-%% The xint bundle (version 1.09a of September 22, 2013)
+%% The xint bundle (version 1.09b of October 3, 2013)
%% xintfrac: Expandable operations on fractions
%% Copyright (C) 2013 by Jean-Francois Burnol
%%----------------------------------------------------------------
@@ -103,69 +103,10 @@
\aftergroup\endinput
\fi
\endgroup%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
- \catcode13=5 % ^^M
- \endlinechar=13 %
- \catcode123=1 % {
- \catcode125=2 % }
- \catcode95=11 % _
- \def\x
- {%
- \endgroup
- \edef\XINT_frac_restorecatcodes_endinput
- {%
- \catcode93=\the\catcode93 % ]
- \catcode91=\the\catcode91 % [
- \catcode94=\the\catcode94 % ^
- \catcode96=\the\catcode96 % `
- \catcode47=\the\catcode47 % /
- \catcode41=\the\catcode41 % )
- \catcode40=\the\catcode40 % (
- \catcode42=\the\catcode42 % *
- \catcode43=\the\catcode43 % +
- \catcode62=\the\catcode62 % >
- \catcode60=\the\catcode60 % <
- \catcode58=\the\catcode58 % :
- \catcode46=\the\catcode46 % .
- \catcode45=\the\catcode45 % -
- \catcode44=\the\catcode44 % ,
- \catcode35=\the\catcode35 % #
- \catcode95=\the\catcode95 % _
- \catcode125=\the\catcode125 % }
- \catcode123=\the\catcode123 % {
- \endlinechar=\the\endlinechar
- \catcode13=\the\catcode13 % ^^M
- \catcode32=\the\catcode32 %
- \catcode61=\the\catcode61\relax % =
- \noexpand\endinput
- }%
- \XINT_setcatcodes % defined in xint.sty
- \catcode91=12 % [
- \catcode93=12 % ]
- }%
-\x
-\begingroup
- \catcode64=11 % @
- \catcode58=12 % :
- \expandafter\ifx\csname ProvidesPackage\endcsname\relax
- \def\x#1#2#3[#4]{\endgroup
- \immediate\write-1{Package: #3 #4}%
- \xdef#1{#4}%
- }%
- \else
- \def\x#1#2[#3]{\endgroup
- #2[{#3}]%
- \ifx#1\@undefined
- \xdef#1{#3}%
- \fi
- \ifx#1\relax
- \xdef#1{#3}%
- \fi
- }%
- \fi
-\expandafter\x\csname ver@xintfrac.sty\endcsname
+\XINTsetupcatcodes%
+\XINT_providespackage
\ProvidesPackage{xintfrac}%
- [2013/09/24 v1.09a Expandable operations on fractions (jfB)]%
+ [2013/10/03 v1.09b Expandable operations on fractions (jfB)]%
\chardef\xint_c_vi 6
\chardef\xint_c_vii 7
\chardef\xint_c_xviii 18
@@ -460,6 +401,27 @@
\expandafter\XINT_raw\romannumeral0\XINT_infrac
}%
\def\XINT_raw #1#2#3{ #2/#3[#1]}%
+\def\xintPRaw {\romannumeral0\xintpraw }%
+\def\xintpraw
+{%
+ \expandafter\XINT_praw\romannumeral0\XINT_infrac
+}%
+\def\XINT_praw #1%
+{%
+ \ifnum #1=\xint_c_ \expandafter\XINT_praw_a\fi \XINT_praw_A {#1}%
+}%
+\def\XINT_praw_A #1#2#3%
+{%
+ \if\XINT_isOne{#3}1\expandafter\xint_firstoftwo
+ \else\expandafter\xint_secondoftwo
+ \fi { #2[#1]}{ #2/#3[#1]}%
+}%
+\def\XINT_praw_a\XINT_praw_A #1#2#3%
+{%
+ \if\XINT_isOne{#3}1\expandafter\xint_firstoftwo
+ \else\expandafter\xint_secondoftwo
+ \fi { #2}{ #2/#3}%
+}%
\def\xintRawWithZeros {\romannumeral0\xintrawwithzeros }%
\def\xintrawwithzeros
{%
@@ -2398,7 +2360,7 @@
{\xintHalf{\xintiQuo{\XINT_dsx_addzerosnofuss {#4}{#2}}{#3}}}}%
}%
\def\XINT_flsqrt_big_end_b #1#2{#2[#1]}%
-\XINT_frac_restorecatcodes_endinput%
+\XINT_restorecatcodes_endinput%
\endinput
%%
%% End of file `xintfrac.sty'.
diff --git a/Master/texmf-dist/tex/generic/xint/xintgcd.sty b/Master/texmf-dist/tex/generic/xint/xintgcd.sty
index c7ff8245b84..6c64b21a9ef 100644
--- a/Master/texmf-dist/tex/generic/xint/xintgcd.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintgcd.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
%%
%%----------------------------------------------------------------
-%% The xint bundle (version 1.09a of September 22, 2013)
+%% The xint bundle (version 1.09b of October 3, 2013)
%% xintgcd: Euclidean algorithm with xint package
%% Copyright (C) 2013 by Jean-Francois Burnol
%%----------------------------------------------------------------
@@ -103,69 +103,10 @@
\aftergroup\endinput
\fi
\endgroup%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
- \catcode13=5 % ^^M
- \endlinechar=13 %
- \catcode123=1 % {
- \catcode125=2 % }
- \catcode95=11 % _
- \def\x
- {%
- \endgroup
- \edef\XINT_gcd_restorecatcodes_endinput
- {%
- \catcode36=\the\catcode36 % $
- \catcode94=\the\catcode94 % ^
- \catcode96=\the\catcode96 % `
- \catcode47=\the\catcode47 % /
- \catcode41=\the\catcode41 % )
- \catcode40=\the\catcode40 % (
- \catcode42=\the\catcode42 % *
- \catcode43=\the\catcode43 % +
- \catcode62=\the\catcode62 % >
- \catcode60=\the\catcode60 % <
- \catcode58=\the\catcode58 % :
- \catcode46=\the\catcode46 % .
- \catcode45=\the\catcode45 % -
- \catcode44=\the\catcode44 % ,
- \catcode35=\the\catcode35 % #
- \catcode95=\the\catcode95 % _
- \catcode125=\the\catcode125 % }
- \catcode123=\the\catcode123 % {
- \endlinechar=\the\endlinechar
- \catcode13=\the\catcode13 % ^^M
- \catcode32=\the\catcode32 %
- \catcode61=\the\catcode61\relax % =
- \noexpand\endinput
- }%
- \XINT_setcatcodes % defined in xint.sty
- \catcode36=3 % $
- }%
-\x
-\begingroup
- \catcode64=11 % @
- \catcode91=12 % [
- \catcode93=12 % ]
- \catcode58=12 % :
- \expandafter\ifx\csname ProvidesPackage\endcsname\relax
- \def\x#1#2#3[#4]{\endgroup
- \immediate\write-1{Package: #3 #4}%
- \xdef#1{#4}%
- }%
- \else
- \def\x#1#2[#3]{\endgroup
- #2[{#3}]%
- \ifx#1\@undefined
- \xdef#1{#3}%
- \fi
- \ifx#1\relax
- \xdef#1{#3}%
- \fi
- }%
- \fi
-\expandafter\x\csname ver@xintgcd.sty\endcsname
+\XINTsetupcatcodes%
+\XINT_providespackage
\ProvidesPackage{xintgcd}%
- [2013/09/24 v1.09a Euclide algorithm with xint package (jfB)]%
+ [2013/10/03 v1.09b Euclide algorithm with xint package (jfB)]%
\def\xintGCD {\romannumeral0\xintgcd }%
\def\xintgcd #1%
{%
@@ -559,7 +500,7 @@
\par
\endgroup
}%
-\XINT_gcd_restorecatcodes_endinput%
+\XINT_restorecatcodes_endinput%
\endinput
%%
%% End of file `xintgcd.sty'.
diff --git a/Master/texmf-dist/tex/generic/xint/xintseries.sty b/Master/texmf-dist/tex/generic/xint/xintseries.sty
index 1b65cfb260f..73eccab40e9 100644
--- a/Master/texmf-dist/tex/generic/xint/xintseries.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintseries.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
%%
%%----------------------------------------------------------------
-%% The xint bundle (version 1.09a of September 22, 2013)
+%% The xint bundle (version 1.09b of October 3, 2013)
%% xintseries: Expandable partial sums with xint package
%% Copyright (C) 2013 by Jean-Francois Burnol
%%----------------------------------------------------------------
@@ -103,69 +103,10 @@
\aftergroup\endinput
\fi
\endgroup%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
- \catcode13=5 % ^^M
- \endlinechar=13 %
- \catcode123=1 % {
- \catcode125=2 % }
- \catcode95=11 % _
- \def\x
- {%
- \endgroup
- \edef\XINT_series_restorecatcodes_endinput
- {%
- \catcode93=\the\catcode93 % ]
- \catcode91=\the\catcode91 % [
- \catcode94=\the\catcode94 % ^
- \catcode96=\the\catcode96 % `
- \catcode47=\the\catcode47 % /
- \catcode41=\the\catcode41 % )
- \catcode40=\the\catcode40 % (
- \catcode42=\the\catcode42 % *
- \catcode43=\the\catcode43 % +
- \catcode62=\the\catcode62 % >
- \catcode60=\the\catcode60 % <
- \catcode58=\the\catcode58 % :
- \catcode46=\the\catcode46 % .
- \catcode45=\the\catcode45 % -
- \catcode44=\the\catcode44 % ,
- \catcode35=\the\catcode35 % #
- \catcode95=\the\catcode95 % _
- \catcode125=\the\catcode125 % }
- \catcode123=\the\catcode123 % {
- \endlinechar=\the\endlinechar
- \catcode13=\the\catcode13 % ^^M
- \catcode32=\the\catcode32 %
- \catcode61=\the\catcode61\relax % =
- \noexpand\endinput
- }%
- \XINT_setcatcodes % defined in xint.sty
- \catcode91=12 % [
- \catcode93=12 % ]
- }%
-\x
-\begingroup
- \catcode64=11 % @
- \catcode58=12 % :
- \expandafter\ifx\csname ProvidesPackage\endcsname\relax
- \def\x#1#2#3[#4]{\endgroup
- \immediate\write-1{Package: #3 #4}%
- \xdef#1{#4}%
- }%
- \else
- \def\x#1#2[#3]{\endgroup
- #2[{#3}]%
- \ifx#1\@undefined
- \xdef#1{#3}%
- \fi
- \ifx#1\relax
- \xdef#1{#3}%
- \fi
- }%
- \fi
-\expandafter\x\csname ver@xintseries.sty\endcsname
+\XINTsetupcatcodes%
+\XINT_providespackage
\ProvidesPackage{xintseries}%
- [2013/09/24 v1.09a Expandable partial sums with xint package (jfB)]%
+ [2013/10/03 v1.09b Expandable partial sums with xint package (jfB)]%
\def\xintSeries {\romannumeral0\xintseries }%
\def\xintseries #1#2%
{%
@@ -505,7 +446,7 @@
{\romannumeral0\XINTinfloatpow [#5]{#1}{#2}}%
{#2}{#1}{#3}{#4}{#5}%
}%
-\XINT_series_restorecatcodes_endinput%
+\XINT_restorecatcodes_endinput%
\endinput
%%
%% End of file `xintseries.sty'.