From f9e07db23dc0c5eabb90c4d9c04666e1ee5c3229 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 8 Jun 2017 11:24:37 +0200 Subject: Much more work on pdf compilation --- gup/pdf.gup | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'gup') 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 -- cgit v1.2.3