diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/xint/xinttrig.sty')
-rw-r--r-- | Master/texmf-dist/tex/generic/xint/xinttrig.sty | 46 |
1 files changed, 30 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/generic/xint/xinttrig.sty b/Master/texmf-dist/tex/generic/xint/xinttrig.sty index ae312937e25..c1005e475ec 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.4k 2022/05/18 +%% The xint bundle 1.4l 2022/05/29 %% Copyright (C) 2013-2022 by Jean-Francois Burnol %% xinttrig: Trigonometry for the xintexpr package %% --------------------------------------------------------------- @@ -33,46 +33,60 @@ \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@xinttrig.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{xinttrig}{\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{xinttrig}% - {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 + xinttrig should not be loaded directly\MessageBreak + The correct way is \string\usepackage{xintexpr}.\MessageBreak + Will try that now% + \else + First loading of xinttrig.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\XINTtrigendinput{\XINTrestorecatcodes\noexpand\endinput}}% \fi \fi \z% -\edef\XINTtrigendinput{\XINTrestorecatcodes\noexpand\endinput}\XINTsetcatcodes% +\XINTsetcatcodes% \catcode`? 12 \ifcsname xintlibver@trig\endcsname \expandafter\xint_firstoftwo \else \expandafter\xint_secondoftwo \fi -{\immediate\write-1{Reloading xinttrig library using Digits=\xinttheDigits.}}% -{\expandafter\gdef\csname xintlibver@trig\endcsname{2022/05/18 v1.4k}% +{\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/18 v1.4k Trigonometrical functions for xintexpr (JFB)]% +[2022/05/29 v1.4l Trigonometrical functions for xintexpr (JFB)]% }% \xintFor* #1 in {iDTVtuwxyzX}\do{\xintensuredummy{#1}}% \def\xintreloadxinttrig{\input xinttrig.sty }% |