dynkin-diagrams (4apr21)

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

4 files changed, 74 insertions, 68 deletions

diff --git a/Master/texmf-dist/doc/latex/dynkin-diagrams/README b/Master/texmf-dist/doc/latex/dynkin-diagrams/README
index ff9a228505a..5d7efb31447 100644
--- a/Master/texmf-dist/doc/latex/dynkin-diagrams/README
+++ b/Master/texmf-dist/doc/latex/dynkin-diagrams/README
@@ -1,6 +1,6 @@
 Dynkin diagrams               
-v3.14159265358979
-30 April 2020
+v3.141592653589793
+31 March 2021
 
 Authors: 
 Ben McKay
diff --git a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf
index 7fb1a915c51..870e3afa275 100644
--- a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf
+++ b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf
diff --git a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex
index fd00a4c7857..8c882f70f26 100644
--- a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex
+++ b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex
@@ -1,7 +1,7 @@
 \documentclass{amsart}
 \title[The Dynkin diagrams package]%
 {The Dynkin diagrams package \\ 
-Version 3.14159265358979}
+Version 3.141592653589793}
 %% My name:
 \makeatletter
 \DeclareRobustCommand{\scotsMc}{\scotsMcx{c}}
@@ -20,7 +20,7 @@ Version 3.14159265358979}
 \author{Ben \scotsMc{}Kay}
 \address{School of Mathematical Sciences,  University College Cork, Cork, Ireland}
 \email{b.mckay@ucc.ie}
-\date{30 April 2020}
+\date{31 March 2021}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenx}
 \usepackage{etoolbox} 
@@ -53,6 +53,7 @@ Version 3.14159265358979}
 \usepackage{filecontents}
 \usetikzlibrary{decorations.markings}
 \usetikzlibrary{decorations.pathmorphing}
+\usepackage{tikz-cd}
 %% Use white rulings in tables.
 \arrayrulecolor{white}
 \makeatletter
@@ -316,13 +317,13 @@ E{I},E{II},E{III},E{IV},E{V},E{VI},E{VII},E{VIII},E{IX},F{I},F{II},GI}
     involutions={16;35}]E6
 \end{tcblisting}
 
-\newpage
-
 \begin{tcblisting}{title={The double arrows for \(A_{IIIa}\) are big}}
 \dynkin[edge length=.75cm,
     involutions={1{10};29;38;47;56}]{A}{oo.o**.**o.oo}
 \end{tcblisting}
 
+\newpage
+
 \begin{tcblisting}{title={We can add labels}}
 \dynkin[edge length=.75cm,
     involutions={
@@ -342,8 +343,6 @@ E{I},E{II},E{III},E{IV},E{V},E{VI},E{VII},E{VIII},E{IX},F{I},F{II},GI}
     ]{A}{oo.o**.**o.oo}
 \end{tcblisting}
 
-\newpage
-
 \begin{tcblisting}{title={Arrow angles}}
 \dynkin[%
     edge length=.75cm,
@@ -380,6 +379,16 @@ segment length=1mm,amplitude=.6mm}}}
 \end{tcblisting}
 
 \section{Labels for the roots}
+
+
+\begin{tcblisting}{title={Make a list of labels for the roots.
+Optionally, you can add label directions to say where to put each label relative to its root.}}
+\dynkin[%
+	labels={m\cosh\theta,1,2,3,,n-2,n-1,n,n+1},
+	label directions={,,left,,,,right,,},
+	scale=1.8,
+	extended] D{*ooo...oooo}
+\end{tcblisting}
 \begin{tcblisting}{title={Make a macro to assign labels to roots}}
 \dynkin[label,label macro/.code={\alpha_{\drlap{#1}}},edge length=.75cm]D5
 \end{tcblisting}
@@ -400,7 +409,7 @@ segment length=1mm,amplitude=.6mm}}}
 \end{tcblisting}
 \begin{tcblisting}{title={Access root labels via TikZ}}
 \begin{dynkinDiagram}B3
-\node[below] at (root 2) {\(\alpha_{\drlap{2}}\)};
+\node[below,/Dynkin diagram/text style] at (root 2) {\(\alpha_{\drlap{2}}\)};
 \end{dynkinDiagram}
 \end{tcblisting}
 \begin{tcblisting}{title={The labels have default locations, mostly below roots}}
@@ -409,7 +418,9 @@ segment length=1mm,amplitude=.6mm}}}
 \begin{tcblisting}{title={The starred form flips labels to alternate locations, mostly above roots}}
 \dynkin[labels*={1,2,3}]E8
 \end{tcblisting}
