diff options
author | Norbert Preining <norbert@preining.info> | 2024-09-09 03:04:13 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-09-09 03:04:13 +0000 |
commit | 851fe059f5142964ae1d327d15bdc2ab7ed68303 (patch) | |
tree | bed47f94210838236352f3309ba57144b013667c /graphics | |
parent | 02b4f3220f1fe1f680dae87bf14e62926b6bf0c5 (diff) |
CTAN sync 202409090304
Diffstat (limited to 'graphics')
18 files changed, 721 insertions, 119 deletions
diff --git a/graphics/pgf/contrib/pgf-periodictable/README b/graphics/pgf/contrib/pgf-periodictable/README index f761cd2439..bfdfafd70a 100644 --- a/graphics/pgf/contrib/pgf-periodictable/README +++ b/graphics/pgf/contrib/pgf-periodictable/README @@ -1,4 +1,4 @@ -This is pgf-PeriodicTable, version 2.1.3 (2024/08/07). +This is pgf-PeriodicTable, version 2.1.4 (2024/09/08). The purpose of this package is to provide the Periodic Table of Elements in a simple way. It relies on pgf/TikZ to offer a full or partial periodic table with @@ -22,6 +22,13 @@ ____________________________________________________________ Major changes: +*** v2.1.4 (08/09/2024) *** +Fixed wrong box width on extra legend of Country of Discovery. +Fixed minor issues in pgfPTbuildcell macros. +Added the prefix 'pgfPT' to the built-in back color schemes. They are now 'pgfPTdefault', 'pgfPTSoft', 'pgfPTJmol', +'pgfPTCPK', 'pgfPTRasmol', 'pgfPTRasmolNew', 'pgfPTWikipedia', 'pgfPTMNM', 'pgfPTPS', 'pgfPTRadio' and 'pgfPTBlocks'. +Fixed some typos in the manual. + *** v2.1.3 (07/08/2024) *** The engine's detection mechanism (pdfLaTeX, LuaLaTeX or XeTeX) has been changed to prevent erroneous detection when the packages 'hyperref' or 'bookmark' are loaded and the document is compiled with LuaLaTeX - in this case, pgf-PeriodicTable disturbs the selection of the document font. Fixed an issue with the Chemical Symbol color when a non-rgb color is used, such as cyan or yellow , which are defined in the xcolor package using the cmyk model (when loaded without options). diff --git a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_DiscY.tex b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_DiscY.tex index 66e67fc3c7..9a18c1f8dd 100644 --- a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_DiscY.tex +++ b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_DiscY.tex @@ -1,23 +1,23 @@ %\vfill% -\subsubsection{\texorpdfstring{\ding{224} The discovery year}{The discovery year}}\vspace{6pt}% +\subsubsection{\texorpdfstring{\ding{224} The year of discovery}{The year of discovery}}\vspace{6pt}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % DiscY color \pgfPTMoption{4}{DiscY color}{black}{% -Sets the discovery year color. +Sets the color of the discovery year. } \\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=pgfPTdisc,DiscY color=red]% \\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=pgfPTdisc,DiscY color=red]}}% \\ [5pt]\pgfPTendoption% % DiscY font \pgfPTMoption{4}{DiscY font}{\string\tiny\string\bfseries}{% -Sets the discovery year font. +Sets the font of the discovery year. } \\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=pgfPTdisc,DiscY font=\string\fontfamily{pbk}\string\selectfont\string\tiny\string\bfseries]% \\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=pgfPTdisc,DiscY font=\fontfamily{pbk}\selectfont\tiny\bfseries]}}% \\ [5pt]\pgfPTendoption% % DiscY BC scale \pgfPTMoption{4}{DiscY BC scale}{1}{% -Sets the font factor scaling for the Before Christ (BC) acronym in the discovery year. +Sets the font factor scaling for the Before Christ (BC) acronym in the year of discovery. } \\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=pgfPTdisc,DiscY BC scale=.8]% \\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},cell style=pgfPTdisc,DiscY BC scale=.8]}}% diff --git a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_Examples.tex b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_Examples.tex index b9b76f64d1..4b9211dc54 100644 --- a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_Examples.tex +++ b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_Examples.tex @@ -71,7 +71,7 @@ The following examples could be used for students or for any other purposes. \def\grupo[#1][#2] #3{% \begin{tikzpicture}[inner xsep=0pt] \node[below left,text width=1.75cm,text centered] (figura) at (0,0) % -{\scalebox{.5}{\pgfPT[show title=false,show label LaAc=true,show legend=false,back color scheme=MNM,% +{\scalebox{.5}{\pgfPT[show title=false,show label LaAc=true,show legend=false,back color scheme=pgfPTMNM,% font=Roboto-TLF,CS font=\fontfamily{RobotoSlab-TLF}\bfseries\large,eDist color=blue!70!black,% DiscC font=\fontsize{4}{4}\selectfont,DiscY font=\fontsize{4}{4}\selectfont\bfseries,% name font=\fontseries{l}\fontsize{6pt}{6pt}\selectfont,name color=red!50!black,% diff --git a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex index c90a4cae94..6b57de7bb0 100644 --- a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex +++ b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_OtherCont.tex @@ -7,7 +7,7 @@ For all the \textit{other contents} available for the cells of the periodic tabl \begin{itemlist} %\item\red{\textbf{name}}:\hspace{.5ex}element name \item\red{\textbf{R}}:\hspace{.5ex}atomic radius -\item\red{\textbf{Rcov}}:\hspace{.5ex}covalente radius +\item\red{\textbf{Rcov}}:\hspace{.5ex}covalent radius \item\red{\textbf{Rion}}:\hspace{.5ex}ionic radius \item\red{\textbf{Ei}}:\hspace{.5ex}first ionization energy \item\red{\textbf{eneg}}:\hspace{.5ex}electronegativity (Pauling) @@ -29,7 +29,7 @@ For all the \textit{other contents} available for the cells of the periodic tabl \item\red{\textbf{lsb}}:\hspace{.5ex}lattice constant -- b \item\red{\textbf{lsc}}:\hspace{.5ex}lattice constant -- c \item\red{\textbf{lsca}}:\hspace{.5ex}lattice c/a ratio -\item\red{\textbf{DiscC}}:\hspace{.5ex}discover country +\item\red{\textbf{DiscC}}:\hspace{.5ex}country of discovery \item\red{\textbf{spectra}}:\hspace{.5ex}visible range spectral lines \end{itemlist} \end{minipage} diff --git a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_commands.tex b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_commands.tex index 9e1ba55405..cbc7cbc2fa 100644 --- a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_commands.tex +++ b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_commands.tex @@ -33,8 +33,8 @@ \\ [0pt]\pgfPTMline% \newpage% This command can also be used with options -- as described in section \hyperlink{OPTIONS}{Options for \textbackslash pgfPT: creating a «Periodic Table»} -- to modify, for instance, the font of the Periodic Table or the colors of the cells: -\\ [10pt]\pgfPTMmacrobox{pgfPT}[font=pnc,back color scheme=MNM]% -\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[font=pnc,back color scheme=MNM]}}% +\\ [10pt]\pgfPTMmacrobox{pgfPT}[font=pnc,back color scheme=pgfPTMNM]% +\\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[font=pnc,back color scheme=pgfPTMNM]}}% \\ [0pt]\pgfPTMline% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \\ [-32pt]\ % @@ -87,7 +87,7 @@ It is possible to locally override the \textit{global style} defined: \\ [-32pt]\ % \def\tmpSection{\bs{pgfPTresetcell}}% \subsection*{}{\normalfont\large\bfseries\raisebox{1.25pt}{\color{black}$\mathbf{\blacktriangleright}$}\ Utilization of \tmpSection}% -\label{command:pgfPTresetcell}\addcontentsline{toc}{subsection}{\texorpdfstring{\tmpSection{}}{\textbackslash pgfPTbuildcellstyle}}% +\label{command:pgfPTresetcell}\addcontentsline{toc}{subsection}{\texorpdfstring{\tmpSection{}}{\textbackslash pgfPTresetcell}}% \index{COMMANDS@\textbf{COMMANDS}!\textbackslash pgfPTresetcell}% \\ [4pt]The \pgfPTMmacro{pgfPTresetcell}[] resets the cell to its default layout. \\ [-32pt]\ % @@ -154,16 +154,16 @@ It is possible to locally override the \textit{global style} defined: There are a few \textit{color schemes} predefined: \index{BUILT-IN@\textbf{BUILT-IN}!color schemes}% \begin{itembar} -\item\textbf{default}, the default built-in color scheme, which is loaded if no value is passed to the \red{back color scheme} key. -\item\textbf{Soft}, a soft color pattern for cells, differentiating metals, non metals, semimetals, lanthanides and actinides. -\item\textbf{Jmol}, a color scheme based upon \href{http://www.jmol.org/}{Jmol: an open-source Java viewer for chemical structures in 3D}. -\item\textbf{CPK}, a color scheme that is based upon the colors of the popular plastic spacefilling models which were developed by Corey, Pauling and later improved by Kultun. -\item\textbf{Rasmol} and \textbf{RasmolNew}, two color schemes based upon the computer program \href{http://www.rasmol.org/}{RasMol}. -\item\textbf{Wikipedia}, a color scheme built on the Periodic Table of Elements available at \href{https://en.wikipedia.org/wiki/Periodic_table#Classification_of_elements}{Wikipedia}. -\item\textbf{MNM}, a color pattern which distinguishes between \textbf{M}etals, semimetals and \textbf{N}on \textbf{M}etals. -\item\textbf{PS}, a color scheme depicting the \textbf{P}hysical \textbf{S}tate at room temperature. -\item\textbf{Radio}, a two color color scheme showing the radioactivity of the elements. -\item\textbf{Blocks}, a four colored color scheme showing the \textit{s}, \textit{p}, \textit{d} and \textit{f} blocks of the Periodic Table. +\item\textbf{pgfPTdefault}, the default built-in color scheme, which is loaded if no value is passed to the \red{back color scheme} key. +\item\textbf{pgfPTSoft}, a soft color pattern for cells, differentiating metals, non metals, semimetals, lanthanides and actinides. +\item\textbf{pgfPTJmol}, a color scheme based upon \href{http://www.jmol.org/}{Jmol: an open-source Java viewer for chemical structures in 3D}. +\item\textbf{pgfPTCPK}, a color scheme that is based upon the colors of the popular plastic spacefilling models which were developed by Corey, Pauling and later improved by Kultun. +\item\textbf{pgfPTRasmol} and \textbf{pgfPTRasmolNew}, two color schemes based upon the computer program \href{http://www.rasmol.org/}{RasMol}. +\item\textbf{pgfPTWikipedia}, a color scheme built on the Periodic Table of Elements available at \href{https://en.wikipedia.org/wiki/Periodic_table#Classification_of_elements}{Wikipedia}. +\item\textbf{pgfPTMNM}, a color pattern which distinguishes between \textbf{M}etals, semimetals and \textbf{N}on \textbf{M}etals. +\item\textbf{pgfPTPS}, a color scheme depicting the \textbf{P}hysical \textbf{S}tate at room temperature. +\item\textbf{pgfPTRadio}, a two color color scheme showing the radioactivity of the elements. +\item\textbf{pgfPTBlocks}, a four colored color scheme showing the \textit{s}, \textit{p}, \textit{d} and \textit{f} blocks of the Periodic Table. \end{itembar} \vspace{5pt} Writing a color scheme can be painstaking work, so a \textit{script} is provided for that: diff --git a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_generallayout.tex b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_generallayout.tex index 6658536639..3c32e1a95c 100644 --- a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_generallayout.tex +++ b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_generallayout.tex @@ -151,27 +151,27 @@ any \textbf{user defined} name via \pgfPTMmacro{pgfPTnewZlist}[]\{name\}\{list\} % back color scheme \label{option_back color scheme}% \vfill -\pgfPTMoption{4}{back color scheme}{default}% +\pgfPTMoption{4}{back color scheme}{pgfPTdefault}% {Sets a \blue{named} back color scheme for the Periodic Table.}% -\\ [5pt]\pgfPTMmacrobox{pgfPT}[back color scheme=Soft]% -\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[back color scheme=Soft]}}% +\\ [5pt]\pgfPTMmacrobox{pgfPT}[back color scheme=pgfPTSoft]% +\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[back color scheme=pgfPTSoft]}}% \newpage% \pgfPTMoptiontxt{% The possible \lblue{name} is one of the following: \begin{itembar} \item\textbf{built-in}: \begin{itemize} -\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Soft}, a soft color scheme that distinguishes metal, non metals, silicon and germanium, lanthanoids and actinoids. -\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Jmol}, is the color scheme used in the computer software \href{http://jmol.sourceforge.net/}{Jmol}: an open-source Java viewer for chemical structures in 3D. -\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{CPK}, is the color scheme of the popular color convention for distinguishing atoms of different chemical +\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTSoft}, a soft color scheme that distinguishes metals, non metals, silicon and germanium, lanthanoids and actinoids. +\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTJmol}, is the color scheme used in the computer software \href{http://jmol.sourceforge.net/}{Jmol}: an open-source Java viewer for chemical structures in 3D. +\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTCPK}, is the color scheme of the popular color convention for distinguishing atoms of different chemical elements in molecular models. The scheme is named after the CPK molecular models designed by chemists Robert Corey and Linus Pauling, and improved by Walter Koltun. -\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Rasmol}, is the color scheme used in the computer software \href{http://www.rasmol.org/}{RasMol}, a program for molecular graphics visualization originally developed by Roger Sayle. -\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{RasmolNew}, is a color scheme used in RasMol with revision of CPK colors made by C. Chigbo (RasMol 2.7.3). -\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Wikipedia}, is the color scheme based on the \href{https://en.wikipedia.org/wiki/Periodic_table\#Classification_of_elements}{Wikipedia Periodic Table of Elements}. -\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{MNM}, is designed to show \textbf{M}etals and \textbf{N}on \textbf{M}etals in two different colors, showing also the semi-metals in a third color. -\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{PS}, is designed to show the \textbf{P}hysical \textbf{S}tate of the elements at normal temperature and pressure (NTP) in different colors. -\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Radio}, is designed to show the \textbf{R}adioactive elements in one color and the non radioactive elements in another color. -\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{Blocks}, for showing the elements in each block of the Periodic Table with the same color. +\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTRasmol}, is the color scheme used in the computer software \href{http://www.rasmol.org/}{RasMol}, a program for molecular graphics visualization originally developed by Roger Sayle. +\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTRasmolNew}, is a color scheme used in RasMol with revision of CPK colors made by C. Chigbo (RasMol 2.7.3). +\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTWikipedia}, is the color scheme based on the \href{https://en.wikipedia.org/wiki/Periodic_table\#Classification_of_elements}{Wikipedia Periodic Table of Elements}. +\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTMNM}, is designed to show \textbf{M}etals and \textbf{N}on \textbf{M}etals in two different colors, showing also the semi-metals in a third color. +\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTPS}, is designed to show the \textbf{P}hysical \textbf{S}tate of the elements at normal temperature and pressure (NTP) in different colors. +\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTRadio}, is designed to show the \textbf{R}adioactive elements in one color and the non radioactive elements in another color. +\item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{pgfPTBlocks}, for showing the elements in each block of the Periodic Table with the same color. \item[\raisebox{1pt}{\scriptsize$\vartriangleright\,$}]\sq{solid}, to show the background of each cell of the Periodic Table with the same color specified by the key \sq{\red{back color}}. \end{itemize} \item any \textbf{user defined} name via \bs{pgfPTnewColorScheme}\lb\red{name}\rb\lb\red{color list}\rb% @@ -201,7 +201,7 @@ elements in molecular models. The scheme is named after the CPK molecular models \newpage\vspace{-34pt}\ % \foreach \csName/\x in {Soft/0,Jmol/1,CPK/0,Rasmol/1,RasmolNew/0,Wikipedia/1,MNM/0,PS/1,Radio/0,Blocks/1}{% \pgfPTMstyletxt{4}{cs\csName}{no value}% -{A style equivalent to \red{back color scheme=\csName}}% +{A style equivalent to \red{back color scheme=pgfPT\csName}}% \\ [5pt]\pgfPTMmacrobox{pgfPT}[cs\csName]% \\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[cs\csName]}}% \\ [0pt]\pgfPTendstyle% @@ -262,7 +262,7 @@ elements in molecular models. The scheme is named after the CPK molecular models \vfill \label{option_languages}% \pgfPTMoption[\pgfPTchangedinversion{2.1.0}]{4}{languages}{\{\}}% -{Sets a language list to use in the Periodic Table. It is a comma separated list of language flags: \sq{pt}, \sq{en}, \sq{fr}, \sq{de}, \sq{it}, \sq{es} or \sq{br}. If a user language has been loaded, the corresponding ISO 639-1 code can also be used as a language flag. \textit{This key overrides the default language, that is, the language loaded at package inclusion}.\\ \ }% +{Sets a language list to use in the Periodic Table. It is a comma separated list of language flags: \sq{pt}, \sq{en}, \sq{fr}, \sq{de}, \sq{it}, \sq{es} or \sq{br}. If a user language has been loaded, the corresponding ISO 639-1 code can also be used as a language flag. \textit{This key locally overrides the default language, that is, the language loaded at package inclusion}.\\ \ }% \\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},languages=pt]% \\ [10pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},languages=pt]}}% \\ [10pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},cell style=pgfPT2lang,languages={en,fr}]% diff --git a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_libCS.tex b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_libCS.tex index 5e8ffea167..e973146b7f 100644 --- a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_libCS.tex +++ b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_libCS.tex @@ -232,7 +232,7 @@ P6=*[RGB:62;82;126],P7=*[RGB:101;117;153]}\rb% \label{command:pgfPTCScombine}\addcontentsline{toc}{subsubsection}{\texorpdfstring{\tmpSectionIII{}}{\textbackslash pgfPTCScombine}}% \index{LIBRARIES@\textbf{\cyan{LIBRARIES}}!colorschemes@\textbf{\red{Color Schemes Library}}!\tmpSectionIII}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\\ [10pt]This command \textbf{combines two named Color Schemes} and merges the result in a new Color Scheme with \red{name of the new color scheme}. +\\ [10pt]This command \textbf{combines two named Color Schemes} and merges the result into a new Color Scheme with \red{name of the new color scheme}. \\ For example \bs{pgfPTCScombine}\lb\red{myCSA,myCSB,myCSC}\rb\ adds the color scheme \red{myCSA} to the color scheme \red{myCSB} and their sum will be available as the color scheme \red{myCSC}. \\ [3pt]\blue{\textbf{NOTE}}: if the Color Schemes have different sizes (\ie, different number of colors), the last color from the color scheme that ends first will be used until the other color scheme also ends. \\ [3pt]The optional parameters \lp\red{prop1:prop2,mode}\rp\ are for controlling how the two Color Schemes are combined: @@ -292,24 +292,24 @@ P6=*[RGB:62;82;126],P7=*[RGB:101;117;153]}\rb% }{% \scalebox{.425}{\pgfPT[back color scheme=mix,show title=false]}% }% ----- -\vfill\pgfPTCScombine[add]{Soft,group,mix}% +\vfill\pgfPTCScombine[add]{pgfPTSoft,group,mix}% \textit{Built-in color schemes can also be mixed}: \\ [10pt]\pgfPTMlibexample{% -\bs{pgfPTCScombine}\lp\red{add}\rp\lb\red{Soft,group,mix}\rb% +\bs{pgfPTCScombine}\lp\red{add}\rp\lb\red{pgfPTSoft,group,mix}\rb% \\ \pgfPTMmacro{pgfPT}[back color scheme=mix,show title=false]% }{% \scalebox{.425}{\pgfPT[back color scheme=mix,show title=false]}% }% ----- -\newpage\pgfPTCScombine[add,3:1]{Soft,PS,mix}% +\newpage\pgfPTCScombine[add,3:1]{pgfPTSoft,pgfPTPS,mix}% \pgfPTMlibexample{% -\bs{pgfPTCScombine}\lp\red{add,3:1}\rp\lb\red{Soft,PS,mix}\rb% +\bs{pgfPTCScombine}\lp\red{add,3:1}\rp\lb\red{pgfPTSoft,pgfPTPS,mix}\rb% \\ \pgfPTMmacro{pgfPT}[back color scheme=mix,show title=false]% }{% \scalebox{.425}{\pgfPT[back color scheme=mix,show title=false]}% }% ----- -\\ [4pt]\pgfPTCScombine{Radio,Wikipedia,mix}% +\\ [4pt]\pgfPTCScombine{pgfPTRadio,pgfPTWikipedia,mix}% \pgfPTMlibexample{% -\bs{pgfPTCScombine}\lp\red{add}\rp\lb\red{Radio,Wikipedia,mix}\rb% +\bs{pgfPTCScombine}\lp\red{add}\rp\lb\red{pgfPTRadio,pgfPTWikipedia,mix}\rb% \\ \pgfPTMmacro{pgfPT}[back color scheme=mix,show title=false]% }{% \scalebox{.425}{\pgfPT[back color scheme=mix,show title=false]}% @@ -322,7 +322,7 @@ P6=*[RGB:62;82;126],P7=*[RGB:101;117;153]}\rb% \index{LIBRARIES@\textbf{\cyan{LIBRARIES}}!colorschemes@\textbf{\red{Color Schemes Library}}!\tmpSectionIV}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \\ [10pt]This command \textbf{writes the provided Color Schemes to a file} for later use without loading this library. It has a mandatory argument, the \red{list of the color schemes names} to be written and an optional argument, the \red{filename}. If no \red{filename} is provided the first name on the \red{list of the color schemes names} is used. -\\ For example, \bs{pgfPTCSwrite}\lp\red{myGroupColors}\rp\lb\red{myGroupGradGreenToRed,myGroupGreens, myGroupGradYellowToRed}\rb, \dcyan{\textit{will create (or overwrite), in the current working directory, a file with name} \texttt{\large myGroupColors.tex} \textit{with the follwing contents}}: +\\ For example, \bs{pgfPTCSwrite}\lp\red{myGroupColors}\rp\lb\red{myGroupGradGreenToRed,myGroupGreens, myGroupGradYellowToRed}\rb, \dcyan{\textit{will create (or overwrite), in the current working directory, a file with name} \texttt{\large myGroupColors.tex} \textit{with the following contents}}: \mymfbox{\textsf{% \textbackslash pgfPTnewColorScheme\{myGroupGradGreenToRed\}\{0/1/0,\myldots% \\ \textbackslash pgfPTnewColorScheme\{myGroupGreens\}\{0/1/.1,\myldots% diff --git a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_variations.tex b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_variations.tex index 04a606adfd..019fcf8e2b 100644 --- a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_variations.tex +++ b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_variations.tex @@ -21,7 +21,7 @@ {Sets the color used in the filling of the \textit{arrows} for the atomic radius variations. \\ [10pt]\tikz{\node[text width=\linewidth-.6666em,fill=orange!5!white,draw=orange,rounded corners=2pt] {\textbf{\orange{NOTE}}:\\ The color provided to \red{varR color} could be any defined color via the command \texttt{\normalsize\textbackslash definecolor} or by \textit{mixing} colors, using, for instance, the syntax \texttt{\normalsize color1!value!color2}, as explained in the \href{https://ctan.org/pkg/xcolor}{xcolor} package documentation.};} }% -\\ [5pt]\pgfPTMmacrobox{pgfPT}[show periodic variations,cell style=pgfPTR,varR color=teal,R color=purple]% +\\ [5pt]\pgfPTMmacrobox{pgfPT}[show periodic variations,cell style=pgfPTR,varR color=purple!50!white,R color=purple]% \\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[show periodic variations,cell style=pgfPTR,varR color=purple!50!white, R color=purple]}}% \\ [5pt]\pgfPTendoption% % varR font diff --git a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex index f53b6659ce..0783999e80 100644 --- a/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex +++ b/graphics/pgf/contrib/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex @@ -1,5 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Definitions for pgf-PeriodicTable Manual +% Hugo Gomes @ 09/09/2024 v2.1.4 % Hugo Gomes @ 07/08/2024 v2.1.3 % Hugo Gomes @ 01/08/2024 v2.1.2 % Hugo Gomes @ 07/07/2024 v2.1.1 @@ -9,7 +10,7 @@ % Hugo Gomes @ 20/02/2023 v2.0.0 % Hugo Gomes @ 08/11/2022 v1.0.1 % Hugo Gomes @ 10/10/2022 v1.0.0 -\def\pgfPTversion{2.1.3}% +\def\pgfPTversion{2.1.4}% \def\pgfPTnewinversion#1{new in v#1}% \def\pgfPTchangedinversion#1{changed in v#1}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/graphics/pgf/contrib/pgf-periodictable/pgf-PeriodicTable.sty b/graphics/pgf/contrib/pgf-periodictable/pgf-PeriodicTable.sty index 69f65ee602..41e135194f 100644 --- a/graphics/pgf/contrib/pgf-periodictable/pgf-PeriodicTable.sty +++ b/graphics/pgf/contrib/pgf-periodictable/pgf-PeriodicTable.sty @@ -1,4 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Hugo Gomes @ 09/09/2024 v2.1.4 % Hugo Gomes @ 07/08/2024 v2.1.3 % Hugo Gomes @ 01/08/2024 v2.1.2 % Hugo Gomes @ 07/07/2024 v2.1.1 @@ -10,7 +11,7 @@ % Hugo Gomes @ 10/10/2022 v1.0.0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{pgf-PeriodicTable}[07/08/2024 pgf-PeriodicTable v2.1.3]%% +\ProvidesPackage{pgf-PeriodicTable}[08/09/2024 pgf-PeriodicTable v2.1.4]%% \RequirePackage{tikz}% \usetikzlibrary{fadings}% \tikzfading[name=aumentax, left color=transparent!80, right color=transparent!1]% @@ -2446,7 +2447,7 @@ d unit,d precision,E precision,ls unit,ls precision,T precision,Cp precision,kT \tikz{% \node[text width=\pgfPT@boxwd,text centered,inner sep=0pt] (exFlag) at (0,0) {\includegraphics[height=\pgfPT@boxht]{flags/\pgfPT@country@flag.pdf}};% \global\pgfPT@countc=0% - \node[below right,text width=3.75*\pgfPTcellwd,inner xsep=0pt] at ([xshift=.025*\pgfPTcellwd]exFlag.north east) {% + \node[below right,text width=2.2*\pgfPTcellwd,inner xsep=0pt] at ([xshift=.025*\pgfPTcellwd]exFlag.north east) {% \@for\pgfPT@tmp:=\pgfPTlanguages\do{% \ifnum\pgfPT@countc=0\relax% \pgfPT@box@zerodepth{\csname pgfPT@country@name@\pgfPT@tmp\endcsname}% diff --git a/graphics/pgf/contrib/pgf-periodictable/pgf-PeriodicTableManual.pdf b/graphics/pgf/contrib/pgf-periodictable/pgf-PeriodicTableManual.pdf Binary files differindex e8c9672259..9eff3db20b 100644 --- a/graphics/pgf/contrib/pgf-periodictable/pgf-PeriodicTableManual.pdf +++ b/graphics/pgf/contrib/pgf-periodictable/pgf-PeriodicTableManual.pdf diff --git a/graphics/pgf/contrib/pgf-periodictable/pgfPT.backcolors.keys.tex b/graphics/pgf/contrib/pgf-periodictable/pgfPT.backcolors.keys.tex index 076f588ca0..b9e45c2b5e 100644 --- a/graphics/pgf/contrib/pgf-periodictable/pgfPT.backcolors.keys.tex +++ b/graphics/pgf/contrib/pgf-periodictable/pgfPT.backcolors.keys.tex @@ -6,24 +6,25 @@ % % defining PGF keys: the colors of the cells of the periodic table to be drawn ----------------- % list names available to use in key 'back color scheme', e.g. ---------------------------------- -% «back color scheme=CPK» or «back color scheme=Wikipedia» ------------------------------ +% v2.1.4 -> add prefix pgfPT to the built-in names +% «back color scheme=pgfPTCPK» or «back color scheme=pgfPTWikipedia» ------------------ % if «back color scheme=solid» the «back color» key is used to fill the cells ------------------- -\def\pgfPT@backColorsScheme@default{.769/.812/.961,.678/.733/.925,.871/.89/.875,.922/.886/.71,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741}% -\def\pgfPT@backColorsScheme@Soft{.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.973/.945/.78,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.973/.945/.78,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918}% -\def\pgfPT@backColorsScheme@Jmol{1/1/1,.851/1/1,.8/.502/1,.761/1/0,1/.71/.71,.565/.565/.565,.188/.314/.973,1/.051/.051,.565/.878/.314,.702/.89/.961,.671/.361/.949,.541/1/0,.749/.651/.651,.941/.784/.627,1/.502/0,1/1/.188,.122/.941/.122,.502/.82/.89,.561/.251/.831,.239/1/0,.902/.902/.902,.749/.761/.78,.651/.651/.671,.541/.6/.78,.612/.478/.78,.878/.4/.2,.941/.565/.627,.314/.816/.314,.784/.502/.2,.49/.502/.69,.761/.561/.561,.4/.561/.561,.741/.502/.89,1/.631/0,.651/.161/.161,.361/.722/.82,.439/.18/.69,0/1/0,.58/1/1,.58/.878/.878,.451/.761/.788,.329/.71/.71,.231/.62/.62,.141/.561/.561,.039/.49/.549,0/.412/.522,.753/.753/.753,1/.851/.561,.651/.459/.451,.4/.502/.502,.62/.388/.71,.831/.478/0,.58/0/.58,.259/.62/.69,.341/.09/.561,0/.788/0,.439/.831/1,1/1/.78,.851/1/.78,.78/1/.78,.639/1/.78,.561/1/.78,.38/1/.78,.271/1/.78,.188/1/.78,.122/1/.78,0/1/.612,0/.902/.459,0/.831/.322,0/.749/.22,0/.671/.141,.302/.761/1,.302/.651/1,.129/.58/.839,.149/.49/.671,.149/.4/.588,.09/.329/.529,.816/.816/.878,1/.82/.137,.722/.722/.816,.651/.329/.302,.341/.349/.38,.62/.31/.71,.671/.361/0,.459/.31/.271,.259/.51/.588,.259/0/.4,0/.49/0,.439/.671/.98,0/.729/1,0/.631/1,0/.561/1,0/.502/1,0/.42/1,.329/.361/.949,.471/.361/.89,.541/.31/.89,.631/.212/.831,.702/.122/.831,.702/.122/.729,.702/.051/.651,.741/.051/.529,.78/0/.4,.8/0/.349,.82/0/.31,.851/0/.271,.878/0/.22,.902/0/.18,.922/0/.149,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}% -\def\pgfPT@backColorsScheme@CPK{1/1/1,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.133/.133/.133,.133/.2/1,1/.133/0,.122/.941/.122,0/1/1,.467/0/1,0/.467/0,.867/.467/1,.867/.467/1,1/.6/0,1/.898/.133,.122/.941/.122,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.6/.6/.6,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/0,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.6/.133/0,0/1/1,.467/0/1,0/.467/0,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.4/0/.733,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.467/0/1,0/.467/0,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}% -\def\pgfPT@backColorsScheme@Rasmol{1/1/1,1/.753/.796,.698/.133/.133,1/.078/.576,0/1/0,.784/.784/.784,.561/.561/1,.941/0/0,.855/.647/.125,1/.078/.576,0/0/1,.133/.545/.133,.502/.502/.565,.855/.647/.125,1/.647/0,1/.784/.196,0/1/0,1/.078/.576,1/.078/.576,.502/.502/.565,1/.078/.576,.502/.502/.565,1/.078/.576,.502/.502/.565,.502/.502/.565,1/.647/0,1/.078/.576,.647/.165/.165,.647/.165/.165,.647/.165/.165,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.647/.165/.165,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.502/.502/.565,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.627/.125/.941,1/.078/.576,1/.078/.576,1/.647/0,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.855/.647/.125,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}% -\def\pgfPT@backColorsScheme@RasmolNew{1/1/1,1/.753/.796,.698/.129/.129,1/.078/.58,0/1/.004,.827/.827/.827,.529/.808/.902,1/0/0,.855/.647/.129,1/.078/.58,0/0/1,.133/.545/.137,.412/.412/.412,.855/.647/.129,1/.667/0,1/1/0,0/1/.004,1/.078/.576,1/.078/.576,.412/.412/.412,1/.078/.58,.412/.412/.412,1/.078/.58,.412/.412/.412,.412/.412/.412,1/.667/0,1/.078/.58,.502/.157/.157,.502/.157/.157,.502/.157/.157,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.502/.157/.157,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.412/.412/.412,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.627/.125/.945,1/.078/.576,1/.078/.576,1/.667/0,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.855/.647/.129,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576}% -\def\pgfPT@backColorsScheme@Wikipedia{.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,.8/.8/.6,.941/1/.561,.941/1/.561,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,.8/.8/.8,.8/.8/.6,.941/1/.561,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.6,.8/.8/.6,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.8,.8/.8/.6,.8/.8/.6,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.8,.8/.8/.8,.8/.8/.8,.8/.8/.8,.753/1/1,1/.4/.4,1/.871/.678,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91}% -\def\pgfPT@backColorsScheme@MNM{.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.878/.816/.753,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847}% -\def\pgfPT@backColorsScheme@PS{.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,.553/.706/.89,.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.714/.867/.91,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.714/.867/.91,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647}% -\def\pgfPT@backColorsScheme@Radio{.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0}% -\def\pgfPT@backColorsScheme@Blocks{1/.937/.671,1/.937/.671,1/.937/.671,1/.937/.671,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635}% +\def\pgfPT@backColorsScheme@pgfPTdefault{.769/.812/.961,.678/.733/.925,.871/.89/.875,.922/.886/.71,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.631/.6/.435,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.8/.878/.859,.706/.871/.827,.612/.859/.796,.42/.89/.769,.671/.608/.749,.588/.655/.89,.871/.89/.875,.922/.886/.71,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.522/.49/.329,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.62/.604/.522,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741,.78/.788/.741}% +\def\pgfPT@backColorsScheme@pgfPTSoft{.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.973/.945/.78,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.973/.945/.78,.843/.839/.659,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.827/.824/1,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.843/.839/.659,.843/.839/.659,.945/.941/.918,.945/.941/.918,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.71/.706/1,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918,.945/.941/.918}% +\def\pgfPT@backColorsScheme@pgfPTJmol{1/1/1,.851/1/1,.8/.502/1,.761/1/0,1/.71/.71,.565/.565/.565,.188/.314/.973,1/.051/.051,.565/.878/.314,.702/.89/.961,.671/.361/.949,.541/1/0,.749/.651/.651,.941/.784/.627,1/.502/0,1/1/.188,.122/.941/.122,.502/.82/.89,.561/.251/.831,.239/1/0,.902/.902/.902,.749/.761/.78,.651/.651/.671,.541/.6/.78,.612/.478/.78,.878/.4/.2,.941/.565/.627,.314/.816/.314,.784/.502/.2,.49/.502/.69,.761/.561/.561,.4/.561/.561,.741/.502/.89,1/.631/0,.651/.161/.161,.361/.722/.82,.439/.18/.69,0/1/0,.58/1/1,.58/.878/.878,.451/.761/.788,.329/.71/.71,.231/.62/.62,.141/.561/.561,.039/.49/.549,0/.412/.522,.753/.753/.753,1/.851/.561,.651/.459/.451,.4/.502/.502,.62/.388/.71,.831/.478/0,.58/0/.58,.259/.62/.69,.341/.09/.561,0/.788/0,.439/.831/1,1/1/.78,.851/1/.78,.78/1/.78,.639/1/.78,.561/1/.78,.38/1/.78,.271/1/.78,.188/1/.78,.122/1/.78,0/1/.612,0/.902/.459,0/.831/.322,0/.749/.22,0/.671/.141,.302/.761/1,.302/.651/1,.129/.58/.839,.149/.49/.671,.149/.4/.588,.09/.329/.529,.816/.816/.878,1/.82/.137,.722/.722/.816,.651/.329/.302,.341/.349/.38,.62/.31/.71,.671/.361/0,.459/.31/.271,.259/.51/.588,.259/0/.4,0/.49/0,.439/.671/.98,0/.729/1,0/.631/1,0/.561/1,0/.502/1,0/.42/1,.329/.361/.949,.471/.361/.89,.541/.31/.89,.631/.212/.831,.702/.122/.831,.702/.122/.729,.702/.051/.651,.741/.051/.529,.78/0/.4,.8/0/.349,.82/0/.31,.851/0/.271,.878/0/.22,.902/0/.18,.922/0/.149,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}% +\def\pgfPT@backColorsScheme@pgfPTCPK{1/1/1,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.133/.133/.133,.133/.2/1,1/.133/0,.122/.941/.122,0/1/1,.467/0/1,0/.467/0,.867/.467/1,.867/.467/1,1/.6/0,1/.898/.133,.122/.941/.122,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.6/.6/.6,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/0,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.6/.133/0,0/1/1,.467/0/1,0/.467/0,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.4/0/.733,0/1/1,.467/0/1,0/.467/0,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.467/0/1,0/.467/0,1/.667/.467,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,.867/.467/1,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/.667/.467,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}% +\def\pgfPT@backColorsScheme@pgfPTRasmol{1/1/1,1/.753/.796,.698/.133/.133,1/.078/.576,0/1/0,.784/.784/.784,.561/.561/1,.941/0/0,.855/.647/.125,1/.078/.576,0/0/1,.133/.545/.133,.502/.502/.565,.855/.647/.125,1/.647/0,1/.784/.196,0/1/0,1/.078/.576,1/.078/.576,.502/.502/.565,1/.078/.576,.502/.502/.565,1/.078/.576,.502/.502/.565,.502/.502/.565,1/.647/0,1/.078/.576,.647/.165/.165,.647/.165/.165,.647/.165/.165,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.647/.165/.165,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.502/.502/.565,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.627/.125/.941,1/.078/.576,1/.078/.576,1/.647/0,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.855/.647/.125,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1,1/1/1}% +\def\pgfPT@backColorsScheme@pgfPTRasmolNew{1/1/1,1/.753/.796,.698/.129/.129,1/.078/.58,0/1/.004,.827/.827/.827,.529/.808/.902,1/0/0,.855/.647/.129,1/.078/.58,0/0/1,.133/.545/.137,.412/.412/.412,.855/.647/.129,1/.667/0,1/1/0,0/1/.004,1/.078/.576,1/.078/.576,.412/.412/.412,1/.078/.58,.412/.412/.412,1/.078/.58,.412/.412/.412,.412/.412/.412,1/.667/0,1/.078/.58,.502/.157/.157,.502/.157/.157,.502/.157/.157,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.502/.157/.157,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.412/.412/.412,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.627/.125/.945,1/.078/.576,1/.078/.576,1/.667/0,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,.855/.647/.129,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576,1/.078/.576}% +\def\pgfPT@backColorsScheme@pgfPTWikipedia{.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,.8/.8/.6,.941/1/.561,.941/1/.561,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,.8/.8/.8,.8/.8/.6,.941/1/.561,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.6,.8/.8/.6,.941/1/.561,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.8,.8/.8/.6,.8/.8/.6,.941/1/.561,.753/1/1,1/.4/.4,1/.871/.678,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.749/1,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.8/.8/.8,.8/.8/.8,.8/.8/.8,.8/.8/.8,.8/.8/.8,.753/1/1,1/.4/.4,1/.871/.678,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.6/.8,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,1/.753/.753,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91,.91/.91/.91}% +\def\pgfPT@backColorsScheme@pgfPTMNM{.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.878/.816/.753,.91/.839/.659,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.878/.816/.753,.878/.816/.753,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.91/.839/.659,.91/.839/.659,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847,.886/.886/.847}% +\def\pgfPT@backColorsScheme@pgfPTPS{.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,.553/.706/.89,.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.714/.867/.91,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.714/.867/.91,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.553/.706/.89,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,1/.878/.718,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647,.647/.647/.647}% +\def\pgfPT@backColorsScheme@pgfPTRadio{.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.761/.839/.604,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0,.957/.933/0}% +\def\pgfPT@backColorsScheme@pgfPTBlocks{1/.937/.671,1/.937/.671,1/.937/.671,1/.937/.671,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,1/.937/.671,1/.937/.671,.98/.667/.541,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.757/.835/.914,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.98/.667/.541,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635,.718/.871/.635}% % user defined color schemes(s): ----------------------------------------------------------------- % \pgfPTnewcolorscheme[<trailing color (default=1/1/1 e.g. white)>]{name}{list} ----- \def\pgfPTnewColorScheme{\@ifnextchar[\pgfPT@newColorScheme@withoptions{\pgfPT@newColorScheme@noptions}}% \def\pgfPT@newColorScheme@withoptions[#1/#2/#3]#4#5{% -\expandafter\def\csname pgfPT@backColorsScheme@#4\endcsname{#5,#1/#2/#3}% +\expandafter\gdef\csname pgfPT@backColorsScheme@#4\endcsname{#5,#1/#2/#3}% \definecolor{cpgfPTTMP}{rgb}{#1,#2,#3}% \xglobal\colorlet{cpgfPTTMP}{cpgfPTTMP}% }% @@ -36,20 +37,20 @@ \pgfkeys{/pgfPerTable/.cd,% back color scheme/.get=\pgfPTbcs,% back color scheme/.store in=\pgfPTbcs,% -back color scheme/.default=default,% +back color scheme/.default=pgfPTdefault,% back color/.get=\pgfPTbcsolid,% back color/.store in=\pgfPTbcsolid,% back color/.default=white,% -csSoft/.style={back color scheme=Soft},% -csJmol/.style={back color scheme=Jmol},% -csCPK/.style={back color scheme=CPK},% -csRasmol/.style={back color scheme=Rasmol},% -csRasmolNew/.style={back color scheme=RasmolNew},% -csWikipedia/.style={back color scheme=Wikipedia},% -csMNM/.style={back color scheme=MNM},% -csPS/.style={back color scheme=PS},% -csRadio/.style={back color scheme=Radio},% -csBlocks/.style={back color scheme=Blocks},% +csSoft/.style={back color scheme=pgfPTSoft},% +csJmol/.style={back color scheme=pgfPTJmol},% +csCPK/.style={back color scheme=pgfPTCPK},% +csRasmol/.style={back color scheme=pgfPTRasmol},% +csRasmolNew/.style={back color scheme=pgfPTRasmolNew},% +csWikipedia/.style={back color scheme=pgfPTWikipedia},% +csMNM/.style={back color scheme=pgfPTMNM},% +csPS/.style={back color scheme=pgfPTPS},% +csRadio/.style={back color scheme=pgfPTRadio},% +csBlocks/.style={back color scheme=pgfPTBlocks},% 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 --------------------------------------------------------------- @@ -59,7 +60,7 @@ csSolid/.style={back color scheme=solid,back color=#1}% \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}{% +\foreach \cs in {pgfPTdefault,pgfPTSoft,pgfPTJmol,pgfPTCPK,pgfPTRasmol,pgfPTRasmolNew,pgfPTWikipedia,pgfPTMNM,pgfPTPS,pgfPTRadio,pgfPTBlocks}{% \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}% diff --git a/graphics/pgf/contrib/pgf-periodictable/pgfPT.buildcell.tex b/graphics/pgf/contrib/pgf-periodictable/pgfPT.buildcell.tex index a9a3699c36..7684834830 100644 --- a/graphics/pgf/contrib/pgf-periodictable/pgfPT.buildcell.tex +++ b/graphics/pgf/contrib/pgf-periodictable/pgfPT.buildcell.tex @@ -38,7 +38,9 @@ \newif\ifpgfPT@dot\pgfPT@dotfalse% \newif\ifpgfPT@unnamedcell\pgfPT@unnamedcelltrue% \newdimen\pgfPT@cell@collumnwd\pgfPT@cell@collumnwd=0pt% +\newdimen\pgfPT@cell@collumnwd@unnamedcell\pgfPT@cell@collumnwd@unnamedcell=0pt% \newdimen\pgfPT@cell@lineht\pgfPT@cell@lineht=0pt% +\newdimen\pgfPT@cell@lineht@unnamedcell\pgfPT@cell@lineht@unnamedcell=0pt% \newdimen\pgfPT@tmpx\pgfPT@tmpx=0pt% \newdimen\pgfPT@tmpy\pgfPT@tmpy=0pt% \newdimen\pgfPT@tmpwd\pgfPT@tmpwd=0pt% @@ -47,10 +49,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\pgfPTbuildcellstyle#1(#2,#3)[#4]{\pgfPT@unnamedcellfalse\relax% \pgfPTbuildcell(#2,#3)[#4]% -\expandafter\edef\csname pgfPT@cellcontents@#1\endcsname{\pgfPT@cellcontents}% -\expandafter\edef\csname ppfPT@thebuildcellcom@#1\endcsname{\textbackslash pgfPTbuildcell(\detokenize{#2},\detokenize{#3})\%\par[\detokenize{#4}]}% -\expandafter\edef\csname pgfPT@nlinhas@#1\endcsname{#2}% -\expandafter\edef\csname pgfPT@ncolunas@#1\endcsname{#3}% +\expandafter\xdef\csname pgfPT@cellcontents@#1\endcsname{\pgfPT@cellcontents}% +\expandafter\xdef\csname ppfPT@thebuildcellcom@#1\endcsname{\textbackslash pgfPTbuildcell(\detokenize{#2},\detokenize{#3})\%\par[\detokenize{#4}]}% +\expandafter\xdef\csname pgfPT@nlinhas@#1\endcsname{#2}% +\expandafter\xdef\csname pgfPT@ncolunas@#1\endcsname{#3}% \pgfPT@unnamedcelltrue\relax% }% \def\pgfPT@builtincellstyle#1(#2,#3)[#4]{\pgfPT@unnamedcellfalse\relax% @@ -66,7 +68,8 @@ % \pgfPTbuildcell(<lines>,<columns>)[<entries>] % \def\pgfPTbuildcell(#1,#2)[#3]{% -\ifpgfPT@unnamedcell\gdef\ppfPT@thebuildcellcom{\textbackslash pgfPTbuildcell(\detokenize{#1},\detokenize{#2})\%\par[\detokenize{#3}]}\fi% +\ifpgfPT@unnamedcell\gdef\pgfPT@numlinhas@unnamedcell{#1}\gdef\pgfPT@numcolunas@unnamedcell{#2}% +\gdef\ppfPT@thebuildcellcom{\textbackslash pgfPTbuildcell(\detokenize{#1},\detokenize{#2})\%\par[\detokenize{#3}]}\fi% \gdef\pgfPT@numlinhas{#1}\gdef\pgfPT@numcolunas{#2}% \pgfPT@cellcontentssize=0% \xdef\pgfPT@cellcontents{}% vanishes list contents @@ -74,6 +77,10 @@ \pgfmathsetlength{\pgfPT@cell@lineht}{\pgfPTcellht/#1}% \global\pgfPT@cell@lineht=\pgfPT@cell@lineht% \global\pgfPT@cell@collumnwd=\pgfPT@cell@collumnwd% +\ifpgfPT@unnamedcell% +\global\pgfPT@cell@lineht@unnamedcell=\pgfPT@cell@lineht% +\global\pgfPT@cell@collumnwd@unnamedcell=\pgfPT@cell@collumnwd% +\fi% \expandafter\pgfPTg@bblespaces#3\relax% \@for\@tmp:=\pgfPT@listn@spaces\do{\expandafter\pgfPT@buildcellcontents\@tmp\relax}% \ifpgfPT@unnamedcell\global\let\pgfPT@cellcontents@unnamed\pgfPT@cellcontents\relax\fi% @@ -186,7 +193,7 @@ \@for\pgfPT@tmp:=\pgfPT@builtincells@names\do{\edef\pgfPT@tempb{\pgfPT@tmp}\ifx\pgfPT@tempa\pgfPT@tempb\relax\def\pgfPT@builtin{1}\fi}% \ifnum\pgfPT@builtin=1\relax\textit{Built-in style}\else\textit{User style}\fi\ \textbf{#2}\relax% \if\pgfPT@preview@cellcontents\@empty\relax% -\textit{ doesn't exist!}% +\textit{ doesn't exist!} (\pgfPT@preview@cellcontents)% \else% \edef\pgfPT@numlinhas{\csname pgfPT@nlinhas@#2\endcsname}% \edef\pgfPT@numcolunas{\csname pgfPT@ncolunas@#2\endcsname}% @@ -204,6 +211,8 @@ \\ [2pt]The build command:\\ \textcolor{green!70!black}{\footnotesize\ppfPT@thebuildcellcom}\\ % \else\textbf{Using the last cell built}% \edef\pgfPT@preview@cellcontents{\csname pgfPT@cellcontents@unnamed\endcsname}% +\let\pgfPT@numlinhas\pgfPT@numlinhas@unnamedcell\let\pgfPT@numcolunas\pgfPT@numcolunas@unnamedcell% +\let\pgfPT@cell@lineht\pgfPT@cell@lineht@unnamedcell\let\pgfPT@cell@collumnwd\pgfPT@cell@collumnwd@unnamedcell% \\ [2pt]The build command:\\ \textcolor{green!70!black}{\footnotesize\ppfPT@thebuildcellcom}\\ % \fi\fi% \makebox[\linewidth][c]{% @@ -354,7 +363,7 @@ at (-.5*\pgfPT@cell@collumnwd+\pgfPT@cell@collumnwd*\coluna,\pgfPT@cell@lineht) % wd -> \pgfPT@<what>@wd % ht -> \pgfPT@<what>@ht % and turning the if<what> to true -% what -> \@pgfPT@<what>rtue +% what -> \@pgfPT@<what>true \ifdim\pgfPTcellwd=34pt\relax% \xdef\pgfPT@loadcell@scaleX{1}% \else% diff --git a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-en.pdf b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-en.pdf Binary files differindex 029671719e..3fabaece9c 100644 --- a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-en.pdf +++ b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-en.pdf diff --git a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-en.tex b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-en.tex index d89c17bff4..f9b63dcec6 100644 --- a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-en.tex +++ b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-en.tex @@ -29,8 +29,8 @@ \hypersetup{pdfborder=0 0 0} \usepackage[margin=2cm]{geometry} \setlength{\parindent}{0pt} -\def\TPversion{0.1.6} -\def\TPdate{13/07/2024} +\def\TPversion{0.1.8} +\def\TPdate{08/09/2024} \usepackage{soul} \usepackage{codehigh} \usepackage{tabularray} @@ -1684,6 +1684,7 @@ et $\frac{\pi}{4} \approx \RoundNb[4]{pi/4}$. \begin{quote} \begin{verbatim} +0.1.8 : New commands [in french doc] (binomial, cabweb,\ldots) 0.1.6 : Vertical asymptote + [in french doc] commands for integrals 0.1.5 : Initial version [en] \end{verbatim} diff --git a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf Binary files differindex ba330fa444..bda1e6e063 100644 --- a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf +++ b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf diff --git a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex index 99d8414cd0..14a4ada92d 100644 --- a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex +++ b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex @@ -7,6 +7,7 @@ \usepackage[utf8]{inputenc} \usepackage{tkz-grapheur} \usepackage{amsmath} +\usepackage{enumitem} \usepackage{fancyvrb} \usepackage{fancyhdr} \usepackage{hyperref} @@ -29,8 +30,8 @@ \hypersetup{pdfborder=0 0 0} \usepackage[margin=2cm]{geometry} \setlength{\parindent}{0pt} -\def\TPversion{0.1.6} -\def\TPdate{13/07/2024} +\def\TPversion{0.1.8} +\def\TPdate{08/09/2024} \usepackage{soul} \usepackage{codehigh} \usepackage{tabularray} @@ -332,17 +333,24 @@ Concernant les styles des \textit{objets}, ils sont donnĂ©s ci-dessous. \tikzset{pflgrillep/.style={thin,lightgray}} \tikzset{pflgrilles/.style={very thin,lightgray}} \tikzset{pflaxes/.style={line width=0.8pt,->,>=latex}} +\end{tcblisting} -%style des points (courbe / nuage /labels /montecarlo) +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only} +%style des points (courbe / nuage /labels / montecarlo) \tikzset{pflpoint/.style={line width=0.95pt}} \tikzset{pflpointc/.style={radius=1.75pt}} \tikzset{pflpointnuage/.style={radius=1.75pt}} \tikzset{pflpointmc/.style={radius=0.875pt}} \tikzset{pflnoeud/.style={}} %pour les inner sep par exemple :-) +\tikzset{pflcourbediscont/.style={line width=1.1pt}} +\end{tcblisting} +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only} %style des courbes \tikzset{pflcourbe/.style={line width=1.05pt}} +\end{tcblisting} +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only} %style des traits (normaux, antĂ©cĂ©dents, images) \tikzset{pfltrait/.style={line width=0.8pt}} \tikzset{pfltraitantec/.style={line width=0.95pt,densely dashed}} @@ -354,6 +362,18 @@ Concernant les styles des \textit{objets}, ils sont donnĂ©s ci-dessous. \tikzset{pflflechegd/.style={<->,>=latex}} \end{tcblisting} +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only} +%style des constructions ECC (courbe / paramètres) +\tikzset{pfltraitsparamecc/.style={line width=0.9pt,densely dashed}} +\tikzset{pflcourbeecc/.style={line width=1.05pt}} +\end{tcblisting} + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only} +%style des constructions rĂ©currence +\tikzset{pfltraitrec/.style={line width=0.8pt}} +\tikzset{pfltraitrecpointill/.style={pfltraitrec,densely dashed}} +\end{tcblisting} + L'idĂ©e est donc de pouvoir redĂ©finir globalement ou localement les styles, et Ă©ventuellement de rajouter des Ă©lĂ©ments, en utilisant \mintinline{latex}|monstyle/.append style={...}|. \subsection{CrĂ©ation de l'environnement}\label{creaenvt} @@ -829,6 +849,38 @@ Les \MontreCode{[clĂ©s]}, optionnelles, disponibles sont : \end{GraphiqueTikz} \end{tcblisting} +\subsection{Marquer des points de discontinuitĂ©}\label{ptsdiscont} + +Il est possible de marquer des points de discontinuitĂ©, mais c'est commande est \textit{dĂ©connectĂ©e} des commandes de tracĂ© de courbes/splines. + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only} +%dans l'environnement GraphiqueTikz +\AfficherPtsDiscont[clĂ©s]{liste} +\end{tcblisting} + +Le premier argument, \textit{optionnel} et entre \MontreCode{[...]}, contient les \MontreCode{ClĂ©s} suivantes : + +\begin{itemize} + \item \MontreCode{Couleur=...} (\MontreCode{black} par dĂ©faut) ; + \item \MontreCode{Pos=...} (\MontreCode{D} par dĂ©faut) pour choisir la position de la discontinuitĂ© (parmi \MontreCode{G/D}) ; + \item \MontreCode{Echelle=...} (\MontreCode{1} par dĂ©faut) pour modifier l'Ă©chelle du symbole ; + \item \MontreCode{Type=...} (\MontreCode{par} par dĂ©faut) pour choisir le type de symbole, parmi \MontreCode{par/cro/rond/demirond}. +\end{itemize} + +Le second argument, obligatoire et entre \MontreCode{\{...\}} permet de prĂ©ciser la liste des points en lesquels le symbole de discontinuitĂ© sera positionnĂ©, sous la forme \MontreCode{x1/y1/d1 § x2/y2/d2 § ...} avec les points \MontreCode{(xi;yi)} et \MontreCode{f'(xi)=di}. + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5} +\begin{GraphiqueTikz}[x=1cm,y=1cm,Xmin=0,Xmax=10,Ymin=0,Ymax=5] + \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto} + \DefinirCourbeSpline[Trace,Couleur=red]{0/1/-1 § 4/4/0} + \AfficherPtsDiscont{4/4/0} + \AfficherPtsDiscont[Pos=G,Type=cro]{0/1/-1} + \DefinirCourbeSpline[Trace,Couleur=blue]{5/1/1.5 § 8/4/0.5} + \AfficherPtsDiscont[Couleur=blue,Type=rond]{8/4/0.5} + \AfficherPtsDiscont[Couleur=blue,Pos=G,Type=demirond,Echelle=2]{5/1/1.5} +\end{GraphiqueTikz} +\end{tcblisting} + \subsection{RĂ©cupĂ©rer les coordonnĂ©es de nĹ“uds}\label{recupcoordo} Il est Ă©galement possible, dans l'optique d'une rĂ©utilisation de coordonnĂ©es, de rĂ©cupĂ©rer les coordonnĂ©es d'un nĹ“ud (dĂ©fini ou dĂ©terminĂ©). @@ -1336,6 +1388,60 @@ Le dernier argument obligatoire est le point de travail (version abscisse ou nĹ“ \pagebreak +\subsection{Suites rĂ©currentes et toiles}\label{toilerecurr} + +L'idĂ©e est d'obtenir une commande pour tracer la \og toile \fg{} permettant d'obtenir -- graphiquement -- les termes d'une suite rĂ©currente dĂ©finie par une relation $u_{n+1}=f(u_n)$. + +La commande est compatible avec une fonction prĂ©cĂ©demment dĂ©finie, mais Ă©galement avec une courbe type \textit{spline} prĂ©cĂ©demment dĂ©finie. + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only} +%dans l'environnement GraphiqueTikz +\TracerToileRecurrence[clĂ©s]{fct ou courbe} +\end{tcblisting} + +Le premier argument, \textit{optionnel} et entre \MontreCode{[...]}, contient les \MontreCode{ClĂ©s} suivantes : + +\begin{itemize} + \item \MontreCode{Couleur=...} (\MontreCode{black} par dĂ©faut) ; + \item \MontreCode{Spline=...} (\MontreCode{false} par dĂ©faut) pour spĂ©cifier qu'une courbe \textit{spline} est utilisĂ©e ; + \item \MontreCode{No=...} (\MontreCode{0} par dĂ©faut) est l'indice initial ; + \item \MontreCode{Uno=...} est qui est la valeur du terme initial (Ă donner obligatoirement !) ; + \item \MontreCode{Nom=...} (\MontreCode{u} par dĂ©faut) est le nom de la suite ; + \item \MontreCode{Nb=...} (\MontreCode{5} par dĂ©faut) ; + \item \MontreCode{AffTermes=...} (\MontreCode{false} par dĂ©faut) qui est un boolĂ©en pour afficher les termes ; + \item \MontreCode{AffPointilles=...} (\MontreCode{true} par dĂ©faut) pour afficher les pointillĂ©s ; + \item \MontreCode{TailleLabel=...} (\MontreCode{\textbackslash small} par dĂ©faut) ; + \item \MontreCode{PosLabel=...} (\MontreCode{below} par dĂ©faut). +\end{itemize} + +Le second argument, obligatoire et entre \MontreCode{\{...\}} permet de prĂ©ciser l'objet avec lequel il faut effectuer les tracĂ©s (fonction ou nom\_courbe). + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5} +\begin{GraphiqueTikz}% + [x=0.75cm,y=0.75cm,Xmin=0,Xmax=10,Xgrille=1,Xgrilles=0.5, + Ymin=0,Ymax=8,Ygrille=1,Ygrilles=0.5] + \TracerAxesGrilles[Elargir=2.5mm,Police=\small]{auto}{auto} + \DefinirCourbe[Couleur=red,Nom=cf,Debut=0,Fin=10,Trace]<f>{sqrt(5*x)+1} + \TracerCourbe[Couleur=blue]{x} + \TracerToileRecurrence[Couleur=orange,No=1,Uno=1]{f} +\end{GraphiqueTikz} +\end{tcblisting} + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5} +\begin{GraphiqueTikz}[x=4cm,y=3cm,Xmin=0,Xmax=2.5,Xgrille=1,Xgrilles=0.25, + Ymin=0,Ymax=1.25,Ygrille=0.5,Ygrilles=0.25] + \TracerAxesGrilles[Elargir=2.5mm,Police=\small]{auto}{auto} + \DefinirCourbeInterpo[Nom=interpotest,Couleur=blue,Trace]% + {(0,0)(0.5,0.75)(1,0.25)(2,1)(2.5,0.25)} + \TracerCourbe[Couleur=olive]{x} + \TracerToileRecurrence% + [AffTermes,Couleur=purple,Spline,No=0,Uno=2,PosLabel=above left]% + {interpotest} +\end{GraphiqueTikz} +\end{tcblisting} + +\pagebreak + \section{Commandes spĂ©cifiques des fonctions de densitĂ©} \subsection{Loi normale}\label{loinormale} @@ -1419,6 +1525,52 @@ Les \MontreCode{[clĂ©s]}, optionnelles, disponibles sont : \end{GraphiqueTikz} \end{tcblisting} +\subsection{Histogramme pour une loi binomiale}\label{histobinom} + +Il est Ă©galement possible (d'une manière moins explicite que dans \MontreCode{ProfLycee}) de reprĂ©senter l'histogramme d'une loi binomiale (\MontreCode{ProfLycee} permet de dĂ©terminer les unitĂ©s automatiquement, ici elles doivent ĂŞtre prĂ©cisĂ©es et connues). + +Il est Ă©galement possible de rajouter la loi normale \og associĂ©e \fg. + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only} +%dans l'environnement GraphiqueTikz +\TracerHistoBinomiale[clĂ©s]<nom fct normale>{n}{p} +\end{tcblisting} + +Le premier argument, optionnel et entre \MontreCode{[...]} propose les clĂ©s suivantes : + +\begin{itemize} + + \item \MontreCode{Plage} : plage, sous la forme \MontreCode{a-b} du coloriage Ă©ventuel ; + \item \MontreCode{CouleurPlage} : couleur de la plage Ă©ventuelle ; + \item \MontreCode{ClipX} : restriction de l'axe Ox, sous la forme \MontreCode{a-b} ; + \item \MontreCode{AffNormale} : boolĂ©en (\MontreCode{true} par dĂ©faut) pour rajouter la loi normale ; + \item \MontreCode{CouleurNormale} : couleur pour la loi normale. +\end{itemize} + +Les arguments obligatoires et entre \MontreCode{\{...\}} permettent de spĂ©cifier les paramètres de la loi binomiale. + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5} +%les unitĂ©s ont Ă©tĂ© dĂ©terminĂ©es au prĂ©alable... +\begin{GraphiqueTikz}[x=0.2cm,y=50cm,Origx=-0.5,Xmin=-0.5,Xmax=50.5, + Xgrille=5,Xgrilles=1,Ymin=0,Ymax=0.12,Ygrille=0.01,Ygrilles=0.001] + \TracerAxesGrilles[Elargir=2.5mm,Police=\small,Grille=false]% + {0,5,...,50}{auto} + \TracerHistoBinomiale{50}{0.4} +\end{GraphiqueTikz} +\end{tcblisting} + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5} +%les unitĂ©s ont Ă©tĂ© dĂ©terminĂ©es au prĂ©alable... +\begin{GraphiqueTikz}[x=0.5cm,y=100cm,Origx=14.5,Xmin=14.5,Xmax=35.5, + Xgrille=5,Xgrilles=1,Ymin=0,Ymax=0.09,Ygrille=0.01,Ygrilles=0.001] + \TracerAxesGrilles[Elargir=2.5mm,Police=\small,Grille=false]% + {15,20,...,35}{auto} + \TracerHistoBinomiale% + [ClipX=15-35,Plage=18-25,CouleurPlage=teal,AffNormale,CouleurNormale=red]% + {1000}{0.02} +\end{GraphiqueTikz} +\end{tcblisting} + \pagebreak \section{Commandes spĂ©cifiques des mĂ©thodes intĂ©grales} @@ -1440,6 +1592,7 @@ L'idĂ©e est de proposer plusieurs mĂ©thodes graphiques pour illustrer graphiquem Les \MontreCode{ClĂ©s} disponibles sont : \begin{itemize} + \item \MontreCode{Spline} : boolĂ©en pour prĂ©ciser qu'un spline est utilisĂ©, \MontreCode{false} par dĂ©faut ; \item \MontreCode{Couleur} : couleur des tracĂ©s, \MontreCode{red} par dĂ©faut ; \item \MontreCode{NbSubDiv} : nombre de subdivisions, \MontreCode{10} par dĂ©faut ; \item \MontreCode{Methode} : mĂ©thode gĂ©omĂ©trique utilisĂ©e, parmi parmi \MontreCode{RectanglesGauche / RectanglesDroite / RectanglesMilieu / Trapezes} pour spĂ©cifier la mĂ©thode utilisĂ©e, \MontreCode{RectanglesGauche} par dĂ©faut ; @@ -1450,7 +1603,7 @@ Les \MontreCode{ClĂ©s} disponibles sont : \smallskip -Le deuxième argument, optionnel et entre \MontreCode{<...>}, correspond Ă la fonction \textbf{prĂ©cĂ©demment dĂ©finie} ! +Le deuxième argument, optionnel et entre \MontreCode{<...>}, correspond Ă la fonction ou le spline \textbf{prĂ©cĂ©demment dĂ©finie} ! \smallskip @@ -1499,6 +1652,17 @@ Les deux derniers arguments, obligatoires, correspondent aux bornes de l'intĂ©gr \end{GraphiqueTikz} \end{tcblisting} +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5} +\begin{GraphiqueTikz}% + [x=0.8cm,y=1cm,Xmin=-7,Xmax=4,Ymin=0,Ymax=5] + \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto} + \DefinirListeSpline{-6.5/0/2.5§-2/4/0§3.75/0/-1}[\lstsplineB] + \DefinirCourbeSpline[Nom=splinered]{\lstsplineB} + \TracerCourbeSpline[Couleur=red]{\lstsplineB} + \RepresenterMethodeIntegrale[Methode=RectanglesMilieu,Spline,Couleur=teal]<splinered>{-5}{1.25} +\end{GraphiqueTikz} +\end{tcblisting} + \subsection{MĂ©thode de Monte-Carlo}\label{montecarlo} L'idĂ©e est de proposer une commande pour simuler un calcul intĂ©gral via la mĂ©thode de Monte-Carlo. @@ -1547,9 +1711,54 @@ et $\frac{\pi}{4} \approx \ArrondirNum[4]{pi/4}$. \pagebreak -\section{Commandes spĂ©cifiques des statistiques Ă deux variables} +\section{Commandes spĂ©cifiques des statistiques} + +\subsection{Courbe des ECC/FCC (1 variable)}\label{cbeECC} + +Il est possible de travailler sur une reprĂ©sentation de la courbe des ECC/FCC. + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only} +\TracerCourbeECC[clĂ©s]{liste valeurs}{liste effectifs} +\end{tcblisting} + +Le code se charge de dĂ©terminer une valeur des paramètres, pour utilisation ultĂ©rieure (avec arrondis Ă©ventuels car ils sont obtenus par \textit{conversions}) : + +\begin{itemize} + \item le premier quartile, $Q_1$, est stockĂ© dans la macro \MontreCode{\textbackslash ValPremQuartile} ; + \item la mĂ©diane, mĂ©d, est stockĂ© dans la macro \MontreCode{\textbackslash ValMed} ; + \item le troisième quartile, $Q_3$, est stockĂ© dans la macro \MontreCode{\textbackslash ValTroisQuartile}. +\end{itemize} + +Les \MontreCode{ClĂ©s} disponibles sont : + +\begin{itemize} + \item \MontreCode{Couleur=...} : couleur du tracĂ©, \MontreCode{black} par dĂ©faut ; + \item \MontreCode{AffParams} : boolĂ©en, \MontreCode{true} par dĂ©faut, pour afficher les paramètres ; + \item \MontreCode{CouleursParams=...} : couleur des paramètres, \MontreCode{black} par dĂ©faut ; + \item \MontreCode{TraitsComplets} : boolĂ©en, \MontreCode{true} par dĂ©faut, pour afficher les pointillĂ©s en entier +\end{itemize} + +\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5} +\begin{GraphiqueTikz}[x=0.15cm,y=0.03cm,Xmin=0,Xmax=75,Xgrille=10,Xgrilles=5, + Ymin=0,Ymax=200,Ygrille=20,Ygrilles=10] + \TracerAxesGrilles[Elargir=2.5mm,Police=\small]{auto}{auto} + \TracerCourbeECC% + [Couleur=blue,CouleursParams={lime!75!black/pink!75!black}, + TraitsComplets=false]% + {0,15,25,35,40,45,55,65,75}% + {15,20,50,30,35,25,15,10} + %ajouts 'manuels' + \PlacerTexte[Couleur=lime!75!black,Police=\small,Position=below]% + {(\ValPremQuartile,0)}{\ArrondirNum[0]{\ValPremQuartile}} + \PlacerTexte[Couleur=lime!75!black,Police=\small,Position=below]% + {(\ValTroisQuartile,0)}{\ArrondirNum[0]{\ValTroisQuartile}} + \PlacerTexte[Couleur=pink!75!black,Police=\small,Position=below]% + {(\ValMed,0)}{\ArrondirNum[0]{\ValMed}} +\end{GraphiqueTikz} + +\end{tcblisting} -\subsection{Le nuage de points}\label{nuage} +\subsection{Le nuage de points (2 variables)}\label{nuage} En marge des commandes liĂ©es aux fonctions, il est Ă©galement possible de reprĂ©senter des sĂ©ries statistiques doubles. @@ -1592,7 +1801,7 @@ Les arguments, obligatoires, permettent de spĂ©cifier : \end{GraphiqueTikz} \end{tcblisting} -\subsection{La droite de rĂ©gression}\label{reglin} +\subsection{La droite de rĂ©gression (2 variables)}\label{reglin} La droite de rĂ©gression linĂ©aire (obtenue par la mĂ©thode des moindres carrĂ©s) peut facilement ĂŞtre rajoutĂ©e, en utilisant la clĂ© \MontreCode{TracerDroite}. @@ -1626,7 +1835,7 @@ Dans ce cas, de nouvelles clĂ©s sont disponibles : \end{GraphiqueTikz} \end{tcblisting} -\subsection{Autres rĂ©gressions}\label{regressions} +\subsection{Autres rĂ©gressions (2 variables)}\label{regressions} En partenariat avec le package \MontreCode{xint-regression}, chargĂ© par le package (mais \textit{dĂ©sactivable} via l'option \MontreCode{[nonxintreg]}), il est possible de travailler sur d'autres types de rĂ©gression : @@ -1884,10 +2093,10 @@ $\begin{cases} Les commandes disponibles sont : \NewDocumentCommand\lstcmd{ m m m }{% - \item[\texttt{#1}] : \mintinline{latex}|#2|\hfill{}page \pageref{#3} + \item[\footnotesize\texttt{#1}]{\footnotesize : \mintinline{latex}|#2|\hfill{}page \pageref{#3}} } -\begin{description} +\begin{description}[noitemsep] \lstcmd{environnement~~}{\begin{GraphiqueTikz}...\end{GraphiqueTikz}}{creaenvt} \lstcmd{axes et grilles}{\TracerAxesGrille}{creaaxesgr} \lstcmd{aj val axes X~~}{\RajouterValeursAxeX}{ajoutvals} @@ -1904,6 +2113,7 @@ Les commandes disponibles sont : \lstcmd{def image~~~~~~}{\DefinirImage}{defpts} \lstcmd{marq pts~~~~~~~}{\MarquerPts}{markpts} \lstcmd{placer txt~~~~~}{\PlacerTexte}{placetxt} + \lstcmd{pts discont~~~~}{\AfficherPtsDiscont}{ptsdiscont} \lstcmd{rĂ©cup absc~~~~~}{\RecupererAbscisse}{recupcoordo} \lstcmd{rĂ©cup ordo~~~~~}{\RecupererOrdonnee}{recupcoordo} \lstcmd{rĂ©cup coordos~~}{\RecupererCoordonnees}{recupcoordo} @@ -1917,10 +2127,13 @@ Les commandes disponibles sont : \lstcmd{mĂ©thodes int~~~}{\RepresenterMethodeIntegrale}{methodesintergrales} \lstcmd{Monte-Carlo~~~~}{\SimulerMonteCarlo}{montecarlo} \lstcmd{tangente~~~~~~~}{\TracerTangente}{tgte} + \lstcmd{toile rĂ©curr~~~}{\TracerToileRecurrence}{toilerecurr} \lstcmd{loi normale~~~~}{\DefinirLoiNormale}{loinormale} \lstcmd{loi normale~~~~}{\TracerLoiNormale}{loinormale} \lstcmd{loi khideux~~~~}{\DefinirLoiKhiDeux}{loikhideux} \lstcmd{loi khideux~~~~}{\TracerLoiKhiDeux}{loikhideux} + \lstcmd{loi binom~~~~~~}{\TracerHistoBinomiale}{histobinom} + \lstcmd{courbe ECC~~~~~}{\TracerCourbeECC}{cbeECC} \lstcmd{stats 2 var~~~~}{\TracerNuage}{nuage} \lstcmd{regressions~~~~}{\TracerAjustement}{regressions} \lstcmd{arrondi~~~~~~~~}{\ArrondirNum}{numarrond} @@ -1931,8 +2144,10 @@ Les commandes disponibles sont : \section{Historique} -\begin{quote} +{\footnotesize \begin{quote} \begin{verbatim} +0.1.8 : Courbes ECC/FCC + Toile rĂ©currence + Points discontinuitĂ© + HistoBinom +0.1.7 : MĂ©thodes intĂ©grales avec des splines 0.1.6 : Asymptote verticale + MĂ©thodes intĂ©grales (gĂ©om + Monte Carlo) 0.1.5 : Correction d'un bug sur les rajouts de valeurs + NĹ“ud pour une image + [en] version ! 0.1.4 : Placement de texte @@ -1941,6 +2156,6 @@ Les commandes disponibles sont : 0.1.1 : DensitĂ© loi normale et khi deux + Marquage points + AmĂ©liorations 0.1.0 : Version initiale \end{verbatim} -\end{quote} +\end{quote}} \end{document}
\ No newline at end of file diff --git a/graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty b/graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty index ce321f6d4b..274adac46c 100644 --- a/graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty +++ b/graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty @@ -2,9 +2,11 @@ % licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tkz-grapheur}[2024/07/13 0.1.6.Des outils en TikZ pour travailler comme avec un grapheur] +\ProvidesPackage{tkz-grapheur}[2024/09/08 0.1.8 Des outils en TikZ pour travailler comme avec un grapheur] %====HISTORIQUE +% v 0.1.8 Ajout des courbes d'ECC/FCC + Toile récurrence + Points discontinuité + Histobinom +% v 0.1.7 Méthodes intégrales avec des splines % v 0.1.6 Asymptote verticale + Monte Carlo + Méthode intégrales (rectangles, etc) % v 0.1.5 Correction d'un bug avec les valeurs manuelles + Nœud pour une image + [en] version ! % v 0.1.4 Ajout des placements de textes @@ -50,7 +52,7 @@ \if@lngenglish \sisetup{mode=match,propagate-math-font=true,reset-math-version=false,reset-text-family=false,reset-text-series=false,reset-text-shape=false,text-family-to-math=true,text-series-to-math=true} \else - \sisetup{locale=FR,output-decimal-marker={,},mode=match,propagate-math-font=true,reset-math-version=false,reset-text-family=false,reset-text-series=false,reset-text-shape=false,text-family-to-math=true,text-series-to-math=true,group-minimum-digits=4} + \sisetup{locale=FR,output-decimal-marker={,},mode=match,propagate-math-font=true,reset-math-version=false,reset-text-family=false,reset-text-series=false,reset-text-shape=false,text-family-to-math=true,text-series-to-math=true}%,group-minimum-digits=4} \fi \fi @@ -112,6 +114,7 @@ \tikzset{pflpointnuage/.style={radius=1.75pt}} \tikzset{pflcadre/.style={line width=0.8pt,gray}} \tikzset{pflcourbe/.style={line width=1.05pt}} +\tikzset{pflcourbediscont/.style={line width=1.1pt}} \tikzset{pfltrait/.style={line width=0.8pt}} \tikzset{pflflecheg/.style={<-,>=latex}} \tikzset{pflfleched/.style={->,>=latex}} @@ -1068,10 +1071,11 @@ Methode=RectanglesGauche,% Remplir=true,% CouleurRemplissage={\graphtikzintgrcol!25},% - Opacite=0.25 + Opacite=0.25,% + Spline=false } -\NewDocumentCommand\RepresenterMethodeIntegrale{ O{} D<>{f} m m }{%opts+nom_fct+a+b +\NewDocumentCommand\RepresenterMethodeIntegrale{ O{} D<>{f} m m }{%opts+nom_fct/spline+a+b \useKVdefault[graphiquetikzintegr]% \setKV[graphiquetikzintegr]{#1}% \ifboolKV[graphiquetikzintegr]{Remplir}% @@ -1083,31 +1087,73 @@ }% \tikzset{figureintegr/.style={pfltrait,\graphtikzintgrcol,fill=\graphtikzintgrcolrempl,fill opacity=\graphtikzintgropac}}% \def\TmpH{(#4-#3)/\graphtikzintgrnb} - %rectangles gauches - \IfEq{\graphtikzintgrtype}{RectanglesGauche}% + \ifboolKV[graphiquetikzintegr]{Spline}% {% - \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}% - \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+\i*\TmpH)}}) ; - }% - {}% - \IfEq{\graphtikzintgrtype}{RectanglesDroite}% - {% - \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}% - \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+(\i+1)*\TmpH)}}) ; - }% - {}% - \IfEq{\graphtikzintgrtype}{RectanglesMilieu}% - {% - \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}% - \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+(\i+0.5)*\TmpH)}}) ; + \IfEq{\graphtikzintgrtype}{RectanglesGauche}% + {% + \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}{% + \path[draw=none,pflcourbe,name path=tmpintmethod] ({#3+\i*\TmpH},{\pflymin})--({#3+\i*\TmpH},{\pflymax}) ; + \path[name intersections={of=#2 and tmpintmethod,name=KLM}] ; + \draw[pflfigureintegr] let \p1 = (KLM-1) in ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\y1}) ; + }% + }% + {}% + \IfEq{\graphtikzintgrtype}{RectanglesDroite}% + {% + \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}{% + \path[draw=none,pflcourbe,name path=tmpintmethod] ({#3+(\i+1)*\TmpH},{\pflymin})--({#3+(\i+1)*\TmpH},{\pflymax}) ; + \path[name intersections={of=#2 and tmpintmethod,name=KLM}] ; + \draw[pflfigureintegr] let \p1 = (KLM-1) in ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\y1}) ; + }% + }% + {}% + \IfEq{\graphtikzintgrtype}{RectanglesMilieu}% + {% + \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}{% + \path[draw=none,pflcourbe,name path=tmpintmethod] ({#3+(\i+0.5)*\TmpH},{\pflymin})--({#3+(\i+0.5)*\TmpH},{\pflymax}) ; + \path[name intersections={of=#2 and tmpintmethod,name=KLM}] ; + \draw[pflfigureintegr] let \p1 = (KLM-1) in ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\y1}) ; + }% + }% + {}% + \IfEq{\graphtikzintgrtype}{Trapezes}% + {% + \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}{% + \path[draw=none,pflcourbe,name path=tmpintmethodg] ({#3+(\i)*\TmpH},{\pflymin})--({#3+(\i)*\TmpH},{\pflymax}) ; + \path[name intersections={of=#2 and tmpintmethodg,name=KLMg}] ; + \path[draw=none,pflcourbe,name path=tmpintmethodd] ({#3+(\i+1)*\TmpH},{\pflymin})--({#3+(\i+1)*\TmpH},{\pflymax}) ; + \path[name intersections={of=#2 and tmpintmethodd,name=KLMd}] ; + \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) -- (KLMg-1) -- (KLMd-1) -- ({#3+(\i+1)*\TmpH},{0}) -- cycle ; + }% + }% + {}% }% - {}% - \IfEq{\graphtikzintgrtype}{Trapezes}% {% - \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}% - \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) -- ({#3+\i*\TmpH},{\xintfloateval{#2(#3+\i*\TmpH)}}) -- ({#3+(\i+1)*\TmpH},{\xintfloateval{#2(#3+(\i+1)*\TmpH)}}) -- ({#3+(\i+1)*\TmpH},{0}) -- cycle ; + \IfEq{\graphtikzintgrtype}{RectanglesGauche}% + {% + \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}% + \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+\i*\TmpH)}}) ; + }% + {}% + \IfEq{\graphtikzintgrtype}{RectanglesDroite}% + {% + \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}% + \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+(\i+1)*\TmpH)}}) ; + }% + {}% + \IfEq{\graphtikzintgrtype}{RectanglesMilieu}% + {% + \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}% + \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) rectangle++ ({\TmpH},{\xintfloateval{#2(#3+(\i+0.5)*\TmpH)}}) ; + }% + {}% + \IfEq{\graphtikzintgrtype}{Trapezes}% + {% + \foreach \i in {0,...,\inteval{\graphtikzintgrnb-1}}% + \draw[pflfigureintegr] ({#3+\i*\TmpH},{0}) -- ({#3+\i*\TmpH},{\xintfloateval{#2(#3+\i*\TmpH)}}) -- ({#3+(\i+1)*\TmpH},{\xintfloateval{#2(#3+(\i+1)*\TmpH)}}) -- ({#3+(\i+1)*\TmpH},{0}) -- cycle ; + }% + {}% }% - {}% } @@ -4218,4 +4264,325 @@ }% } +%====ECC +\defKV[tkzgECC]{% + Couleur=\def\tkzecc@coul@graph{#1},% + CouleursParams=\def\tkzecc@coul@params{#1} +} + +\setKVdefault[tkzgECC]{% + Couleur=black,% + AffParams=true,% + CouleursParams={black},% + TraitsComplets=true +} + +\tikzset{pfltraitsparamecc/.style={line width=0.9pt,densely dashed}} +\tikzset{pflcourbeecc/.style={line width=1.05pt}} + +\NewDocumentCommand\TracerCourbeECC{ O{} m m }{% + \restoreKV[tkzgECC]% + \setKV[tkzgECC]{#1}% + \IfSubStr{\tkzecc@coul@params}{/}% + {% + \StrCut{\tkzecc@coul@params}{/}{\tkzecc@coul@quart}{\tkzecc@coul@med}% + }% + {% + \def\tkzecc@coul@quart{\tkzecc@coul@params}\def\tkzecc@coul@med{\tkzecc@coul@params}% + }% + \readlist*\DataClass{#2}% + \readlist*\DataEff{#3}% + \xdef\DonneesECC{0}% + \xintFor* ##1 in {\xintSeq{1}{\DataEfflen}}\do{% + \xdef\DonneesTmp{0} + \xintFor* ##2 in {\xintSeq{1}{##1}}\do{% + \xdef\DonneesTmp{\xintfloateval{\DonneesTmp+\DataEff[##2]}}% + }% + \xdef\DonneesECC{\DonneesECC,\DonneesTmp}% + }% + \readlist*\DataECC\DonneesECC% + \itemtomacro\DataClass[1]\DonneesXmin% + \itemtomacro\DataClass[-1]\DonneesXmax% + \itemtomacro\DataECC[-1]\DonneesEffMax% + \xdef\DonneesListeECC{(\DataClass[1],\DataECC[1])}% + \xintFor* ##1 in {\xintSeq{2}{\DataECClen}}\do{% + \xdef\DonneesListeECC{\DonneesListeECC--(\DataClass[##1],\DataECC[##1])}% + }% + %paramètres par interpolation + \xintFor* ##1 in {\xintSeq{1}{\DataEfflen}}\do{% + \xdef\isuiv{\xinteval{##1+1}}% + \xintifboolexpr{\DataECC[##1] < (0.25*\DonneesEffMax) 'and' \DataECC[\isuiv] >= (0.25*\DonneesEffMax)}% + {% + \xdef\pentetmpECC{(\DataECC[\isuiv]-\DataECC[##1])/(\DataClass[\isuiv]-\DataClass[##1])}%OK + \xdef\ValPremQuartile{\xintfloateval{(0.25*\DonneesEffMax+\pentetmpECC*\DataClass[##1]-\DataECC[##1])/(\pentetmpECC)}}% + } + {}% + \xintifboolexpr{\DataECC[##1] < (0.50*\DonneesEffMax) 'and' \DataECC[\isuiv] >= (0.50*\DonneesEffMax)}% + {% + \xdef\pentetmpECC{(\DataECC[\isuiv]-\DataECC[##1])/(\DataClass[\isuiv]-\DataClass[##1])}%OK + \xdef\ValMed{\xintfloateval{(0.50*\DonneesEffMax+\pentetmpECC*\DataClass[##1]-\DataECC[##1])/(\pentetmpECC)}}% + } + {}% + \xintifboolexpr{\DataECC[##1] < (0.75*\DonneesEffMax) 'and' \DataECC[\isuiv] >= (0.75*\DonneesEffMax)}% + {% + \xdef\pentetmpECC{(\DataECC[\isuiv]-\DataECC[##1])/(\DataClass[\isuiv]-\DataClass[##1])}%OK + \xdef\ValTroisQuartile{\xintfloateval{(0.75*\DonneesEffMax+\pentetmpECC*\DataClass[##1]-\DataECC[##1])/(\pentetmpECC)}}% + } + {}% + }% + %partie graphique + \draw[pflcourbeecc,\tkzecc@coul@graph] \DonneesListeECC ; + \xintFor* ##1 in {\xintSeq{1}{\DataECClen}}\do{% + \filldraw[\tkzecc@coul@graph] (\DataClass[##1],\DataECC[##1]) circle[pflpointnuage] ; + }% + \ifboolKV[tkzgECC]{AffParams}% + {% + %médiane + \ifboolKV[tkzgECC]{TraitsComplets}% + {% + \draw[pfltraitsparamecc,\tkzecc@coul@med] (\pflxmin,{0.50*\DonneesEffMax})--(\pflxmax,{0.50*\DonneesEffMax}); + \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\pflxmin,{0.25*\DonneesEffMax})--++({\pflxmax-\pflxmin},0); + \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\pflxmin,{0.75*\DonneesEffMax})--++({\pflxmax-\pflxmin},0); + }% + {% + \draw[pfltraitsparamecc,\tkzecc@coul@med] (\pflxmin,{0.50*\DonneesEffMax})--(\ValMed,{0.50*\DonneesEffMax}); + \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\pflxmin,{0.25*\DonneesEffMax})--++({\ValPremQuartile-\pflxmin},0); + \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\pflxmin,{0.75*\DonneesEffMax})--++({\ValTroisQuartile-\pflxmin},0); + }% + \draw[pfltraitsparamecc,\tkzecc@coul@med] (\ValMed,{0.5*\DonneesEffMax})--(\ValMed,0) ; \draw[\tkzecc@coul@med,thick,fill=white] (\ValMed,{0.5*\DonneesEffMax}) circle[pflpointnuage] ; + \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\ValPremQuartile,{0.25*\DonneesEffMax})--(\ValPremQuartile,\pflymin) ; \draw[\tkzecc@coul@quart,thick,fill=white] (\ValPremQuartile,{0.25*\DonneesEffMax}) circle[pflpointnuage] ; + \draw[pfltraitsparamecc,\tkzecc@coul@quart] (\ValTroisQuartile,{0.75*\DonneesEffMax})--(\ValTroisQuartile,\pflymin) ; \draw[\tkzecc@coul@quart,thick,fill=white] (\ValTroisQuartile,{0.75*\DonneesEffMax}) circle[pflpointnuage] ; + }% + {}% +} + +%====PTS DISCONTINUITÉ +\defKV[tkzptdiscont]{% + Couleur=\def\pfldiscontcouleur{#1},% + Pos=\def\pfldiscontpos{#1},% + Echelle=\def\pfldiscontechelle{#1},% + Type=\def\pfldisconttype{#1} +} + +\setKVdefault[tkzptdiscont]{% + Couleur=black,% + Pos=D,% + Echelle=1,% + Type=par +} + +\NewDocumentCommand\AfficherPtsDiscont{ O{} m }{% + \restoreKV[tkzptdiscont] + \setKV[tkzptdiscont]{#1}% + \setsepchar[.]{§./}% + \readlist*\SPLlisteDiscont{#2}% + \def\SPLlisteDiscontNb{\SPLlisteDiscontlen}% + \foreach \i in {1,...,\SPLlisteDiscontNb}{% + \begin{scope}[shift={(\SPLlisteDiscont[\i,1],\SPLlisteDiscont[\i,2])},rotate={atan \SPLlisteDiscont[\i,3]},scale=\pfldiscontechelle] + \IfStrEq{\pfldisconttype}{rond}% + {% + \draw[pflcourbediscont,fill=white,draw=\pfldiscontcouleur] (0,0) circle[radius=3pt] ; + }{}% + \IfStrEq{\pfldiscontpos}{D}% + {% + \IfStrEq{\pfldisconttype}{par}% + {% + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=90,in=170] (4pt,5pt) ; + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=-90,in=-170] (4pt,-5pt) ; + }{}% + \IfStrEq{\pfldisconttype}{demirond}% + {% + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=90,in=180] (3pt,3pt) ; + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=-90,in=180] (3pt,-3pt) ; + }{}% + \IfStrEq{\pfldisconttype}{cro}% + {% + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) |- (4pt,5pt) ; + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) |- (4pt,-5pt) ; + }{}% + }% + {% + \IfStrEq{\pfldisconttype}{par}% + {% + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=90,in=-10] (-4pt,5pt) ; + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=-90,in=10] (-4pt,-5pt) ; + }{}% + \IfStrEq{\pfldisconttype}{demirond}% + {% + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=90,in=0] (-3pt,3pt) ; + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) to[out=-90,in=0] (-3pt,-3pt) ; + }{}% + \IfStrEq{\pfldisconttype}{cro}% + {% + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) |- (-4pt,5pt) ; + \draw[pflcourbediscont,\pfldiscontcouleur] (0,0) |- (-4pt,-5pt) ; + }{}% + }% + \end{scope} + }% +} + +%====TOILE RÉCURRENCE (OK avec courbe + spline !!) +\tikzset{pfltraitrec/.style={line width=0.8pt}} +\tikzset{pfltraitrecpointill/.style={pfltraitrec,densely dashed}} + +\defKV[tkzwebrecurr]{% + Couleur=\def\pflrecurcolor{#1},% + Nom=\def\pflrecurnom{#1},% + No=\def\pflrecurno{#1},% + Nb=\def\pflrecurnb{#1},% + Uno=\def\pflrecuruno{#1}, + TailleLabel=\def\pflrecurlabelsize{#1},% + PosLabel=\def\pflrecurlabelpos{#1} +} + +\setKVdefault[tkzwebrecurr]{% + Couleur=black,% + Spline=false,% + No=0,% + Nom=u,% + Nb=5,% + AffTermes=false,% + AffPointilles=true,% + TailleLabel=\small,% + PosLabel=below +} + +\NewDocumentCommand\TracerToileRecurrence{ O{} m }{ + %<clés> + fonction/courbe + \useKVdefault[tkzwebrecurr]% + \setKV[tkzwebrecurr]{#1}% on paramètres les nouvelles clés et on les simplifie + \ifboolKV[tkzwebrecurr]{Spline}% + {% + \foreach \i [remember=\i as \x (initially \pflrecuruno)] in {1,...,\pflrecurnb}{% + %\xdef\y{\xintfloateval{#2(\x)}}% + \path[draw=none,pflcourbe,name path=tmprecur] ({\x},{\pflymin})--({\x},{\pflymax}) ; + \path[name intersections={of=#2 and tmprecur,name=ZZZZ}] ; + %\coordinate (\pflrecurnoms) at (ZZZZ-1) ; + \GetYcoord{(ZZZZ-1)}[\y] + %test de la position courbe / bissectrice ? + \ifnum \i=1 + \newdimen \X + \newdimen \Y + \X = \x pt + \Y = \y pt + \ifdim \Y < \X + \draw[pfltraitrec,\pflrecurcolor] (\x,\y)--(\y,\y) ; + \else + \draw[pfltraitrec,\pflrecurcolor] (\x,\x)--(\x,\y)--(\y,\y) ; + \fi + \else + \draw[pfltraitrec,\pflrecurcolor] (\x,\x)--(\x,\y)--(\y,\y) ; + \fi + \ifboolKV[tkzwebrecurr]{AffPointilles}% + {% + \def\indice{\fpeval{\i+\pflrecurno-1}}% + \ifboolKV[tkzwebrecurr]{AffTermes}% + {% + \draw[pfltraitrecpointill,\pflrecurcolor] (\x,\y)--(\x,\pflxmin) node[\pflrecurlabelpos,font=\pflrecurlabelsize]{$\pflrecurnom_{\indice}$};% + }% + {% + \draw[pfltraitrecpointill,\pflrecurcolor] (\x,\y)--(\x,\pflxmin) ;% + }% + }% + {} + \def\i{\y}% + }% + }% + {% + \foreach \i [remember=\i as \x (initially \pflrecuruno)] in {1,...,\pflrecurnb}{% + \xdef\y{\xintfloateval{#2(\x)}}% + %test de la position courbe / bissectrice ? + \ifnum \i=1 + \newdimen \X + \newdimen \Y + \X = \x pt + \Y = \y pt + \ifdim \Y < \X + \draw[pfltraitrec,\pflrecurcolor] (\x,\y)--(\y,\y) ; + \else + \draw[pfltraitrec,\pflrecurcolor] (\x,\x)--(\x,\y)--(\y,\y) ; + \fi + \else + \draw[pfltraitrec,\pflrecurcolor] (\x,\x)--(\x,\y)--(\y,\y) ; + \fi + \ifboolKV[tkzwebrecurr]{AffPointilles}% + {% + \def\indice{\fpeval{\i+\pflrecurno-1}}% + \ifboolKV[tkzwebrecurr]{AffTermes}% + {% + \draw[pfltraitrecpointill,\pflrecurcolor] (\x,\y)--(\x,\pflxmin) node[\pflrecurlabelpos,font=\pflrecurlabelsize]{$\pflrecurnom_{\indice}$};% + }% + {% + \draw[pfltraitrecpointill,\pflrecurcolor] (\x,\y)--(\x,\pflxmin) ;% + }% + }% + {} + \def\i{\xintfloateval{\y}}% + }% + }% +} + +%====HISTOBINOM +\defKV[tkzHistoBinom]{% + Plage=\def\tkzGraphBinomPlage{#1},% + CouleurPlage=\def\tkzGraphBimomColPlage{#1},% + ClipX=\def\tkzGraphBinomXminmax{#1},% + CouleurNormale=\def\tkzGraphBinomColNorm{#1} +} +\setKVdefault[tkzHistoBinom]{% + Plage={},% + CouleurPlage=black,% + ClipX={},% + AffNormale=false,% + CouleurNormale=black +} + +\NewDocumentCommand\TracerHistoBinomiale{ O{} D<>{phi} m m }{% + \restoreKV[tkzHistoBinom]% + \setKV[tkzHistoBinom]{#1} + \def\tkzGraphBinomN{#3}% + \def\tkzGraphBinomP{#4}% + \IfStrEq{\tkzGraphBinomXminmax}{}% + {% + \xdef\tkzGraphBinomXmin{0}% + \xdef\tkzGraphBinomXmax{\tkzGraphBinomN}% + }% + {% + \StrCut{\tkzGraphBinomXminmax}{-}{\tkzGraphBinomXmin}{\tkzGraphBinomXmax}% + \IfStrEq{\tkzGraphBinomXmin}{*}{\xdef\tkzGraphBinomXmin{0}}{}% + \IfStrEq{\tkzGraphBinomXmax}{*}{\xdef\tkzGraphBinomXmax{\tkzGraphBinomN}}{}% + }% + \IfStrEq{\tkzGraphBinomPlage}{}% + {}% + {% + \StrCut{\tkzGraphBinomPlage}{-}{\tkzGraphBinomColorMin}{\tkzGraphBinomColorMax}% + \IfStrEq{\tkzGraphBinomColorMin}{*}{\xdef\tkzGraphBinomColorMin{\tkzGraphBinomXmin}}{}% + \IfStrEq{\tkzGraphBinomColorMax}{*}{\xdef\tkzGraphBinomColorMax{\tkzGraphBinomXmax}}{}% + }% + %coloriage éventuel + \IfStrEq{\tkzGraphBinomPlage}{}% + {}% + {% + \xintFor* ##1 in {\xintSeq{\tkzGraphBinomColorMin}{\tkzGraphBinomColorMax}}\do{% + \xdef\tkztmpYYY{\xintfloateval{binomial(\tkzGraphBinomN,##1)*(\tkzGraphBinomP)^(##1)*(1-(\tkzGraphBinomP))^((\tkzGraphBinomN)-(##1))}}% + \draw[draw=none,fill=\tkzGraphBimomColPlage,fill opacity=0.5] ({##1-0.5},{\pflymin}) rectangle++ (1,{\tkztmpYYY-\pflymin}) ; + }% + }% + %tracé + \xintFor* ##1 in {\xintSeq{\tkzGraphBinomXmin}{\tkzGraphBinomXmax}}\do{% + \xdef\tkztmpYYY{\xintfloateval{binomial(\tkzGraphBinomN,##1)*(\tkzGraphBinomP)^(##1)*(1-(\tkzGraphBinomP))^((\tkzGraphBinomN)-(##1))}}% + \draw[pfltrait] ({##1-0.5},{\pflymin}) rectangle++ (1,{\tkztmpYYY-\pflymin}) ; + }% + \ifboolKV[tkzHistoBinom]{AffNormale}% + {% + \xdef\tkzMinNormHistoBinom{\xintfloateval{{\tkzGraphBinomXmin-0.5}}}% + \xdef\tkzMaxNormHistoBinom{\xintfloateval{{\tkzGraphBinomXmax+0.5}}}% + \xdef\tkzEsperNorm{\xintfloateval{(#3)*(#4)}}% + \xdef\tkzVarNorm{\xintfloateval{sqrt((#3)*(#4)*(1-(#4)))}}% + \DefinirLoiNormale[Trace,Couleur=\tkzGraphBinomColNorm,pflcourbe,Debut=\tkzMinNormHistoBinom,Fin=\tkzMaxNormHistoBinom]<#2>{\tkzEsperNorm}{\tkzVarNorm} + }% + {}% +} + \endinput
\ No newline at end of file |