xint (12jun22)

git-svn-id: svn://tug.org/texlive/trunk@63562 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 185 insertions, 186 deletions

diff --git a/Master/texmf-dist/tex/generic/xint/xint.sty b/Master/texmf-dist/tex/generic/xint/xint.sty
index 3614cc5a8a3..75a26223975 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.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xint: Expandable operations on big integers
 %% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
   \expandafter\let\expandafter\x\csname ver@xint.sty\endcsname
   \expandafter\let\expandafter\w\csname ver@xintcore.sty\endcsname
   \expandafter\ifx\csname numexpr\endcsname\relax
-    \expandafter\ifx\csname PackageWarning\endcsname\relax
+    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
       \immediate\write128{^^JPackage xint Warning:^^J%
                           \space\space\space\space
                           \numexpr not available, aborting input.^^J}%
@@ -68,7 +68,7 @@
 \XINTsetupcatcodes% defined in xintkernel.sty (loaded by xintcore.sty)
 \XINT_providespackage
 \ProvidesPackage{xint}%
-  [2022/05/29 v1.4l Expandable operations on big integers (JFB)]%
+  [2022/06/10 v1.4m 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}%
diff --git a/Master/texmf-dist/tex/generic/xint/xintbinhex.sty b/Master/texmf-dist/tex/generic/xint/xintbinhex.sty
index 7c6b6131a21..3bc06180104 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.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xintbinhex: Expandable binary and hexadecimal conversions
 %% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
   \expandafter\let\expandafter\x\csname ver@xintbinhex.sty\endcsname
   \expandafter\let\expandafter\w\csname ver@xintkernel.sty\endcsname
   \expandafter\ifx\csname numexpr\endcsname\relax
-    \expandafter\ifx\csname PackageWarning\endcsname\relax
+    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
       \immediate\write128{^^JPackage xintbinhex Warning:^^J%
                           \space\space\space\space
                           \numexpr not available, aborting input.^^J}%
@@ -68,7 +68,7 @@
 \XINTsetupcatcodes% defined in xintkernel.sty
 \XINT_providespackage
 \ProvidesPackage{xintbinhex}%
