summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-21 20:53:00 +0000
committerKarl Berry <karl@freefriends.org>2023-02-21 20:53:00 +0000
commit307d931f6e784fa18a29b2675473afaa8a25aba1 (patch)
tree9f5f3afc75809f57d9d3435f4d82fe134a6f5b67 /Master/texmf-dist/tex
parent5dd5c8504b7ea6fb177c99f4db0c8fd0d48bf548 (diff)
pgf-periodictable (21feb23) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66035 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty9
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.backcolors.keys.tex28
2 files changed, 21 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty b/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty
index d814cc34b22..9507cdfcae4 100644
--- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty
+++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty
@@ -1,9 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Hugo Gomes @ 20/02/2023 (v2.0.0)
% Hugo Gomes @ 08/11/2022 (v1.0.1)
% Hugo Gomes @ 10/10/2022 (v1.0.0)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{pgf-PeriodicTable}[08/11/2022 pgf-PeriodicTable v1.0.1]%%
+\ProvidesPackage{pgf-PeriodicTable}[20/02/2023 pgf-PeriodicTable v2.0.0]%%
\RequirePackage{tikz}%
\usetikzlibrary{fadings}%
\tikzfading[name=aumentax, left color=transparent!80, right color=transparent!1]%
@@ -41,6 +42,7 @@
\def\pgfPT@TRUE{TRUE}%
\def\pgfPT@false{false}%
\def\pgfPT@relax{}%
+\def\pgfPT@space{ }%
\def\pgfPT@unit@d@gcm{g/cm3}% v1.0.1
\def\pgfPT@unit@d@gdm{g/dm3}% v1.0.1
\def\pgfPT@unit@d@both{both}% v1.0.1
@@ -68,6 +70,7 @@
\input{pgfPT.names.tex}% Loading the names of the elements in the Periodic Table
\input{pgfPT.labels.tex}% Loading language labels
\input{pgfPT.process.language.tex}% Macros for process language labels
+\input{pgfPT.input.library.tex}% Loading the input library mechanism (new v2.0.0)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% --------------------------------------------------------------------------------------------------
% commands #################################################
@@ -2755,7 +2758,9 @@ rectangle
% internal macro -> pgfPT@processlist -----------------------------------------------------------
% Analyze the key and store the list of Z numbers in \pgfPT@@cellslist ------------------------
\def\pgfPT@processlist{%
- \ifcat1\pgfPTcells\relax%
+\def\pgfPT@processlist@firstchar##1##2\relax{\edef\pgfPT@tmp{##1}}%
+\expandafter\pgfPT@processlist@firstchar\pgfPTcells\relax%
+ \ifcat1\pgfPT@tmp\relax%
%\pgfPTcells is a list of Z numbers
\edef\pgfPT@@cellslist{\pgfPTcells}%
\else%
diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.backcolors.keys.tex b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.backcolors.keys.tex
index 59b7670dab7..076f588ca02 100644
--- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.backcolors.keys.tex
+++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.backcolors.keys.tex
@@ -28,7 +28,7 @@
\xglobal\colorlet{cpgfPTTMP}{cpgfPTTMP}%
}%
\def\pgfPT@newColorScheme@noptions#1#2{%
-\expandafter\def\csname pgfPT@backColorsScheme@#1\endcsname{#2,1/1/1}%
+\expandafter\edef\csname pgfPT@backColorsScheme@#1\endcsname{#2,1/1/1}%
\definecolor{cpgfPTTMP}{rgb}{1,1,1}%
\xglobal\colorlet{cpgfPTTMP}{cpgfPTTMP}%
}%
@@ -53,24 +53,24 @@ csBlocks/.style={back color scheme=Blocks},%
csSolid/.style={back color scheme=solid,back color=#1}%
}% STYLES -> csSoft,csJmol,csCPK,csRasmol,csRasmolNew,csWikipedia,csMNM,csPS,csRadio,csBlocks,csSolid
% setting keys with default values ---------------------------------------------------------------
-\pgfkeys{/pgfPerTable/.cd,back color scheme,back color}
+\pgfkeys{/pgfPerTable/.cd,back color scheme,back color}%
% end !! PGF keys: the cells of the periodic table to be drawn ----------------------------------
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\pgfPTcolorSchemeInfo{%
\global\pgfPT@dima=0pt\relax%
-\foreach \Z in {1,...,118}{\path (-\pgfPTcellwd,-10pt*\Z) rectangle node[midway,font=\tiny\bfseries] {Z=\Z} ++(\pgfPTcellwd,-10pt);}
-\foreach \cs in {default,Soft,Jmol,CPK,Rasmol,RasmolNew,Wikipedia,MNM,PS,Radio,Blocks}{
- \node[below right,text width=\pgfPTcellwd,text centered,font=\tiny,inner xsep=0pt] at (\pgfPT@dima,0pt) {\cs};
- \path (\pgfPTcellwd+\pgfPT@dima,0pt) rectangle node[midway,font=\tiny\bfseries] {(r,g,b)} ++(2*\pgfPTcellwd,-10pt);
+\foreach \Z in {1,...,118}{\path (-\pgfPTcellwd,-10pt*\Z) rectangle node[midway,font=\tiny\bfseries] {Z=\Z} ++(\pgfPTcellwd,-10pt);}%
+\foreach \cs in {default,Soft,Jmol,CPK,Rasmol,RasmolNew,Wikipedia,MNM,PS,Radio,Blocks}{%
+ \node[below right,text width=\pgfPTcellwd,text centered,font=\tiny,inner xsep=0pt] at (\pgfPT@dima,0pt) {\cs};%
+ \path (\pgfPTcellwd+\pgfPT@dima,0pt) rectangle node[midway,font=\tiny\bfseries] {(r,g,b)} ++(2*\pgfPTcellwd,-10pt);%
\edef\pgfPT@@colorlist{\csname pgfPT@backColorsScheme@\cs\endcsname}%
- \foreach \Z in {1,...,118}{
+ \foreach \Z in {1,...,118}{%
\pgfPT@processbackcolor{\Z}%
- \draw[fill=cpgfPTTMP] (\pgfPT@dima,-10pt*\Z) rectangle ++(\pgfPTcellwd,-10pt);
- \pgfPT@extract@rgb@fill{cpgfPTTMP}
- \draw (\pgfPTcellwd+\pgfPT@dima,-10pt*\Z) rectangle node[midway,font=\tiny\bfseries] {(\pgfPT@rf,\pgfPT@gf,\pgfPT@bf)} ++(2*\pgfPTcellwd,-10pt);
- }
- \draw[thick] (\pgfPT@dima,0pt) rectangle ++(3*\pgfPTcellwd,-1190pt);
+ \draw[fill=cpgfPTTMP] (\pgfPT@dima,-10pt*\Z) rectangle ++(\pgfPTcellwd,-10pt);%
+ \pgfPT@extract@rgb@fill{cpgfPTTMP}%
+ \draw (\pgfPTcellwd+\pgfPT@dima,-10pt*\Z) rectangle node[midway,font=\tiny\bfseries] {(\pgfPT@rf,\pgfPT@gf,\pgfPT@bf)} ++(2*\pgfPTcellwd,-10pt);%
+ }%
+ \draw[thick] (\pgfPT@dima,0pt) rectangle ++(3*\pgfPTcellwd,-1190pt);%
\global\advance\pgfPT@dima by\pgfPTcellwd\global\advance\pgfPT@dima by\pgfPTcellwd\relax\global\advance\pgfPT@dima by\pgfPTcellwd\relax%
- }
-}
+ }%
+}%
\endinput