common.tex

@@ -23,7 +23,7 @@
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Data Manipulation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Graphics & Plotting %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
@@ -72,17 +72,21 @@
     }
 }
 
+%
+% Styles
+%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Graphics & Plotting %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\pgfplotsset{
+	fancy marks/.style={
+		% TODO
+	}
+}
 
 %
 % Colors
 %
 
-% KIT Colors
-
 \definecolor{kit-green100}{rgb}{0,.59,.51}
 \definecolor{kit-green70}{rgb}{.3,.71,.65}
 \definecolor{kit-green50}{rgb}{.50,.79,.75}
@@ -139,19 +143,6 @@
 \colorlet{kit-cyanblue30}{KITcyanblue!30}
 \colorlet{kit-cyanblue15}{KITcyanblue!15}
 
-% Matplotlib Colors
-
-\definecolor{Mpl1}{HTML}{1f77b4}
-\definecolor{Mpl2}{HTML}{ff7f0e}
-\definecolor{Mpl3}{HTML}{2ca02c}
-\definecolor{Mpl4}{HTML}{d62728}
-\definecolor{Mpl5}{HTML}{9467bd}
-\definecolor{Mpl6}{HTML}{8c564b}
-\definecolor{Mpl7}{HTML}{e377c2}
-\definecolor{Mpl8}{HTML}{7f7f7f}
-\definecolor{Mpl9}{HTML}{bcbd22}
-\definecolor{Mpl10}{HTML}{17becf}
-
 %
 % Color Schemes
 %
@@ -189,11 +180,6 @@
  		color=(kit-green70);
 		color=(kit-yellow70!80!kit-orange70);
 	},
-	colormap={matplotlib}{
-		color=(blue!90!black);
-		color=(red!20!blue!20);
-		color=(red!90!black);
-	}
 }
 
 % Define cycle lists
@@ -213,11 +199,8 @@
 \pgfplotscreateplotcyclelist{cel}{%
 	[samples of colormap={4} of cel]%
 }
-\pgfplotscreateplotcyclelist{matplotlib}{%
-	{Mpl1},{Mpl2},{Mpl3},{Mpl4}
-}
 
-% Define 'scolX' colors
+% Define individual colors
 
 \makeatletter
 
@@ -236,52 +219,40 @@
 
 \makeatother
 
-\def\setschemecolorsfrommap{
+\def\setschemecolors{
 	\extractcolormapcolor{scol0}{0}
 	\extractcolormapcolor{scol1}{333}
 	\extractcolormapcolor{scol2}{666}
 	\extractcolormapcolor{scol3}{1000}
 }
 
-\newcommand{\setschemecolorsmanually}[4]{
-	\colorlet{scol0}{#1}
-	\colorlet{scol1}{#2}
-	\colorlet{scol2}{#3}
-	\colorlet{scol3}{#4}
-}
-
 % Define color schemes
 
 \pgfplotsset{
-	/pgfplots/colorscheme/cel/.style={
-		colormap name={cel},
-		cycle list name={cel},
-		/utils/exec={\setschemecolorsfrommap},
+	/pgfplots/colorscheme/mako/.style={
+		colormap name={mako},
+		cycle list name={mako},
+		/utils/exec={\setschemecolors},
 	},
 	/pgfplots/colorscheme/rocket/.style={
 		colormap name={rocket},
 		cycle list name={rocket},
-		/utils/exec={\setschemecolorsfrommap},
-	},
-	/pgfplots/colorscheme/viridis/.style={
-		colormap name={viridis},
-		cycle list name={viridis},
-		/utils/exec={\setschemecolorsfrommap},
-	},
-	/pgfplots/colorscheme/mako/.style={
-		colormap name={mako},
-		cycle list name={mako},
-		/utils/exec={\setschemecolorsfrommap},
+		/utils/exec={\setschemecolors},
 	},
 	/pgfplots/colorscheme/cividis/.style={
 		colormap name={cividis},
 		cycle list name={cividis},
-		/utils/exec={\setschemecolorsfrommap},
+		/utils/exec={\setschemecolors},
 	},
-	/pgfplots/colorscheme/matplotlib/.style={
-		colormap name={matplotlib},
-		cycle list name={matplotlib},
-		/utils/exec={\setschemecolorsmanually{Mpl1}{Mpl2}{Mpl3}{Mpl4}},
+	/pgfplots/colorscheme/viridis/.style={
+		colormap name={viridis},
+		cycle list name={viridis},
+		/utils/exec={\setschemecolors},
+	},
+	/pgfplots/colorscheme/cel/.style={
+		colormap name={cel},
+		cycle list name={cel},
+		/utils/exec={\setschemecolors},
 	},
 }
 

examples/colorschemes.tex

@@ -18,6 +18,7 @@
 
 
 \input{common.tex}
+\pgfplotsset{colorscheme/cel}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -25,26 +26,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-\title{Colorschemes}
-\author{}
-\date{}
-
-
 \begin{document}
 
-\maketitle
-
-\foreach \x in {cel, rocket, viridis, mako, cividis, matplotlib}{
-
-	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-	% Set colorscheme
 
+\foreach \x in {cel, rocket, viridis, mako, cividis}{
 	\pgfplotsset{colorscheme/\x}
 
-	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-	% Preview colorscheme
-
-	\noindent\begin{minipage}{\textwidth}
 	\colorbox{gray!30}{\texttt{colorscheme/\x}}
 	\begin{figure}[H]
 		\centering
@@ -94,8 +81,6 @@
 			\end{tikzpicture}
 		\end{subfigure}%
 	\end{figure}
-		\vspace{\parskip}
-	\end{minipage}
 }