From f41f19063b4eeb01ac278d4d84341194ac4497c4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Nov 2016 22:24:46 +0000 Subject: xint (21nov16) git-svn-id: svn://tug.org/texlive/trunk@42550 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/xint/xint.sty | 34 ++++++---- Master/texmf-dist/tex/generic/xint/xintbinhex.sty | 4 +- Master/texmf-dist/tex/generic/xint/xintcfrac.sty | 4 +- Master/texmf-dist/tex/generic/xint/xintcore.sty | 4 +- Master/texmf-dist/tex/generic/xint/xintexpr.sty | 76 ++++++++++++++++++++--- Master/texmf-dist/tex/generic/xint/xintfrac.sty | 42 ++++++++----- Master/texmf-dist/tex/generic/xint/xintgcd.sty | 4 +- Master/texmf-dist/tex/generic/xint/xintkernel.sty | 4 +- Master/texmf-dist/tex/generic/xint/xintseries.sty | 4 +- Master/texmf-dist/tex/generic/xint/xinttools.sty | 12 ++-- 10 files changed, 134 insertions(+), 54 deletions(-) (limited to 'Master/texmf-dist/tex/generic/xint') diff --git a/Master/texmf-dist/tex/generic/xint/xint.sty b/Master/texmf-dist/tex/generic/xint/xint.sty index 6cad13c1d89..25a779f3a93 100644 --- a/Master/texmf-dist/tex/generic/xint/xint.sty +++ b/Master/texmf-dist/tex/generic/xint/xint.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% --------------------------------------------------------------- -%% The xint bundle 1.2g 2016/03/19 +%% The xint bundle 1.2h 2016/11/20 %% Copyright (C) 2013-2016 by Jean-Francois Burnol %% xint: Expandable operations on big integers %% --------------------------------------------------------------- @@ -70,7 +70,7 @@ \XINTsetupcatcodes% defined in xintkernel.sty (loaded by xintcore.sty) \XINT_providespackage \ProvidesPackage{xint}% - [2016/03/19 1.2g Expandable operations on big integers (JFB)]% + [2016/11/20 1.2h Expandable operations on big integers (JFB)]% \long\def\xint_firstofthree #1#2#3{#1}% \long\def\xint_secondofthree #1#2#3{#2}% \long\def\xint_thirdofthree #1#2#3{#3}% @@ -1510,8 +1510,9 @@ \let\xintibinomial\xintiibinomial \def\XINT_binom_fork #1#2.#3#4.#5#6.% {% - \if-#1\xint_dothis {\xintError:OutOfRangeBinomial\space 0}\fi - \if-#3\xint_dothis {\xintError:OutOfRangeBinomial\space 0}\fi + \if-#5\xint_dothis{\xintError:OutOfRangeBinomial\space 0}\fi + \if-#1\xint_dothis{ 0}\fi + \if-#3\xint_dothis{ 0}\fi \if0#1\xint_dothis{ 1}\fi \if0#3\xint_dothis{ 1}\fi \ifnum #5#6>\xint_c_x^viii_mone\xint_dothis{\xintError:OutOfRangeBinomial\space 0}\fi @@ -1750,13 +1751,24 @@ }% \def\xintiPFactorial{\romannumeral0\xintipfactorial}% \let\xintipfactorial\xintiipfactorial -\def\XINT_pfac_fork #1#2.#3.% -{% - \if-#1\xint_dothis {\xintError:OutOfRangePFac\space 0}\fi - \ifnum #1#2=#3 \xint_dothis{ 1}\fi - \ifnum #1#2>#3 \xint_dothis{\xintError:OutOfRangePFac\space 0}\fi - \ifnum #3>\xint_c_x^viii_mone\xint_dothis{\xintError:OutOfRangePFac\space 0}\fi - \xint_orthat {\XINT_pfac_a #1#2.#3.}% +\def\XINT_pfac_fork #1#2.#3#4.% +{% + \unless\ifnum #1#2<#3#4 \xint_dothis\XINT_pfac_one\fi + \if-#3\xint_dothis\XINT_pfac_neg\fi + \if-#1\xint_dothis\XINT_pfac_zero\fi + \ifnum #3#4>\xint_c_x^viii_mone\xint_dothis\XINT_pfac_outofrange\fi + \xint_orthat \XINT_pfac_a #1#2.#3#4.% +}% +\def\XINT_pfac_outofrange #1.#2.{\xintError:OutOfRangePFac\space 0}% +\def\XINT_pfac_one #1.#2.{ 1}% +\def\XINT_pfac_zero #1.#2.{ 0}% +\def\XINT_pfac_neg -#1.-#2.% +{% + \ifnum #1>\xint_c_x^viii\xint_dothis\XINT_pfac_outofrange\fi + \xint_orthat + {\ifodd\numexpr#2-#1\relax\xint_afterfi{\expandafter-\romannumeral`&&@}\fi + \expandafter\XINT_pfac_a }% + \the\numexpr #2-\xint_c_i\expandafter.\the\numexpr#1-\xint_c_i.% }% \def\XINT_pfac_a #1.#2.% {% diff --git a/Master/texmf-dist/tex/generic/xint/xintbinhex.sty b/Master/texmf-dist/tex/generic/xint/xintbinhex.sty index 429bd7fb008..2dc7e73d50c 100644 --- a/Master/texmf-dist/tex/generic/xint/xintbinhex.sty +++ b/Master/texmf-dist/tex/generic/xint/xintbinhex.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% --------------------------------------------------------------- -%% The xint bundle 1.2g 2016/03/19 +%% The xint bundle 1.2h 2016/11/20 %% Copyright (C) 2013-2016 by Jean-Francois Burnol %% xintbinhex: Expandable binary and hexadecimal conversions %% --------------------------------------------------------------- @@ -70,7 +70,7 @@ \XINTsetupcatcodes% defined in xintkernel.sty \XINT_providespackage \ProvidesPackage{xintbinhex}% - [2016/03/19 1.2g Expandable binary and hexadecimal conversions (JFB)]% + [2016/11/20 1.2h Expandable binary and hexadecimal conversions (JFB)]% \newcount\xint_c_ii^xv \xint_c_ii^xv 32768 \newcount\xint_c_ii^xvi \xint_c_ii^xvi 65536 \newcount\xint_c_x^v \xint_c_x^v 100000 diff --git a/Master/texmf-dist/tex/generic/xint/xintcfrac.sty b/Master/texmf-dist/tex/generic/xint/xintcfrac.sty index d4df3400f4b..1a28b862822 100644 --- a/Master/texmf-dist/tex/generic/xint/xintcfrac.sty +++ b/Master/texmf-dist/tex/generic/xint/xintcfrac.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% --------------------------------------------------------------- -%% The xint bundle 1.2g 2016/03/19 +%% The xint bundle 1.2h 2016/11/20 %% Copyright (C) 2013-2016 by Jean-Francois Burnol %% xintcfrac: Expandable continued fractions with xint package %% --------------------------------------------------------------- @@ -70,7 +70,7 @@ \XINTsetupcatcodes% defined in xintkernel.sty \XINT_providespackage \ProvidesPackage{xintcfrac}% - [2016/03/19 1.2g Expandable continued fractions with xint package (JFB)]% + [2016/11/20 1.2h Expandable continued fractions with xint package (JFB)]% \def\xintCFrac {\romannumeral0\xintcfrac }% \def\xintcfrac #1% {% diff --git a/Master/texmf-dist/tex/generic/xint/xintcore.sty b/Master/texmf-dist/tex/generic/xint/xintcore.sty index c0ae2f7d5dc..88d32749bc2 100644 --- a/Master/texmf-dist/tex/generic/xint/xintcore.sty +++ b/Master/texmf-dist/tex/generic/xint/xintcore.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% --------------------------------------------------------------- -%% The xint bundle 1.2g 2016/03/19 +%% The xint bundle 1.2h 2016/11/20 %% Copyright (C) 2013-2016 by Jean-Francois Burnol %% xintcore: Expandable arithmetic on big integers %% --------------------------------------------------------------- @@ -70,7 +70,7 @@ \XINTsetupcatcodes% defined in xintkernel.sty \XINT_providespackage \ProvidesPackage{xintcore}% - [2016/03/19 1.2g Expandable arithmetic on big integers (JFB)]% + [2016/11/20 1.2h Expandable arithmetic on big integers (JFB)]% \ifdefined\m@ne\let\xint_c_mone\m@ne \else\csname newcount\endcsname\xint_c_mone \xint_c_mone -1 \fi \newcount\xint_c_x^viii \xint_c_x^viii 100000000 diff --git a/Master/texmf-dist/tex/generic/xint/xintexpr.sty b/Master/texmf-dist/tex/generic/xint/xintexpr.sty index b2736c3398b..2e7812a152f 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.2g 2016/03/19 +%% The xint bundle 1.2h 2016/11/20 %% Copyright (C) 2013-2016 by Jean-Francois Burnol %% xintexpr: Expandable expression parser %% --------------------------------------------------------------- @@ -81,7 +81,7 @@ \XINTsetupcatcodes% \XINT_providespackage \ProvidesPackage{xintexpr}% - [2016/03/19 1.2g Expandable expression parser (JFB)]% + [2016/11/20 1.2h Expandable expression parser (JFB)]% \catcode`! 11 \def\xint_gob_til_! #1!{}% catcode 11 ! default in xintexpr.sty code. \edef\XINT_expr_lockscan#1!% not used for decimal numbers in xintexpr 1.2 @@ -120,6 +120,10 @@ \def\xinttheiiexpr {\romannumeral`&&@\expandafter\XINT_iiexpr_print\romannumeral0\xintbareiieval }% \def\xintthe #1{\romannumeral`&&@\expandafter\xint_gobble_iii\romannumeral`&&@#1}% +\let\thexintexpr \xinttheexpr +\let\thexintiexpr \xinttheiexpr +\let\thexintfloatexpr\xintthefloatexpr +\let\thexintiiexpr \xinttheiiexpr \def\xintthecoords #1{\romannumeral`&&@\expandafter\expandafter\expandafter \XINT_thecoords_a \expandafter\xint_gobble_iii\romannumeral0#1}% @@ -189,6 +193,7 @@ \XINT_boolexpr_done \expandafter\xint_gobble_iv\romannumeral0\xinteval }% \def\xinttheboolexpr {\romannumeral`&&@\expandafter\expandafter\expandafter \XINT_boolexpr_print\expandafter\xint_gobble_iv\romannumeral0\xinteval }% +\let\thexintboolexpr\xinttheboolexpr \def\XINT_boolexpr_done { !\XINT_expr_usethe\XINT_protectii\XINT_boolexpr_print }% \def\xintifboolexpr #1{\romannumeral0\xintifnotzero {\xinttheexpr #1\relax}}% \def\xintifboolfloatexpr #1{\romannumeral0\xintifnotzero {\xintthefloatexpr #1\relax}}% @@ -1209,18 +1214,22 @@ \xintApplyInline{\XINT_tmpa {flexpr}\xintOpp}{{vi}{vii}{viii}{ix}}% \xintApplyInline{\XINT_tmpa {iiexpr}\xintiiOpp}{{vi}{vii}{viii}{ix}}% \let\XINT_expr_precedence_? \xint_c_x -\def\XINT_expr_op_? #1#2{\if ?#2\expandafter \XINT_expr_op_??\fi - \XINT_expr_op_?a #1{#2}}% +\def\XINT_expr_op_? #1#2% + {\XINT_expr_op_?checka #2!\xint_bye\XINT_expr_op_?a #1{#2}}% +\def\XINT_expr_op_?checka #1{\expandafter\XINT_expr_op_?checkb\detokenize{#1}}% +\def\XINT_expr_op_?checkb #1{\if ?#1\expandafter\XINT_expr_op_?checkc + \else\expandafter\xint_bye\fi }% +\def\XINT_expr_op_?checkc #1{\xint_gob_til_! #1\XINT_expr_op_?? !\xint_bye}% \def\XINT_expr_op_?a #1#2#3% {% \xintiiifNotZero{\XINT_expr_unlock #1}{\XINT_expr_getnext #2}{\XINT_expr_getnext #3}% }% \let\XINT_flexpr_op_?\XINT_expr_op_? \let\XINT_iiexpr_op_?\XINT_expr_op_? -\def\XINT_expr_op_?? #1#2#3#4#5#6% +\def\XINT_expr_op_?? !\xint_bye\xint_bye\XINT_expr_op_?a #1#2#3#4#5% {% - \xintiiifSgn {\XINT_expr_unlock #2}{\XINT_expr_getnext #4}{\XINT_expr_getnext #5}% - {\XINT_expr_getnext #6}% + \xintiiifSgn {\XINT_expr_unlock #1}% + {\XINT_expr_getnext #3}{\XINT_expr_getnext #4}{\XINT_expr_getnext #5}% }% \let\XINT_expr_precedence_! \xint_c_x \def\XINT_expr_op_! #1{\expandafter\XINT_expr_getop @@ -1522,7 +1531,7 @@ \def\XINT_expr_op:_d #1!#2#3#4#5% {\expandafter\XINT_expr_op:_b\expandafter #4\expandafter {\romannumeral`&&@#4{\XINT_expr_unlock#1}{#5}}}% -\def\XINT_expr_op:_noop\csname.=,#1\endcsname #2#3#4{\XINT_expr_seq:_b #3{#4}{#2}#1,}% +\def\XINT_expr_op:_noop\csname.=,#1\endcsname #2#3#4{\XINT_expr_op:_b #3{#4}{#2}#1,}% \def\XINT_expr_op:_end \csname.=^\endcsname #1#2#3{#3}% \def\XINT_expr_onlitteral_subs {\expandafter\XINT_expr_onlitteral_subs_f\romannumeral`&&@\XINT_expr_onlitteral_seq_a {}}% @@ -2323,9 +2332,58 @@ \XINT_tmpa\xintdeffloatfunc{flexpr}\XINT_NewFloatFunc{floatexpr}% \def\XINT_expr_defuserfunc #1#2{% \def #1##1##2##3{\expandafter ##1\expandafter ##2% - \csname .=\expandafter #2\romannumeral-`0\XINT_expr_unlock ##3,\endcsname + \csname .=\expandafter #2\romannumeral`&&@\XINT_expr_unlock ##3,\endcsname }% }% +\def\XINT_expr_wrapit #1{\expandafter\XINT_expr_wrap\csname.=#1\endcsname}% +\def\xintNewFunction #1#2[#3]#4% +{% + \edef\XINT_expr_tmpa {#1}% + \edef\XINT_expr_tmpa {\xint_zapspaces_o \XINT_expr_tmpa}% + \def\XINT_expr_tmpb ##1##2##3##4##5##6##7##8##9{#4}% + \begingroup + \ifcase #3\relax + \toks0{,}% + \or \toks0{##1,}% + \or \toks0{##1,##2,}% + \or \toks0{##1,##2,##3,}% + \or \toks0{##1,##2,##3,##4,}% + \or \toks0{##1,##2,##3,##4,##5,}% + \or \toks0{##1,##2,##3,##4,##5,##6,}% + \or \toks0{##1,##2,##3,##4,##5,##6,##7,}% + \or \toks0{##1,##2,##3,##4,##5,##6,##7,##8,}% + \else \toks0{##1,##2,##3,##4,##5,##6,##7,##8,##9,}% + \fi + \expandafter + \endgroup + \expandafter + \def\csname XINT_expr_macrofunc_\XINT_expr_tmpa\expandafter\endcsname + \the\toks0\expandafter{\XINT_expr_tmpb + {\XINT_expr_wrapit{##1}}{\XINT_expr_wrapit{##2}}{\XINT_expr_wrapit{##3}}% + {\XINT_expr_wrapit{##4}}{\XINT_expr_wrapit{##5}}{\XINT_expr_wrapit{##6}}% + {\XINT_expr_wrapit{##7}}{\XINT_expr_wrapit{##8}}{\XINT_expr_wrapit{##9}}}% + \expandafter\XINT_expr_newfunction + \csname XINT_expr_func_\XINT_expr_tmpa\expandafter\endcsname + \csname XINT_expr_macrofunc_\XINT_expr_tmpa\endcsname\xintbareeval + \expandafter\XINT_expr_newfunction + \csname XINT_iiexpr_func_\XINT_expr_tmpa\expandafter\endcsname + \csname XINT_expr_macrofunc_\XINT_expr_tmpa\endcsname\xintbareiieval + \expandafter\XINT_expr_newfunction + \csname XINT_flexpr_func_\XINT_expr_tmpa\expandafter\endcsname + \csname XINT_expr_macrofunc_\XINT_expr_tmpa\endcsname\xintbarefloateval + \ifxintverbose + \xintMessage {xintexpr}{Info} + {Function \XINT_expr_tmpa\space for the expression parsers is + associated to \string\XINT_expr_macrofunc_\XINT_expr_tmpa\space + with meaning \expandafter\meaning + \csname XINT_expr_macrofunc_\XINT_expr_tmpa\endcsname}% + \fi +}% +\def\XINT_expr_newfunction #1#2#3% +{% + \def#1##1##2##3{\expandafter ##1\expandafter ##2\romannumeral`&&@% + #3\expandafter#2\romannumeral`&&@\XINT_expr_unlock##3,\relax}% +}% \def\xintApply::csv #1#2% {\expandafter\XINT_applyon::_a\expandafter {\romannumeral`&&@#2}{#1}}% \def\XINT_applyon::_a #1#2{\XINT_applyon::_b {#2}{}#1,,}% diff --git a/Master/texmf-dist/tex/generic/xint/xintfrac.sty b/Master/texmf-dist/tex/generic/xint/xintfrac.sty index ab128c57272..4ffec9ded36 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 1.2g 2016/03/19 +%% The xint bundle 1.2h 2016/11/20 %% Copyright (C) 2013-2016 by Jean-Francois Burnol %% xintfrac: Expandable operations on fractions %% --------------------------------------------------------------- @@ -70,7 +70,7 @@ \XINTsetupcatcodes% defined in xintkernel.sty \XINT_providespackage \ProvidesPackage{xintfrac}% - [2016/03/19 1.2g Expandable operations on fractions (JFB)]% + [2016/11/20 1.2h Expandable operations on fractions (JFB)]% \def\XINT_cntSgnFork #1% {% \ifcase #1\expandafter\xint_secondofthree @@ -2865,17 +2865,25 @@ \the\numexpr \xintNum{#3}\expandafter.% \the\numexpr \xintNum{#4}.\xint_c_i{#1}{#2[#1]}% }% -\def\XINT_FL_pfac_fork #1#2.#3.% +\def\XINT_FL_pfac_fork #1#2.#3#4.% {% - \if-#1\xint_dothis\XINT_FL_pfac_outofrange\fi - \ifnum #1#2=#3 \xint_dothis\XINT_FL_pfac_one\fi - \ifnum #1#2>#3 \xint_dothis\XINT_FL_pfac_outofrange\fi - \ifnum #3>\xint_c_x^viii_mone - \xint_dothis\XINT_FL_pfac_outofrange\fi - \xint_orthat \XINT_FL_pfac_increaseP #1#2.#3.% + \unless\ifnum #1#2<#3#4 \xint_dothis\XINT_FL_pfac_one\fi + \if-#3\xint_dothis\XINT_FL_pfac_neg \fi + \if-#1\xint_dothis\XINT_FL_pfac_zero\fi + \ifnum #3#4>\xint_c_x^viii_mone\xint_dothis\XINT_FL_pfac_outofrange\fi + \xint_orthat \XINT_FL_pfac_increaseP #1#2.#3#4.% }% \def\XINT_FL_pfac_outofrange #1.#2.#3#4#5{\xintError:OutOfRangePFac #5{0[0]}}% -\def\XINT_FL_pfac_one #1.#2.#3#4#5{#5{1[0]}}% +\def\XINT_FL_pfac_one #1.#2.#3#4#5{#5{1[0]}}% +\def\XINT_FL_pfac_zero #1.#2.#3#4#5{#5{0[0]}}% +\def\XINT_FL_pfac_neg -#1.-#2.% +{% + \ifnum #1>\xint_c_x^viii\xint_dothis\XINT_FL_pfac_outofrange\fi + \xint_orthat {% + \ifodd\numexpr#2-#1\relax\xint_afterfi{\expandafter-\romannumeral`&&@}\fi + \expandafter\XINT_FL_pfac_increaseP}% + \the\numexpr #2-\xint_c_i\expandafter.\the\numexpr#1-\xint_c_i.% +}% \def\XINT_FL_pfac_increaseP #1.#2.#3#4% {% \expandafter\XINT_FL_pfac_a @@ -3033,20 +3041,22 @@ {% \expandafter\XINT_FL_binom_fork \the\numexpr #1-#2.#2.#1.% }% -\def\XINT_FL_binom_fork #1#2.#3#4.#5.% +\def\XINT_FL_binom_fork #1#2.#3#4.#5#6.% {% - \if-#1\xint_dothis \XINT_FL_binom_outofrange\fi - \if-#3\xint_dothis \XINT_FL_binom_outofrange\fi + \if-#5\xint_dothis \XINT_FL_binom_outofrange\fi + \if-#1\xint_dothis \XINT_FL_binom_zero\fi + \if-#3\xint_dothis \XINT_FL_binom_zero\fi \if0#1\xint_dothis \XINT_FL_binom_one\fi \if0#3\xint_dothis \XINT_FL_binom_one\fi - \ifnum #5>\xint_c_x^viii_mone \xint_dothis\XINT_FL_binom_outofrange\fi + \ifnum #5#6>\xint_c_x^viii_mone \xint_dothis\XINT_FL_binom_outofrange\fi \ifnum #1#2>#3#4 \xint_dothis\XINT_FL_binom_ab \fi \xint_orthat\XINT_FL_binom_aa - #1#2.#3#4.#5.% + #1#2.#3#4.#5#6.% }% \def\XINT_FL_binom_outofrange #1.#2.#3.#4.#5% {\xintError:OutOfRangeBinomial #5[#4]{0[0]}}% -\def\XINT_FL_binom_one #1.#2.#3.#4.#5{#5[#4]{1[0]}}% +\def\XINT_FL_binom_one #1.#2.#3.#4.#5{#5[#4]{1[0]}}% +\def\XINT_FL_binom_zero #1.#2.#3.#4.#5{#5[#4]{0[0]}}% \def\XINT_FL_binom_aa #1.#2.#3.#4.#5% {% #5[#4]{\xintDiv{\XINT_FL_pfac_increaseP diff --git a/Master/texmf-dist/tex/generic/xint/xintgcd.sty b/Master/texmf-dist/tex/generic/xint/xintgcd.sty index fc4a69848d2..7c1fc1420ed 100644 --- a/Master/texmf-dist/tex/generic/xint/xintgcd.sty +++ b/Master/texmf-dist/tex/generic/xint/xintgcd.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% --------------------------------------------------------------- -%% The xint bundle 1.2g 2016/03/19 +%% The xint bundle 1.2h 2016/11/20 %% Copyright (C) 2013-2016 by Jean-Francois Burnol %% xintgcd: Euclidean algorithm with xint package %% --------------------------------------------------------------- @@ -70,7 +70,7 @@ \XINTsetupcatcodes% defined in xintkernel.sty \XINT_providespackage \ProvidesPackage{xintgcd}% - [2016/03/19 1.2g Euclide algorithm with xint package (JFB)]% + [2016/11/20 1.2h Euclide algorithm with xint package (JFB)]% \def\xintGCD {\romannumeral0\xintgcd }% \def\xintgcd #1% {% diff --git a/Master/texmf-dist/tex/generic/xint/xintkernel.sty b/Master/texmf-dist/tex/generic/xint/xintkernel.sty index 2a5828c2bf1..8a688ec26e1 100644 --- a/Master/texmf-dist/tex/generic/xint/xintkernel.sty +++ b/Master/texmf-dist/tex/generic/xint/xintkernel.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% --------------------------------------------------------------- -%% The xint bundle 1.2g 2016/03/19 +%% The xint bundle 1.2h 2016/11/20 %% Copyright (C) 2013-2016 by Jean-Francois Burnol %% xintkernel: Paraphernalia for the xint packages %% --------------------------------------------------------------- @@ -156,7 +156,7 @@ \fi \XINT_providespackage \ProvidesPackage {xintkernel}% - [2016/03/19 1.2g Paraphernalia for the xint packages (JFB)]% + [2016/11/20 1.2h Paraphernalia for the xint packages (JFB)]% \chardef\xint_c_ 0 \chardef\xint_c_i 1 \chardef\xint_c_ii 2 diff --git a/Master/texmf-dist/tex/generic/xint/xintseries.sty b/Master/texmf-dist/tex/generic/xint/xintseries.sty index d820b443a62..937e3a4010b 100644 --- a/Master/texmf-dist/tex/generic/xint/xintseries.sty +++ b/Master/texmf-dist/tex/generic/xint/xintseries.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% --------------------------------------------------------------- -%% The xint bundle 1.2g 2016/03/19 +%% The xint bundle 1.2h 2016/11/20 %% Copyright (C) 2013-2016 by Jean-Francois Burnol %% xintseries: Expandable partial sums with xint package %% --------------------------------------------------------------- @@ -70,7 +70,7 @@ \XINTsetupcatcodes% defined in xintkernel.sty \XINT_providespackage \ProvidesPackage{xintseries}% - [2016/03/19 1.2g Expandable partial sums with xint package (JFB)]% + [2016/11/20 1.2h Expandable partial sums with xint package (JFB)]% \def\xintSeries {\romannumeral0\xintseries }% \def\xintseries #1#2% {% diff --git a/Master/texmf-dist/tex/generic/xint/xinttools.sty b/Master/texmf-dist/tex/generic/xint/xinttools.sty index 0a21ba1e579..4cb247565da 100644 --- a/Master/texmf-dist/tex/generic/xint/xinttools.sty +++ b/Master/texmf-dist/tex/generic/xint/xinttools.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% --------------------------------------------------------------- -%% The xint bundle 1.2g 2016/03/19 +%% The xint bundle 1.2h 2016/11/20 %% Copyright (C) 2013-2016 by Jean-Francois Burnol %% xinttools: Expandable and non-expandable utilities %% --------------------------------------------------------------- @@ -70,7 +70,7 @@ \XINTsetupcatcodes% defined in xintkernel.sty \XINT_providespackage \ProvidesPackage{xinttools}% - [2016/03/19 1.2g Expandable and non-expandable utilities (JFB)]% + [2016/11/20 1.2h Expandable and non-expandable utilities (JFB)]% \newtoks\XINT_toks \xint_firstofone{\let\XINT_sptoken= } %<- space here! \def\xintgodef {\global\xintodef }% @@ -518,7 +518,7 @@ {% \expandafter\expandafter\expandafter\XINT_trim_finish_a \expandafter\expandafter\expandafter\space % avoids brace removal - \csname xint_gobble_\romannumeral\numexpr#1\endcsname + \csname xint_gobble_\romannumeral#1\endcsname }% \long\def\XINT_trim_finish_a #1\xint_relax #2\xint_bye {#1}% \def\xintTrimUnbraced {\romannumeral0\xinttrimunbraced }% @@ -1197,7 +1197,7 @@ \def\XINT_trim:f:csv_neg #1.#2\xint_relax% {% \expandafter\XINT_trim:f:csv_neg_b - \the\numexpr\expandafter\XINT_length:f:csv_a\romannumeral`&&@#2% + \the\numexpr\XINT_length:f:csv_a #2% \xint_relax,\xint_relax,\xint_relax,\xint_relax,% \xint_relax,\xint_relax,\xint_relax,\xint_relax,\xint_bye -#1.#2\xint_relax @@ -1228,7 +1228,7 @@ \def\XINT_trim:f:csv_finish #1.% {% \expandafter\XINT_trim:f:csv_finish_a - \romannumeral`&&@\csname xint_gobble:csv_\romannumeral\numexpr#1\endcsname + \romannumeral`&&@\csname xint_gobble:csv_\romannumeral#1\endcsname }% \def\xint_gobble:csv_ {}% \def\xint_gobble:csv_i #1,{}% @@ -1258,7 +1258,7 @@ \def\XINT_keep:f:csv_neg #1.#2\xint_relax% {% \expandafter\XINT_keep:f:csv_neg_b - \the\numexpr\expandafter\XINT_length:f:csv_a\romannumeral`&&@#2% + \the\numexpr\XINT_length:f:csv_a #2% \xint_relax,\xint_relax,\xint_relax,\xint_relax,% \xint_relax,\xint_relax,\xint_relax,\xint_relax,\xint_bye -#1.#2\xint_relax -- cgit v1.2.3