summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-22 20:35:42 +0000
committerKarl Berry <karl@freefriends.org>2021-09-22 20:35:42 +0000
commitbaa77b393e5f15903197c8a300b4aa4e37187a42 (patch)
tree82294d194f279ee115e1400c2270e5b8be9ce9b5
parente1ac6a7abe74427c3cf0c66ca12fc1c75c16b671 (diff)
datax (22sep21)
git-svn-id: svn://tug.org/texlive/trunk@60580 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/datax/datax.pdfbin188210 -> 189196 bytes
-rw-r--r--Master/texmf-dist/source/latex/datax/datax.dtx33
-rw-r--r--Master/texmf-dist/tex/latex/datax/datax.sty30
3 files changed, 40 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/datax/datax.pdf b/Master/texmf-dist/doc/latex/datax/datax.pdf
index d0db4830ed1..0c266b995df 100644
--- a/Master/texmf-dist/doc/latex/datax/datax.pdf
+++ b/Master/texmf-dist/doc/latex/datax/datax.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/datax/datax.dtx b/Master/texmf-dist/source/latex/datax/datax.dtx
index 198745020b0..d1f9e5c996f 100644
--- a/Master/texmf-dist/source/latex/datax/datax.dtx
+++ b/Master/texmf-dist/source/latex/datax/datax.dtx
@@ -17,7 +17,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2020/02/02]
%<package>\ProvidesPackage{datax}
-%<package> [2020/11/29 v1.1.1 data import into LaTeX]
+%<package> [2021-09-22 v1.1.2 data import into LaTeX]
%<package>\RequirePackage{pgfkeys}
%<package>\RequirePackage{pgfopts}
%
@@ -60,7 +60,7 @@
%</driver>
% \fi
%
-%\CheckSum{19}
+%\CheckSum{29}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -81,6 +81,7 @@
% \changes{v1.0}{2020/11/15}{Initial version}
% \changes{v1.1}{2020/11/17}{Polishing for release}
% \changes{v1.1.1}{2020/11/29}{Renaming the plugins, adding Python support}
+% \changes{v1.1.2}{2021-09-22}{Removing excessive spaces}
%
% \GetFileInfo{datax.sty}
% \DoNotIndex{}
@@ -180,16 +181,17 @@
% Default data file name: \texttt{data.tex}
% \begin{macrocode}
\pgfkeys{ /packageoptions/dataxfile/.initial=data.tex, }
+\pgfkeys{ /packageoptions/siunitxoptions/.initial={}, }
% \end{macrocode}
% Read any given options into family \texttt{/packageoptions/}. Then introduce
% family \texttt{/datax/} where all the variables will be stored.
% \begin{macrocode}
\ProcessPgfPackageOptions{/packageoptions}
-\pgfkeys{ /datax/.is family, datax, %
- .unknown/.code={ \pgfkeyssetvalue{ %
- \pgfkeyscurrentpath/\pgfkeyscurrentname %
- }{ #1 } },
+\pgfkeys{ /datax/.is family, datax,%
+ .unknown/.code={ \pgfkeyssetvalue{%
+ \pgfkeyscurrentpath/\pgfkeyscurrentname%
+ }{ #1 } },%
}
% \end{macrocode}
@@ -202,17 +204,24 @@
}{}{
\PackageWarning{datax}{Cannot read file `\dataxfile'}
}
+\newif\ifhassiunitx
+\@ifpackageloaded{siunitx}{\hassiunitxtrue}{\hassiunitxfalse}
% \end{macrocode}
% \begin{macro}{\datax}
% Include datum. If the supplied tag is unused, print bold question marks (like
% |\ref|), and throw a warning.
% \begin{macrocode}
-\newcommand{\datax}[1]{
- \pgfkeysifdefined{/datax/#1}{ %
- \pgfkeysvalueof{/datax/#1} %
- }{ %
- \PackageWarning{datax}{Data value `#1' undefined}\textbf{??} %
- } %
+\newcommand{\datax}[2][]{%
+ \pgfkeysifdefined{/datax/#2}{%
+ {%
+ \ifhassiunitx%
+ \sisetup{\pgfkeysvalueof{/packageoptions/siunitxoptions},#1}%
+ \fi%
+ \pgfkeysvalueof{/datax/#2}%
+ }%
+ }{%
+ \PackageWarning{datax}{Data value `#2' undefined}\textbf{??}%
+ }%
}
% \end{macrocode}
% \end{macro}
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
%%