+
 \newpage
+
 \begin{tcblisting}{title={Labelling several roots and alternates}}
 \dynkin[%
 label macro/.code={\alpha_{\drlap{#1}}},
@@ -465,16 +476,19 @@ labels*={1,3,4,5,6}]A7
 
 \section{Text style for the labels}
 \begin{tcblisting}{title={Use a text style: big and blue}}
-\begin{dynkinDiagram}[text style={scale=1.2,blue},
-edge length=.75cm,
+\begin{dynkinDiagram}[text style/.style={scale=1.2,blue},
+edge length=1cm,
 labels={1,2,n-1,n},
 label macro/.code={\alpha_{\drlap{#1}}}
 ]A{}
 \end{dynkinDiagram}
 \end{tcblisting}
+
+\newpage
+
 \begin{tcblisting}{title={Use a text style; font selection is in the label macro}}
-\begin{dynkinDiagram}[text style={scale=1.2,blue},
-edge length=.75cm,
+\begin{dynkinDiagram}[text style/.style={scale=1.2,blue},
+edge length=1cm,
 labels={1,2,n-1,n},
 label macro/.code={\mathbb{A}_{\drlap{#1}}}]A{}
 \end{dynkinDiagram}
@@ -495,6 +509,9 @@ label macro/.code={\mathbb{A}_{\drlap{#1}}}]A{}
 \dynkinBrace*[\text{Roots 3 to 8}]38
 \end{dynkinDiagram}
 \end{tcblisting}
+
+\newpage
+
 \begin{tcblisting}{title={Bracing roots}}
 \newcommand\circleRoot[1]{\draw (root #1) circle (3pt);}
 \begin{dynkinDiagram}A{**.***.***.***.***.**}
@@ -506,7 +523,6 @@ label macro/.code={\mathbb{A}_{\drlap{#1}}}]A{}
 \end{dynkinDiagram}
 \end{tcblisting}
 
-\newpage
 \section{Label placement}
 Take a \(D_8\):
 \begin{tcblisting}{}
@@ -607,8 +623,6 @@ For extended diagrams, this list starts at \(0\)-offset.
 \end{filecontents*}
 {\input{EulerProducts}}\VerbatimInput{EulerProducts.tex}
 
-\newpage
-
 \section{Style}
 \begin{tcblisting}{title={Colours}}
 \dynkin[extended,
@@ -949,6 +963,16 @@ projective 3-space is associated to
 the Dynkin diagram \dynkin[parabolic=3]A3.
 \end{tcblisting}
 
+\begin{tcblisting}{title={Commutative diagrams: anchor nodes to center}}
+\begin{tikzcd}[row sep=0em,column sep=1em,cramped,
+cells={nodes={anchor=center}}]
+& \dynkin{G}{xx} \arrow{dr} \arrow{dl} & \\ 
+\dynkin{G}{*x} \arrow{dr} &
+& \dynkin{G}{x*} \arrow{dl} \\ 
+& \dynkin{G}{**} \\ 
+\end{tikzcd}
+\end{tcblisting}
+
 \begin{filecontents*}{hermitian-symmetric-spaces.tex}
 \NewDocumentCommand\HSS{mommm}
 {#1&\IfNoValueTF{#2}{\dynkin{#3}{#4}}{\dynkin[parabolic=#2]{#3}{#4}}&#5\\}
@@ -998,8 +1022,6 @@ The extended Dynkin diagrams are also described in the notation of Kac \cite{Kac
 A[1]{}
 \end{tcblisting}
 
-\newpage
-
 \section{Affine twisted and untwisted Dynkin diagrams}
 The affine Dynkin diagrams are described in the notation of Kac \cite{Kac:1990} p. 55:
 \begin{tcblisting}{title={Affine Dynkin diagrams}}
@@ -1013,8 +1035,6 @@ D^{(3)}_4=\dynkin D[3]4\)
 A[2]2,A[2]{even},A[2]{odd},D[2]{},E[2]6,D[3]4}
 \end{dynkinTable}
 
-\newpage
-
 \begin{dynkinTable}{Some more affine Dynkin diagrams}{3cm}{3.25cm}
 \docsvlist{A[2]4,A[2]5,A[2]6,A[2]7,A[2]8,D[2]3,D[2]4,D[2]5,D[2]6,D[2]7,D[2]8,
 D[3]4,E[2]6}
@@ -1036,12 +1056,13 @@ D[3]4,E[2]6}
 \docsvlist{A{},B{},C{},D{},E6,E7,E8,F4,G2,H3,H4,I1}
 \end{dynkinTable}
 
+\newpage
+
 \section{Kac style}
 We include a style called \verb!Kac! which tries to imitate the style of \cite{Kac:1990}.
 \begin{tcblisting}{title={Kac style}}
 \dynkin[Kac]F4
 \end{tcblisting}
-\newpage
 \begingroup
 \pgfkeys{/Dynkin diagram,Kac}
 \renewcommand{\do}[1]{\dyn#1}
@@ -1096,7 +1117,6 @@ Most diagrams can only allow a 2-ply folding, so \verb!fold! is a synonym for \v
 \dynkin[ply=3,fold right]D4
 \dynkin[ply=3]D[1]4
 \end{tcblisting}
-\newpage
 \begin{tcblisting}{title={4-ply}}
 \dynkin[ply=4]D[1]4
 \end{tcblisting}
@@ -1261,6 +1281,8 @@ It is perhaps only useful when automatically generating a large collection of Dy
 \dynkinName D[3]4
 \end{tcblisting}
 
+\newpage
+
 \section{Connecting Dynkin diagrams}\label{section:name}
 We can make some sophisticated folded diagrams by drawing multiple diagrams, each with a name:
 \begin{tcblisting}{title={Name a diagram}}
diff --git a/Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty b/Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty
index 0a6191599fa..df3bc2ef693 100644
--- a/Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty
+++ b/Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty
@@ -1,6 +1,6 @@
 % The Dynkin Diagrams package.
 %
-% Version 3.14159265358979
+% Version 3.141592653589793
 %
 % This package draws Dynkin diagrams in LaTeX 
 % documents, using the TikZ package.
@@ -13,7 +13,7 @@
 % 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}[2020/04/30 Dynkin diagrams]
+\ProvidesPackage{dynkin-diagrams}[2021/03/31 Dynkin diagrams]
 \RequirePackage{tikz}
 \RequirePackage{xstring}
 \RequirePackage{xparse}
@@ -161,9 +161,10 @@
 		}%
 		_%
 		{%
-			\IfStrEq{\dynkin@user@string}{}%
-				{\dynkin@indefinite@number@symbol}%
-				{\ifdynkin@Satake@diagram%
+			\ifx\dynkin@user@string\empty\relax%
+				\dynkin@indefinite@number@symbol%
+			\else%
+				\ifdynkin@Satake@diagram%
 					\dynkin@user@string%
 				\else%
 					\IfStrEq{\dynkin@user@string}{even}{ev}%
@@ -174,7 +175,7 @@
 						}%
 					}%
 				\fi%
-				}%
+			\fi%
 			\IfStrEq{\dynkin@parabolic}{0}%
 				{}%
 				{,\dynkin@parabolic}
@@ -210,7 +211,6 @@
 
 \NewDocumentCommand\dynkinRefreshRoots{}%
 {%
-???
 	\dynkin@override@label@directions{}%
 	\dynkin@draw@all@roots{}%
 	\ifdynkin@label@the@roots%
@@ -296,10 +296,8 @@
 		Allowed values are up to \the\dynkin@nodes}%
 		{}%
 	\fi%
-	\IfStrEq{#3}{}%
-	{%
-	}%
-	{%
+	\ifx#3\empty\relax%
+	\else%
 		\dynkin@rpo=#2\relax%
 		\advance\dynkin@rpo by 1\relax%
 		\IfBooleanTF{#1}%
@@ -331,7 +329,7 @@
 			]%
 			at (\dynkin@root@name #2){};%
 		}%
-	}%
+	\fi%
 }%
 \newcounter{dynkinRootNo}
 \NewDocumentCommand\@dynkinLabelThisRoot{m}%
@@ -461,7 +459,7 @@
 \newcommand{\dynkinPrintLabels}%
 {%
 	\dynkin@check@if@in@tikZ%
-	\IfStrEq{\dynkin@label@list}{}{%
+	\ifx\dynkin@label@list\empty\relax%
 		\foreach \i in {1,...,\the\dynkin@nodes}{\dynkinLabelRoot{\i}{\i}}%
 		\ifdynkin@is@extended%
 			\dynkinLabelRoot{0}{0}%
@@ -470,8 +468,7 @@
 				\dynkinLabelRoot{0}{0}%
 			\fi%
 		\fi%
-	}%
-	{%
+	\else%
 		\ifdynkin@is@extended%
 			\setcounter{dynkinRootNo}{-1}%	
 		\else%
@@ -481,8 +478,7 @@
 				\setcounter{dynkinRootNo}{0}%	
 			\fi%
 		\fi%
-		\edef\XXX{\dynkin@label@list}%
-		\foreach \i in \XXX%
+		\foreach \i in \dynkin@label@list%
 		{%
 			\@dynkinLabelThisRoot{\i}%
 		}%
@@ -495,14 +491,14 @@
 				\setcounter{dynkinRootNo}{0}%	
 			\fi%
 		\fi%
-	}%
+    \fi%
 }%
 
 % Print alternate location labels.
 \newcommand{\dynkinPrintLabelsStar}%
 {%
 	\dynkin@check@if@in@tikZ%
-	\IfStrEq{\dynkin@label@list@star}{}{%
+	\ifx\dynkin@label@list@star\empty\relax%
 		\foreach \i in {1,...,\the\dynkin@nodes}{\dynkinLabelRoot*{\i}{\i}}%
 		\ifdynkin@is@extended%
 			\dynkinLabelRoot*{0}{0}%
@@ -511,8 +507,7 @@
 				\dynkinLabelRoot*{0}{0}%
 			\fi%
 		\fi%
-	}%
-	{%
+	\else%
 		\ifdynkin@is@extended%
 			\setcounter{dynkinRootNo}{-1}%	
 		\else%
@@ -522,8 +517,7 @@
 				\setcounter{dynkinRootNo}{0}%	
 			\fi%
 		\fi%
-		\edef\XXX{\dynkin@label@list@star}%
-		\foreach \i in \XXX%
+		\foreach \i in \dynkin@label@list@star%
 		{%
 			\@dynkinLabelThisRootStar{\i}%
 		}%
@@ -536,23 +530,23 @@
 				\setcounter{dynkinRootNo}{0}%	
 			\fi%
 		\fi%
-	}%
+	\fi%
 }%
 
 %% \dynkinEdgeLabel{<n1>}{<n2>}{<s>}
 %% Prints <s> between root <n1> and <n2> on the current Dynkin diagram in the current root ordering.
 \NewDocumentCommand\dynkinEdgeLabel{mmm}%
 {%
-		\convertRootPair{#1}{#2}%
-		\node[inner sep=\dynkin@root@radius,%
-			label={%
-				[/Dynkin diagram/text style,/Dynkin diagram/edge label]%
-				above:
-				\(\pgfkeys{/Dynkin diagram/label macro*=#3}\)%
-				}%
-			]
-			at ($.5*(\dynkin@root@name \the\@dynkin@from@root)+.5*(\dynkin@root@name \the\@dynkin@to@root)$) 
-			{};
+	\convertRootPair{#1}{#2}%
+	\node[inner sep=\dynkin@root@radius,%
+		label={%
+			[/Dynkin diagram/text style,/Dynkin diagram/edge label]%
+			above:
+			\(\pgfkeys{/Dynkin diagram/label macro*=#3}\)%
+			}%
+		]
+		at ($.5*(\dynkin@root@name \the\@dynkin@from@root)+.5*(\dynkin@root@name \the\@dynkin@to@root)$) 
+		{};
 }%
 
 
@@ -2735,18 +2729,8 @@
 	\ifdynkin@is@upsidedown%
 		\tikzset{yscale=-1}%
 	\fi%
-	\IfStrEq{\dynkin@label@list}{}%
-	{%
-	}%
-	{%
-		\global\dynkin@label@the@rootstrue%
-	}%
-	\IfStrEq{\dynkin@label@list@star}{}%
-	{%
-	}%
-	{%
-		\global\dynkin@label@star@the@rootstrue%
-	}%
+	\ifx\dynkin@label@list\empty\relax\else\global\dynkin@label@the@rootstrue\fi%
+\ifx\dynkin@label@list@star\empty\relax\else\global\dynkin@label@star@the@rootstrue\fi%
 	\xdef\dynkin@user@series{#2}%
 	\xdef\dynkin@twisted@series{#3}%
 	\xdef\dynkin@user@string{#4}%