recovering from merge

This commit is contained in:
Jeff committed 2024-07-05 18:35:46 +02:00
1 parent 058c6a49ca
commit 3ef7d78729
3 files changed
+15 -19

No files matched your search

BIN
View File
Binary file not shown.
+2 -2
View File
@@ -129,11 +129,11 @@ Kormophyta = Tracheophyta
\section{Monokotyledonen}
\pagebreak
\part[Allgemeiner Teil: Allgemeine Phylogenetik]{Phylogenetik}
\part[Allgemeiner Teil: Phylogenetik]{Allgemeine Phylogenetik}
\begin{table}
\sffamily
\begin{tabularx}{\textwidth}{|r|c|X|}
\begin{tabularx}{0.8\textwidth}{|r|c|X|}
\hline
\textbf{Taxon} & \textbf{Endung} & \textbf{Beispiel}
\\ \hline
+13 -17
View File
@@ -1,7 +1,7 @@
%#######################################
% jjpackages.tex
% generic include for common LaTeX packages
% @author Jeff J
% @author Jeff J https://gist.github.com/zlotap/43d796c70298018e29720f3e5380ac73
% usage: \input{jjpackages.tex}
%
% v0.1 2024-05
@@ -49,20 +49,16 @@
% ### FONTS & COLORS ###################
\usepackage{lmodern} %modern font-family
%\usepackage{mathptmx} %times ff that also works in math mode
\usepackage[table]{xcolor}
%\usepackage{mathptmx} %times ff that also works in math mode
\usepackage{titlesec} % allows heading customisation
\usepackage{titlesec} % heading customisation
% \titlespacing*{command}{left}{before}{after}[right]
\titleformat{\part}{\huge\bfseries\sffamily}{Teil \thepart:}{10pt}{}
\titleformat{\section}{\Large\bfseries\sffamily}{\thesection}{10pt}{}
\titlespacing*{\section}{0pt}{3.5ex plus 1ex minus .2ex}{1.5ex plus .2ex}
\titleformat{\subsection}{\bfseries\sffamily}{\thesubsection}{5pt}{}
\titleformat{\paragraph}{\bfseries\sffamily}{}{}{}
\titlespacing*{\paragraph}{0pt}{5pt}{2pt}
@@ -81,6 +77,16 @@
%\usepackage{minted}
% ### TABLES ###########################
\usepackage{multirow}
\usepackage{tabularx}
% \usepackage{tabulary}
% \usepackage{ltxtable}
% \usepackage{dcolumn}
% \usepackage{tabularray}
% ### IMAGES & FIGURES #################
\usepackage{graphicx}
@@ -90,16 +96,6 @@
\floatplacement{table}{H}
% ### TABLES ###########################
\usepackage{multirow}
\usepackage{tabularx}
\usepackage{tabulary}
% \usepackage{ltxtable}
% \usepackage{dcolumn}
% \usepackage{tabularray}
% ### LISTS ############################
% \usepackage{enumerate}