diff options
| -rw-r--r-- | default.beamer | 29 | ||||
| -rw-r--r-- | default.docbook5 | 31 | ||||
| -rw-r--r-- | default.dzslides | 2 | ||||
| -rw-r--r-- | default.epub | 6 | ||||
| -rw-r--r-- | default.epub3 | 6 | ||||
| -rw-r--r-- | default.html5 | 6 | ||||
| -rw-r--r-- | default.latex | 28 | ||||
| -rw-r--r-- | default.revealjs | 10 | ||||
| -rw-r--r-- | default.slidy | 2 | ||||
| -rw-r--r-- | default.zimwiki | 16 |
10 files changed, 112 insertions, 24 deletions
diff --git a/default.beamer b/default.beamer index ccd0862d1..1dcc77e4e 100644 --- a/default.beamer +++ b/default.beamer @@ -24,6 +24,9 @@ $endif$ \usepackage{fontspec} \fi \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} +$for(fontfamilies)$ + \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$} +$endfor$ $if(euro)$ \newcommand{\euro}{€} $endif$ @@ -45,7 +48,7 @@ $if(CJKmainfont)$ $endif$ \fi $if(theme)$ -\usetheme{$theme$} +\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$} $endif$ $if(colortheme)$ \usecolortheme{$colortheme$} @@ -89,12 +92,30 @@ $if(natbib)$ \bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} $endif$ $if(biblatex)$ -\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex} -$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$ +\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex} $for(bibliography)$ \addbibresource{$bibliography$} $endfor$ $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} $if(listings)$ \usepackage{listings} $endif$ @@ -162,6 +183,8 @@ $if(strikeout)$ % 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}} diff --git a/default.docbook5 b/default.docbook5 new file mode 100644 index 000000000..415ccf9c3 --- /dev/null +++ b/default.docbook5 @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE article> +<article + xmlns="http://docbook.org/ns/docbook" version="5.0" +$if(mathml)$ + xmlns:mml="http://www.w3.org/1998/Math/MathML" +$endif$ + xmlns:xlink="http://www.w3.org/1999/xlink" > + <info> + <title>$title$</title> +$if(author)$ + <authorgroup> +$for(author)$ + <author> + $author$ + </author> +$endfor$ + </authorgroup> +$endif$ +$if(date)$ + <date>$date$</date> +$endif$ + </info> +$for(include-before)$ +$include-before$ +$endfor$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ +</article> diff --git a/default.dzslides b/default.dzslides index c8c249030..97d518931 100644 --- a/default.dzslides +++ b/default.dzslides @@ -12,7 +12,7 @@ $if(keywords)$ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$"> $endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> - <style type="text/css">code{white-space: pre;}</style> + <style type="text/css">code{white-space: pre-wrap;}</style> $if(quotes)$ <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style> $endif$ diff --git a/default.epub b/default.epub index 1c042ff1e..afcf96a3e 100644 --- a/default.epub +++ b/default.epub @@ -28,13 +28,13 @@ $else$ $endif$ $endfor$ $if(subtitle)$ - <h1 class="subtitle">$subtitle$</h1> + <p class="subtitle">$subtitle$</p> $endif$ $for(author)$ - <h2 class="author">$author$</h2> + <p class="author">$author$</p> $endfor$ $for(creator)$ - <h2 class="$creator.role$">$creator.text$</h2> + <p class="$creator.role$">$creator.text$</p> $endfor$ $if(publisher)$ <p class="publisher">$publisher$</p> diff --git a/default.epub3 b/default.epub3 index 0325d53eb..8a12e0fb3 100644 --- a/default.epub3 +++ b/default.epub3 @@ -33,13 +33,13 @@ $else$ $endif$ $endfor$ $if(subtitle)$ - <h1 class="subtitle">$subtitle$</h1> + <p class="subtitle">$subtitle$</p> $endif$ $for(author)$ - <h2 class="author">$author$</h2> + <p class="author">$author$</p> $endfor$ $for(creator)$ - <h2 class="$creator.role$">$creator.text$</h2> + <p class="$creator.role$">$creator.text$</p> $endfor$ $if(publisher)$ <p class="publisher">$publisher$</p> diff --git a/default.html5 b/default.html5 index 6b1fdb38b..5641ecb80 100644 --- a/default.html5 +++ b/default.html5 @@ -44,13 +44,13 @@ $if(title)$ <header> <h1 class="title">$title$</h1> $if(subtitle)$ -<h1 class="subtitle">$subtitle$</h1> +<p class="subtitle">$subtitle$</p> $endif$ $for(author)$ -<h2 class="author">$author$</h2> +<p class="author">$author$</p> $endfor$ $if(date)$ -<h3 class="date">$date$</h3> +<p class="date">$date$</p> $endif$ </header> $endif$ diff --git a/default.latex b/default.latex index 776eb68fa..ab9c7c547 100644 --- a/default.latex +++ b/default.latex @@ -1,4 +1,7 @@ \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$paper,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} +$if(beamerarticle)$ +\usepackage{beamerarticle} % needs to be loaded first +$endif$ $if(fontfamily)$ \usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$} $else$ @@ -24,6 +27,9 @@ $endif$ \usepackage{fontspec} \fi \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} +$for(fontfamilies)$ + \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$} +$endfor$ $if(euro)$ \newcommand{\euro}{€} $endif$ @@ -48,18 +54,18 @@ $endif$ \IfFileExists{upquote.sty}{\usepackage{upquote}}{} % use microtype if available \IfFileExists{microtype.sty}{% -\usepackage{microtype} +\usepackage[$for(microtypeoptions)$$microtypeoptions$$sep$,$endfor$]{microtype} \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} $if(geometry)$ \usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry} $endif$ \PassOptionsToPackage{hyphens}{url} % url is loaded by hyperref -\usepackage{hyperref} +\usepackage[unicode=true]{hyperref} $if(colorlinks)$ \PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref $endif$ -\hypersetup{unicode=true, +\hypersetup{ $if(title-meta)$ pdftitle={$title-meta$}, $endif$ @@ -67,7 +73,7 @@ $if(author-meta)$ pdfauthor={$author-meta$}, $endif$ $if(keywords)$ - pdfkeywords={$for(keywords)$$keywords$$sep$; $endfor$}, + pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$}, $endif$ $if(colorlinks)$ colorlinks=true, @@ -98,8 +104,7 @@ $if(natbib)$ \bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} $endif$ $if(biblatex)$ -\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex} -$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$ +\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex} $for(bibliography)$ \addbibresource{$bibliography$} $endfor$ @@ -119,6 +124,8 @@ $if(verbatim-in-note)$ $endif$ $if(tables)$ \usepackage{longtable,booktabs} +% Fix footnotes in tables (requires footnote package) +\IfFileExists{footnote.sty}{\usepackage{footnote}\makesavenoteenv{long table}}{} $endif$ $if(graphics)$ \usepackage{graphicx,grffile} @@ -153,7 +160,7 @@ $endif$ \providecommand{\tightlist}{% \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} $if(numbersections)$ -\setcounter{secnumdepth}{5} +\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$5$endif$} $else$ \setcounter{secnumdepth}{0} $endif$ @@ -186,6 +193,12 @@ $if(dir)$ \newenvironment{LTR}{\beginL}{\endL} \fi $endif$ + +% set default figure placement to htbp +\makeatletter +\def\fps@figure{htbp} +\makeatother + $for(header-includes)$ $header-includes$ $endfor$ @@ -201,6 +214,7 @@ $if(author)$ \author{$for(author)$$author$$sep$ \and $endfor$} $endif$ $if(institute)$ +\providecommand{\institute}[1]{} \institute{$for(institute)$$institute$$sep$ \and $endfor$} $endif$ \date{$date$} diff --git a/default.revealjs b/default.revealjs index db16168f9..1d356ef8d 100644 --- a/default.revealjs +++ b/default.revealjs @@ -63,13 +63,13 @@ $if(title)$ <section> <h1 class="title">$title$</h1> $if(subtitle)$ - <h1 class="subtitle">$subtitle$</h1> + <p class="subtitle">$subtitle$</p> $endif$ $for(author)$ - <h2 class="author">$author$</h2> + <p class="author">$author$</p> $endfor$ $if(date)$ - <h3 class="date">$date$</h3> + <p class="date">$date$</p> $endif$ </section> $endif$ @@ -228,6 +228,10 @@ $endif$ dependencies: [ { src: '$revealjs-url$/lib/js/classList.js', condition: function() { return !document.body.classList; } }, { src: '$revealjs-url$/plugin/zoom-js/zoom.js', async: true }, + $if(notes-server)$ + { src: '$revealjs-url$/socket.io/socker.io.js', async: true }, + { src: '$revealjs-url$/plugin/notes-server/client.js', async: true }, + $endif$ { src: '$revealjs-url$/plugin/notes/notes.js', async: true } ] }); diff --git a/default.slidy b/default.slidy index 5f83b40ca..cccf3537d 100644 --- a/default.slidy +++ b/default.slidy @@ -51,7 +51,7 @@ $if(title)$ <div class="slide titlepage"> <h1 class="title">$title$</h1> $if(subtitle)$ - <h1 class="subtitle">$subtitle$</h1> + <p class="subtitle">$subtitle$</p> $endif$ $if(author)$ <p class="author"> diff --git a/default.zimwiki b/default.zimwiki new file mode 100644 index 000000000..30824bd9f --- /dev/null +++ b/default.zimwiki @@ -0,0 +1,16 @@ +Content-Type: text/x-zim-wiki +Wiki-Format: zim 0.4 + +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +__TOC__ + +$endif$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ |