diff --git a/compendium.pdf b/compendium.pdf index aa7e0c9..8f67ff5 100644 Binary files a/compendium.pdf and b/compendium.pdf differ diff --git a/compendium.tex b/compendium.tex index 3b46f99..f097073 100644 --- a/compendium.tex +++ b/compendium.tex @@ -1,23 +1,21 @@ +% !TeX program = lualatex % MAIN FILE \input{jjpackages.tex} -%\usepackage{tikz} -%\usetikzlibrary{graphs, graphdrawing} -%\usegdlibrary{phylogenetics} +\usepackage{tikz} +\usetikzlibrary{graphs, graphdrawing} +\usegdlibrary{phylogenetics, trees} +\pgfgdset{phylogenetic inner node/.style={ + /tikz/.cd, draw, circle, inner sep=0pt, minimum size=5pt + } +} +\pgfgdset{phylogenetic edge/.style={ + /tikz/.cd, thick, rounded corners + } +} + -\usepackage{forest} -\tikzset{ - comment/.append style={label={[font=\small]0:#1}}, -} -\forestset{ - /tikz/label position=below left, - /tikz/label distance=.1em, - dot/.style={tikz+={\fill[fill=#1] (.child anchor) circle[radius=2pt];}}, - dot/.default=black, - bar/.style={tikz+={\draw[color=#1,line width=2pt] let \p1 = (!u.parent anchor), \p2 = (.child anchor) in ($(\x1, \y2 - 0.5em)!0.5!(\x2, \y2)$) -- ($(\x1, \y2 + 0.5em)!0.5!(\x2, \y2)$);}}, - bar/.default=black, -} \definecolor{treecolor-edge}{RGB}{120, 120, 120} \definecolor{treecolor-event}{RGB}{0, 0, 0} @@ -44,24 +42,16 @@ \section[Systematik der Pflanzen]{Spezieller Teil: Systematik der Pflanzen} \subsection{Prokaryota, Eukaryota \& Archea} -\begin{figure}[th!] - \centering - \input{trees/basetree.tex} - \caption{Stammbaum der drei grundlegenden Reiche des Lebens} - \label{fig:basetree} + +\begin{figure}[!ht] +\tikz \graph [phylogenetic tree layout, grow'=right] { + a -- { + b [>length=2] --[length=1] { c, d }, + e [>length=3] + } +}; \end{figure} -\subsection{Algen} - -\begin{figure}[th] - \centering - \input{trees/algae.tex} - \caption{} - \label{fig:algaetree} -\end{figure} - - - \section[Allgemeine Phylogenetik]{Allgemeiner Teil: Phylogenetik}