diff options
author | Karl Berry <karl@freefriends.org> | 2020-05-26 21:28:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-05-26 21:28:39 +0000 |
commit | 53821330eacaf8f45f79b1a7644c72aa10ecd9fa (patch) | |
tree | c98ca8fcede629142d5ab1404b929427719cdb06 /Master | |
parent | 8fe3d71a4ac82c3ee6b34f2ffa9705cec7f3ccbd (diff) |
tikz-lake-fig (26may20)
git-svn-id: svn://tug.org/texlive/trunk@55288 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/tikz-lake-fig/README.md | 40 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/tikz-lake-fig/tikz-lake-fig-doc.pdf | bin | 0 -> 61521 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/tikz-lake-fig/tikz-lake-fig-doc.tex | 157 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/tikz-lake-fig/tikz-lake-fig.sty | 910 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/collection-pictures.tlpsrc | 1 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/tikz-lake-fig.tlpsrc | 0 |
7 files changed, 1109 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/latex/tikz-lake-fig/README.md b/Master/texmf-dist/doc/latex/tikz-lake-fig/README.md new file mode 100644 index 00000000000..5d641352493 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-lake-fig/README.md @@ -0,0 +1,40 @@ +# tikz-lake-fig + +[![GitHub](https://img.shields.io/github/license/jsta/tikz-lake-fig.svg?color=blue)](http://www.latex-project.org/lppl.txt) +[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/jsta/tikz-lake-fig.svg?label=current%20version)](https://github.com/jsta/tikz-lake-fig/releases/latest) +[![CTAN](https://img.shields.io/ctan/v/tikz-lake-fig.svg)](https://ctan.org/pkg/tikz-lake-fig) + +A collection of schematic diagrams of lakes for use in LaTeX documents. Diagrams include representations of material budgets, fluxes, and connectivity arrangements. + +## Usage + +Call diagram commands in your document by setting `tikz-lake-fig.sty` as an input (e.g. `\usepackage{tikz-lake-fig}`). Each command takes a single argument specifiying the scale of the diagram (optionally a second argument for fill color): + +```latex +\documentclass{standalone} +\usepackage{tikz-lake-fig} + +\begin{document} + +\secondarywireframe[1] + +\end{document} +``` + +![tikz lakes](example.png) + +## Prerequsites + +### LaTeX packages + +| import | pbox | relsize | +| --------------- | ------------ | ------- | +| __pgfplots__ | __subfiles__ | | + +## Gallery + +See [tikz-lake-fig-doc.pdf](https://github.com/jsta/tikz-lake-fig/blob/master/tikz-lake-fig-doc.pdf) + +## Links + +This collection inspired by [JLDiaz](https://tex.stackexchange.com/questions/95044/create-diagrams-in-latex-with-tikz) diff --git a/Master/texmf-dist/doc/latex/tikz-lake-fig/tikz-lake-fig-doc.pdf b/Master/texmf-dist/doc/latex/tikz-lake-fig/tikz-lake-fig-doc.pdf Binary files differnew file mode 100644 index 00000000000..ad66c4b7f3f --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-lake-fig/tikz-lake-fig-doc.pdf diff --git a/Master/texmf-dist/doc/latex/tikz-lake-fig/tikz-lake-fig-doc.tex b/Master/texmf-dist/doc/latex/tikz-lake-fig/tikz-lake-fig-doc.tex new file mode 100644 index 00000000000..ac52ed101c6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-lake-fig/tikz-lake-fig-doc.tex @@ -0,0 +1,157 @@ +\documentclass[bigger]{beamer} +\usepackage[utf8]{inputenc} +\usepackage{graphicx} +\usepackage{pgfplots} +\usepackage{tabularx} + +\setbeamertemplate{navigation symbols}{}%remove navigation symbols +\setbeamertemplate{caption}{\raggedright\insertcaption\par} + +\usepackage{tikz-lake-fig} + +\begin{document} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{2D inputs outputs} + \begin{frame}{2D inputs outputs} + + \begin{tabular}{c|c} + \begin{minipage}{0.65\textwidth}\lakediagramblue[0.6]\end{minipage} & lake diagram blue\\ + \begin{minipage}{0.65\textwidth}\lakediagramgreen[0.6]\end{minipage} & lake diagram green + \end{tabular} + + \end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{3D profile blue} + \begin{frame}{3D profile blue} + + \begin{tabular}{c|c} + {Isolated} + \begin{minipage}{0.55\textwidth}\isolatedprofile[0.4]{cyan}\end{minipage} & isolated profile\\ + {Headwater} + \begin{minipage}{0.55\textwidth}\headwaterprofile[0.6]{cyan}\end{minipage} & headwater profile\\ + {Primary} + \begin{minipage}{0.55\textwidth}\primaryprofile[0.6]{cyan}\end{minipage} & primary profile\\ + {Secondary} + \begin{minipage}{0.55\textwidth}\secondaryprofile[0.8]{cyan}\end{minipage} & secondary profile + \end{tabular} + + \end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{3d profile green} + \begin{frame}{3d profile green} + + \begin{tabular}{c|c} + {Isolated} + \begin{minipage}{0.55\textwidth}\isolatedprofile[0.4]{green}\end{minipage} & isolated profile\\ + {Headwater} + \begin{minipage}{0.55\textwidth}\headwaterprofile[0.6]{green}\end{minipage} & headwater profile\\ + {Primary} + \begin{minipage}{0.55\textwidth}\primaryprofile[0.6]{green}\end{minipage} & primary profile\\ + {Secondary} + \begin{minipage}{0.55\textwidth}\secondaryprofile[0.8]{green}\end{minipage} & secondary profile + \end{tabular} + + \end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{2D Connectivity Diagram} + \begin{frame}{2D Connectivity Diagram} + \begin{minipage}[c]{\paperwidth} + \connectivitydiagram[1] + \end{minipage} + \end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Isolated Budget} + \begin{frame}{Isolated Budget} + \begin{center} + \isolatedwireframe[1.2] + \end{center} + \end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Secondary Budget} + \begin{frame}{Secondary Budget} + \begin{center} + \secondarywireframe[1] + \end{center} + \end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Secondary Shaded} + \begin{frame}{Secondary Shaded} + \begin{center} + \secondaryprofileflatequal[0.8]{gray} + \definecolor{halfgrey}{HTML}{aaaaaa} + \secondaryprofileflatequal[0.8]{halfgrey} + \secondaryprofileflatequal[0.8]{white} + \end{center} + \end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{3D Connectivity Diagram} +\begin{frame}{3D Connectivity Diagram} + \begin{center} + \secondaryprofileflatequal[0.8]{white} + \primaryprofileflatequal[0.8]{white} \\ + \isolatedprofileflatequal[0.8]{white} + \end{center} + \end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\section{2D Watershed Connectivity} +\begin{frame} +\begin{columns}[t] +\begin{column}{0.7\textwidth} +\begin{figure}\flushleft + \watershedconnectivity[0.73] +\end{figure} +\end{column} +\begin{column}{0.3\textwidth} +\end{column} +\end{columns} +\end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\section{Incremental versus Cumulative Loading} +\begin{frame}{Incremental versus Cumulative Loading} + \begin{center} + \incrementalcumulativeloads[1.1] + \end{center} +\end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\section{Retention vs Trapping} +\begin{frame}{Retention vs Trapping} + \begin{center} + \retentiontrapping[1.1] + \end{center} +\end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\section{Isolated vs Ecological Context} +\begin{frame}{Isolated vs Ecological Context} + + \begin{minipage}[b]{0.28\paperwidth} + \isolated[0.96] + \vspace{0.7em} + \end{minipage} + \begin{minipage}[b]{0.22\paperwidth} + \secondary[1.3] + \end{minipage} + \begin{minipage}[b]{0.24\paperwidth} + \secondarypluswatershed[1.3] + \end{minipage} + +\end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\end{document} diff --git a/Master/texmf-dist/tex/latex/tikz-lake-fig/tikz-lake-fig.sty b/Master/texmf-dist/tex/latex/tikz-lake-fig/tikz-lake-fig.sty new file mode 100644 index 00000000000..eefdb68d648 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tikz-lake-fig/tikz-lake-fig.sty @@ -0,0 +1,910 @@ +%% tikz-lake-fig.tex +%% +%% Copyright (C) 2016 - 2020 Joseph Stachelek +%% +%% This file is part of tikz-lake-fig repository. +%% +%% Released under the LaTeX Project Public License v1.3c or later +%% See http://www.latex-project.org/lppl.txt + + +\ProvidesPackage{tikz-lake-fig}% +[2020/05/22 The tikz-lake-fig lake drawing package version 1.0] + +\PassOptionsToPackage{x11names}{xcolor} +\usepackage{tikz} +\usetikzlibrary{decorations.pathmorphing,calc} +\usepackage{subfiles} +\usepackage{pbox} +\usepackage{multirow} +\usepackage{tabularx} +\usepackage{colortbl} + +\usepackage{array} +\newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash\hspace{0pt}}m{#1}} +\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}m{#1}} + +\def\mystrut(#1,#2){\vrule height #1 depth #2 width 0pt} + +\newcolumntype{C}[1]{% + >{\mystrut(3ex,2ex)\centering}% + p{#1}% + <{}} + +\newcolumntype{K}[1]{% + >{\vbox to 5ex\bgroup\vfill\centering}% + p{#1}% + <{\egroup}} + +% \definecolor{darkgreen}{rgb}{0.13,0.62,0.25} +\definecolor{darkgreen}{RGB}{23,155,51} + +\usepackage{relsize} +\tikzset{fontscale/.style = {font=\relsize{#1}} + } + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{lakediagramgreen} +\def\lakediagramgreen[#1]{ +\begin{tikzpicture}[scale = #1] +% https://tex.stackexchange.com/questions/95044/create-diagrams-in-latex-with-tikz + +% Define some reference points +% The figure is drawn a bit bigger, and then clipped to the following dimensions: +\coordinate (clipping area) at (10, 7); +\clip (0,0) rectangle (clipping area); + +% Next reference points are relative to the lower left corner of the clipping area +\coordinate (water level) at (0, 6); +\coordinate (bottom) at (5, 1.3); % (bottom of the pit) +\coordinate (ground1) at (0, 5); % (left shore) +\coordinate (ground2) at (10, 5); % (right shore) + +% Coordinates of the bigger area really drawn +\coordinate (lower left) at ([xshift=-5mm, yshift=-5mm] 0,0); +\coordinate (upper right) at ([xshift=5mm, yshift=5mm] clipping area); + +% Draw the water and ripples +\draw [draw=blue!80!black, decoration={bumps, mirror, segment length=6mm}, decorate, + bottom color=cyan!60!black, top color=darkgreen!20!white] + (lower left) rectangle (water level-|upper right); + +% Draw the ground +\draw [draw=brown!30!black, fill=brown] + (lower left) -- (lower left|-ground1) -- + (ground1) .. controls ($(ground1)!.3!(bottom)$) and (bottom-|ground1) .. + (bottom) .. controls (bottom-|ground2) and ($(ground2)!.3!(bottom)$) .. + (ground2) -- (ground2-|upper right) -- (lower left-|upper right) -- cycle; + +% \draw[dotted](0,0) rectangle (clipping area); + +% labels +\draw[>=stealth, ->, line width = 0.7mm] (0, 5.5) -- (3, 5.5) node at (1.5, 4.8) {Inputs}; +\draw[>=stealth, ->, line width = 0.2mm] (8, 5.5) -- (10, 5.5) node at (8.5, 4.8) {Outputs}; + +\end{tikzpicture} +} + +% \section{lakediagramblue} +\def\lakediagramblue[#1]{ +\begin{tikzpicture}[scale = #1] +% https://tex.stackexchange.com/questions/95044/create-diagrams-in-latex-with-tikz + +% Define some reference points +% The figure is drawn a bit bigger, and then clipped to the following dimensions: +\coordinate (clipping area) at (10, 7); +\clip (0,0) rectangle (clipping area); + +% Next reference points are relative to the lower left corner of the clipping area +\coordinate (water level) at (0, 6); +\coordinate (bottom) at (5, 1.3); % (bottom of the pit) +\coordinate (ground1) at (0, 5); % (left shore) +\coordinate (ground2) at (10, 5); % (right shore) + +% Coordinates of the bigger area really drawn +\coordinate (lower left) at ([xshift=-5mm, yshift=-5mm] 0,0); +\coordinate (upper right) at ([xshift=5mm, yshift=5mm] clipping area); + +% Draw the water and ripples +\draw [draw=blue!80!black, decoration={bumps, mirror, segment length=6mm}, decorate, + bottom color=cyan!60!black, top color=blue!20!white] + (lower left) rectangle (water level-|upper right); + +% Draw the ground +\draw [draw=brown!30!black, fill=brown] + (lower left) -- (lower left|-ground1) -- + (ground1) .. controls ($(ground1)!.3!(bottom)$) and (bottom-|ground1) .. + (bottom) .. controls (bottom-|ground2) and ($(ground2)!.3!(bottom)$) .. + (ground2) -- (ground2-|upper right) -- (lower left-|upper right) -- cycle; + +% \draw[dotted](0,0) rectangle (clipping area); + +% labels +\draw[>=stealth, ->, line width = 0.5mm] (0, 5.5) -- (3, 5.5) node at (1.5, 4.8) {Inputs}; +\draw[>=stealth, ->, line width = 0.5mm] (8, 5.5) -- (10, 5.5) node at (8.5, 4.8) {Outputs}; + +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{isolated} +\def\isolated[#1]{ + \begin{tikzpicture}[scale = #1] + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan] plot (\x:1+rnd*0.5); + \node[fontscale=2.5] at (0, 0) {Isolated}; + \end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% \section{headwater} +\def\headwater[#1]{ + \begin{tikzpicture}[scale = #1] + \draw [-,ultra thick, cyan] (0,0) to [out=90,in=0] (0.2,-2) to [out=180,in=90] (-1,-3); + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan] (0,3) plot (\x:1+rnd*0.5); + \node[fontscale=2.5] at (0, 0) {Headwater}; + \end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% \section{primary} +\def\primary[#1]{ + \begin{tikzpicture}[scale = #1] + \draw [-,ultra thick, cyan] (-1,3) to [out=270,in=180] (0.2,2) to [out=0,in=90] (0,0); + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan] (0,-3) plot (\x:1+rnd*0.5); + \node[fontscale=2.5] at (0, 0) {Primary}; + \end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% \section{secondary} +\def\secondary[#1]{ + \begin{tikzpicture}[scale = #1] + \draw [-,ultra thick, cyan] (-1,3) to [out=270,in=180] (0.2,2) to [out=0,in=90] (0,0.3) to [out=90,in=0] (0,-1) to [out=90,in=0] (0.2,-2) to [out=180,in=90] (-1,-3); + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan,yshift=20] plot (\x:0.5+rnd*0.25); + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan,yshift=-50] plot (\x:0.8+rnd*0.5); + \node[fontscale=2.5] at (0,-1.7) {Connected}; + \end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% \section{secondarypluswatershed} +\def\secondarypluswatershed[#1]{ + \begin{tikzpicture}[scale = #1] + %\draw[step=1cm,gray,very thin] (-3,-2) grid (3,3); + + % iws + \draw[cyan,ultra thick,dashed] % + (-1.1,-1.6) to % + (-1.5, 0.2) to % + % (-3, 7.5) to % + (-1.9, 2.3) to % + (-1.1, 3.1) to % + (1.1, 3.1) to % + (1.9, 2.3) to % + % (3, 7.5) to % + (1.5, 0.2) to % + (1.1, -1.6); + + \draw [-,ultra thick, cyan] (-1,3) to [out=270,in=180] (0.2,2) to [out=0,in=90] (0,0.3) to [out=90,in=0] (0,-1) to [out=90,in=0] (0.2,-2) to [out=180,in=90] (-1,-3); + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan,yshift=20] plot (\x:0.5+rnd*0.25); + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan,yshift=-50] plot (\x:0.8+rnd*0.5); + \node[fontscale=2.5] at (0,-1.7) {Embedded}; + \end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% \section{connectivitydiagram} +\def\connectivitydiagram[#1]{ + \begin{minipage}[c]{0.23\textwidth} + \secondary[#1] + \end{minipage} + \begin{minipage}[c]{0.2\textwidth} + \primary[#1/1.2] + \end{minipage} + \begin{minipage}[c]{0.2\textwidth} + \headwater[#1/1.2] + \end{minipage} + \begin{minipage}[c]{0.2\textwidth} + \isolated[#1/1.2] + \end{minipage} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{secondaryprofile} +\def\secondaryprofile[#1]#2{ +\begin{tikzpicture}[scale = #1] + \draw [-,line width = 5, #2!100!black] (0.9,0) to [out=0,in=180] (1.55,0); + \draw [-,line width = 5, dashed, #2!100!black] (5.5,0) to [out=0,in=180] (6.2,0); + % \node at (2, 1) {Secondary}; +\fill[ + top color=#2!100, + bottom color=#2!40, + shading=axis, + opacity=0.45 + ] + (0,0) circle (1cm and 0.25cm); +\fill[ + left color=#2!50!black, + right color=#2!50!black, + middle color=#2!100, + shading=axis, + opacity=0.25 + ] + (1,0) {[rounded corners=45pt] -- (0,-2)} -- (-1,0) arc (180:360:1cm and 0.25cm); + +\fill[ + top color=#2!100, + bottom color=#2!40, + shading=axis, + opacity=0.45, + xshift=100 + ] + (0,0) circle (2cm and 0.5cm); +\fill[ + left color=#2!50!black, + right color=#2!50!black, + middle color=#2!100, + shading=axis, + opacity=0.25, + xshift=100 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{secondaryprofileflatequal} +\def\secondaryprofileflatequal[#1]#2{ +\begin{tikzpicture}[scale = #1] + \draw [fill=#2, ultra thick] (0.1,-.3) rectangle (1.7,0.1); + \draw [fill=#2, ultra thick] (5.3,0.1) rectangle (6.2,-0.3); + % \node at (2, 1) {Secondary}; +\draw + [fill=#2, + ultra thick, + xshift=-50 + ] + (0,0) circle (2cm and 0.5cm); +\draw + [fill=#2, + ultra thick, + xshift=-50 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); + +\draw + [fill = #2, + ultra thick, + xshift=100 + ] + (0,0) circle (2cm and 0.5cm); +\draw + [fill = #2, + ultra thick, + xshift=100 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{primaryprofileflatequal} +\def\primaryprofileflatequal[#1]#2{ +\begin{tikzpicture}[scale = #1] + \draw [fill=#2, ultra thick] (1.8,-.3) rectangle (3.2,0.1); + \draw [fill=#2, ultra thick] (-1.8,0.1) rectangle (-3.2,-0.3); + % \node at (2, 1) {Secondary}; +\draw + [fill=#2, + ultra thick + ] + (0,0) circle (2cm and 0.5cm); +\clip (-2,-3) rectangle (2,0); +\draw + [fill=#2, + ultra thick + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); + +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{headwaterprofileflatequal} +\def\headwaterprofileflatequal[#1]#2{ +\begin{tikzpicture}[scale = #1] + \draw [fill=#2, ultra thick] (1.8,-.3) rectangle (3.2,0.1); + % \node at (2, 1) {Secondary}; +\draw + [fill=#2, + ultra thick + ] + (0,0) circle (2cm and 0.5cm); +\clip (-2,-3) rectangle (2,0); +\draw + [fill=#2, + ultra thick + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); + +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{isolatedprofileflatequal} +\def\isolatedprofileflatequal[#1]#2{ +\begin{tikzpicture}[scale = #1] +\draw + [fill=#2, + ultra thick + ] + (0,0) circle (2cm and 0.5cm); +\clip (-2,-3) rectangle (2,0); +\draw + [fill=#2, + ultra thick + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); + +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{headwaterprofile} +\def\headwaterprofile[#1]#2{ +\begin{tikzpicture}[scale = #1] + \draw [-,line width = 5, #2!100!black] (1.95,0) to [out=0,in=180] (2.7,0); + % \node at (0.4, 1) {Headwater}; +\fill[ + top color=#2!100, + bottom color=#2!40, + shading=axis, + opacity=0.45 + ] + (0,0) circle (2cm and 0.5cm); +\fill[ + left color=#2!50!black, + right color=#2!50!black, + middle color=#2!100, + shading=axis, + opacity=0.25 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{primaryprofile} +\def\primaryprofile[#1]#2{ +\begin{tikzpicture}[scale = #1] + \draw [-,line width = 5, #2!100!black] (-2,0) to [out=0,in=180] (-2.7,0); + \draw [-,line width = 5, dashed, #2!100!black] (2,0) to [out=0,in=180] (2.7,0); + % \node at (0.4, 1) {Primary}; +\fill[ + top color=#2!100, + bottom color=#2!40, + shading=axis, + opacity=0.45 + ] + (0,0) circle (2cm and 0.5cm); +\fill[ + left color=#2!50!black, + right color=#2!50!black, + middle color=#2!100, + shading=axis, + opacity=0.25 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{isolatedprofile} +\def\isolatedprofile[#1]#2{ +\begin{tikzpicture}[scale = #1] +\fill[ + top color=#2!100, + bottom color=#2!40, + shading=axis, + opacity=0.45 + ] + (0,0) circle (2cm and 0.5cm); +\fill[ + left color=#2!50!black, + right color=#2!50!black, + middle color=#2!100, + shading=axis, + opacity=0.25 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{primaryprofileplus} +\def\primaryprofileplus{ +\begin{tikzpicture}[scale = 0.8] + \draw [-,line width=3pt, cyan!40] (-2,0) to [out=0,in=180] (-3.25,0); + \draw [-,thick, dashed, darkgreen!40] (2,0) to [out=0,in=180] (3.25,0); + \node at (0.2, 1) {Primary}; +\fill[ + top color=darkgreen!100, + bottom color=darkgreen!40, + shading=axis, + opacity=0.45 + ] + (0,0) circle (2cm and 0.5cm); +\fill[ + left color=darkgreen!50!black, + right color=darkgreen!50!black, + middle color=darkgreen!100, + shading=axis, + opacity=0.25 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{secondaryprofileplus} +\def\secondaryprofileplus{ +\begin{tikzpicture}[scale = 0.8] + \draw [-,line width=3pt, cyan!40] (-1,0) to [out=0,in=180] (-2.25,0); + \draw [-,line width=3pt, cyan!40] (1,0) to [out=0,in=180] (2.25,0); + \draw [-,line width=3pt, dashed, cyan!40] (6,0) to [out=0,in=180] (7.25,0); + \node at (2, 1) {Secondary}; +\fill[ + top color=cyan!100, + bottom color=cyan!40, + shading=axis, + opacity=0.45 + ] + (0,0) circle (1cm and 0.25cm); +\fill[ + left color=cyan!50!black, + right color=cyan!50!black, + middle color=cyan!100, + shading=axis, + opacity=0.25 + ] + (1,0) {[rounded corners=45pt] -- (0,-2)} -- (-1,0) arc (180:360:1cm and 0.25cm); + +\fill[ + top color=cyan!100, + bottom color=cyan!40, + shading=axis, + opacity=0.45, + xshift=120 + ] + (0,0) circle (2cm and 0.5cm); +\fill[ + left color=cyan!50!black, + right color=cyan!50!black, + middle color=cyan!100, + shading=axis, + opacity=0.25, + xshift=120 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{primaryprofileblue} +\def\primaryprofileblue{ +\begin{tikzpicture}[scale = 0.8] + \draw [-,line width=5pt, cyan!40] (-2,0) to [out=0,in=180] (-3.25,0); + \draw [-,line width=5pt, dashed, cyan!40] (2,0) to [out=0,in=180] (3.25,0); + \node at (0.2, 1) {Low retention}; +\fill[ + top color=cyan!100, + bottom color=cyan!40, + shading=axis, + opacity=0.45 + ] + (0,0) circle (2cm and 0.5cm); +\fill[ + left color=cyan!50!black, + right color=cyan!50!black, + middle color=cyan!100, + shading=axis, + opacity=0.25 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{primaryprofilegreen} +\def\primaryprofilegreen{ +\begin{tikzpicture}[scale = 0.8] + \draw [-,line width=5pt, cyan!40] (-2,0) to [out=0,in=180] (-3.25,0); + \draw [-,thick, dashed, darkgreen!40] (2,0) to [out=0,in=180] (3.25,0); + \node at (0.2, 1) {High retention}; +\fill[ + top color=darkgreen!100, + bottom color=darkgreen!40, + shading=axis, + opacity=0.45 + ] + (0,0) circle (2cm and 0.5cm); +\fill[ + left color=darkgreen!50!black, + right color=darkgreen!50!black, + middle color=darkgreen!100, + shading=axis, + opacity=0.25 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{isolatedflux} +\def\isolatedflux[#1]#2{ +\begin{tikzpicture}[scale = #1] + \node at (1.5, 1) {#2}; + +\pgfsetarrowsend{latex} +\pgfsetlinewidth{1ex} + +\node at (3, 5) {Evaporation}; +\pgfpathmoveto{\pgfpoint{0cm}{1cm}} +\pgfpathlineto{\pgfpoint{0cm}{4cm}} +\pgfusepath{stroke} + +\node at (-3, 5) {Precipitation}; +\pgfpathmoveto{\pgfpoint{-1cm}{4cm}} +\pgfpathlineto{\pgfpoint{-1cm}{1cm}} +\pgfusepath{stroke} + +\fill[ + top color=cyan!100, + bottom color=cyan!40, + shading=axis, + opacity=0.45 + ] + (0,0) circle (2cm and 0.5cm); +\fill[ + left color=cyan!50!black, + right color=cyan!50!black, + middle color=cyan!100, + shading=axis, + opacity=0.25 + ] + (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{isolatedwireframe} +\def\isolatedwireframe[#1]{ +\begin{tikzpicture}[scale = #1] + + % \draw[step=1cm,gray,very thin] (-4,-3) grid (4,4); + + \draw (0,0) circle (2cm and 0.5cm); + \draw (2,0) {[rounded corners=45pt] -- (0,-3)} -- (-2,0) arc (180:360:2cm and 0.5cm); + + \pgfsetarrowsend{latex} + \pgfsetlinewidth{1ex} + + \node[rotate=-90] at (0.6, 2){Evaporation}; + \node[rotate=-90] at (-0.6, 2){Precipitation}; + \node at (1.5, -2.1){Groundwater}; + \node at (-1.5, -2.1){Groundwater}; + + + % GW out + \pgfpathmoveto{\pgfpoint{1cm}{-1.5cm}} + \pgfpathlineto{\pgfpoint{2cm}{-2cm}} + \pgfusepath{stroke} + + % GW in + \pgfpathmoveto{\pgfpoint{-2cm}{-2cm}} + \pgfpathlineto{\pgfpoint{-1cm}{-1.5cm}} + \pgfusepath{stroke} + + % SW out + % \node at (3, -0.5){Outflow}; + % \pgfpathmoveto{\pgfpoint{2.2cm}{0cm}} + % \pgfpathlineto{\pgfpoint{4cm}{0cm}} + % \pgfusepath{stroke} + + % SW in + % \node at (-3, -0.5){Inflow}; + % \pgfpathmoveto{\pgfpoint{-4cm}{0cm}} + % \pgfpathlineto{\pgfpoint{-2.2cm}{0cm}} + % \pgfusepath{stroke} + + % Runoff in + \node at (-3, 0.4){Runoff}; + \pgfpathmoveto{\pgfpoint{-3cm}{0cm}} + \pgfpathlineto{\pgfpoint{-2.2cm}{0cm}} + \pgfusepath{stroke} + + \pgfpathmoveto{\pgfpoint{0.26cm}{1cm}} + \pgfpathlineto{\pgfpoint{0.26cm}{3cm}} + \pgfusepath{stroke} + + \pgfpathmoveto{\pgfpoint{-0.3cm}{3cm}} + \pgfpathlineto{\pgfpoint{-0.3cm}{1cm}} + \pgfusepath{stroke} + +\end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{secondarywireframe} +\def\secondarywireframe[#1]{ +\scalebox{#1}{% +\begin{tikzpicture} + + % \draw[step=1cm,gray,very thin] (-4,-3) grid (7,4); + + \draw [-,line width=3pt] (0,0) to [out=0,in=180] (1.25,0); + \draw (-1,0) circle (1cm and 0.25cm); + \draw (0,0) {[rounded corners=45pt] -- (-1,-2)} -- (-2,0) arc (180:360:1cm and 0.25cm); + \draw[xshift=120] (-1,0) circle (2cm and 0.5cm); + \draw[xshift=120] (1,0) {[rounded corners=45pt] -- (-1,-3)} -- (-3,0) arc (180:360:2cm and 0.5cm); + + \pgfsetarrowsend{latex} + \pgfsetlinewidth{1ex} + + % GW out + \node at (4.9, -2.1){Groundwater}; + \pgfpathmoveto{\pgfpoint{4.2cm}{-1.5cm}} + \pgfpathlineto{\pgfpoint{5.2cm}{-2cm}} + \pgfusepath{stroke} + + % GW in + \node at (1.5, -2.1){Groundwater}; + \pgfpathmoveto{\pgfpoint{1.2cm}{-2cm}} + \pgfpathlineto{\pgfpoint{2.2cm}{-1.5cm}} + \pgfusepath{stroke} + + % SW out + \node at (5.6, -0.5){Outflow}; + \pgfpathmoveto{\pgfpoint{5.2cm}{0cm}} + \pgfpathlineto{\pgfpoint{7cm}{0cm}} + \pgfusepath{stroke} + + % SW in + \node at (-2.3, -0.5){Inflow}; + \pgfpathmoveto{\pgfpoint{-3.4cm}{0cm}} + \pgfpathlineto{\pgfpoint{-2cm}{0cm}} + \pgfusepath{stroke} + + % Runoff in + \node at (-2.3, 1){Runoff}; + \pgfpathmoveto{\pgfpoint{-2.8cm}{0.6cm}} + \pgfpathlineto{\pgfpoint{-2cm}{0.6cm}} + \pgfusepath{stroke} + + % Evaporation + \node[rotate=-90] at (3.7, 2){Evaporation}; + \pgfpathmoveto{\pgfpoint{3.36cm}{1cm}} + \pgfpathlineto{\pgfpoint{3.36cm}{3cm}} + \pgfusepath{stroke} + + % Precip + \node[rotate=-90] at (2.4, 2){Precipitation}; + \pgfpathmoveto{\pgfpoint{2.8cm}{3cm}} + \pgfpathlineto{\pgfpoint{2.8cm}{1cm}} + \pgfusepath{stroke} + +\end{tikzpicture} +} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% \section{watershedconnectivity} +% See Soranno et al., 2015, Plos One +\def\watershedconnectivity[#1]{ +\begin{columns} + + \begin{column}{0.7\textwidth} + \begin{tikzpicture}[scale = #1] + %\draw[step=1cm,gray,very thin] (-4,-2) grid (4,9); + + % streamlines + % lake 3 + % center + \draw [-,ultra thick, cyan] (-0.6, 3.2) to [out=270,in=180] (0.2,2) to [out=0,in=90] (0,0); + \draw [-,ultra thick, cyan] (0.2, 3.2) to [out=270,in=90] (-0.1,2.2) to [out=0,in=180] (0.2,2) to [out=0,in=90] (0,0); + % right + \draw [-,ultra thick, cyan] (2.2,3.5) to [out=90,in=0] (1.1,1.1) to [out=270,in=90] (0,0); + % left + \draw [-,ultra thick, cyan] (-1.9, 2) to [out=270,in=90] (-1.1,1.1) to [out=270,in=90] (0,0); + + % lake 2 + \draw [-,ultra thick, darkgreen] % + (-0.3,6.5) to % + [out=270,in=90] (0.5, 4.9) to % + [out=270,in=90] (0,4); + + % lake 1 + \draw [-,ultra thick, yellow] % + (0.3, 7.8) to % + [out=90,in=270] (1.2, 8.2); + + \draw [-,ultra thick, yellow] % + (0.3, 8) to % + [out=90,in=270] (0, 8.5) to % + [out=90,in=270] (0.5, 9); + + \draw [-,ultra thick, yellow] % + (-0.4, 7.5) to % + [out=90,in=270] (-0.6, 8.5) to % + [out=90,in=270] (-1.5, 9); + + \draw [-,ultra thick, yellow] % + (-0.4, 7.3) to % + [out=90,in=270] (-1.5, 8); + + % lakes + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan] (0,-3) plot (\x:1.1+rnd*0.5); + \node at (0, 0) {Lake 3}; + + \draw[darkgreen, ultra thick, domain=0:350, smooth cycle, fill=darkgreen, yshift=4cm] (0,-3) plot (\x:0.7+rnd*0.5); + \node at (0, 4) {Lake 2}; + + \draw[yellow, ultra thick, domain=0:350, smooth cycle, yshift=7cm, fill=yellow] (0,-3) plot (\x:1.1+rnd*0.5); + \node at (0, 7) {Lake 1}; + + % iws + \draw[yellow,ultra thick,dashed] % + (-0.2, 5.6) to % + (-1.1, 6.2) to % + (-3.05, 7.5) to % + (-1.9, 9) to % + (1.9, 9) to % + (3.05, 7.5) to % + (1.1, 6.2) to % + (0.2, 5.6); + + \draw[darkgreen,ultra thick,dashed] % + (-0.8, 3.4) to % + (-1.5, 4.2) to % + (-3, 7.5) to % + (-1.1, 6.2) to % + (-0.5, 5.6) to (0.5, 5.6) to% + (1.1, 6.2) to % + (3, 7.5) to % + (1.5, 4.2) to % + (0.8, 3.4); + + \draw[cyan,ultra thick,dashed] % + (-1.1,-0.4) to % + (-1.5, 0.2) to % + (-3, 7.5) to % + (-1.1, 6.2) to % + (-0.5, 5.6) to (0.5, 5.6) to % + (1.1, 6.2) to % + (3, 7.5) to % + (1.5, 0.2) to (1.1, -0.4); + + \draw [cyan, thick, decorate, decoration={brace,amplitude=10pt,mirror,raise=4pt},yshift=0pt, align=center, anchor=center] + (3,-1.2) -- (3,7.2) node [cyan,midway,xshift=1.1cm] {\footnotesize + LWS\\Lake 3}; + \draw [cyan, thick, decorate,decoration={brace,amplitude=10pt,mirror,raise=4pt},yshift=0pt, align=center, anchor=center] + (5,-1.2) -- (5,9) node [cyan,midway,xshift=1.1cm] {\footnotesize + NWS\\Lake 3}; + + \draw [darkgreen, thick, decorate, decoration={brace,amplitude=10pt,raise=4pt},yshift=0pt] + (-3.1,3) -- (-3.1,7.2) node [darkgreen,midway,xshift=-1.1cm, align=center] {\footnotesize + LWS\\Lake 2}; + \draw [darkgreen, thick, decorate, decoration={brace,amplitude=10pt,raise=4pt},yshift=0pt, align=center, anchor=center] + (-5,3) -- (-5,9) node [darkgreen,midway,xshift=-1.1cm, align=center] {\footnotesize + NWS\\Lake 2}; + \end{tikzpicture} + \end{column} +\end{columns} + +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% \section{incrementalcumulativeloads} +\def\incrementalcumulativeloads[#1]{ + \begin{tikzpicture}[scale = #1] + + % \draw[step=1cm,gray,very thin] (-4,-3) grid (4,3); + + \draw [-,ultra thick, cyan] (-1,3) to [out=270,in=180] (0.2,2) to [out=0,in=90] (0,0.3) to [out=90,in=0] (0,-1) to [out=90,in=0] (0.2,-2) to [out=180,in=90] (-1,-3); + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan,yshift=20] plot (\x:0.5+rnd*0.25); + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan,yshift=-50] plot (\x:0.8+rnd*0.5); + % \node at (0,-1.7) {test}; + + \pgfsetarrowsend{latex} + \pgfsetlinewidth{0.7ex} + \pgfsetstrokecolor{red} + + % cumulative 1 + \pgfpathmoveto{\pgfpoint{1.7cm}{0.3cm}} + \pgfpathlineto{\pgfpoint{1.7cm}{-1.3cm}} + \pgfusepath{stroke} + + % cumulative 2 + \pgfpathmoveto{\pgfpoint{1.7cm}{-3cm}} + \pgfpathlineto{\pgfpoint{1.7cm}{-4cm}} + \pgfusepath{stroke} + + \pgfsetstrokecolor{black} + % incremental 1 + \pgfpathmoveto{\pgfpoint{-1.7cm}{1.9cm}} + \pgfpathlineto{\pgfpoint{-0.8cm}{0.8cm}} + \pgfusepath{stroke} + + \pgfpathmoveto{\pgfpoint{1.7cm}{1.9cm}} + \pgfpathlineto{\pgfpoint{0.8cm}{0.8cm}} + \pgfusepath{stroke} + + % incremental 1 + \pgfpathmoveto{\pgfpoint{-2cm}{-0.1cm}} + \pgfpathlineto{\pgfpoint{-1.1cm}{-1.2cm}} + \pgfusepath{stroke} + + \end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% \section{retentiontrapping} +\def\retentiontrapping[#1]{ + \begin{tikzpicture}[scale = #1] + + % \draw[step=1cm,gray,very thin] (-4,-3) grid (4,3); + + \draw [-,ultra thick, cyan] (-1,3) to [out=270,in=180] (0.2,2) to [out=0,in=90] (0,0.3) to [out=90,in=0] (0,-1) to [out=90,in=0] (0.2,-2) to [out=180,in=90] (-1,-3); + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan,yshift=20] plot (\x:0.5+rnd*0.25); + \draw[cyan, ultra thick, domain=0:350, smooth cycle, fill=cyan,yshift=-50] plot (\x:0.8+rnd*0.5); + % \node at (0,-1.7) {test}; + + \pgfsetarrowsend{latex} + \pgfsetlinewidth{0.7ex} + \pgfsetstrokecolor{red} + +% outflow 1 + \pgfpathmoveto{\pgfpoint{1.8cm}{0.5cm}} + \pgfpathlineto{\pgfpoint{1.8cm}{0cm}} + \pgfusepath{stroke} + + % outflow 2 + \pgfpathmoveto{\pgfpoint{1.8cm}{-2cm}} + \pgfpathlineto{\pgfpoint{1.8cm}{-1.7cm}} + \pgfusepath{stroke} + + \pgfsetstrokecolor{black} + % inflow 1 + \pgfpathmoveto{\pgfpoint{1.2cm}{0cm}} + \pgfpathlineto{\pgfpoint{1.2cm}{1.4cm}} + \pgfusepath{stroke} + + % trapping 1 + \pgfpathmoveto{\pgfpoint{1.5cm}{1.4cm}} + \pgfpathlineto{\pgfpoint{1.5cm}{0.6cm}} + \pgfusepath{stroke} + + % inflow 2 + \pgfpathmoveto{\pgfpoint{1.2cm}{-2.3cm}} + \pgfpathlineto{\pgfpoint{1.2cm}{-0.7cm}} + \pgfusepath{stroke} + + % trapping 2 + \pgfpathmoveto{\pgfpoint{1.5cm}{-0.7cm}} + \pgfpathlineto{\pgfpoint{1.5cm}{-1.9cm}} + \pgfusepath{stroke} + + \end{tikzpicture} +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput
\ No newline at end of file diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 89a19d726d9..7e8d069ab55 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -723,7 +723,7 @@ my @TLP_working = qw( ticket ticollege tikz-bayesnet tikz-cd tikz-3dplot tikz-dependency tikz-dimline tikz-feynhand tikz-feynman tikz-imagelabels tikz-inet - tikz-kalender tikz-karnaugh tikz-ladder tikz-layers + tikz-kalender tikz-karnaugh tikz-ladder tikz-lake-fig tikz-layers tikz-nef tikz-network tikz-opm tikz-optics tikz-palattice tikz-planets tikz-qtree tikz-relay tikz-sfc tikz-timing tikz-trackschematic tikz-truchet diff --git a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc index 34b9c8585c4..a5eecc7c344 100644 --- a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc @@ -156,6 +156,7 @@ depend tikz-inet depend tikz-kalender depend tikz-karnaugh depend tikz-ladder +depend tikz-lake-fig depend tikz-layers depend tikz-nef depend tikz-network diff --git a/Master/tlpkg/tlpsrc/tikz-lake-fig.tlpsrc b/Master/tlpkg/tlpsrc/tikz-lake-fig.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Master/tlpkg/tlpsrc/tikz-lake-fig.tlpsrc |