From 3ef7d787294a2a69dcff53ddd34032f22f5224a8 Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 5 Jul 2024 18:26:46 +0200 Subject: [PATCH] recovering from merge --- compendium.pdf | Bin 256220 -> 256224 bytes compendium.tex | 4 ++-- jjpackages.tex | 30 +++++++++++++----------------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/compendium.pdf b/compendium.pdf index 7f1d2387795d4f3312ff449c73073f66630defda..990aa58a803a40ce7efb49202e24a2ebd74d9f22 100644 GIT binary patch delta 5038 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 E3a~P%g8%>k delta 5046 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 M2sa8PB}Gq03Zu%fR{#J2 diff --git a/compendium.tex b/compendium.tex index 6fbcaee..7f7e5c4 100644 --- a/compendium.tex +++ b/compendium.tex @@ -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 diff --git a/jjpackages.tex b/jjpackages.tex index dfc3fc2..54e0475 100644 --- a/jjpackages.tex +++ b/jjpackages.tex @@ -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}