From 511779c7f55de7b5ad824b9e936c48008f1d0d52 Mon Sep 17 00:00:00 2001 From: coolneng Date: Thu, 14 Jan 2021 00:14:46 +0100 Subject: [PATCH] Update eisvogel template to latest version --- pandoc/.pandoc/templates/eisvogel.latex | 87 +++++++++++++++++++------ 1 file changed, 66 insertions(+), 21 deletions(-) diff --git a/pandoc/.pandoc/templates/eisvogel.latex b/pandoc/.pandoc/templates/eisvogel.latex index 0db6c5f..f79fa3f 100644 --- a/pandoc/.pandoc/templates/eisvogel.latex +++ b/pandoc/.pandoc/templates/eisvogel.latex @@ -1,6 +1,6 @@ %% -% Copyright (c) 2017 - 2019, Pascal Wagler; -% Copyright (c) 2014 - 2019, John MacFarlane +% Copyright (c) 2017 - 2020, Pascal Wagler; +% Copyright (c) 2014 - 2020, John MacFarlane % % All rights reserved. % @@ -49,6 +49,9 @@ $if(latex-dir-rtl)$ \PassOptionsToPackage{RTLdocument}{bidi} $endif$ $endif$ +$if(CJKmainfont)$ +\PassOptionsToPackage{space}{xeCJK} +$endif$ % \documentclass[ $if(fontsize)$ @@ -60,7 +63,7 @@ $endif$ $if(papersize)$ $papersize$paper, $else$ - a4paper, + paper=a4, $endif$ $if(beamer)$ ignorenonframetext, @@ -74,7 +77,7 @@ $endif$ $for(classoption)$ $classoption$$sep$, $endfor$ -,tablecaptionabove + ,captions=tableheading ]{$if(beamer)$$documentclass$$else$$if(book)$scrbook$else$scrartcl$endif$$endif$} $if(beamer)$ $if(background-image)$ @@ -129,6 +132,7 @@ $endif$ $if(beamerarticle)$ \usepackage{beamerarticle} % needs to be loaded first $endif$ +\usepackage{amsmath,amssymb} $if(fontfamily)$ \usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$} $else$ @@ -141,15 +145,17 @@ $else$ \usepackage{setspace} \setstretch{1.2} $endif$ -\usepackage{amssymb,amsmath} +\usepackage{amsmath} \usepackage{ifxetex,ifluatex} \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provide euro and other symbols + \usepackage{amssymb} \else % if luatex or xetex $if(mathspec)$ \ifxetex + \usepackage{amssymb} \usepackage{mathspec} \else \usepackage{unicode-math} @@ -336,7 +342,8 @@ $highlighting-macros$ $endif$ $if(tables)$ -\usepackage{longtable,booktabs} +\usepackage{longtable,booktabs,array} +\usepackage{calc} % for calculating minipage widths $if(beamer)$ \usepackage{caption} % Make caption package work with longtable @@ -360,7 +367,7 @@ $else$ \usepackage{footnotebackref} $endif$ $if(graphics)$ -\usepackage{graphicx,grffile} +\usepackage{graphicx} \makeatletter \def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi} \def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi} @@ -369,6 +376,10 @@ $if(graphics)$ % margins by default, and it is still possible to overwrite the defaults % using explicit options in \includegraphics[width, height, ...]{} \setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio} +% Set default figure placement to htbp +\makeatletter +\def\fps@figure{htbp} +\makeatother $endif$ $if(links-as-notes)$ % Make links footnotes instead of hotlinks: @@ -379,11 +390,11 @@ $if(strikeout)$ % Avoid problems with \sout in headers with hyperref \pdfstringdefDisableCommands{\renewcommand{\sout}{}} $endif$ -\setlength{\emergencystretch}{3em} % prevent overfull lines +\setlength{\emergencystretch}{3em} % prevent overfull lines \providecommand{\tightlist}{% \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} $if(numbersections)$ -\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$3$endif$} +\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$5$endif$} $else$ \setcounter{secnumdepth}{-\maxdimen} % remove section numbering $endif$ @@ -422,17 +433,23 @@ $if(lang)$ $endif$ % Load polyglossia as late as possible: uses bidi with RTL langages (e.g. Hebrew, Arabic) \usepackage{polyglossia} - \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$} + \setmainlanguage[$for(polyglossia-lang.options)$$polyglossia-lang.options$$sep$,$endfor$]{$polyglossia-lang.name$} $for(polyglossia-otherlangs)$ - \setotherlanguage[$polyglossia-otherlangs.options$]{$polyglossia-otherlangs.name$} + \setotherlanguage[$for(polyglossia-otherlangs.options)$$polyglossia-otherlangs.options$$sep$,$endfor$]{$polyglossia-otherlangs.name$} $endfor$ \else - \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel} + \usepackage[$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel} +% get rid of language-specific shorthands (see #6817): +\let\LanguageShortHands\languageshorthands +\def\languageshorthands#1{} $if(babel-newcommands)$ $babel-newcommands$ $endif$ \fi $endif$ +\ifluatex + \usepackage{selnolig} % disable illegal ligatures +\fi $if(dir)$ \ifxetex % Load bidi as late as possible as it modifies e.g. graphicx @@ -459,10 +476,24 @@ $endif$ $if(csl-refs)$ \newlength{\cslhangindent} \setlength{\cslhangindent}{1.5em} -\newenvironment{cslreferences}% - {$if(csl-hanging-indent)$\setlength{\parindent}{0pt}% - \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}% - {\par} +\newlength{\csllabelwidth} +\setlength{\csllabelwidth}{3em} +\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing + {% don't indent paragraphs + \setlength{\parindent}{0pt} + % turn on hanging indent if param 1 is 1 + \ifodd #1 \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces\fi + % set entry spacing + \ifnum #2 > 0 + \setlength{\parskip}{#2\baselineskip} + \fi + }% + {} +\usepackage{calc} +\newcommand{\CSLBlock}[1]{#1\hfill\break} +\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}} +\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break} +\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1} $endif$ $if(title)$ @@ -480,9 +511,7 @@ $else$ $endif$ \subtitle{$subtitle$} $endif$ -$if(author)$ \author{$for(author)$$author$$sep$ \and $endfor$} -$endif$ \date{$date$} $if(beamer)$ $if(institute)$ @@ -531,6 +560,10 @@ $endfor$ \fi $endif$ +$if(page-background)$ +\usepackage[pages=all]{background} +$endif$ + % % for the background color of the title page % @@ -630,13 +663,14 @@ $endif$ %\addtokomafont{chapter}{\color{heading-color}} % -% variables for title and author +% variables for title, author and date % $if(beamer)$ $else$ \usepackage{titling} \title{$title$} \author{$for(author)$$author$$sep$, $endfor$} +\date{$date$} $endif$ % @@ -828,6 +862,17 @@ $else$ \renewcommand{\footrulewidth}{0.4pt} } \pagestyle{eisvogel-header-footer} +$if(page-background)$ +\backgroundsetup{ +scale=1, +color=black, +opacity=$if(page-background-opacity)$$page-background-opacity$$else$0.2$endif$, +angle=0, +contents={% + \includegraphics[width=\paperwidth,height=\paperheight]{$page-background$} + }% +} +$endif$ $endif$ $endif$ @@ -942,7 +987,7 @@ $if(toc-title)$ \renewcommand*\contentsname{$toc-title$} $endif$ $if(beamer)$ -\begin{frame} +\begin{frame}[allowframebreaks] $if(toc-title)$ \frametitle{$toc-title$} $endif$ @@ -956,7 +1001,7 @@ $else$ $if(colorlinks)$ \hypersetup{linkcolor=$if(toccolor)$$toccolor$$else$$endif$} $endif$ -\setcounter{tocdepth}{$if(toc-depth)$$toc-depth$$else$3$endif$} +\setcounter{tocdepth}{$toc-depth$} \tableofcontents $if(toc-own-page)$ \newpage