diff options
author | Karl Berry <karl@freefriends.org> | 2021-02-21 22:15:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-02-21 22:15:40 +0000 |
commit | 55349b823b85a84a670fd885ac6fa8035893ebf2 (patch) | |
tree | 67fc48d51516d8341af748ddcf6d4091a2303ea6 /Master/texmf-dist/tex/generic/xint/xintexpr.sty | |
parent | 037b5617dc1197da3c4065d8784e9e6887caab2a (diff) |
xint (21feb21)
git-svn-id: svn://tug.org/texlive/trunk@57832 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/xint/xintexpr.sty')
-rw-r--r-- | Master/texmf-dist/tex/generic/xint/xintexpr.sty | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/generic/xint/xintexpr.sty b/Master/texmf-dist/tex/generic/xint/xintexpr.sty index 889e3e521b9..8df9da27a74 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.4b 2020/02/25 +%% The xint bundle 1.4c 2021/02/20 %% Copyright (C) 2013-2020 by Jean-Francois Burnol %% xintexpr: Expandable expression parser %% --------------------------------------------------------------- @@ -82,7 +82,7 @@ \XINTsetupcatcodes% \XINT_providespackage \ProvidesPackage{xintexpr}% - [2020/02/25 v1.4b Expandable expression parser (JFB)]% + [2021/02/20 v1.4c Expandable expression parser (JFB)]% \catcode`! 11 \let\XINT_Cmp \xintiiCmp \def\XINTfstop{\noexpand\XINTfstop}% @@ -151,7 +151,7 @@ >% back to normal catcodes \catcode`& 4 \protected\def\xintexpralignbegin {\halign\bgroup\tabskip2ex\hfil##&&##\hfil\cr}% -\protected\def\xintexpralignend {\crcr\egroup}% +\def\xintexpralignend {\crcr\egroup}% \protected\def\xintexpralignlinesep {,\cr}% \protected\def\xintexpralignleftbracket {[}% \protected\def\xintexpralignrightbracket{]}% @@ -382,7 +382,7 @@ {\xint_gob_til_! #9\xintthespaceseparated_c !% #1#2#3#4#5#6#7#8#9% \xintthespaceseparated_b}% -\def\xintthespaceseparated_c !#1!#2^{#1}% +\def\xintthespaceseparated_c !#1!#2^{ #1}% \let\XINT:NEhook:f:one:from:one\expandafter \let\XINT:NEhook:f:one:from:one:direct\empty \let\XINT:NEhook:f:one:from:two\expandafter @@ -1835,9 +1835,11 @@ {{\expandafter\noexpand\csname XINT_expr_varvalue_#1\endcsname}}% \XINT_global \expandafter\edef\csname XINT_expr_onliteral_#1\endcsname - {\noexpand\expandafter\XINT_expr_precedence_*** - \noexpand\expandafter *\expandafter - \noexpand\csname XINT_expr_var_#1\endcsname(}% + {\unexpanded{\expandafter\expandafter\expandafter}% + \XINT_expr_precedence_*** + \unexpanded{\expandafter\expandafter\expandafter}% + *\unexpanded{\expandafter\expandafter}% + \expandafter\noexpand\csname XINT_expr_var_#1\endcsname(}% \ifxintverbose\xintMessage{xintexpr}{Info} {Variable "#1" \ifxintglobaldefs globally \fi defined with value \csname XINT_expr_varvalue_#1\endcsname.}% |