CTAN sync 202305260302

3 files changed, 44 insertions, 23 deletions

diff --git a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
index 66db61382a..6a0b9acda0 100644
--- a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
+++ b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
diff --git a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
index 6173132ee6..20d2e09eb0 100644
--- a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
+++ b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
@@ -1,6 +1,6 @@
 % The Dynkin Diagrams package.
 %
-% Version 3.141 592 653 589 793 23
+% Version 3.141 592 653 589 793 238
 %
 % This package draws Dynkin diagrams in LaTeX 
 % documents, using the TikZ package.
@@ -13,12 +13,10 @@
 % Released under the LaTeX Project Public License v1.3c or later, see 
 % http://www.latex-project.org/lppl.txt
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{dynkin-diagrams}[2023/05/18 Dynkin diagrams]
+\ProvidesPackage{dynkin-diagrams}[2023/05/25 Dynkin diagrams]
 \RequirePackage{tikz}
 \RequirePackage{xstring}
-\RequirePackage{xparse}
 \RequirePackage{etoolbox}
-\RequirePackage{expl3}
 \RequirePackage{pgfkeys}
 \RequirePackage{pgfopts}
 \RequirePackage{amsmath}
@@ -130,15 +128,21 @@
 	\xdef\dynkin@string{#4}%
 	\xdef\dynkin@series{#2}%
 	\dynkin@grok@series%
-	\IfSubStr{ABCDEFGHI}{\dynkin@series}{}{\dynkin@error@series}%
-	\IfInteger{\dynkin@string}%
-	{%
+	\expandafter\expandafter%
+	\ifx\csname dynkin\dynkin@series \endcsname\relax%
+	% Undefined series
+	\dynkin@error@series%
+	\fi	
+%%	\IfSubStr{ABCDEFGHI}{\dynkin@series}{}{\dynkin@error@series}%
+%%	\IfInteger{\dynkin@string}%
+	\if!\ifnum9<1\dynkin@string!\fi%
+%%	{%
 		\dynkin@integer@rank%
-	}%
-	{%
+%%	}%
+%%	{%
 		% Turn Satake codes into Dynkin diagram expressions in \dynkin@string.
-		\dynkin@grok@Satake@codes%
-	}%
+\else\dynkin@grok@Satake@codes\fi%
+%%	}%
 	% Expand out any digits in \dynkin@string into multiples of the various root marks.
 	\expand@Dynkin@Roots@Digits%
 	% Assign to \dynkin@roots the input string \dynkin@string with all . symbols removed,
@@ -4962,19 +4966,33 @@
 %% Draws an F series Dynkin diagram.
 \newcommand*{\Fdynkin}%
 {%
-	\dynkinPlaceRootHere*{1}{below}{above}%
-	\dynkinPlaceRootRelativeTo*{2}{1}{east}{below}{above}%
-	\dynkinPlaceRootRelativeTo*{3}{2}{east}{below}{above}%
-	\dynkinPlaceRootRelativeTo*{4}{3}{east}{below}{above}%
-	\ifdynkin@Coxeter%
+	\ifnum\dynkin@ply>1\relax%
+		\dynkin@jump{1}%
+		\dynkinPlaceRootHere*{1}{left}{above}%
+		\dynkinPlaceRootRelativeTo*{2}{1}{east}{below}{above}%
+		\dynkinPlaceRootRelativeTo*{3}{2}{southfold}{left}{below}%
+		\dynkinEdge*{DoubleDownRightSemiCircle}{2}{3}%
+		\dynkinPlaceRootRelativeTo*{4}{3}{west}{below}{above}%
+		\ifdynkin@arrows%
+			\dynkinLeftFold*{1}{4}%
+		\fi%
 		\dynkinEdge*{SingleEdge}{1}{2}%
-		\dynkinEdge*{SingleEdge}{2}{3}%
 		\dynkinEdge*{SingleEdge}{3}{4}%
-		\dynkinEdgeLabel{2}{3}{4}%
 	\else%
-		\dynkinEdge*{SingleEdge}{1}{2}%
-		\dynkinEdge*{SingleEdge}{3}{4}%
-		\dynkinEdge*{DoubleEdge}{2}{3}%
+		\dynkinPlaceRootHere*{1}{below}{above}%
+		\dynkinPlaceRootRelativeTo*{2}{1}{east}{below}{above}%
+		\dynkinPlaceRootRelativeTo*{3}{2}{east}{below}{above}%
+		\dynkinPlaceRootRelativeTo*{4}{3}{east}{below}{above}%
+		\ifdynkin@Coxeter%
+			\dynkinEdge*{SingleEdge}{1}{2}%
+			\dynkinEdge*{SingleEdge}{2}{3}%
+			\dynkinEdge*{SingleEdge}{3}{4}%
+			\dynkinEdgeLabel{2}{3}{4}%
+		\else%
+			\dynkinEdge*{SingleEdge}{1}{2}%
+			\dynkinEdge*{SingleEdge}{3}{4}%
+			\dynkinEdge*{DoubleEdge}{2}{3}%
+		\fi%
 	\fi%
 }%
 %% \Gdynkin 
@@ -5239,6 +5257,7 @@
 	\xdef\dynkin@fold@radius{\pgfmathresult pt}%
 	\dynkin@fold{2}{\the\dynkin@rank@minus@two}%
 	% We place the root number rank-2 once again (it is already placed in the \dynkin@fold):
+	\dynkinMoveToRoot*{\the\dynkin@rank@minus@two}% 
 	\dynkinPlaceRootHere*%
 		{\the\dynkin@rank@minus@two}%
 		{below right}{above right}%
diff --git a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
index 8e4901234e..9523f43845 100644
--- a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
+++ b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
@@ -1,7 +1,7 @@
 \documentclass{amsart}
 \title[The Dynkin diagrams package]%
 {The Dynkin diagrams package \\ 
-Version 3.141\,592\,653\,589\,793\,23}
+Version 3.141\,592\,653\,589\,793\,238}
 %% My name:
 \makeatletter
 \DeclareRobustCommand{\scotsMc}{\scotsMcx{c}}
@@ -20,7 +20,7 @@ Version 3.141\,592\,653\,589\,793\,23}
 \author{Ben \scotsMc{}Kay}
 \address{School of Mathematical Sciences,  University College Cork, Cork, Ireland}
 \email{b.mckay@ucc.ie}
-\date{18 May 2023}
+\date{25 May 2023}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenx}
 \usepackage{etoolbox} 
@@ -321,11 +321,13 @@ G_2&\dynkins{G2}&\texttt{\detokenize{\dynkins}\{G2\}}\\
 [Coxeter]A{};
 [Coxeter]B{};
 [Coxeter]C{};
+[Coxeter]D{};
 [Coxeter]E6;
 [Coxeter]E7;
 [Coxeter]E8;
 [Coxeter]F4;
 [Coxeter,gonality=n]G2;
+[Coxeter]H2;
 [Coxeter]H3;
 [Coxeter]H4;
 [Coxeter,gonality=n]I{}}