dynkin-diagrams 18dec18

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

4 files changed, 79 insertions, 46 deletions

diff --git a/Master/texmf-dist/doc/latex/dynkin-diagrams/README b/Master/texmf-dist/doc/latex/dynkin-diagrams/README
index c7eddc99ce4..c636f063a80 100644
--- a/Master/texmf-dist/doc/latex/dynkin-diagrams/README
+++ b/Master/texmf-dist/doc/latex/dynkin-diagrams/README
@@ -2,9 +2,9 @@ ___________________________________
 
             Dynkin diagrams
                
-                v3.141
+                v3.1415
 
-            11 December 2018
+            18 December 2018
 ___________________________________
 
 Authors   : Ben McKay
@@ -16,5 +16,5 @@ Licence   : Released under the LaTeX Project Public License v1.3c or
 ----------------------------------------------------------------------
 
 Draws Dynkin di­a­grams in LaTeX doc­u­ments, us­ing the TikZ pack­age.
-Version 3.141 allows lists of labels and lists of alternate labels (using TikZ for loop notation), improves the vertical alignment when Dynkin diagrams appear in text, provides backwards and upside down options, improves the alignment of text labels around the roots of a Dynkin diagram, and makes the Kac style look more like the style in Kac's book.
+Version 3.1415 allows use of hyphens in option names, so that they can be used as global options to the package.
 
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 5e9a51052cb..aa798bfe73d 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 b0206a9147e..18627906ac4 100644
--- a/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex
+++ b/Master/texmf-dist/doc/latex/dynkin-diagrams/dynkin-diagrams.tex
@@ -1,6 +1,6 @@
 \documentclass{amsart}
 
-\title{The Dynkin diagrams package \\ Version 3.141}
+\title{The Dynkin diagrams package \\ Version 3.1415}
 
 \makeatletter
 \DeclareRobustCommand{\scotsMc}{\scotsMcx{c}}
@@ -20,7 +20,7 @@
 \author{Ben \scotsMc{}Kay}
 \address{School of Mathematical Sciences,  University College Cork, Cork, Ireland}
 \email{b.mckay@ucc.ie}
-\date{11 December 2018}
+\date{18 December 2018}
  
 \usepackage{etex}
 \usepackage[T1]{fontenc}
@@ -162,7 +162,6 @@ before upper={\widowpenalties=3 10000 10000 150}}
 \setlength{\arrayrulewidth}{1.5pt}
 
 \section{Quick introduction}
-See section~\ref{section:changes} for the latest changes to earlier versions.
 \begin{tcolorbox}[title={Load the Dynkin diagram package (see options below)}]
 \begin{verbatim}
 \documentclass{amsart}
@@ -213,21 +212,28 @@ the Dynkin diagram of \(B_3\) is
 
 \begin{tcolorbox}[title={Most options set globally \dots}]
 \begin{verbatim}
-\pgfkeys{/Dynkin diagram,edge length=.5cm,fold radius=.5cm}
+\pgfkeys{/Dynkin diagram,edge length=.5cm,fold radius=.5cm,
+indefinite edge/.style={
+    draw=black,fill=white,thin,densely dashed}}
 \end{verbatim}
 \end{tcolorbox}
+You can also pass options to the package in \verb!\usepackage!.
+\emph{Danger:} spaces in option names are replaced with hyphens: \texttt{edge length=1cm} is \texttt{edge-length=1cm} as a global option; moreover you should drop the extension \verb!/.style! on any option with spaces in its name (but not otherwise). For example,
 \begin{tcolorbox}[title={\dots or pass global options to the package}]
 \begin{verbatim}
 \usepackage[
      ordering=Kac,
      edge/.style=blue,
+	indefinite-edge={draw=green,fill=white,densely dashed},
+	indefinite-edge-ratio=5,
      mark=o,
-     root radius=.06cm]
+     root-radius=.06cm]
      {dynkin-diagrams}
 \end{verbatim}
 \end{tcolorbox}
 
 
+
 \section{Coxeter diagrams}
 
 \begin{tcblisting}{title={Coxeter diagram option}}
