datax (28jan22)

git-svn-id: svn://tug.org/texlive/trunk@61772 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 24 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/datax/README.md b/Master/texmf-dist/doc/latex/datax/README.md
index 1471c9a39d7..ce8d63cb24f 100644
--- a/Master/texmf-dist/doc/latex/datax/README.md
+++ b/Master/texmf-dist/doc/latex/datax/README.md
@@ -1,5 +1,7 @@
 # The datax package
-A LaTeX package to insert data from a script in a document. Interacting plugins available at [Github, Datax-package](https://github.com/Datax-package).
+
+A LaTeX package to insert data from a script in a document. Interacting plugins
+available at [Github, Datax-package](https://github.com/Datax-package).
 
 ## Example usage
 Julia script:
@@ -29,17 +31,19 @@ Julia | [LaTeXDatax.jl](https://github.com/Datax-package/LaTeXDatax.jl) | David
 MATLAB | [LaTeXDatax.m](https://github.com/Datax-package/Datax.m) | David Gustavsson
 Python | [LaTeXDatax.py](https://github.com/Datax-package/LaTeXDatax.py) | David Gustavsson
 
-If your language isn't listed above, check [the super-repo](https://github.com/Datax-package).
-Extending it to your language of choice should be fairly simple, just make it so your script can write `\pgfkeyssetvalue{/datax/<tag>}{<value>}` to a file.
-If you end up writing a plugin for a language, or if you want to request one, please make a feature request or send me an e-mail.
+If your language isn't listed above, check [the
+super-repo](https://github.com/Datax-package). Extending it to your language of
+choice should be fairly simple, just make it so your script can write
+`\pgfkeyssetvalue{/datax/<tag>}{<value>}` to a file. If you end up writing a
+plugin for a language, or if you want to request one, please make a feature
+request or send me an e-mail.
 
 ## Copyright and license
-Copyright 2020 David Gustavsson (david.e.gustavsson@gmail.com)
+Copyright 2020 − 2022 David Gustavsson (david.e.gustavsson@gmail.com)
 
-This package may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.3 of this license or (at your option) any later
-version. The latest version of this license is in:
+This package may be distributed and/or modified under the conditions of the
+LaTeX Project Public License, either version 1.3 of this license or (at your
+option) any later version. The latest version of this license is in:
 
 http://www.latex-project.org/lppl.txt
 
diff --git a/Master/texmf-dist/doc/latex/datax/datax.pdf b/Master/texmf-dist/doc/latex/datax/datax.pdf
index 0c266b995df..65e79fdba78 100644
--- a/Master/texmf-dist/doc/latex/datax/datax.pdf
+++ b/Master/texmf-dist/doc/latex/datax/datax.pdf
diff --git a/Master/texmf-dist/source/latex/datax/datax.dtx b/Master/texmf-dist/source/latex/datax/datax.dtx
index d1f9e5c996f..81b5c7f64cb 100644
--- a/Master/texmf-dist/source/latex/datax/datax.dtx
+++ b/Master/texmf-dist/source/latex/datax/datax.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2020 by David Gustavsson
+% Copyright (C) 2020-2021 by David Gustavsson
 %
 % This file may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[2020/02/02]
 %<package>\ProvidesPackage{datax}
-%<package>      [2021-09-22 v1.1.2 data import into LaTeX]
+%<package>      [2022-01-27 v1.2.0 data import into LaTeX]
 %<package>\RequirePackage{pgfkeys}
 %<package>\RequirePackage{pgfopts}
 %
@@ -60,7 +60,7 @@
 %</driver>
 % \fi
 %
-%\CheckSum{29}
+%\CheckSum{21}
 %
 % \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
@@ -82,6 +82,7 @@
 % \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}
+% \changes{v1.2.0}{2022-01-27}{Removing package wide siunitx options}
 %
 % \GetFileInfo{datax.sty}
 % \DoNotIndex{}
@@ -181,7 +182,6 @@
 % 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.
@@ -204,8 +204,6 @@
         }{}{
         \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
@@ -214,9 +212,9 @@
 \newcommand{\datax}[2][]{%
         \pgfkeysifdefined{/datax/#2}{%
                 {%
-                        \ifhassiunitx%
-                                \sisetup{\pgfkeysvalueof{/packageoptions/siunitxoptions},#1}%
-                        \fi%
+                        \@ifpackageloaded{siunitx}{%
+                                \sisetup{#1}%
+                        }{}%
                         \pgfkeysvalueof{/datax/#2}%
                 }%
                 }{%
diff --git a/Master/texmf-dist/tex/latex/datax/datax.sty b/Master/texmf-dist/tex/latex/datax/datax.sty
index cf83b59e1d9..c57e799edc0 100644
--- a/Master/texmf-dist/tex/latex/datax/datax.sty
+++ b/Master/texmf-dist/tex/latex/datax/datax.sty
@@ -21,12 +21,11 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020/02/02]
 \ProvidesPackage{datax}
-      [2021-09-22 v1.1.2 data import into LaTeX]
+      [2022-01-27 v1.2.0 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,%
@@ -41,14 +40,12 @@
         }{}{
         \PackageWarning{datax}{Cannot read file `\dataxfile'}
 }
-\newif\ifhassiunitx
-\@ifpackageloaded{siunitx}{\hassiunitxtrue}{\hassiunitxfalse}
 \newcommand{\datax}[2][]{%
         \pgfkeysifdefined{/datax/#2}{%
                 {%
-                        \ifhassiunitx%
-                                \sisetup{\pgfkeysvalueof{/packageoptions/siunitxoptions},#1}%
-                        \fi%
+                        \@ifpackageloaded{siunitx}{%
+                                \sisetup{#1}%
+                        }{}%
                         \pgfkeysvalueof{/datax/#2}%
                 }%
                 }{%