summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-23 23:05:18 +0000
committerKarl Berry <karl@freefriends.org>2016-12-23 23:05:18 +0000
commit53a12757d6cc681bfd39c6bb93db49b2c21ee97b (patch)
treecee0781c5fba02968d70118b1da22b7cc71b0870
parentddd286f02bd5b5cb542c2315e1d4a6dcf0476f75 (diff)
smartdiagram (23dec16)
git-svn-id: svn://tug.org/texlive/trunk@42781 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/smartdiagram/smartdiagram.pdfbin265835 -> 267814 bytes
-rw-r--r--Master/texmf-dist/source/latex/smartdiagram/smartdiagram.dtx111
-rw-r--r--Master/texmf-dist/tex/latex/smartdiagram/smartdiagram.sty2
-rw-r--r--Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.commands.code.tex14
-rw-r--r--Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.definitions.code.tex66
-rw-r--r--Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.styles.code.tex24
6 files changed, 109 insertions, 108 deletions
diff --git a/Master/texmf-dist/doc/latex/smartdiagram/smartdiagram.pdf b/Master/texmf-dist/doc/latex/smartdiagram/smartdiagram.pdf
index 720a1a66209..2c8b23c98f0 100644
--- a/Master/texmf-dist/doc/latex/smartdiagram/smartdiagram.pdf
+++ b/Master/texmf-dist/doc/latex/smartdiagram/smartdiagram.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/smartdiagram/smartdiagram.dtx b/Master/texmf-dist/source/latex/smartdiagram/smartdiagram.dtx
index fe305caac24..27ee87ff150 100644
--- a/Master/texmf-dist/source/latex/smartdiagram/smartdiagram.dtx
+++ b/Master/texmf-dist/source/latex/smartdiagram/smartdiagram.dtx
@@ -105,7 +105,7 @@ and the derived files smartdiagram.ins,
%</internal>
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{smartdiagram}[2013/04/19 v0.3a Automatic creation of smart diagrams from lists of items.]
+\ProvidesPackage{smartdiagram}[2016/12/23 v0.3b Automatic creation of smart diagrams from lists of items.]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -162,6 +162,7 @@ and the derived files smartdiagram.ins,
% added initial null space to items to hypenate first word,libraries, additions, arrows styles
% }
% \changes{v0.3a}{2013/04/19}{Fix bug in circular diagram animated: last arrow appearence, added key "back arrow distance"}
+% \changes{v0.3b}{2016/12/23}{Fix bug uniform color list}
%
% \GetFileInfo{smartdiagram.sty}
% \title{The \textsf{smartdiagram} package\thanks{This document
@@ -171,7 +172,7 @@ and the derived files smartdiagram.ins,
% \maketitle
% \begin{abstract}
% This package provides a way to easily draw diagrams in documents and presentations from a list of items thanks to Ti\textit{k}Z.
-% The idea cames out from \href{http://tex.stackexchange.com/questions/78310/powerpoints-smart-art-for-tikz}{this question} on \href{http://tex.stackexchange.com}{TeX.StackExchange}.
+% The idea originated from \href{http://tex.stackexchange.com/questions/78310/powerpoints-smart-art-for-tikz}{this question} on \href{http://tex.stackexchange.com}{TeX.StackExchange}.
%
% \end{abstract}
%
@@ -1089,7 +1090,7 @@ and the derived files smartdiagram.ins,
% \section{Aknowledgements}
% I would like to acknowledge first of all \href{http://tex.stackexchange.com/users/3144/alain-matthes}{Alain Matthes} and \href{http://tex.stackexchange.com/users/4956/mohsen}{Mohsen} because the \diagram{bubble diagram} and the \diagram{constellation diagram} are based on \href{http://tex.stackexchange.com/questions/52394/high-level-macros-and-environments-based-on-tikz?#52408}{Alain's answer} while the \diagram{circular diagram} is based on \href{http://tex.stackexchange.com/questions/52394/high-level-macros-and-environments-based-on-tikz?#52972}{Mohsen's answer}.
%
-% I would also like to thank \href{http://tex.stackexchange.com/users/4427/egreg}{Enrico Gregorio} and \href{http://tex.stackexchange.com/users/994/ahmed-musa}{Ahmed Musa} for the courtesy of explaining me why my poor attempt in creating the \smkey{set color list} failed and for providing me valid solutions.
+% I would also like to thank \href{http://tex.stackexchange.com/users/4427/egreg}{Enrico Gregorio} and \href{http://tex.stackexchange.com/users/994/ahmed-musa}{Ahmed Musa} for the courtesy of explaining me why my poor attempt in creating the \smkey{set color list} failed and for providing me valid solutions. Enrico also kindly fixed a spacing bug concerning the \smkey{uniform color list}.
%
% Last, but not least, I would like to thank prof.~Ludger~Humbert for suggesting and providing the code for the \diagram{circular diagram:clockwise} as well as for pointing out some bugs in the version 0.3 and André Hilbig for suggesting the key \smkey{back arrow disabled}.
% \StopEventually{\PrintChanges}
@@ -1308,31 +1309,31 @@ and the derived files smartdiagram.ins,
% \end{macrocode}
% The specific key to set the list of colors:
% \begin{macrocode}
-\pgfkeys{/smart diagram/.cd, set color list/.code={
- \foreach \listitem [count=\i] in {#1}{
- \global\@namedef{color@\i\expandafter}\expandafter{\listitem}
- }
- }
+\pgfkeys{/smart diagram/.cd, set color list/.code={%
+ \foreach \listitem [count=\i] in {#1}{%
+ \global\@namedef{color@\i\expandafter}\expandafter{\listitem}%
+ }%
+ }%
}
-\pgfkeys{/smart diagram/.cd, uniform color list/.code args={#1 for #2 items}{
- \foreach \listitem [count=\i] in {1,...,#2}{
- \global\@namedef{color@\i\expandafter}\expandafter{#1}
- }
- }
+\pgfkeys{/smart diagram/.cd, uniform color list/.code args={#1 for #2 items}{%
+ \foreach \listitem [count=\i] in {1,...,#2}{%
+ \global\@namedef{color@\i\expandafter}\expandafter{#1}%
+ }%
+ }%
}
-\pgfkeys{/smart diagram/.cd, use predefined color list/.code={
- \@namedef{color@1}{red!30}
- \@namedef{color@2}{cyan!30}
- \@namedef{color@3}{blue!30}
- \@namedef{color@4}{green!30}
- \@namedef{color@5}{orange!30}
- \@namedef{color@6}{yellow!30}
- \@namedef{color@7}{magenta!30}
- \@namedef{color@8}{brown!30}
- \@namedef{color@9}{violet!30}
- \@namedef{color@10}{teal!30}
+\pgfkeys{/smart diagram/.cd, use predefined color list/.code={%
+ \@namedef{color@1}{red!30}%
+ \@namedef{color@2}{cyan!30}%
+ \@namedef{color@3}{blue!30}%
+ \@namedef{color@4}{green!30}%
+ \@namedef{color@5}{orange!30}%
+ \@namedef{color@6}{yellow!30}%
+ \@namedef{color@7}{magenta!30}%
+ \@namedef{color@8}{brown!30}%
+ \@namedef{color@9}{violet!30}%
+ \@namedef{color@10}{teal!30}%
}
}
% \end{macrocode}
@@ -1425,13 +1426,13 @@ and the derived files smartdiagram.ins,
\pgfkeys{/smart diagram/.cd,%
uniform sequence color/.is choice,%
uniform sequence color/true/.code={%
- \tikzset{sequence item/.append style={
+ \tikzset{sequence item/.append style={%
fill=\sm@core@seqitemuniformcol,
- },
- }
+ },%
+ }%
},%
uniform sequence color/false/.style={sequence item},%
- uniform sequence color/.default=false,
+ uniform sequence color/.default=false,%
}%
% \end{macrocode}
% Key to let the connection planet satellite color be uniform:
@@ -1439,13 +1440,13 @@ and the derived files smartdiagram.ins,
\pgfkeys{/smart diagram/.cd,%
uniform connection color/.is choice,%
uniform connection color/true/.code={%
- \tikzset{connection planet satellite/.append style={
+ \tikzset{connection planet satellite/.append style={%
\sm@core@connectioncolor
- },
- }
+ },%
+ }%
},%
uniform connection color/false/.style={connection planet satellite},%
- uniform connection color/.default=false,
+ uniform connection color/.default=false,%
}%
% \end{macrocode}
% Key to let the arrow color be uniform:
@@ -1453,13 +1454,13 @@ and the derived files smartdiagram.ins,
\pgfkeys{/smart diagram/.cd,%
uniform arrow color/.is choice,%
uniform arrow color/true/.code={%
- \tikzset{diagram arrow type/.append style={
+ \tikzset{diagram arrow type/.append style={%
\sm@core@arrowcolor
- },
- }
+ },%
+ }%
},%
uniform arrow color/false/.style={diagram arrow type},%
- uniform arrow color/.default=false,
+ uniform arrow color/.default=false,%
}%
% \end{macrocode}
@@ -1482,7 +1483,7 @@ and the derived files smartdiagram.ins,
}
}
-\tikzset{module/.style={
+\tikzset{module/.style={%
\pgfkeysvalueof{/smart diagram/module shape},
thick,
draw=\sm@core@bordercolor,
@@ -1495,14 +1496,14 @@ and the derived files smartdiagram.ins,
font=\sm@core@modulefontsize,
\sm@core@borderdecoration
},
- diagram arrow type/.style={
+ diagram arrow type/.style={%
\sm@core@arrowstyle,
>=\sm@core@arrowtip,
line width=\sm@core@arrowlinewidth,
\col
- },
+ },%
}
-\tikzset{description title/.style={
+\tikzset{description title/.style={%
circle,
draw=\sm@core@bordercolor,
minimum width=\sm@core@descriptiontitlewidth,
@@ -1513,7 +1514,7 @@ and the derived files smartdiagram.ins,
text width=\sm@core@descriptiontitletextwidth,
\sm@core@borderdecoration,
},
- description/.style={
+ description/.style={%
\pgfkeysvalueof{/smart diagram/module shape},
text width=\sm@core@descriptiontextwidth,
draw=\sm@core@bordercolor,
@@ -1524,7 +1525,7 @@ and the derived files smartdiagram.ins,
top color=white!80!\col,
font=\sm@core@descriptionfontsize,
\sm@core@borderdecoration,
- }
+ }%
}
\tikzset{priority arrow/.style={
draw=\sm@core@bordercolor,
@@ -1600,22 +1601,22 @@ and the derived files smartdiagram.ins,
}
}
% let the first word of the item be hypenate
-\tikzset{let hypenation/.style={
+\tikzset{let hypenation/.style={%
execute at begin node={%
\hspace{0pt}%
- }
- }
+ }%
+ }%
}%
% \end{macrocode}
% The definition of the visibility style:
% \begin{macrocode}
-\tikzset{
+\tikzset{%
sminvisible/.style={opacity=0,text opacity=0},
smvisible on/.style={smalt=#1{}{sminvisible}},
smalt/.code args={<#1>#2#3}{%
\alt<#1>{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}
- },
-}
+ },%
+}%
% \end{macrocode}
% \iffalse
%</styles>
@@ -1718,20 +1719,20 @@ and the derived files smartdiagram.ins,
\else
\ifnum\xi=\maxsmitem
\IfStrEq{\option}{horizontal}{% true-horizontal-flow diagram
- \tikzset{square arrow/.style={
+ \tikzset{square arrow/.style={%
to path={-- ++(0,\sm@core@backarrowdistance) -| (\tikztotarget)}
- }
- }
+ }%
+ }%
\draw[diagram arrow type, square arrow]
(module\xj.north) to (module\xi.north);
}{% false-horizontal-flow diagram
- \tikzset{square arrow/.style={
+ \tikzset{square arrow/.style={%
to path={-- ++(\sm@core@backarrowdistance,0) |- (\tikztotarget)}
- }
- }
+ }%
+ }%
\draw[diagram arrow type,square arrow]
(module\xj.east) to (module\xi);
- }
+ }%
\fi
\fi
}%
diff --git a/Master/texmf-dist/tex/latex/smartdiagram/smartdiagram.sty b/Master/texmf-dist/tex/latex/smartdiagram/smartdiagram.sty
index e0daf834524..c2068ab502e 100644
--- a/Master/texmf-dist/tex/latex/smartdiagram/smartdiagram.sty
+++ b/Master/texmf-dist/tex/latex/smartdiagram/smartdiagram.sty
@@ -15,7 +15,7 @@
%% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{smartdiagram}[2013/04/19 v0.3a Automatic creation of smart diagrams from lists of items.]
+\ProvidesPackage{smartdiagram}[2016/12/23 v0.3b Automatic creation of smart diagrams from lists of items.]
\RequirePackage{tikz}
diff --git a/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.commands.code.tex b/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.commands.code.tex
index e894a127687..7956a085216 100644
--- a/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.commands.code.tex
+++ b/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.commands.code.tex
@@ -106,20 +106,20 @@
\else
\ifnum\xi=\maxsmitem
\IfStrEq{\option}{horizontal}{% true-horizontal-flow diagram
- \tikzset{square arrow/.style={
+ \tikzset{square arrow/.style={%
to path={-- ++(0,\sm@core@backarrowdistance) -| (\tikztotarget)}
- }
- }
+ }%
+ }%
\draw[diagram arrow type, square arrow]
(module\xj.north) to (module\xi.north);
}{% false-horizontal-flow diagram
- \tikzset{square arrow/.style={
+ \tikzset{square arrow/.style={%
to path={-- ++(\sm@core@backarrowdistance,0) |- (\tikztotarget)}
- }
- }
+ }%
+ }%
\draw[diagram arrow type,square arrow]
(module\xj.east) to (module\xi);
- }
+ }%
\fi
\fi
}%
diff --git a/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.definitions.code.tex b/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.definitions.code.tex
index 0b108b23ced..7522561a3b5 100644
--- a/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.definitions.code.tex
+++ b/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.definitions.code.tex
@@ -158,31 +158,31 @@
text color/.get=\sm@core@textcolor,
back arrow distance/.get=\sm@core@backarrowdistance,
}%
-\pgfkeys{/smart diagram/.cd, set color list/.code={
- \foreach \listitem [count=\i] in {#1}{
- \global\@namedef{color@\i\expandafter}\expandafter{\listitem}
- }
- }
+\pgfkeys{/smart diagram/.cd, set color list/.code={%
+ \foreach \listitem [count=\i] in {#1}{%
+ \global\@namedef{color@\i\expandafter}\expandafter{\listitem}%
+ }%
+ }%
}
-\pgfkeys{/smart diagram/.cd, uniform color list/.code args={#1 for #2 items}{
- \foreach \listitem [count=\i] in {1,...,#2}{
- \global\@namedef{color@\i\expandafter}\expandafter{#1}
- }
- }
+\pgfkeys{/smart diagram/.cd, uniform color list/.code args={#1 for #2 items}{%
+ \foreach \listitem [count=\i] in {1,...,#2}{%
+ \global\@namedef{color@\i\expandafter}\expandafter{#1}%
+ }%
+ }%
}
-\pgfkeys{/smart diagram/.cd, use predefined color list/.code={
- \@namedef{color@1}{red!30}
- \@namedef{color@2}{cyan!30}
- \@namedef{color@3}{blue!30}
- \@namedef{color@4}{green!30}
- \@namedef{color@5}{orange!30}
- \@namedef{color@6}{yellow!30}
- \@namedef{color@7}{magenta!30}
- \@namedef{color@8}{brown!30}
- \@namedef{color@9}{violet!30}
- \@namedef{color@10}{teal!30}
+\pgfkeys{/smart diagram/.cd, use predefined color list/.code={%
+ \@namedef{color@1}{red!30}%
+ \@namedef{color@2}{cyan!30}%
+ \@namedef{color@3}{blue!30}%
+ \@namedef{color@4}{green!30}%
+ \@namedef{color@5}{orange!30}%
+ \@namedef{color@6}{yellow!30}%
+ \@namedef{color@7}{magenta!30}%
+ \@namedef{color@8}{brown!30}%
+ \@namedef{color@9}{violet!30}%
+ \@namedef{color@10}{teal!30}%
}
}
\newif\ifbackarrowdisabled
@@ -263,35 +263,35 @@
\pgfkeys{/smart diagram/.cd,%
uniform sequence color/.is choice,%
uniform sequence color/true/.code={%
- \tikzset{sequence item/.append style={
+ \tikzset{sequence item/.append style={%
fill=\sm@core@seqitemuniformcol,
- },
- }
+ },%
+ }%
},%
uniform sequence color/false/.style={sequence item},%
- uniform sequence color/.default=false,
+ uniform sequence color/.default=false,%
}%
\pgfkeys{/smart diagram/.cd,%
uniform connection color/.is choice,%
uniform connection color/true/.code={%
- \tikzset{connection planet satellite/.append style={
+ \tikzset{connection planet satellite/.append style={%
\sm@core@connectioncolor
- },
- }
+ },%
+ }%
},%
uniform connection color/false/.style={connection planet satellite},%
- uniform connection color/.default=false,
+ uniform connection color/.default=false,%
}%
\pgfkeys{/smart diagram/.cd,%
uniform arrow color/.is choice,%
uniform arrow color/true/.code={%
- \tikzset{diagram arrow type/.append style={
+ \tikzset{diagram arrow type/.append style={%
\sm@core@arrowcolor
- },
- }
+ },%
+ }%
},%
uniform arrow color/false/.style={diagram arrow type},%
- uniform arrow color/.default=false,
+ uniform arrow color/.default=false,%
}%
diff --git a/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.styles.code.tex b/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.styles.code.tex
index 6972be4b692..98c755f241f 100644
--- a/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.styles.code.tex
+++ b/Master/texmf-dist/tex/latex/smartdiagram/smartdiagramlibrarycore.styles.code.tex
@@ -25,7 +25,7 @@
}
}
-\tikzset{module/.style={
+\tikzset{module/.style={%
\pgfkeysvalueof{/smart diagram/module shape},
thick,
draw=\sm@core@bordercolor,
@@ -38,14 +38,14 @@
font=\sm@core@modulefontsize,
\sm@core@borderdecoration
},
- diagram arrow type/.style={
+ diagram arrow type/.style={%
\sm@core@arrowstyle,
>=\sm@core@arrowtip,
line width=\sm@core@arrowlinewidth,
\col
- },
+ },%
}
-\tikzset{description title/.style={
+\tikzset{description title/.style={%
circle,
draw=\sm@core@bordercolor,
minimum width=\sm@core@descriptiontitlewidth,
@@ -56,7 +56,7 @@
text width=\sm@core@descriptiontitletextwidth,
\sm@core@borderdecoration,
},
- description/.style={
+ description/.style={%
\pgfkeysvalueof{/smart diagram/module shape},
text width=\sm@core@descriptiontextwidth,
draw=\sm@core@bordercolor,
@@ -67,7 +67,7 @@
top color=white!80!\col,
font=\sm@core@descriptionfontsize,
\sm@core@borderdecoration,
- }
+ }%
}
\tikzset{priority arrow/.style={
draw=\sm@core@bordercolor,
@@ -142,19 +142,19 @@
text=\sm@core@seqitemtextcolor,
}
}
-\tikzset{let hypenation/.style={
+\tikzset{let hypenation/.style={%
execute at begin node={%
\hspace{0pt}%
- }
- }
+ }%
+ }%
}%
-\tikzset{
+\tikzset{%
sminvisible/.style={opacity=0,text opacity=0},
smvisible on/.style={smalt=#1{}{sminvisible}},
smalt/.code args={<#1>#2#3}{%
\alt<#1>{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}
- },
-}
+ },%
+}%
%%
%% Copyright (C) 2012-2013 by Claudio Fiandrino