@@ -1699,29 +1705,29 @@ are indicated with double edges (like those of an \(F_4\) Dynkin diagram without
 
 \section{Changes in the latest version}\label{section:changes}
 \begin{center}
-\begin{tabular}{@{}>{\ttfamily}r>{\ttfamily}l@{}}
-\textrm{was} & \textrm{is} \\ \midrule
-edgeLength&edge length\\
-radius&root radius\\
-affineMark&affine mark\\
-labelMacro&label macro\\
-makeIndefiniteEdge&make indefinite edge\\
-indefiniteEdgeRatio&indefinite edge ratio\\
-indefiniteEdge&indefinite edge\\
-reverseArrows&reverse arrows\\
-foldLeft&fold left\\
-foldRight&fold right\\
-foldradius&fold radius\\
-foldStyle&fold style\\
-leftFoldStyle&fold left style\\
-rightFoldStyle&fold right style\\
-doubleEdges&double edges\\
-doubleFold&double fold\\
-doubleLeft&double left\\
-doubleLeftFold&double fold left\\
-doubleRight&double right\\
-doubleRightFold&double fold right\\
-arrowColor&arrow color\\\
+\begin{tabular}{@{}>{\ttfamily}r>{\ttfamily}l>{\ttfamily}l@{}}
+\textrm{was} & \textrm{is} & \textrm{or as a global option} \\ \midrule
+edgeLength&edge length&edge-length\\
+radius&root radius&root-radius\\
+affineMark&affine mark&affine-mark\\
+labelMacro&label macro&label-macro\\
+makeIndefiniteEdge&make indefinite edge&make-indefinite-edge\\
+indefiniteEdgeRatio&indefinite edge ratio&indefinite-edge-ratio\\
+indefiniteEdge&indefinite edge&indefinite-edge\\
+reverseArrows&reverse arrows&reverse-arrows\\
+foldLeft&fold left&fold-left\\
+foldRight&fold right&fold-right\\
+foldradius&fold radius&fold-radius\\
+foldStyle&fold style&fold-style\\
+leftFoldStyle&fold left style&fold-left-style\\
+rightFoldStyle&fold right style&fold-right-style\\
+doubleEdges&double edges&double-edges\\
+doubleFold&double fold&double-fold\\
+doubleLeft&double left&double-left\\
+doubleLeftFold&double fold left&double-fold-left\\
+doubleRight&double right&double-right\\
+doubleRightFold&double fold right&double-fold-right\\
+arrowColor&arrow color&arrow-color\\
 \end{tabular}
 \end{center}
 
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 1335db12cc6..64319fb3a37 100644
--- a/Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty
+++ b/Master/texmf-dist/tex/latex/dynkin-diagrams/dynkin-diagrams.sty
@@ -2,7 +2,7 @@
 %
 %                                  The Dynkin Diagrams package.
 %
-%                                            Version 3.141
+%                                            Version 3.1415
 %
 %
 %               This package draws Dynkin diagrams in LaTeX documents, using the TikZ package.
@@ -18,7 +18,7 @@
 %
 %
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{dynkin-diagrams}[2018/11/29 Dynkin diagrams]
+\ProvidesPackage{dynkin-diagrams}[2018/12/18 Dynkin diagrams]
 \RequirePackage{tikz}
 \RequirePackage{xstring}
 \RequirePackage{xparse}
@@ -143,7 +143,7 @@
 		{%
 		\node[inner sep=\dynkin@root@radius,%
 			label={%
-				[/Dynkin diagram/text]%
+				[/Dynkin diagram/text style]%
 				\dynkin@label@direction:%
 				\(\pgfkeys{/Dynkin diagram/label macro*=#3}\)%
 				}%
@@ -153,7 +153,7 @@
 		{%
 		\node[inner sep=\dynkin@root@radius,%
 			label={%
-				[/Dynkin diagram/text]%
+				[/Dynkin diagram/text style]%
 				\dynkin@label@direction:%
 				\(\pgfkeys{/Dynkin diagram/label macro=#3}\)%
 				}%
@@ -222,7 +222,8 @@ decoration=
     	pos=0.5,
 	   	anchor=\IfBooleanTF{#1}{south}{north},
   		yshift=\IfBooleanTF{#1}{1mm}{-1mm},
-    	/Dynkin diagram/text] 
+    	/Dynkin diagram/text style
+] 
 {\IfValueT{#2}{\(#2\)}};%
 }
 
@@ -1689,27 +1690,38 @@ decoration=
 	mark/.estore in = \dynkin@root@mark,
 	mark = *,
 	affine mark/.estore in = \dynkin@affine@root@mark,
-	affine mark = o,
+	affine-mark/.forward to = /Dynkin diagram/affine mark,
+	affine-mark = o,
 	edge length/.estore in = \dynkin@edge@length,
+	edge-length/.forward to=/Dynkin diagram/edge length,
 	edge length = .35cm,
 	edge/.style={draw=black,fill=white,thin},
 	make indefinite edge/.code={\dynkin@set@edge@indefinite@pair{#1}},
+    make-indefinite-edge/.forward to=/Dynkin diagram/make indefinite edge,
 	indefinite edge ratio/.estore in = \dynkin@indefinite@edge@ratio,
+	indefinite-edge-ratio/.forward to = /Dynkin diagram/indefinite edge ratio,
 	indefinite edge ratio = 1.6,
 	indefinite edge/.style={draw=black,fill=white,thin,densely dotted},
+	indefinite-edge/.forward to=/Dynkin diagram/indefinite edge/.style,
 	backwards/.is if = dynkin@is@backwards,
 	backwards = false,
 	upside down/.is if = dynkin@is@upsidedown,
 	upside down = false,
+    upside-down/.forward to = /Dynkin diagram/upside down,
 	arrows/.is if = dynkin@arrows,
 	arrows = true,
 	reverse arrows/.is if = dynkin@reverse@arrows,
 	reverse arrows = false,
+	reverse-arrows/.forward to = /Dynkin diagram/reverse arrows,
 	fold style/.style = {draw=black!40,fill=none,line width=\dynkin@root@radius},
+	fold-style/.forward to=/Dynkin diagram/fold style/.style,
 	fold left style/.style = {},
+	fold-left-style/.forward to=/Dynkin diagram/fold left style/.style,
 	fold right style/.style = {},
+	fold-right-style/.forward to=/Dynkin diagram/fold right style/.style,
 	arrow color/.estore in = \dynkin@arrow@color,
 	arrow color = black,
+	arrow-color/.forward to=/Dynkin diagram/arrow color,
 	double edges/.style = {
 	 	fold style/.style = {
 	 		draw=black,
@@ -1718,6 +1730,7 @@ decoration=
 	 		double distance=\dynkin@root@radius,
 	 		line width=\defaultpgflinewidth}
 	},
+    double-edges/.forward to=/Dynkin diagram/double edges/.style,
 	double fold/.style = {
 	 	fold style/.style = {
 	 		draw=black,
@@ -1726,6 +1739,7 @@ decoration=
 	 		double distance=\dynkin@root@radius,
 	 		line width=\defaultpgflinewidth}
 	},
+    double-fold/.forward to=/Dynkin diagram/double fold/.style,
 	double left/.style = {
 	 	fold left style/.style = {
 	 		draw=black,
@@ -1734,6 +1748,7 @@ decoration=
 	 		double distance=\dynkin@root@radius,
 	 		line width=\defaultpgflinewidth}
 	 	},
+    double-left/.forward to=/Dynkin diagram/double left/.style,
 	double fold left/.style = {
 	 	fold left style/.style = {
 	 		draw=black,
@@ -1742,6 +1757,7 @@ decoration=
 	 		double distance=\dynkin@root@radius,
 	 		line width=\defaultpgflinewidth}
 	 	},
+    double-fold/.forward to=/Dynkin diagram/double fold/.style,
 	double right/.style = {
 	 	fold right style/.style = {
 	 		draw=black,
@@ -1750,6 +1766,7 @@ decoration=
 	 		double distance=\dynkin@root@radius,
 	 		line width=\defaultpgflinewidth}
 	 	},
+    double-right/.forward to=/Dynkin diagram/double right/.style,
 	double fold right/.style = {
 	 	fold right style/.style = {
 	 		draw=black,
@@ -1758,9 +1775,12 @@ decoration=
 	 		double distance=\dynkin@root@radius,
 	 		line width=\defaultpgflinewidth}
 	 	},
+    double-fold-right/.forward to=/Dynkin diagram/double fold right/.style,
 	root radius/.estore in = \dynkin@root@radius,
+    root-radius/.forward to=/Dynkin diagram/root radius,
 	root radius=.05cm,
 	fold radius/.estore in = \dynkin@fold@radius,
+    fold-radius/.forward to=/Dynkin diagram/fold radius,
 	fold radius=.3cm,
 	*/.style = {
 		draw=black,
@@ -1792,14 +1812,18 @@ decoration=
 	Coxeter=false,
 	ordering/.store in = \dynkin@ordering,
 	ordering = Bourbaki,
-    text/.style={scale=.7},
+    text style/.style={scale=.7},
+    text-style/.forward to=/Dynkin diagram/text style/.style,
 	label macro/.code = {\regurgitate{#1}},
+    label-macro/.forward to=/Dynkin diagram/label macro,
 	label macro*/.code = {\regurgitate{#1}},
+    label-macro*/.forward to=/Dynkin diagram/label macro*,
  	labels/.store in = \dynkin@label@list,
  	labels*/.store in = \dynkin@label@list@star,
 	odd/.is if = dynkin@odd,
 	odd=false,
 	Kac arrows/.is if = dynkin@Kac@arrows,
+	Kac-arrows/.forward to = /Dynkin diagram/Kac arrows,
 	Kac arrows=false,
 	Kac/.style={
 		Kac arrows=true,
@@ -1828,13 +1852,16 @@ decoration=
 	twisted/.is if = dynkin@is@twisted,
 	twisted = false,
 	twisted series/.estore in = \dynkin@twisted@series,
+	twisted-series/.forward to = /Dynkin diagram/twisted series,
 	twisted series = 0,
 	ply/.estore in = \dynkin@ply@value,
 	ply = 1,
 	fold/.style = {ply=2},
 	fold left/.is if = dynkin@left@fold,
+	fold-left/.forward to = /Dynkin diagram/fold left,
 	fold left = false,
 	fold right/.is if = dynkin@right@fold,
+	fold-right/.forward to = /Dynkin diagram/fold right,
 	fold right = false,
   	},
 	.search also={/tikz},
@@ -3136,7 +3163,7 @@ decoration=
 		\ifdynkin@Coxeter
 			\Adynkin
 			\convertRootPair{\the\drmo}{\the\dynkin@rank}
-			\node[/Dynkin diagram/text,above] 
+			\node[/Dynkin diagram/text style,above] 
 			at ($.5*(\dynkin@root@name \the\@fromRoot)+.5*(\dynkin@root@name \the\@toRoot)$) 
 			{\(4\)};
 		\else
@@ -3619,7 +3646,7 @@ decoration=
 		\dynkinEdge*{SingleEdge}{2}{3}
 		\dynkinEdge*{SingleEdge}{3}{4}
 		\convertRootPair{2}{3}	
-		\node[/Dynkin diagram/text,above] 
+		\node[/Dynkin diagram/text style,above] 
 			at ($.5*(\dynkin@root@name \the\@fromRoot)+.5*(\dynkin@root@name \the\@toRoot)$) 
 			{\(4\)};
 	\else
@@ -3658,7 +3685,7 @@ decoration=
 {%
 	\Adynkin%
 	\convertRootPair{1}{2}%
-	\node[/Dynkin diagram/text,above] at ($.5*(\dynkin@root@name \the\@fromRoot)+.5*(\dynkin@root@name \the\@toRoot)$) {\(5\)};%
+	\node[/Dynkin diagram/text style,above] at ($.5*(\dynkin@root@name \the\@fromRoot)+.5*(\dynkin@root@name \the\@toRoot)$) {\(5\)};%
 }%
 
 %% \Idynkin 
@@ -3670,7 +3697,7 @@ decoration=
 	\dynkin@rank=2%
 	\Adynkin%
 	\convertRootPair{1}{2}%
-	\node[/Dynkin diagram/text,above] at ($.5*(\dynkin@root@name \the\@fromRoot)+.5*(\dynkin@root@name \the\@toRoot)$) {\(\dynkin@gonality\)};%
+	\node[/Dynkin diagram/text style,above] at ($.5*(\dynkin@root@name \the\@fromRoot)+.5*(\dynkin@root@name \the\@toRoot)$) {\(\dynkin@gonality\)};%
 }%
 
 %% \extendedAdynkin
@@ -3793,7 +3820,7 @@ decoration=
 				\ifdynkin@Coxeter%
 					\dynkinEdge*{SingleEdge}{\the\drmo}{\the\dynkin@rank}%
 					\convertRootPair{\the\drmo}{\the\dynkin@rank}
-					\node[/Dynkin diagram/text,above] at 
+					\node[/Dynkin diagram/text style,above] at 
 						($.5*(\dynkin@root@name \the\@fromRoot)+.5*(\dynkin@root@name \the\@toRoot)$) {\(4\)};
 				\else%
 					\ifnum\dynkin@ply<3%
@@ -3817,7 +3844,7 @@ decoration=
 	\ifdynkin@Coxeter%
 		\dynkinEdge*{SingleEdge}{0}{1}%
 		\convertRootPair{0}{1}
-		\node[/Dynkin diagram/text,above] at 
+		\node[/Dynkin diagram/text style,above] at 
 			($.5*(\dynkin@root@name \the\@fromRoot)+.5*(\dynkin@root@name \the\@toRoot)$) {\(4\)};
 	\else%
 		\dynkinEdge*{DoubleEdge}{0}{1}%
@@ -4010,7 +4037,7 @@ decoration=
 	\else%
 		\convertRootPair{0}{1}%
 	\fi%
-	\node[/Dynkin diagram/text,above] 
+	\node[/Dynkin diagram/text style,above] 
 		at 
 		($.5*(\dynkin@root@name \the\@fromRoot)+.5*(\dynkin@root@name \the\@toRoot)$) 
 		{\(5\)};%
@@ -4027,7 +4054,7 @@ decoration=
 	\Adynkin%
 	\dynkinEdge*{SingleEdge}{0}{1}%
 	\convertRootPair{0}{1}%
-	\node[/Dynkin diagram/text,above] 
+	\node[/Dynkin diagram/text style,above] 
 		at 
 		($.5*(\dynkin@root@name \the\@fromRoot)+.5*(\dynkin@root@name \the\@toRoot)$) 
 		{\(\infty\)};%