Much more work on pdf compilation

3 files changed, 316 insertions, 9 deletions

diff --git a/beamer-template.tex b/beamer-template.tex
new file mode 100644
index 0000000..89d9a28
--- /dev/null
+++ b/beamer-template.tex
@@ -0,0 +1,280 @@
+\documentclass[$if(lang)$$babel-lang$,$endif$$if(handout)$handout,$endif$$if(aspectratio)$aspectratio=$aspectratio$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{beamer}
+%% \setbeamertemplate{caption}[numbered]
+%% \setbeamertemplate{caption label separator}{: }
+%% \setbeamercolor{caption name}{fg=normal text.fg}
+\usepackage{pgfpages}
+\beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$
+\setbeameroption{show notes on second screen}
+$if(fontfamily)$
+\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
+$else$
+\usepackage{lmodern}
+$endif$
+\usepackage{amssymb,amsmath}
+\usepackage{ifxetex,ifluatex}
+\usepackage{fixltx2e} % provides \textsubscript
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
+  \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc}
+  \usepackage[utf8]{inputenc}
+$if(euro)$
+  \usepackage{eurosym}
+$endif$
+\else % if luatex or xelatex
+  \ifxetex
+    \usepackage{mathspec}
+  \else
+    \usepackage{fontspec}
+  \fi
+  \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
+$for(fontfamilies)$
+  \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$}
+$endfor$
+$if(euro)$
+  \newcommand{\euro}{€}
+$endif$
+$if(mainfont)$
+    \setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$}
+$endif$
+$if(sansfont)$
+    \setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$]{$sansfont$}
+$endif$
+$if(monofont)$
+    \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$endif$]{$monofont$}
+$endif$
+$if(mathfont)$
+    \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
+$endif$
+$if(CJKmainfont)$
+    \usepackage{xeCJK}
+    \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
+$endif$
+\fi
+$if(theme)$
+\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$}
+$endif$
+$if(colortheme)$
+\usecolortheme{$colortheme$}
+$endif$
+$if(fonttheme)$
+\usefonttheme{$fonttheme$}
+$endif$
+$if(mainfont)$
+\usefonttheme{serif} % use mainfont rather than sansfont for slide text
+$endif$
+$if(innertheme)$
+\useinnertheme{$innertheme$}
+$endif$
+$if(outertheme)$
+\useoutertheme{$outertheme$}
+$endif$
+% use upquote if available, for straight quotes in verbatim environments
+\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
+% use microtype if available
+\IfFileExists{microtype.sty}{%
+\usepackage{microtype}
+\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
+}{}
+$if(lang)$
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
+  \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel}
+$if(babel-newcommands)$
+  $babel-newcommands$
+$endif$
+\else
+  \usepackage{polyglossia}
+  \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$}
+$for(polyglossia-otherlangs)$
+  \setotherlanguage[$polyglossia-otherlangs.options$]{$polyglossia-otherlangs.name$}
+$endfor$
+\fi
+$endif$
+\newif\ifbibliography
+$if(natbib)$
+\usepackage{natbib}
+\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
+$endif$
+$if(biblatex)$
+\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex}
+$for(bibliography)$
+\addbibresource{$bibliography$}
+$endfor$
+$endif$
+$if(verbatim-in-note)$
+\usepackage{fancyvrb}
+$endif$
+\hypersetup{
+$if(title-meta)$
+            pdftitle={$title-meta$},
+$endif$
+$if(author-meta)$
+            pdfauthor={$author-meta$},
+$endif$
+$if(keywords)$
+            pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$},
+$endif$
+$if(colorlinks)$
+            colorlinks=true,
+            linkcolor=$if(linkcolor)$$linkcolor$$else$Maroon$endif$,
+            citecolor=$if(citecolor)$$citecolor$$else$Blue$endif$,
+            urlcolor=$if(urlcolor)$$urlcolor$$else$Blue$endif$,
+$else$
+            pdfborder={0 0 0},
+$endif$
+            breaklinks=true}
+\urlstyle{same}  % don't use monospace font for urls
+$if(verbatim-in-note)$
+\VerbatimFootnotes % allows verbatim text in footnotes
+$endif$
+$if(listings)$
+\usepackage{listings}
+$endif$
+$if(lhs)$
+\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
+$endif$
+$if(highlighting-macros)$
+$highlighting-macros$
+$endif$
+$if(tables)$
+\usepackage{longtable,booktabs}
+\usepackage{caption}
+% These lines are needed to make table captions work with longtable:
+\makeatletter
+\def\fnum@table{\tablename~\thetable}
+\makeatother
+$endif$
+$if(graphics)$
+\usepackage{graphicx,grffile}
+\makeatletter
+\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
+\def\maxheight{\ifdim\Gin@nat@height>\textheight0.8\textheight\else\Gin@nat@height\fi}
+\makeatother
+% Scale images if necessary, so that they will not overflow the page
+% 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}
+$endif$
+
+% Prevent slide breaks in the middle of a paragraph:
+\widowpenalties 1 10000
+\raggedbottom
+
+$if(section-titles)$
+\AtBeginPart{
+  \let\insertpartnumber\relax
+  \let\partname\relax
+  \frame{\partpage}
+}
+\AtBeginSection{
+  \ifbibliography
+  \else
+    \let\insertsectionnumber\relax
+    \let\sectionname\relax
+    \frame{\sectionpage}
+  \fi
+}
+\AtBeginSubsection{
+  \let\insertsubsectionnumber\relax
+  \let\subsectionname\relax
+  \frame{\subsectionpage}
+}
+$endif$
+
+$if(links-as-notes)$
+% Make links footnotes instead of hotlinks:
+\renewcommand{\href}[2]{#2\footnote{\url{#1}}}
+$endif$
+$if(strikeout)$
+\usepackage[normalem]{ulem}
+% avoid problems with \sout in headers with hyperref:
+\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
+$endif$
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{6pt plus 2pt minus 1pt}
+\setlength{\emergencystretch}{3em}  % prevent overfull lines
+\providecommand{\tightlist}{%
+  \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
+$if(numbersections)$
+\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$5$endif$}
+$else$
+\setcounter{secnumdepth}{0}
+$endif$
+$if(dir)$
+\ifxetex
+  % load bidi as late as possible as it modifies e.g. graphicx
+  $if(latex-dir-rtl)$
+  \usepackage[RTLdocument]{bidi}
+  $else$
+  \usepackage{bidi}
+  $endif$
+\fi
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
+  \TeXXeTstate=1
+  \newcommand{\RL}[1]{\beginR #1\endR}
+  \newcommand{\LR}[1]{\beginL #1\endL}
+  \newenvironment{RTL}{\beginR}{\endR}
+  \newenvironment{LTR}{\beginL}{\endL}
+\fi
+$endif$
+$for(header-includes)$
+$header-includes$
+$endfor$
+
+$if(title)$
+\title{$title$}
+$endif$
+$if(subtitle)$
+\subtitle{$subtitle$}
+$endif$
+$if(author)$
+\author{$for(author)$$author$$sep$ \and $endfor$}
+$endif$
+$if(institute)$
+\institute{$for(institute)$$institute$$sep$ \and $endfor$}
+$endif$
+\date{$date$}
+
+\begin{document}
+$if(title)$
+\frame{\titlepage}
+$endif$
+
+$for(include-before)$
+$include-before$
+
+$endfor$
+$if(toc)$
+\begin{frame}
+\tableofcontents[hideallsubsections]
+\end{frame}
+
+$endif$
+$body$
+
+$if(natbib)$
+$if(bibliography)$
+$if(biblio-title)$
+$if(book-class)$
+\renewcommand\bibname{$biblio-title$}
+$else$
+\renewcommand\refname{$biblio-title$}
+$endif$
+$endif$
+\begin{frame}[allowframebreaks]{$biblio-title$}
+\bibliographytrue
+\bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$}
+\end{frame}
+
+$endif$
+$endif$
+$if(biblatex)$$if(bibliography)$
+\begin{frame}[allowframebreaks]{$biblio-title$}
+\bibliographytrue
+\printbibliography[heading=none]
+\end{frame}
+
+$endif$$endif$
+$for(include-after)$
+$include-after$
+
+$endfor$
+\end{document}
diff --git a/gup/pdf.gup b/gup/pdf.gup
index 96f46ca..103aadb 100755
--- a/gup/pdf.gup
+++ b/gup/pdf.gup
@@ -18,8 +18,17 @@ cleanup() {
 }
 trap cleanup EXIT
 
-base=(${2%.pdf}.(md|lhs|tex)([1]))
-metadata=(${2%.pdf}.meta.yml([1]N))
+typeset -a beamerAspects
+beamerAspects=(43 169)
+beamerAspect=beamerAspects[1]
+
+if [[ $beamerAspects[(i)${2:r:e}] -le $#beamerAspects ]]; then
+    beamerAspect=${2:r:e}
+    2=${2:r:r}.${2:e}
+fi
+
+base=(${2:r}.(md|lhs|tex)([1]))
+metadata=(${2:r}.meta.yml([1]N))
 
 gup -u ${base} ${metadata} preamble.tex
 
@@ -39,18 +48,25 @@ if [[ -n ${metadata} ]]; then
     input=$(mktemp)
     cleanupList+=("rm -v ${input}")
 
+    typeset -a class
+    class=()
+    [[ ${base:e} == "tex" ]] && class=(-f latex)
+    
     logged pandoc -f markdown -t native -s ${metadata} | head -n -1 >>${input}
-    logged pandoc -R -t native ${base} >>${input}
+    logged pandoc -R ${class} -t native ${base} >>${input}
 
     extraArgs+=(-f native)
 fi
 
-# logged pandoc ${extraArgs} -t latex ${base} | cat -n >&2
-
 compileDir=$(mktemp -d)
 cleanupList+=("cd /" "rm -rfv ${compileDir}")
 
-logged pandoc ${extraArgs} -t latex -o ${compileDir}/${base:t:r}.tex ${input} >&2
+if [[ ${base:t:r} == "presentation" ]]; then
+    gup -u ${buildDir}/beamer-template.tex
+    extraArgs+=(--template=${buildDir}/beamer-template.tex -M "aspectratio=${beamerAspect}")
+fi
+
+logged pandoc ${extraArgs} -o ${compileDir}/${base:t:r}.tex ${input} >&2
 
 cd ${compileDir}
 for f (bib); do
@@ -59,6 +75,8 @@ for f (bib); do
     logged rsync -av ${base:h}/${f} .
 done
 
+# cat -n ${base:t:r}.tex >&2
+
 max=5
 runs=0
 run=true
diff --git a/preamble.tex b/preamble.tex
index 183313b..369abf6 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -97,23 +97,25 @@ keywordstyle=
   {}% header specification (empty for default)
 \makeatother
 
-\theoremstyle{definition.indented}
+\makeatletter
+\@ifclassloaded{article}{\theoremstyle{definition.indented}}{\theoremstyle{definition}}
 \newtheorem{defn}{\GetTranslation{thm-definition}}
 \newtheorem*{defn*}{\GetTranslation{thm-definition}}
 
-\theoremstyle{plain.indented}
+\@ifclassloaded{article}{\theoremstyle{plain.indented}}{\theoremstyle{plain}}
 \newtheorem{thm}{\GetTranslation{thm-theorem}}
 \newtheorem*{thm*}{\GetTranslation{thm-theorem}}
 \newtheorem{lem}[thm]{\GetTranslation{thm-lemma}}
 \newtheorem*{lem*}{\GetTranslation{thm-lemma}}
 
-\theoremstyle{remark.indented}
+\@ifclassloaded{article}{\theoremstyle{remark.indented}}{\theoremstyle{remark}}
 \newtheorem{rem}{\GetTranslation{thm-remark}}
 \newtheorem*{rem*}{\GetTranslation{thm-remark}}
 \newtheorem{eg}[rem]{\GetTranslation{thm-example}}
 \newtheorem*{eg*}{\GetTranslation{thm-example}}
 \newtheorem*{sketch}{\GetTranslation{thm-proofsketch}}
 \newtheorem*{tshow}{\GetTranslation{thm-show}}
+\makeatother
 
 \newcommand\restr[2]{{% we make the whole thing an ordinary symbol
   \left.\kern-\nulldelimiterspace % automatically resize the bar with \right
@@ -121,3 +123,10 @@ keywordstyle=
   \vphantom{\big|} % pretend it's a little taller at normal size
   \right|_{#2} % this is the delimiter
   }}
+
+\makeatletter
+\@ifclassloaded{article}{
+  \usepackage{abstract}
+  \AtBeginDocument{\setlength{\absparindent}{0em}}
+}{}
+\makeatother