From baa77b393e5f15903197c8a300b4aa4e37187a42 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 22 Sep 2021 20:35:42 +0000 Subject: datax (22sep21) git-svn-id: svn://tug.org/texlive/trunk@60580 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/datax/datax.sty | 30 ++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/latex/datax') diff --git a/Master/texmf-dist/tex/latex/datax/datax.sty b/Master/texmf-dist/tex/latex/datax/datax.sty index 6c0054e96c8..cf83b59e1d9 100644 --- a/Master/texmf-dist/tex/latex/datax/datax.sty +++ b/Master/texmf-dist/tex/latex/datax/datax.sty @@ -21,17 +21,18 @@ %% \NeedsTeXFormat{LaTeX2e}[2020/02/02] \ProvidesPackage{datax} - [2020/11/29 v1.1.1 data import into LaTeX] + [2021-09-22 v1.1.2 data import into LaTeX] \RequirePackage{pgfkeys} \RequirePackage{pgfopts} \pgfkeys{ /packageoptions/dataxfile/.initial=data.tex, } +\pgfkeys{ /packageoptions/siunitxoptions/.initial={}, } \ProcessPgfPackageOptions{/packageoptions} -\pgfkeys{ /datax/.is family, datax, % - .unknown/.code={ \pgfkeyssetvalue{ % - \pgfkeyscurrentpath/\pgfkeyscurrentname % - }{ #1 } }, +\pgfkeys{ /datax/.is family, datax,% + .unknown/.code={ \pgfkeyssetvalue{% + \pgfkeyscurrentpath/\pgfkeyscurrentname% + }{ #1 } },% } \def\dataxfile{./\pgfkeysvalueof{/packageoptions/dataxfile}} @@ -40,12 +41,19 @@ }{}{ \PackageWarning{datax}{Cannot read file `\dataxfile'} } -\newcommand{\datax}[1]{ - \pgfkeysifdefined{/datax/#1}{ % - \pgfkeysvalueof{/datax/#1} % - }{ % - \PackageWarning{datax}{Data value `#1' undefined}\textbf{??} % - } % +\newif\ifhassiunitx +\@ifpackageloaded{siunitx}{\hassiunitxtrue}{\hassiunitxfalse} +\newcommand{\datax}[2][]{% + \pgfkeysifdefined{/datax/#2}{% + {% + \ifhassiunitx% + \sisetup{\pgfkeysvalueof{/packageoptions/siunitxoptions},#1}% + \fi% + \pgfkeysvalueof{/datax/#2}% + }% + }{% + \PackageWarning{datax}{Data value `#2' undefined}\textbf{??}% + }% } \endinput %% -- cgit v1.2.3