-  [2022/05/29 v1.4l Expandable binary and hexadecimal conversions (JFB)]%
+  [2022/06/10 v1.4m 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
 \def\XINT_tmpa #1{\ifx\relax#1\else
diff --git a/Master/texmf-dist/tex/generic/xint/xintcfrac.sty b/Master/texmf-dist/tex/generic/xint/xintcfrac.sty
index e278c56effb..ea09f1df2f8 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.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xintcfrac: Expandable continued fractions with xint package
 %% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
   \expandafter\let\expandafter\x\csname ver@xintcfrac.sty\endcsname
   \expandafter\let\expandafter\w\csname ver@xintfrac.sty\endcsname
   \expandafter\ifx\csname numexpr\endcsname\relax
-    \expandafter\ifx\csname PackageWarning\endcsname\relax
+    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
       \immediate\write128{^^JPackage xintcfrac Warning:^^J%
                           \space\space\space\space
                           \numexpr not available, aborting input.^^J}%
@@ -68,7 +68,7 @@
 \XINTsetupcatcodes% defined in xintkernel.sty
 \XINT_providespackage
 \ProvidesPackage{xintcfrac}%
-  [2022/05/29 v1.4l Expandable continued fractions with xint package (JFB)]%
+  [2022/06/10 v1.4m 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 91702aed00a..9ffd58c266a 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.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xintcore: Expandable arithmetic on big integers
 %% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
   \expandafter\let\expandafter\x\csname ver@xintcore.sty\endcsname
   \expandafter\let\expandafter\w\csname ver@xintkernel.sty\endcsname
   \expandafter\ifx\csname numexpr\endcsname\relax
-    \expandafter\ifx\csname PackageWarning\endcsname\relax
+    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
       \immediate\write128{^^JPackage xintcore Warning:^^J%
                           \space\space\space\space
                           \numexpr not available, aborting input.^^J}%
@@ -68,7 +68,7 @@
 \XINTsetupcatcodes% defined in xintkernel.sty
 \XINT_providespackage
 \ProvidesPackage{xintcore}%
-  [2022/05/29 v1.4l Expandable arithmetic on big integers (JFB)]%
+  [2022/06/10 v1.4m Expandable arithmetic on big integers (JFB)]%
 \csname XINT_Clamped_istrapped\endcsname
 \csname XINT_ConversionSyntax_istrapped\endcsname
 \csname XINT_DivisionByZero_istrapped\endcsname
@@ -88,7 +88,7 @@
                     \xint_dothis{\csname XINT_#1-signal\endcsname}%
                   \fi\xint_orthat{{#1}}{#1}}%
 \def\XINT_signalcondition_a #1#2#3#4#5{% copied over from Python Decimal module
-    \ifcsname XINT_#1_isignoredflag\endcsname
+\ifcsname XINT_#1_isignoredflag\endcsname
        \xint_dothis{\csname XINT_#1.handler\endcsname {#4}}%
     \fi
     \expandafter\xint_gobble_i\csname XINT_#1Flag_ON\endcsname
@@ -100,7 +100,7 @@
        % #2
        \XINT_expandableerror{#3}%
        % not for X3.274
-       %\XINT_expandableerror{<RET>, or I\xintUse{...}<RET>, or I\xintCTRLC<RET>}%
+       % \XINT_expandableerror{<RET>, or I\xintUse{...}<RET>, or I\xintCTRLC<RET>}%
        \xint_firstofone{#5}%
     }%
 }%
@@ -294,7 +294,7 @@
     *\xint_c_v+\xint_c_v)/\xint_c_x-\xint_c_i\relax}%
 \def\XINT_half_fork #1%
 {%
-    \xint_UDsignfork
+  \xint_UDsignfork
      #1\XINT_half_neg
       -\XINT_half
     \krof #1%
@@ -745,64 +745,11 @@
 \def\XINT_cmp_minusplus    #1\xint:#2\xint:{ -1}%
 \def\XINT_cmp_minusminus
     --{\expandafter\XINT_opp\romannumeral0\XINT_cmp_plusplus {}{}}%
-\def\XINT_cmp_plusplus  #1#2#3\xint:
-{%
-    \expandafter\XINT_cmp_pp
-    \the\numexpr\expandafter\XINT_sepbyviii_andcount
-    \romannumeral0\XINT_zeroes_forviii #2#3\R\R\R\R\R\R\R\R{10}0000001\W
-    #2#3\XINT_sepbyviii_end 2345678\relax
-        \xint_c_vii!\xint_c_vi!\xint_c_v!\xint_c_iv!%
-        \xint_c_iii!\xint_c_ii!\xint_c_i!\xint_c_\W
-    #1%
-}%
-\def\XINT_cmp_pp #1\xint:#2\xint:#3\xint:
-{%
-    \expandafter\XINT_cmp_checklengths
-    \the\numexpr #2\expandafter\xint:%
-    \the\numexpr\expandafter\XINT_sepbyviii_andcount
-    \romannumeral0\XINT_zeroes_forviii #3\R\R\R\R\R\R\R\R{10}0000001\W
-    #3\XINT_sepbyviii_end 2345678\relax
-        \xint_c_vii!\xint_c_vi!\xint_c_v!\xint_c_iv!%
-        \xint_c_iii!\xint_c_ii!\xint_c_i!\xint_c_\W
-    #1;!1;!1;!1;!\W
-}%
-\def\XINT_cmp_checklengths #1\xint:#2\xint:#3\xint:
-{%
-    \ifnum #1=#3
-       \expandafter\xint_firstoftwo
-    \else
-       \expandafter\xint_secondoftwo
-    \fi
-    \XINT_cmp_a {\XINT_cmp_distinctlengths {#1}{#3}}#2;!1;!1;!1;!\W
+\def\XINT_cmp_plusplus #1#2#3\xint:#4\xint:{\expanded{ %
+    \ifcase\expandafter\XINT_cntSgn\the\numexpr\xintLength{#1#4}-\xintLength{#2#3}\xint:
+        \xintstrcmp{#1#4}{#2#3}\or1\else-1\fi
+    }%
 }%
-\def\XINT_cmp_distinctlengths #1#2#3\W #4\W
-{%
-    \ifnum #1>#2
-        \expandafter\xint_firstoftwo
-    \else
-        \expandafter\xint_secondoftwo
-    \fi
-    { -1}{ 1}%
-}%
-\def\XINT_cmp_a 1#1!1#2!1#3!1#4!#5\W 1#6!1#7!1#8!1#9!%
-{%
-    \xint_gob_til_sc #1\XINT_cmp_equal ;%
-    \ifnum #1>#6 \XINT_cmp_gt\fi
-    \ifnum #1<#6 \XINT_cmp_lt\fi
-    \xint_gob_til_sc #2\XINT_cmp_equal ;%
-    \ifnum #2>#7 \XINT_cmp_gt\fi
-    \ifnum #2<#7 \XINT_cmp_lt\fi
-    \xint_gob_til_sc #3\XINT_cmp_equal ;%
-    \ifnum #3>#8 \XINT_cmp_gt\fi
-    \ifnum #3<#8 \XINT_cmp_lt\fi
-    \xint_gob_til_sc #4\XINT_cmp_equal ;%
-    \ifnum #4>#9 \XINT_cmp_gt\fi
-    \ifnum #4<#9 \XINT_cmp_lt\fi
-    \XINT_cmp_a #5\W
-}%
-\def\XINT_cmp_lt#1{\def\XINT_cmp_lt\fi ##1\W ##2\W {\fi#1-1}}\XINT_cmp_lt{ }%
-\def\XINT_cmp_gt#1{\def\XINT_cmp_gt\fi ##1\W ##2\W {\fi#11}}\XINT_cmp_gt{ }%
-\def\XINT_cmp_equal #1\W #2\W { 0}%
 \def\xintiiSub   {\romannumeral0\xintiisub }%
 \def\xintiisub #1{\expandafter\XINT_iisub\romannumeral`&&@#1\xint:}%
 \def\XINT_iisub #1#2\xint:#3%
diff --git a/Master/texmf-dist/tex/generic/xint/xintexpr.sty b/Master/texmf-dist/tex/generic/xint/xintexpr.sty
index d1862e9130f..32d7659cfbd 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.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xintexpr: Expandable expression parser
 %% ---------------------------------------------------------------
@@ -42,7 +42,7 @@
   \expandafter\let\expandafter\t\csname ver@xinttools.sty\endcsname
   % I don't think engine exists providing \expanded but not \numexpr
   \expandafter\ifx\csname expanded\endcsname\relax
-    \expandafter\ifx\csname PackageWarning\endcsname\relax
+    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
       \immediate\write128{^^JPackage xintexpr Warning:^^J%
                           \space\space\space\space
                           \expanded not available, aborting input.^^J}%
@@ -51,8 +51,8 @@
     \fi
     \def\z{\endgroup\endinput}%
   \else
-    \ifx\x\relax   % plain-TeX, first loading of xintexpr.sty
-      \ifx\w\relax % but xintfrac.sty not yet loaded.
+    \ifx\x\relax   % plain-TeX (possibly with miniltx!), first loading of xintexpr.sty
+      \ifx\w\relax % but xintfrac.sty not yet loaded (made miniltx robust 2022/06/09)
          \expandafter\def\expandafter\z\expandafter
                     {\z\input xintfrac.sty\relax}%
       \fi
@@ -80,7 +80,7 @@
 \XINTsetupcatcodes%
 \XINT_providespackage
 \ProvidesPackage{xintexpr}%
-  [2022/05/29 v1.4l Expandable expression parser (JFB)]%
+  [2022/06/10 v1.4m Expandable expression parser (JFB)]%
 \catcode`! 11
 \let\XINT_Cmp \xintiiCmp
 \def\XINTfstop{\noexpand\XINTfstop}%
@@ -145,7 +145,7 @@
     \if ^#1\expandafter\xint_gobble_i\else\expandafter\XINT:expr:flatten_a\fi
     #1%
 }%
-\begingroup % should I check lccode s generally if corrupted context at load?
+\begingroup
 \catcode`[ 1 \catcode`] 2 \lccode`[`{ \lccode`]`}
 \catcode`< 1 \catcode`> 2 \catcode`{ 12 \catcode`} 12
 \lowercase<\endgroup
@@ -283,7 +283,8 @@
     \expanded
     \XINT:NEhook:x:mapwithin\XINT:expr:mapwithin{\XINTiRound_braced{#1}}%
 }%
-\def\XINTiRound_braced#1#2{{\xintiRound{#1}{#2}[\the\numexpr\ifnum#1<\xint_c_i0\else-#1\fi]}}%
+\def\XINTiRound_braced#1#2%
+  {{\xintiRound{#1}{#2}[\the\numexpr\ifnum#1<\xint_c_i0\else-#1\fi]}}%
 \def\xintfloatexpro #1%
 {%
     \ifx [#1\expandafter\XINT_flexpr_withopt\else\expandafter\XINT_flexpr_noopt
@@ -330,7 +331,7 @@
 \let\xintfloatexprPrintOne\xintPFloat_wopt
 \protected\def\XINTboolexprprint.%
     {\XINT:NEhook:x:toblist\XINT:expr:toblistwith\xintboolexprPrintOne}%
-\def\xintboolexprPrintOne#1{\xintiiifNotZero{#1}{True}{False}}%
+\def\xintboolexprPrintOne#1{\xintiiifNotZero{#1}{true}{false}}%
 \def\xintthe      #1{\expanded\expandafter\xint_gobble_i\romannumeral`&&@#1}%
 \def\xintthealign #1{\expandafter\xintexpralignbegin
                      \expanded\expandafter\XINT:expr:toalignwith
@@ -345,17 +346,16 @@
    {\expanded\expandafter\xint_gobble_i\romannumeral`&&@\xintfloatexpr}%
 \def\xinttheiiexpr
    {\expanded\expandafter\XINTiiexprprint\expandafter.\romannumeral0\xintbareiieval}%
-\let\thexintexpr     \xinttheexpr
-\let\thexintiexpr    \xinttheiexpr
-\let\thexintfloatexpr\xintthefloatexpr
-\let\thexintiiexpr   \xinttheiiexpr
 \def\xintbareeval     {\XINT_expr_start  }%
 \def\xintbarefloateval{\XINT_flexpr_start}%
 \def\xintbareiieval   {\XINT_iiexpr_start}%
 \def\XINT_expr_unlock     {\expandafter\xint_firstofone\romannumeral`&&@}%
-\def\xintthebareeval      {\romannumeral0\expandafter\xint_stop_atfirstofone\romannumeral0\xintbareeval}%
-\def\xintthebareiieval    {\romannumeral0\expandafter\xint_stop_atfirstofone\romannumeral0\xintbareiieval}%
-\def\xintthebarefloateval {\romannumeral0\expandafter\xint_stop_atfirstofone\romannumeral0\xintbarefloateval}%
+\def\xintthebareeval
+    {\romannumeral0\expandafter\xint_stop_atfirstofone\romannumeral0\xintbareeval}%
+\def\xintthebareiieval
+    {\romannumeral0\expandafter\xint_stop_atfirstofone\romannumeral0\xintbareiieval}%
+\def\xintthebarefloateval
+    {\romannumeral0\expandafter\xint_stop_atfirstofone\romannumeral0\xintbarefloateval}%
 \def\xintthebareroundedfloateval
 {%
     \romannumeral0\expandafter\xintthebareroundedfloateval_a\romannumeral0\xintbarefloateval
@@ -366,7 +366,6 @@
     \expanded\XINT:NEhook:x:mapwithin\XINT:expr:mapwithin{\XINTinFloatSdigits_braced}%
 }%
 \def\XINTinFloatSdigits_braced#1{{\XINTinFloatS[\XINTdigits]{#1}}}%
-\let\xint_relax\relax
 \def\xinteval #1%
    {\expanded\expandafter\XINTexprprint\expandafter.\romannumeral0\xintbareeval#1\relax}%
 \def\xintieval
@@ -395,7 +394,8 @@
 \def\xint_floateval#1%
    {\expandafter\xint_gobble_i\romannumeral`&&@\xintfloatexpr#1\relax}%
 \def\xintiieval #1%
-   {\expanded\expandafter\XINTiiexprprint\expandafter.\romannumeral0\xintbareiieval#1\relax}%
+   {\expanded\expandafter\XINTiiexprprint
+             \expandafter.\romannumeral0\xintbareiieval#1\relax}%
 \def\xintboolexpr
 {%
     \romannumeral0\expandafter\XINT_boolexpr_done\romannumeral0\xintexpro
@@ -405,7 +405,6 @@
 {%
     \expanded\expandafter\XINTboolexprprint\expandafter.\romannumeral0\xintbareeval
 }%
-\let\thexintboolexpr\xinttheboolexpr
 \def\xintifboolexpr      #1{\romannumeral0\xintiiifnotzero {\xinttheexpr #1\relax}}%
 \def\xintifboolfloatexpr #1{\romannumeral0\xintiiifnotzero {\xintthefloatexpr #1\relax}}%
 \def\xintifbooliiexpr    #1{\romannumeral0\xintiiifnotzero {\xinttheiiexpr #1\relax}}%
@@ -612,7 +611,8 @@
 }%
 \def\XINT_expr_missing_arg#1%
 {%
-    \expanded{\XINT_expandableerror{Expected a value, got nothing before `#1'. Inserting 0.}{{0}}\expandafter}%
+    \expanded{\XINT_expandableerror
+              {Expected a value, got nothing before `#1'. Inserting 0.}{{0}}\expandafter}%
     \romannumeral`&&@\XINT_expr_getop_a#1%
 }%
 \def\XINT_expr_startint #1%
@@ -897,7 +897,8 @@
 {%
     \expandafter\XINT_expr_scanhexII_a\romannumeral`&&@#2%
 }%
-\def\XINT_expr_startfunc #1{\expandafter\XINT_expr_func\expanded\bgroup#1\XINT_expr_scanfunc_a}%
+\def\XINT_expr_startfunc #1%
+   {\expandafter\XINT_expr_func\expanded\bgroup#1\XINT_expr_scanfunc_a}%
 \def\XINT_expr_scanfunc_a #1%
 {%
     \expandafter\XINT_expr_scanfunc_b\romannumeral`&&@#1%
@@ -1088,7 +1089,8 @@
     }%
     \def #2##1% op_)
     {%
-        \expanded{\unexpanded{\XINT_expr_put_op_first{##1}}\expandafter}\romannumeral`&&@\XINT_expr_getop
+        \expanded{\unexpanded{\XINT_expr_put_op_first{##1}}\expandafter}%
+        \romannumeral`&&@\XINT_expr_getop
     }%
     \def #3% oparen
     {%
@@ -1550,7 +1552,8 @@
 \def\xintSeqB:tl:x  #1{\expandafter\XINT_SeqB:tl:x\romannumeral`&&@\xintSeqA#1}%
 \def\XINT_SeqB:tl:x #1{\csname XINT_SeqB#1:tl:x\endcsname}%
 \def\XINT_SeqBz:tl:x #1]#2]#3{{#2]}}%
-\def\XINT_SeqBp:tl:x #1]#2]#3{\expandafter\XINT_SeqBp:tl:x_a\romannumeral0\xintraw{#3}#2]#1]}%
+\def\XINT_SeqBp:tl:x #1]#2]#3%
+    {\expandafter\XINT_SeqBp:tl:x_a\romannumeral0\xintraw{#3}#2]#1]}%
 \def\XINT_SeqBp:tl:x_a #1]#2]#3]%
 {%
     \xintifCmp{#1]}{#2]}%
@@ -1561,7 +1564,8 @@
     \xintifCmp{#1]}{#2]}%
     {{#1]}\expandafter\XINT_SeqBp:tl:x_b\romannumeral0\xintadd{#3]}{#1]}#2]#3]}{{#1]}}{}%
 }%
-\def\XINT_SeqBn:tl:x #1]#2]#3{\expandafter\XINT_SeqBn:tl:x_a\romannumeral0\xintraw{#3}#2]#1]}%
+\def\XINT_SeqBn:tl:x #1]#2]#3%
+   {\expandafter\XINT_SeqBn:tl:x_a\romannumeral0\xintraw{#3}#2]#1]}%
 \def\XINT_SeqBn:tl:x_a #1]#2]#3]%
 {%
     \xintifCmp{#1]}{#2]}%
@@ -1962,7 +1966,8 @@
 {%
     \expandafter\XINT_expr_put_op_first
     \expanded{{\romannumeral`&&@\XINT:NEhook:f:one:from:one
-    {\romannumeral`&&@\XINTinFloatFacdigits#1}}\expandafter}\romannumeral`&&@\XINT_expr_getop
+    {\romannumeral`&&@\XINTinFloatFacdigits#1}}\expandafter}%
+    \romannumeral`&&@\XINT_expr_getop
 }%
 \def\XINT_iiexpr_op_! #1%
 {%
@@ -2217,7 +2222,8 @@
     \fi
     {#1}{#2#3}%
 }%
-\def\XINT_expr_fetch_E_comma_V_equal_E_e #1#2{\XINT_expr_fetch_E_comma_V_equal_E_d {#1}{#2)}}%
+\def\XINT_expr_fetch_E_comma_V_equal_E_e #1#2%
+   {\XINT_expr_fetch_E_comma_V_equal_E_d {#1}{#2)}}%
 \def\XINT_expr_fetch_to_semicolon {\XINT_expr_fetch_to_semicolon_a {}\empty}%
 \def\XINT_expr_fetch_to_semicolon_a #1#2;%
 {%
@@ -2645,7 +2651,8 @@
 }%
 \def\XINT_expr_iterr:_Ca #1#2#3{\XINT_expr_iterr:_Cc#3.{#2}}%
 \def\XINT_expr_iterr:_Cb #1{\expandafter\XINT_expr_iterr:_Cc\the\numexpr#1+\xint_c_i.}%
-\def\XINT_expr_iterr:_Cc #1.#2{\expandafter\XINT_expr_iterr:_D\romannumeral0#2{{#1}}{#1}{#2}}%
+\def\XINT_expr_iterr:_Cc #1.#2%
+   {\expandafter\XINT_expr_iterr:_D\romannumeral0#2{{#1}}{#1}{#2}}%
 \def\XINT_expr_iterr:_D #1{\ifx ^#1\xint_dothis\XINT_expr_iterr:_abort\fi
                           \ifx ?#1\xint_dothis\XINT_expr_iterr:_break\fi
                           \ifx !#1\xint_dothis\XINT_expr_iterr:_Omit\fi
@@ -2699,7 +2706,8 @@
 }%
 \def\XINT_expr_rrseq:_Ca #1#2#3{\XINT_expr_rrseq:_Cc#3.{#2}}%
 \def\XINT_expr_rrseq:_Cb #1{\expandafter\XINT_expr_rrseq:_Cc\the\numexpr#1+\xint_c_i.}%
-\def\XINT_expr_rrseq:_Cc #1.#2{\expandafter\XINT_expr_rrseq:_D\romannumeral0#2{{#1}}{#1}{#2}}%
+\def\XINT_expr_rrseq:_Cc #1.#2%
+   {\expandafter\XINT_expr_rrseq:_D\romannumeral0#2{{#1}}{#1}{#2}}%
 \def\XINT_expr_rrseq:_D #1{\ifx ^#1\xint_dothis\XINT_expr_rrseq:_abort\fi
                           \ifx ?#1\xint_dothis\XINT_expr_rrseq:_break\fi
                           \ifx !#1\xint_dothis\XINT_expr_rrseq:_Omit\fi
@@ -3668,9 +3676,6 @@
 \def\XINT:NEhook:userfunc #1#2#3{#2#3\iffalse{{\fi}}}%
 \def\XINT:NEhook:userfunc:argv #1#2#3#4%
    {\expandafter#3\expanded{\xintKeep{#1}{#4}{\xintTrim{#1}{#4}}}\iffalse{{\fi}}}%
-\let\xintdefefunc\xintdeffunc
-\let\xintdefiifunc\xintdefiifunc
-\let\xintdeffloatefunc\xintdeffloatfunc
 \def\XINT_tmpa #1#2#3#4#5#6%
 {%
   \def #1##1(##2)##3={%
@@ -3921,7 +3926,8 @@
 }}\expandafter\XINT:NE:f:iitacitzeroifone:direct\string#%
 \def\XINT:NE:f:iitacitzeroifone_a #1#2&&A#3%
 {%
-    \detokenize{\romannumeral`$XINT_expr_null\expandafter#1\expanded{#2}$XINT_expr_exclam#3}%
+    \detokenize
+    {\romannumeral`$XINT_expr_null\expandafter#1\expanded{#2}$XINT_expr_exclam#3}%
 }%
 \def\XINT:NE:f:iitacitzeroifone_b\XINT:expr:f:iitacitzeroifone #1#2#3&&A#4%
 {%
@@ -3995,7 +4001,8 @@
 }}\expandafter\XINT:NE:f:from:delim:u\string#%
 \def\XINT:NE:f:from:delim:u:p #1#2^%
 {%
-    \detokenize{\expandafter\XINT:fooof:checkifnumber\expandafter#1}~expanded{#2}$XINT_expr_caret%$
+    \detokenize
+    {\expandafter\XINT:fooof:checkifnumber\expandafter#1}~expanded{#2}$XINT_expr_caret%$
 }%
 \def\XINT:fooof:checkifnumber#1{\expandafter\XINT_fooof_checkifnumber\expandafter#1\string}%
 \def\XINT:NE:f:LFL#1#2{\expandafter\XINT:NE:f:LFL_a\expandafter#1#2\XINT:NE:f:LFL_a}%
@@ -4489,10 +4496,10 @@
 }@
 \catcode`% 14
 \XINTsetcatcodes % clean up to avoid surprises if something changes
-\def\xintexprRestoreCatcodes{}%
+\protected\def\xintexprRestoreCatcodes{}%
 \def\xintexprSafeCatcodes
 {%
-    \edef\xintexprRestoreCatcodes  {%
+    \protected\edef\xintexprRestoreCatcodes{%
         \endlinechar=\the\endlinechar
         \catcode59=\the\catcode59   % ;
         \catcode34=\the\catcode34   % "
@@ -4517,8 +4524,8 @@
         \catcode44=\the\catcode44   % ,
         \catcode61=\the\catcode61   % =
         \catcode96=\the\catcode96   % `
-        \catcode32=\the\catcode32   % space
-        \def\noexpand\xintexprRestoreCatcodes{\unexpanded\expandafter{\xintexprRestoreCatcodes}}%
+        \catcode32=\the\catcode32\relax  % space
+        \protected\odef\xintexprRestoreCatcodes{\xintexprRestoreCatcodes}%
     }%
         \endlinechar=13 %
         \catcode59=12  % ;
diff --git a/Master/texmf-dist/tex/generic/xint/xintfrac.sty b/Master/texmf-dist/tex/generic/xint/xintfrac.sty
index d94affd6304..ece90fb756e 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.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xintfrac: Expandable operations on fractions
 %% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
   \expandafter\let\expandafter\x\csname ver@xintfrac.sty\endcsname
   \expandafter\let\expandafter\w\csname ver@xint.sty\endcsname
   \expandafter\ifx\csname numexpr\endcsname\relax
-    \expandafter\ifx\csname PackageWarning\endcsname\relax
+    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
       \immediate\write128{^^JPackage xintfrac Warning:^^J%
                           \space\space\space\space
                           \numexpr not available, aborting input.^^J}%
@@ -68,7 +68,7 @@
 \XINTsetupcatcodes% defined in xintkernel.sty
 \XINT_providespackage
 \ProvidesPackage{xintfrac}%
-  [2022/05/29 v1.4l Expandable operations on fractions (JFB)]%
+  [2022/06/10 v1.4m Expandable operations on fractions (JFB)]%
 \def\XINT_cntSgnFork #1%
 {%
     \ifcase #1\expandafter\xint_secondofthree
@@ -119,7 +119,8 @@
 {%
     \expandafter\XINT_outfrac_P\expandafter {#2}{#1}%
 }%
-\def\XINT_inFrac {\romannumeral0\XINT_infrac }% this one deprecated
+\def\XINT_inFrac {\XINT_expandableerror{\XINT_inFrac is deprecated, use \xintRawBraced}%
+                  \romannumeral0\XINT_infrac }%
 \def\XINT_infrac #1% this one is core xintfrac macro
 {%
     \expandafter\XINT_infrac_fork\romannumeral`&&@#1\xint:/\XINT_W[\XINT_W\XINT_T
@@ -557,7 +558,7 @@
 }%
 \def\XINT_denom_A #1.#2#3{ #3}%
 \def\XINT_denom_B -#1.#2#3{\XINT_dsx_addzeros{#1}#3;}%
-\ifdefined\documentclass
+\ifdefined\PackageWarning
 \def\xintfracTeXDeprecation#1#2{%
 \PackageWarning{xintfrac}{\string#1 is deprecated. Use \string#2\MessageBreak
                           to suppress this warning}#2%
@@ -570,7 +571,20 @@
 on input line \noexpand\the\inputlineno.&&J}}#2%
 }%
 \fi
-\def\xintFrac   {\xintfracTeXDeprecation\xintFrac\xintTeXFrac}%
+\ifdefined\PackageError
+\def\xintfracTeXError#1#2{%
+\PackageError{xintfrac}{\string#1 has been removed.\MessageBreak
+    Use \string#2 to suppress this error}%
+    {I will fix it for now if you hit the `Return' key.}#2%
+}%
+\else
+\edef\xintfracTeXError#1#2{{\newlinechar10
+\errhelp{I will fix it for now if you hit the `Return' key.}%
+\errmessage{Package xintfrac Error: \noexpand\string#1 has been removed.&&J%
+(xintfrac)\xintReplicate{16}{ }Use \noexpand\string#2 to suppress this error}}#2%
+}%
+\fi
+\def\xintFrac   {\xintfracTeXError\xintFrac\xintTeXFrac}%
 \def\xintTeXFrac{\romannumeral0\xintfrac }%
 \def\xintfrac #1%
 {%
@@ -597,7 +611,7 @@ on input line \noexpand\the\inputlineno.&&J}}#2%
     \frac {#2}{#3}#1%
 }%
 \def\XINT_fracfrac_E \fi\space\frac #1#2{\fi \space #1\cdot }%
-\def\xintSignedFrac   {\xintfracTeXDeprecation\xintSignedFrac\xintTeXsignedFrac}%
+\def\xintSignedFrac   {\xintfracTeXError\xintSignedFrac\xintTeXsignedFrac}%
 \def\xintTeXsignedFrac{\romannumeral0\xintsignedfrac }%
 \def\xintsignedfrac #1%
 {%
@@ -622,7 +636,7 @@ on input line \noexpand\the\inputlineno.&&J}}#2%
 {%
     \expandafter-\romannumeral0\XINT_sgnfrac_P
 }%
-\def\xintTeXfromSci{\xintfracTeXDeprecation\xintTeXfromSci\xintTeXFromSci}%
+\def\xintTeXfromSci{\xintfracTeXDeprecated\xintTeXfromSci\xintTeXFromSci}%
 \def\xintTeXFromSci#1%
 {%
     \expandafter\XINT_texfromsci\expanded{#1}/\relax/\xint:
@@ -643,7 +657,7 @@ on input line \noexpand\the\inputlineno.&&J}}#2%
 \else
   \protected\def\xintTeXFromScifracmacro#1#2{{#2\over#1}}%
 \fi
-\def\xintFwOver {\xintfracTeXDeprecation\xintFwOver\xintTeXOver}%
+\def\xintFwOver {\xintfracTeXError\xintFwOver\xintTeXOver}%
 \def\xintTeXOver{\romannumeral0\xintfwover }%
 \def\xintfwover #1%
 {%
@@ -668,7 +682,7 @@ on input line \noexpand\the\inputlineno.&&J}}#2%
     \fi
     #1%
 }%
-\def\xintSignedFwOver {\xintfracTeXDeprecation\xintSignedFwOver\xintTeXsignedOver}%
+\def\xintSignedFwOver {\xintfracTeXError\xintSignedFwOver\xintTeXsignedOver}%
 \def\xintTeXsignedOver{\romannumeral0\xintsignedfwover }%
 \def\xintsignedfwover #1%
 {%
diff --git a/Master/texmf-dist/tex/generic/xint/xintgcd.sty b/Master/texmf-dist/tex/generic/xint/xintgcd.sty
index 4b62b4be377..98b95c653be 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.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xintgcd: Euclidean algorithm with xint package
 %% ---------------------------------------------------------------
@@ -41,7 +41,7 @@
   \expandafter\let\expandafter\w\csname ver@xint.sty\endcsname
   \expandafter\let\expandafter\t\csname ver@xinttools.sty\endcsname
   \expandafter\ifx\csname numexpr\endcsname\relax
-    \expandafter\ifx\csname PackageWarning\endcsname\relax
+    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
       \immediate\write128{^^JPackage xintgcd Warning:^^J%
                           \space\space\space\space
                           \numexpr not available, aborting input.^^J}%
@@ -75,7 +75,7 @@
 \XINTsetupcatcodes% defined in xintkernel.sty
 \XINT_providespackage
 \ProvidesPackage{xintgcd}%
-  [2022/05/29 v1.4l Euclide algorithm with xint package (JFB)]%
+  [2022/06/10 v1.4m Euclide algorithm with xint package (JFB)]%
 \def\xintBezout {\romannumeral0\xintbezout }%
 \def\xintbezout #1%
 {%
diff --git a/Master/texmf-dist/tex/generic/xint/xintkernel.sty b/Master/texmf-dist/tex/generic/xint/xintkernel.sty
index 6d793505eb6..38eda0c8a33 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.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xintkernel: Paraphernalia for the xint packages
 %% ---------------------------------------------------------------
@@ -37,7 +37,7 @@
   \def\space{ }\newlinechar10
   \let\z\relax
   \expandafter\ifx\csname numexpr\endcsname\relax
-    \expandafter\ifx\csname PackageWarning\endcsname\relax
+    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
       \immediate\write128{^^JPackage xintkernel Warning:^^J%
                           \space\space\space\space
                           \numexpr not available, aborting input.^^J}%
@@ -146,15 +146,21 @@
       \XINTsetcatcodes
 }%
 \ifdefined\ProvidesPackage
-  \let\XINT_providespackage\relax
+    \def\XINT_providespackage\ProvidesPackage#1[#2]{%
+             \ProvidesPackage{#1}[{#2}]%
+             \expandafter\ifx\csname ver@#1.sty\endcsname\relax
+                   \expandafter\xdef\csname ver@#1.sty\endcsname{#2}%
+                         \fi
+        }%
 \else
-  \def\XINT_providespackage #1#2[#3]%
-              {\immediate\write-1{Package: #2 #3}%
-               \expandafter\xdef\csname ver@#2.sty\endcsname{#3}}%
+    \def\XINT_providespackage\ProvidesPackage#1[#2]{%
+             \immediate\write-1{Package: #1 #2}%
+             \expandafter\xdef\csname ver@#1.sty\endcsname{#2}%
+        }%
 \fi
 \XINT_providespackage
 \ProvidesPackage {xintkernel}%
-  [2022/05/29 v1.4l Paraphernalia for the xint packages (JFB)]%
+  [2022/06/10 v1.4m Paraphernalia for the xint packages (JFB)]%
 \chardef\xint_c_     0
 \chardef\xint_c_i    1
 \chardef\xint_c_ii   2
@@ -614,11 +620,9 @@
 \def\XINT_global{\ifxintglobaldefs\global\fi}%
 \ifnum\newlinechar=10
 \expandafter\def\csname
-romannumeral (or \string\expanded,&&J \space
-\string\numexpr, ...) expansion could produce its final output.&&J \space
-See above the exception specifics.&&J \space
-xint will try to recover (if in interactive mode, hit <return>&&J \space
-at the ? prompt) and will go ahead hoping repair\endcsname
+xint<...> is done, but will resume:&&J \space
+hit <return> at the ? prompt to try fixing the error above&&J \space
+which has been encountered before expansion\endcsname
 #1\xint:{}%
 \def\XINT_expandableerror#1{%
 \def\XINT_expandableerror##1{%
@@ -626,17 +630,14 @@ at the ? prompt) and will go ahead hoping repair\endcsname
    \XINT_expandableerrorcontinue
    #1! xint error: ##1\par
 }}\expandafter\XINT_expandableerror\csname
-romannumeral (or \string\expanded,&&J \space
-\string\numexpr, ...) expansion could produce its final output.&&J \space
-See above the exception specifics.&&J \space
-xint will try to recover (if in interactive mode, hit <return>&&J \space
-at the ? prompt) and will go ahead hoping repair\endcsname
+xint<...> is done, but will resume:&&J \space
+hit <return> at the ? prompt to try fixing the error above&&J \space
+which has been encountered before expansion\endcsname
 \else
 \expandafter\def\csname
-numexpr or \string\expanded\space or \string\romannumeral\space expansion
-could terminate because an exception was raised (see the above short explanation for
-specifics). xint will now try to recover (hit <return> if in interactive
-mode) and will go ahead hoping repair\endcsname
+xint<...> is done, but will resume: hit <return>
+at \space the ? prompt to try fixing the error
+encountered before expansion\endcsname
 #1\xint:{}%
 \def\XINT_expandableerror#1{%
 \def\XINT_expandableerror##1{%
@@ -644,12 +645,34 @@ mode) and will go ahead hoping repair\endcsname
    \XINT_expandableerrorcontinue
    #1! xint error: ##1\par
 }}\expandafter\XINT_expandableerror\csname
-numexpr or \string\expanded\space or \string\romannumeral\space expansion
-could terminate because an exception was raised (see the above short explanation for
-specifics). xint will now try to recover (hit <return> if in interactive
-mode) and will go ahead hoping repair\endcsname
+xint<...> is done, but will resume: hit <return>
+at \space the ? prompt to try fixing the error
+encountered before expansion\endcsname
 \fi
 \def\XINT_expandableerrorcontinue#1\par{#1}%
+\ifdefined\strcmp\let\xintstrcmp\strcmp
+\else\ifdefined\pdfstrcmp\let\xintstrcmp\pdfstrcmp
+\else\ifdefined\directlua\directlua{%
+xintkernel = xintkernel or {}
+local minus_tok = token.new(string.byte'-', 12)
+local zero_tok = token.new(string.byte'0', 12)
+local one_tok = token.new(string.byte'1', 12)
+function xintkernel.strcmp()
+  local A = token.scan_string()
+  local B = token.scan_string()
+  if A < B then
+    tex.write(minus_tok, one_tok)
+  else
+    tex.write(A == B and zero_tok or one_tok)
+  end
+end
+}\def\xintstrcmp{%
+  \directlua{xintkernel.strcmp()}%
+}%
+\else
+\xintMessage{xintkernel}{Error}{Could not set-up \string\xintstrcmp.}%
+\errhelp{What kind of format are you using? Perhaps write the author? Bye now}%
+\errmessage{Sorry, could not find or define string comparison primitive}\fi\fi\fi
 \XINTrestorecatcodesendinput%
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/generic/xint/xintlog.sty b/Master/texmf-dist/tex/generic/xint/xintlog.sty
index 6b25bde105d..d2b53d54d9e 100644
--- a/Master/texmf-dist/tex/generic/xint/xintlog.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintlog.sty
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% ---------------------------------------------------------------
-%% The xint bundle 1.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xintlog: Logarithms and exponentials for xintexpr
 %% ---------------------------------------------------------------
@@ -41,7 +41,7 @@
   \expandafter\let\expandafter\x\csname ver@xintlog.sty\endcsname
   \expandafter\let\expandafter\w\csname ver@xintexpr.sty\endcsname
   \expandafter
-    \ifx\csname PackageWarning\endcsname\relax
+    \ifx\csname PackageWarningNoLine\endcsname\relax
       \def\y#1#2{\immediate\write128{^^JPackage #1 Warning:^^J%
                  \space\space\space\space#2.^^J}}%
     \else
@@ -82,10 +82,10 @@
   \expandafter\xint_secondoftwo
 \fi
 {\immediate\write128{Reloading xintlog library using Digits=\xinttheDigits.}}%
-{\expandafter\gdef\csname xintlibver@log\endcsname{2022/05/29 v1.4l}%
-\XINT_providespackage
-\ProvidesPackage{xintlog}%
-[2022/05/29 v1.4l Logarithms and exponentials for xintexpr (JFB)]%
+{\expandafter\gdef\csname xintlibver@log\endcsname{2022/06/10 v1.4m}%
+  \XINT_providespackage
+  \ProvidesPackage{xintlog}%
+  [2022/06/10 v1.4m Logarithms and exponentials for xintexpr (JFB)]%
 }%
 \def\xintreloadxintlog{\input xintlog.sty }%
 \xintexprSafeCatcodes
@@ -147,11 +147,6 @@
    \expandafter[\the\numexpr-9+#1\expandafter]\fi
 }%
 \def\PoorManExp#1{\PoorManPowerOfTen{\xintMul{#1}{43429448190325182765[-20]}}}%
-\def\poormanloghack#1%
-{%
-    \xintMessage{xintexpr}{Warning}%
-    {\string\poormanloghack\space is a no-op since 1.4e and will be removed at next major release}%
-}%
 \def\XINTinFloatSciPow{\romannumeral0\XINTinfloatscipow}%
 \def\XINTinfloatscipow#1#2%
 {%
@@ -375,8 +370,10 @@
 \expandafter\let\csname XINT_c_5_0_inv_x\endcsname\XINT_tmpa
 \expandafter\let\csname XINT_c_6_0_inv_x\endcsname\XINT_tmpa
 \def\XINT_tmpa#1#2#3#4;%
-   {\expandafter\edef\csname XINT_c_#1_#2\endcsname{\XINTinFloat[\XINTdigitsormax+5]{#3#4[-79]}}%
-    \expandafter\edef\csname XINT_c_#1_#2_x\endcsname{\XINTinFloat[\XINTdigitsormax+10]{#3#4[-79]}}%
+   {\expandafter\edef\csname XINT_c_#1_#2\endcsname
+                    {\XINTinFloat[\XINTdigitsormax+5]{#3#4[-79]}}%
+    \expandafter\edef\csname XINT_c_#1_#2_x\endcsname
+                    {\XINTinFloat[\XINTdigitsormax+10]{#3#4[-79]}}%
    }%
 \XINT_tmpa 1 1 12589254117941672104239541063958006060936174094669310691079230195266476157825020;%
 \XINT_tmpa 1 2 15848931924611134852021013733915070132694421338250390683162968123166568636684540;%
@@ -433,8 +430,10 @@
 \XINT_tmpa 6 8 10000184208504057336610176132939223090407041937631374389422968832433217547184883;%
 \XINT_tmpa 6 9 10000207234805653031739097001771331138303016031686764989867510425362339583809842;%
 \def\XINT_tmpa#1#2#3#4;%
-   {\expandafter\edef\csname XINT_c_#1_#2_inv\endcsname{\XINTinFloat[\XINTdigitsormax+5]{#3#4[-80]}}%
-    \expandafter\edef\csname XINT_c_#1_#2_inv_x\endcsname{\XINTinFloat[\XINTdigitsormax+10]{#3#4[-80]}}%
+   {\expandafter\edef
+    \csname XINT_c_#1_#2_inv\endcsname{\XINTinFloat[\XINTdigitsormax+5]{#3#4[-80]}}%
+    \expandafter\edef
+    \csname XINT_c_#1_#2_inv_x\endcsname{\XINTinFloat[\XINTdigitsormax+10]{#3#4[-80]}}%
    }%
 \XINT_tmpa 1 1 79432823472428150206591828283638793258896063175548433209232392931695569719148754;%
 \XINT_tmpa 1 2 63095734448019324943436013662234386467294525718822872452772952883349494329768681;%
@@ -690,7 +689,8 @@
    \def##3########1\xint:########2\xint:
    {%
        \expandafter##4%
-       \romannumeral0\xintadd{####4}{\XINTinFloat[####2]{\xintMul{########1}{########2}}}\xint:
+       \romannumeral0\xintadd{####4}%
+                             {\XINTinFloat[####2]{\xintMul{########1}{########2}}}\xint:
    }%
   }%
  }%
diff --git a/Master/texmf-dist/tex/generic/xint/xintseries.sty b/Master/texmf-dist/tex/generic/xint/xintseries.sty
index 1194fb0de6e..46ba4add764 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.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xintseries: Expandable partial sums with xint package
 %% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
   \expandafter\let\expandafter\x\csname ver@xintseries.sty\endcsname
   \expandafter\let\expandafter\w\csname ver@xintfrac.sty\endcsname
   \expandafter\ifx\csname numexpr\endcsname\relax
-    \expandafter\ifx\csname PackageWarning\endcsname\relax
+    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
       \immediate\write128{^^JPackage xintseries Warning:^^J%
                           \space\space\space\space
                           \numexpr not available, aborting input.^^J}%
@@ -68,7 +68,7 @@
 \XINTsetupcatcodes% defined in xintkernel.sty
 \XINT_providespackage
 \ProvidesPackage{xintseries}%
-  [2022/05/29 v1.4l Expandable partial sums with xint package (JFB)]%
+  [2022/06/10 v1.4m 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 3f6ae4a48ef..fe9ed43a1f8 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.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xinttools: Expandable and non-expandable utilities
 %% ---------------------------------------------------------------
@@ -40,7 +40,7 @@
   \expandafter\let\expandafter\x\csname ver@xinttools.sty\endcsname
   \expandafter\let\expandafter\w\csname ver@xintkernel.sty\endcsname
   \expandafter\ifx\csname numexpr\endcsname\relax
-    \expandafter\ifx\csname PackageWarning\endcsname\relax
+    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
       \immediate\write128{^^JPackage xinttools Warning:^^J%
                           \space\space\space\space
                           \numexpr not available, aborting input.^^J}%
@@ -68,7 +68,7 @@
 \XINTsetupcatcodes% defined in xintkernel.sty
 \XINT_providespackage
 \ProvidesPackage{xinttools}%
-  [2022/05/29 v1.4l Expandable and non-expandable utilities (JFB)]%
+  [2022/06/10 v1.4m Expandable and non-expandable utilities (JFB)]%
 \newtoks\XINT_toks
 \xint_firstofone{\let\XINT_sptoken= } %<- space here!
 \def\xintgodef  {\global\xintodef }%
@@ -1183,8 +1183,8 @@
 }%
 \long\def\XINT_assign_c #1%
 {%
-    \def\xint_temp {#1}%
-    \ifx\xint_temp\xint_bracedstopper
+    \def\XINT_assign_tmp {#1}%
+    \ifx\XINT_assign_tmp\xint_bracedstopper
         \expandafter\XINT_assign_e
     \else
         \expandafter\XINT_assign_d
@@ -1192,7 +1192,7 @@
 }%
 \long\def\XINT_assign_d #1\to #2%
 {%
-    \expandafter\XINT_assign_def\expandafter #2\expandafter{\xint_temp}%
+    \expandafter\XINT_assign_def\expandafter #2\expandafter{\XINT_assign_tmp}%
     \XINT_assign_c #1\to
 }%
 \def\XINT_assign_e #1\to {}%
@@ -1243,8 +1243,8 @@
 }%
 \long\def\XINT_assignarray_loop #1%
 {%
-    \def\xint_temp {#1}%
-    \ifx\xint_temp\xint_bracedstopper
+    \def\XINT_assign_tmp {#1}%
+    \ifx\XINT_assign_tmp\xint_bracedstopper
        \expandafter\def\csname\xint_arrayname 0\expandafter\endcsname
                    \expandafter{\the\numexpr\xint_itemcount}%
        \expandafter\expandafter\expandafter\XINT_assignarray_end
@@ -1253,7 +1253,7 @@
                    {\the\numexpr\xint_itemcount+\xint_c_i}%
        \expandafter\XINT_assignarray_def
           \csname\xint_arrayname\xint_itemcount\expandafter\endcsname
-             \expandafter{\xint_temp }%
+             \expandafter{\XINT_assign_tmp }%
        \expandafter\XINT_assignarray_loop
     \fi
 }%
diff --git a/Master/texmf-dist/tex/generic/xint/xinttrig.sty b/Master/texmf-dist/tex/generic/xint/xinttrig.sty
index c1005e475ec..79022cb2f0f 100644
--- a/Master/texmf-dist/tex/generic/xint/xinttrig.sty
+++ b/Master/texmf-dist/tex/generic/xint/xinttrig.sty
@@ -21,7 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% ---------------------------------------------------------------
-%% The xint bundle 1.4l 2022/05/29
+%% The xint bundle 1.4m 2022/06/10
 %% Copyright (C) 2013-2022 by Jean-Francois Burnol
 %% xinttrig: Trigonometry for the xintexpr package
 %% ---------------------------------------------------------------
@@ -41,7 +41,7 @@
   \expandafter\let\expandafter\x\csname ver@xinttrig.sty\endcsname
   \expandafter\let\expandafter\w\csname ver@xintexpr.sty\endcsname
   \expandafter
-    \ifx\csname PackageWarning\endcsname\relax
+    \ifx\csname PackageWarningNoLine\endcsname\relax
       \def\y#1#2{\immediate\write128{^^JPackage #1 Warning:^^J%
                  \space\space\space\space#2.^^J}}%
     \else
@@ -83,10 +83,10 @@
   \expandafter\xint_secondoftwo
 \fi
 {\immediate\write128{Reloading xinttrig library using Digits=\xinttheDigits.}}%
-{\expandafter\gdef\csname xintlibver@trig\endcsname{2022/05/29 v1.4l}%
-\XINT_providespackage
-\ProvidesPackage{xinttrig}%
-[2022/05/29 v1.4l Trigonometrical functions for xintexpr (JFB)]%
+{\expandafter\gdef\csname xintlibver@trig\endcsname{2022/06/10 v1.4m}%
+  \XINT_providespackage
+  \ProvidesPackage{xinttrig}%
+  [2022/06/10 v1.4m Trigonometrical functions for xintexpr (JFB)]%
 }%
 \xintFor* #1 in {iDTVtuwxyzX}\do{\xintensuredummy{#1}}%
 \def\xintreloadxinttrig{\input xinttrig.sty }%
@@ -118,7 +118,8 @@
 \def\XINT_tmpa#1#2#3.#4.%
 {%
   \let #1#2%
-  \def #2##1##2##3##4{##2##3{{~expanded{~unexpanded{#4[#3]}~expandafter}~expanded{##1##4}}}}%
+  \def #2##1##2##3##4%
+      {##2##3{{~expanded{~unexpanded{#4[#3]}~expandafter}~expanded{##1##4}}}}%
 }%
 \expandafter\XINT_tmpa
     \csname XINT_flexpr_exec_+_\expandafter\endcsname
@@ -209,7 +210,8 @@
    \def##4########1\xint:########2\xint:
    {%
        \expandafter##5%
-       \romannumeral0\xintsub{####5}{\XINTinFloat[####1]{\xintMul{########1}{########2}}}\xint:
+       \romannumeral0\xintsub{####5}%
+                             {\XINTinFloat[####1]{\xintMul{########1}{########2}}}\xint:
    }%
   }%
  }%
@@ -636,7 +638,8 @@
 }%
 \def\XINT_Arcsin_II_b##1\xint:
 {%
-    \expandafter\XINT_Arcsin_II_c_i\romannumeral0\xintadd{#4}{\XINTinFloat[#2]{\xintMul{#3}{##1}}}\xint:
+    \expandafter\XINT_Arcsin_II_c_i
+    \romannumeral0\xintadd{#4}{\XINTinFloat[#2]{\xintMul{#3}{##1}}}\xint:
 }%
 \def\XINT_Arcsin_II_c_i##1\xint:##2\xint:
 {%
@@ -686,7 +689,10 @@
     \romannumeral`&&@\XINT:NEhook:f:one:from:one
     {\romannumeral`&&@\XINT_Arcsin_I#3}}%
 }%
-\def\XINT_Arcsin_I#1{\the\numexpr\expandafter\XINT_Arcsin_Ia\romannumeral0\xintiround9{#1}.}%
+\def\XINT_Arcsin_I#1%
+{%
+    \the\numexpr\expandafter\XINT_Arcsin_Ia\romannumeral0\xintiround9{#1}.%
+}%
 \def\XINT_Arcsin_Ia#1.%
 {%
   (\expandafter\XINT_Arcsin_Ib\the\numexpr#1*#1/\xint_c_x^ix.)*%
@@ -866,8 +872,10 @@
 {%
     \xintdeffloatfunc #1(x, y)  := float_dgtormax(@#1(x, y));%
     \xintdeffloatfunc #1d(x, y) := float_dgtormax(@#1d(x, y));%
-    \xintdeffunc #1(x, y) := float_dgtormax(\xintfloatexpr @#1(sfloat_dgtormax(x), sfloat_dgtormax(y))\relax);%
-    \xintdeffunc #1d(x, y):= float_dgtormax(\xintfloatexpr @#1d(sfloat_dgtormax(x), sfloat_dgtormax(y))\relax);%
+    \xintdeffunc #1(x, y) :=
+         float_dgtormax(\xintfloatexpr @#1(sfloat_dgtormax(x), sfloat_dgtormax(y))\relax);%
+    \xintdeffunc #1d(x, y):=
+         float_dgtormax(\xintfloatexpr @#1d(sfloat_dgtormax(x), sfloat_dgtormax(y))\relax);%
 }%
 \xintdeffloatfunc sinc(x):= float_dgtormax(@sinc(x));%
 \xintdeffunc      sinc(x):= float_dgtormax(\xintfloatexpr @sinc(sfloat_dgtormax(x))\relax);%