diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/xint/xintlog.sty')
-rw-r--r-- | Master/texmf-dist/tex/generic/xint/xintlog.sty | 54 |
1 files changed, 34 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/generic/xint/xintlog.sty b/Master/texmf-dist/tex/generic/xint/xintlog.sty index c5751af1217..6b25bde105d 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.4k 2022/05/18 +%% The xint bundle 1.4l 2022/05/29 %% Copyright (C) 2013-2022 by Jean-Francois Burnol %% xintlog: Logarithms and exponentials for xintexpr %% --------------------------------------------------------------- @@ -33,55 +33,69 @@ \catcode64=11 % @ \catcode35=6 % # \catcode44=12 % , - \catcode45=12 % - \catcode46=12 % . \catcode58=12 % : \catcode94=7 % ^ - \def\z{\endgroup}% \def\empty{}\def\space{ }\newlinechar10 + \def\z{\endgroup}% + \expandafter\let\expandafter\x\csname ver@xintlog.sty\endcsname \expandafter\let\expandafter\w\csname ver@xintexpr.sty\endcsname \expandafter - \ifx\csname PackageInfo\endcsname\relax - \def\y#1#2{\immediate\write-1{Package #1 Info:^^J% - \space\space\space\space#2.}}% + \ifx\csname PackageWarning\endcsname\relax + \def\y#1#2{\immediate\write128{^^JPackage #1 Warning:^^J% + \space\space\space\space#2.^^J}}% \else - \def\y#1#2{\PackageInfo{#1}{#2}}% + \def\y#1#2{\PackageWarningNoLine{#1}{#2}}% \fi \expandafter \ifx\csname numexpr\endcsname\relax \y{xintlog}{\numexpr not available, aborting input}% - \aftergroup\endinput + \def\z{\endgroup\endinput}% \else \ifx\w\relax % xintexpr.sty not yet loaded. + \edef\MsgBrk{^^J\space\space\space\space}% \y{xintlog}% - {Loading should be via \ifx\x\empty\string\usepackage{xintexpr.sty} - \else\string\input\space xintexpr.sty \fi - rather, aborting}% - \aftergroup\endinput + {\ifx\x\empty + xintlog should not be loaded directly\MessageBreak + The correct way is \string\usepackage{xintexpr}.\MessageBreak + Will try that now% + \else + First loading of xintlog.sty should be via + \string\input\space xintexpr.sty\relax\MsgBrk + Will try that now% + \fi + }% + \ifx\x\empty + \def\z{\endgroup\RequirePackage{xintexpr}\endinput}% + \else + \def\z{\endgroup\input xintexpr.sty\relax\endinput}% + \fi + \else + \def\z{\endgroup\edef\XINTlogendinput{\XINTrestorecatcodes\noexpand\endinput}}% \fi \fi \z% -\edef\XINTendxintloginput{\XINTrestorecatcodes\noexpand\endinput}\XINTsetcatcodes% +\XINTsetcatcodes% \ifcsname xintlibver@log\endcsname \expandafter\xint_firstoftwo \else \expandafter\xint_secondoftwo \fi -{\immediate\write-1{Reloading xintlog library using Digits=\xinttheDigits.}}% -{\expandafter\gdef\csname xintlibver@log\endcsname{2022/05/18 v1.4k}% +{\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/18 v1.4k Logarithms and exponentials for xintexpr (JFB)]% +[2022/05/29 v1.4l Logarithms and exponentials for xintexpr (JFB)]% }% \def\xintreloadxintlog{\input xintlog.sty }% -\xintexprSafeCatcodes\catcode`_ 11 +\xintexprSafeCatcodes \unless\ifdefined\XINTinFloatPowTen \ifdefined\RequirePackage \RequirePackage{poormanlog}% \else \input poormanlog.tex \fi\fi -\xintexprRestoreCatcodes\XINTsetcatcodes +\xintexprRestoreCatcodes \def\PoorManLogBaseTen{\romannumeral0\poormanlogbaseten}% \def\poormanlogbaseten #1% {% @@ -334,7 +348,7 @@ \romannumeral`&&@\XINT:NEhook:f:one:from:two {\romannumeral`&&@\XINTinFloatSciPow#3}}% }% -\ifnum\XINTdigits<9 \expandafter\XINTendxintloginput\fi% +\ifnum\XINTdigits<9 \expandafter\XINTlogendinput\fi% \def\XINT_tmpa{1[0]}% \expandafter\let\csname XINT_c_1_0\endcsname\XINT_tmpa \expandafter\let\csname XINT_c_2_0\endcsname\XINT_tmpa @@ -1392,7 +1406,7 @@ \XINTinFloat[\XINTdigitsormax-43]{1/9[0]}.% }% \fi -\XINTendxintloginput% +\XINTlogendinput% \endinput %% %% End of file `xintlog.sty'. |