From de9ecc6157f09a370c1af4c9484d314c27247c6f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Jan 2019 21:39:46 +0000 Subject: dynkin-diagrams (21jan19) git-svn-id: svn://tug.org/texlive/trunk@49782 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/dynkin-diagrams/dynkin-diagrams.sty | 197 ++++++++++++--------- 1 file changed, 111 insertions(+), 86 deletions(-) (limited to 'Master/texmf-dist/tex/latex/dynkin-diagrams') 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 64319fb3a37..7e2cf00bca0 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.1415 +% Version 3.14159 % % % 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/12/18 Dynkin diagrams] +\ProvidesPackage{dynkin-diagrams}[2019/1/21 Dynkin diagrams] \RequirePackage{tikz} \RequirePackage{xstring} \RequirePackage{xparse} @@ -37,7 +37,8 @@ decorations.pathreplacing, decorations.pathmorphing, fit, - patterns} + patterns, + shadows} %%% %%% Application programming interface: @@ -385,11 +386,11 @@ decoration= \RootNumber=#3% }% \fill[/Dynkin diagram,o,#2] (\dynkin@root@name \the\RootNumber) circle ({\dynkin@root@radius});% - \draw[/Dynkin diagram,edge,#2]% + \draw[/Dynkin diagram,t,#2]% ($(\dynkin@root@name \the\RootNumber)+({\dynkin@root@radius/sqrt(2)},{\dynkin@root@radius/sqrt(2)})$)% --% ($(\dynkin@root@name \the\RootNumber)-({\dynkin@root@radius/sqrt(2)},{\dynkin@root@radius/sqrt(2)})$);% - \draw[/Dynkin diagram,edge,#2]% + \draw[/Dynkin diagram,t,#2]% ($(\dynkin@root@name \the\RootNumber)+({-\dynkin@root@radius/sqrt(2)},{\dynkin@root@radius/sqrt(2)})$)% --% ($(\dynkin@root@name \the\RootNumber)+({\dynkin@root@radius/sqrt(2)},{-\dynkin@root@radius/sqrt(2)})$);% @@ -532,10 +533,9 @@ decoration= \@fromRoot=#3% \@toRoot=#4% }% - \convertRootPair{\@fromRoot}{\@toRoot}% +% \convertRootPair{\@fromRoot}{\@toRoot}% \begin{scope}[on background layer] - \draw[/Dynkin diagram/fold style,#2,%/Dynkin diagram/fold left style - ] + \draw[/Dynkin diagram/fold style,#2] ($(\dynkin@root@name \the\@fromRoot)$) to ($(\dynkin@root@name \the\@toRoot)$); @@ -560,7 +560,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (90:0:\dynkin@fold@radius) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (90:0:\dynkin@fold@radius);% \end{scope}% }% @@ -610,9 +610,9 @@ decoration= \@toRoot=#4% }% \begin{scope}[on background layer]% - \draw[/Dynkin diagram,edge,fill=none,#2] - ($(\dynkin@root@name \the\@fromRoot)$) - arc (-90:0:\dynkin@fold@radius) -- ($(\dynkin@root@name \the\@toRoot)$);% + \draw[/Dynkin diagram,edge,fill=none,#2]% + ($(\dynkin@root@name \the\@fromRoot)$)% + arc (-90:0:\dynkin@fold@radius);% \end{scope}% }% @@ -643,7 +643,7 @@ decoration= \draw[/Dynkin diagram,edge,fill=none,#2] (center) ++(-30:\dynkin@fold@radius) - arc [start angle=-30, end angle=0, radius=\dynkin@fold@radius] -- ($(\dynkin@root@name \the\@toRoot)$);% + arc [start angle=-30, end angle=0, radius=\dynkin@fold@radius];% \end{scope}% }% @@ -665,7 +665,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (90:180:\dynkin@fold@radius) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (90:180:\dynkin@fold@radius);% \end{scope}% }% @@ -696,7 +696,7 @@ decoration= \draw[/Dynkin diagram,edge,fill=none,#2] (center) ++(150:\dynkin@fold@radius) - arc [start angle=150, end angle=180, radius=\dynkin@fold@radius] -- ($(\dynkin@root@name \the\@toRoot)$);% + arc [start angle=150, end angle=180, radius=\dynkin@fold@radius];% \end{scope}% }% @@ -717,7 +717,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,fill=none,#2] ($(\dynkin@root@name \the\@fromRoot)$) - arc (-90:-180:\dynkin@fold@radius) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (-90:-180:\dynkin@fold@radius);% \end{scope}% }% @@ -748,7 +748,7 @@ decoration= \draw[/Dynkin diagram,edge,fill=none,#2] (center) ++(-150:\dynkin@fold@radius) - arc [start angle=-150, end angle=-180, radius=\dynkin@fold@radius] -- ($(\dynkin@root@name \the\@toRoot)$);% + arc [start angle=-150, end angle=-180, radius=\dynkin@fold@radius];% \end{scope}% }% @@ -770,8 +770,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,fill=none,#2] ($(\dynkin@root@name \the\@fromRoot)$) - arc (90:-90:\dynkin@fold@radius) - -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (90:-90:\dynkin@fold@radius);% \end{scope}% }% @@ -801,8 +800,8 @@ decoration= arc [start angle=30, end angle=-30, radius=\dynkin@fold@radius];% \draw[/Dynkin diagram,edge,fill=none,#2] (center) - ++(-30:\dynkin@fold@radius) - arc [start angle=-30, end angle=-90, radius=\dynkin@fold@radius] -- ($(\dynkin@root@name \the\@toRoot)$);% + ++(-90:\dynkin@fold@radius) + arc [start angle=-90, end angle=-30, radius=\dynkin@fold@radius]; \end{scope}% }% @@ -824,7 +823,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,double,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (90:0:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (90:0:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[-{Computer Modern Rightarrow[\dynkin@arrow@color]}, @@ -860,7 +859,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,double,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (180:90:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (180:90:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[/Dynkin diagram,edge, @@ -898,7 +897,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,double,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (0:90:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (0:90:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[-{Computer Modern Rightarrow[\dynkin@arrow@color]}, @@ -938,7 +937,7 @@ decoration= ($(\dynkin@root@name \the\@fromRoot)$)% -- ($(\dynkin@root@name \the\@toRoot)+(-\dynkin@fold@radius,\dynkin@fold@radius)$)% - arc (-180:-90:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (-180:-90:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[-{Computer Modern Rightarrow[\dynkin@arrow@color]}, @@ -974,7 +973,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,double,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (270:360:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (270:360:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[-{Computer Modern Rightarrow[\dynkin@arrow@color]}, @@ -1009,7 +1008,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,double,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (90:180:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (90:180:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[-{Computer Modern Rightarrow[\dynkin@arrow@color]}, @@ -1046,7 +1045,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,double,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (360:270:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (360:270:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[ @@ -1085,7 +1084,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,double,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (-90:-180:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (-90:-180:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[-{Computer Modern Rightarrow[\dynkin@arrow@color]}, @@ -1122,7 +1121,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,double,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (90:-90:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (90:-90:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[ @@ -1162,10 +1161,10 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,double,double distance=\dynkin@root@radius,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (90:-90:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (90:-90:{\dynkin@fold@radius});% \draw[/Dynkin diagram,edge,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (90:-90:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (90:-90:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[ @@ -1205,7 +1204,7 @@ decoration= \begin{scope}[on background layer]% \draw[/Dynkin diagram,edge,double,fill=none,#2]% ($(\dynkin@root@name \the\@fromRoot)$)% - arc (-90:90:{\dynkin@fold@radius}) -- ($(\dynkin@root@name \the\@toRoot)$);% + arc (-90:90:{\dynkin@fold@radius});% \ifdynkin@arrows% \ifdynkin@reverse@arrows% \path[ @@ -1695,13 +1694,13 @@ decoration= 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}, + edge/.style={solid,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/.style={solid,draw=black,fill=white,thin,densely dotted}, indefinite-edge/.forward to=/Dynkin diagram/indefinite edge/.style, backwards/.is if = dynkin@is@backwards, backwards = false, @@ -1713,7 +1712,7 @@ decoration= 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/.style = {solid,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, @@ -1783,27 +1782,33 @@ decoration= fold-radius/.forward to=/Dynkin diagram/fold radius, fold radius=.3cm, */.style = { + solid, draw=black, fill=black, }, O/.style = { + solid, draw=black, fill=white, }, X/.style = { + solid, draw=black, very thick, line cap=round }, o/.style = { + solid, draw=black, fill=white, }, t/.style = { + solid, draw=black, fill=white, }, x/.style = { + solid, thick, draw=black, line cap=round @@ -1831,39 +1836,75 @@ decoration= root radius=.05cm, edge length=.66cm, indefinite edge ratio = 3, - edge/.style={draw=black,fill=white,thin,shorten <=1mm,shorten >=1mm}, - fold style/.style = {draw=black!40,fill=none,line width=\dynkin@root@radius,shorten <=1mm,shorten >=1mm}, + edge/.style={solid,draw=black,fill=white,thin,shorten <=1mm,shorten >=1mm}, + fold style/.style = {solid,draw=black!40,fill=none,line width=\dynkin@root@radius,shorten <=1mm,shorten >=1mm}, mark=o, - indefinite edge/.style={draw=black,fill=none,thin,loosely dotted}, + indefinite edge/.style={solid,draw=black,fill=none,thin,loosely dotted}, + }, + ceref/.style={ + edge/.style={ + solid, + draw=black, + fill=white, + thin, + copy shadow={draw=black,fill=white,thin,shadow xshift=.2pt, shadow yshift=-.3pt}, + }, + */.style={ + yscale=1.2, + solid, + draw=black, + fill=gray, + copy shadow={fill=black,shadow xshift=0.2pt, shadow yshift=-0.3pt}, + }, + o/.style={ + yscale=1.2, + solid, + draw=black, + fill=white, + copy shadow={fill=black,shadow xshift=0.2pt, shadow yshift=-0.3pt}, + }, + O/.style={ + yscale=1.2, + solid, + draw=black, + fill=white, + copy shadow={fill=black,shadow xshift=0.2pt, shadow yshift=-0.3pt}, + }, + t/.style={ + yscale=1.2, + solid, + draw=black, + fill=white, + }, }, - default/.style = { - label/.is if = dynkin@label@the@roots, - label = false, - labels = {}, - labels* = {}, - at/.estore in = \dynkin@current@location, - at = {(0,0)}, - parabolic/.estore in = \dynkin@parabolic, - parabolic = 0, - gonality/.estore in = \dynkin@gonality, - gonality = 0, - extended/.is if = dynkin@is@extended, - extended = false, - 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, - }, + default/.style = { + label/.is if = dynkin@label@the@roots, + label = false, + labels = {}, + labels* = {}, + at/.estore in = \dynkin@current@location, + at = {(0,0)}, + parabolic/.estore in = \dynkin@parabolic, + parabolic = 0, + gonality/.estore in = \dynkin@gonality, + gonality = 0, + extended/.is if = dynkin@is@extended, + extended = false, + 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}, } @@ -3406,12 +3447,8 @@ decoration= \ifdynkin@right@fold% \dynkinPlaceRootHere*{1}{below left}{above right}% \dynkinPlaceRootRelativeTo*{3}{1}{east}{below left}{above right}% - \xdef\old@edge@length{\dynkin@edge@length}% - \pgfmathparse{1.5*\dynkin@edge@length}% - \xdef\dynkin@edge@length{\pgfmathresult pt}% \dynkinPlaceRootRelativeTo*{2}{3}{north}{below left}{above right}% \dynkinPlaceRootRelativeTo*{4}{3}{south}{below}{above right}% - \xdef\dynkin@edge@length{\old@edge@length}% \edef\old@fold@radius{\dynkin@fold@radius}% \xdef\dynkin@fold@radius{\dynkin@edge@length}% \dynkinEdge*{SingleEdge}{1}{3}% @@ -3556,14 +3593,11 @@ decoration= \NewDocumentCommand\ESixThreePly{}% {% \dynkin@is@extendedtrue - \node (Dynkin current) at ($(Dynkin current)+(0,1.5*\dynkin@edge@length)$){};% + \node (Dynkin current) at ($(Dynkin current)+(0,%1.5* + \dynkin@edge@length)$){};% \dynkinPlaceRootHere*{3}{below left}{above}% - \edef\old@edge@length{\dynkin@edge@length}% - \pgfmathparse{1.5*\dynkin@edge@length}% - \xdef\dynkin@edge@length{\pgfmathresult pt}% \dynkinPlaceRootRelativeTo*{2}{3}{south}{below left}{above right}% \dynkinPlaceRootRelativeTo*{5}{2}{south}{below}{above right}% - \xdef\dynkin@edge@length{\old@edge@length}% \dynkinPlaceRootRelativeTo*{1}{3}{west}{below left}{above right}% \dynkinPlaceRootRelativeTo*{0}{2}{west}{below left}{above right}% \dynkinPlaceRootRelativeTo*{6}{5}{west}{below}{above right}% @@ -3709,7 +3743,7 @@ decoration= \dynkinPlaceRootRelativeTo*{1}{0}{east}{below}{above}% \convertRootNumber{1}% \begin{scope}{on background layer}% - \draw[/Dynkin diagram/edge,double, + \draw[/Dynkin diagram/t,double, {Classical TikZ Rightarrow[length={2*\dynkin@root@radius}]}% -{Classical TikZ Rightarrow[length={2*\dynkin@root@radius}]}% ]% @@ -3858,12 +3892,9 @@ decoration= \dynkin@hop{2.25}% \dynkinPlaceRootHere*{0}{right}{left}% \edef\old@edge@length{\dynkin@edge@length}% - \pgfmathparse{1.5*\dynkin@edge@length}% - \xdef\dynkin@edge@length{\pgfmathresult pt}% \dynkinPlaceRootRelativeTo*{1}{0}{south}{right}{left}% \dynkinPlaceRootRelativeTo*{3}{1}{south}{right}{left}% \dynkinPlaceRootRelativeTo*{4}{3}{south}{right}{left}% - \xdef\dynkin@edge@length{\old@edge@length}% \convertRootPair{0}{4}% \node (Dynkin current) @@ -3919,12 +3950,8 @@ decoration= \dynkinPlaceRootHere*{0}{below}{above}% \dynkinPlaceRootRelativeTo*{1}{0}{east}{below left}{above right}% \dynkinPlaceRootRelativeTo*{3}{1}{east}{below left}{above right}% - \edef\old@edge@length{\dynkin@edge@length}% - \pgfmathparse{1.5*\dynkin@edge@length}% - \xdef\dynkin@edge@length{\pgfmathresult pt}% \dynkinPlaceRootRelativeTo*{2}{3}{north}{below left}{above right}% \dynkinPlaceRootRelativeTo*{4}{3}{south}{below}{above right}% - \xdef\dynkin@edge@length{\old@edge@length}% \dynkinEdge*{SingleEdge}{1}{3}% \edef\old@fold@radius{\dynkin@fold@radius}% \xdef\dynkin@fold@radius{\dynkin@edge@length}% @@ -4077,9 +4104,7 @@ decoration= \hmo=\the\dynkin@nodes% \advance\hmo by -1% \ifodd\dynkin@rank% -\typeout{!!! odd dynkin rank} \ifnum\dynkin@ply>1% -\typeout{!!! ply more than 1} \dynkinPlaceRootHere*{2}{below right}{above right}% \dynkinPlaceRootRelativeTo*{0}{2}{northwestfold}{left}{above left}% \dynkinPlaceRootRelativeTo*{1}{2}{southwestfold}{left}{above left}% -- cgit v1.2.3