diff options
| -rw-r--r-- | default.asciidoc | 17 | ||||
| -rw-r--r-- | default.beamer | 84 | ||||
| -rw-r--r-- | default.context | 95 | ||||
| -rw-r--r-- | default.dzslides | 144 | ||||
| -rw-r--r-- | default.html | 5 | ||||
| -rw-r--r-- | default.html5 | 3 | ||||
| -rw-r--r-- | default.latex | 97 | ||||
| -rw-r--r-- | default.man | 4 | ||||
| -rw-r--r-- | default.opendocument | 4 | ||||
| -rw-r--r-- | default.revealjs | 20 | ||||
| -rw-r--r-- | default.s5 | 21 | ||||
| -rw-r--r-- | default.slideous | 8 | ||||
| -rw-r--r-- | default.slidy | 10 |
13 files changed, 338 insertions, 174 deletions
diff --git a/default.asciidoc b/default.asciidoc index 3e30ceef8..27215469a 100644 --- a/default.asciidoc +++ b/default.asciidoc @@ -1,16 +1,25 @@ $if(titleblock)$ $title$ -$for(author)$ -:author: $author$ -$endfor$ +$if(author)$ +$for(author)$$author$$sep$; $endfor$ +$endif$ $if(date)$ -:date: $date$ +$date$ +$endif$ +$if(keywords)$ +:keywords: $for(keywords)$$keywords$$sep$, $endfor$ $endif$ $if(toc)$ :toc: $endif$ $endif$ +$if(abstract)$ +[abstract] +== Abstract +$abstract$ + +$endif$ $for(header-includes)$ $header-includes$ diff --git a/default.beamer b/default.beamer index dcbc16196..aa9d545f2 100644 --- a/default.beamer +++ b/default.beamer @@ -1,27 +1,10 @@ \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(handout)$handout,$endif$$if(beamer)$ignorenonframetext,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} -$if(theme)$ -\usetheme{$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$ \setbeamertemplate{caption}[numbered] \setbeamertemplate{caption label separator}{: } \setbeamercolor{caption name}{fg=normal text.fg} +\beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$ $if(fontfamily)$ -\usepackage[$fontfamilyoptions$]{$fontfamily$} +\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$} $else$ \usepackage{lmodern} $endif$ @@ -41,24 +24,44 @@ $endif$ \usepackage{fontspec} \fi \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} +$if(euro)$ \newcommand{\euro}{€} +$endif$ $if(mainfont)$ - \setmainfont[$mainfontoptions$]{$mainfont$} + \setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$} $endif$ $if(sansfont)$ - \setsansfont[$sansfontoptions$]{$sansfont$} + \setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$]{$sansfont$} $endif$ $if(monofont)$ - \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$monofontoptions$$endif$]{$monofont$} + \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$endif$]{$monofont$} $endif$ $if(mathfont)$ - \setmathfont(Digits,Latin,Greek)[$mathfontoptions$]{$mathfont$} + \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} $endif$ $if(CJKmainfont)$ \usepackage{xeCJK} - \setCJKmainfont[$CJKoptions$]{$CJKmainfont$} + \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} $endif$ \fi +$if(theme)$ +\usetheme{$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 @@ -68,8 +71,10 @@ $endif$ }{} $if(lang)$ \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex - \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$$sep$,$endfor$,main=$babel-lang$]{babel} + \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$} @@ -78,12 +83,14 @@ $for(polyglossia-otherlangs)$ $endfor$ \fi $endif$ +\newif\ifbibliography $if(natbib)$ \usepackage{natbib} \bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} $endif$ $if(biblatex)$ -\usepackage{biblatex} +\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex} +$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$ $for(bibliography)$ \addbibresource{$bibliography$} $endfor$ @@ -121,23 +128,30 @@ $if(graphics)$ \setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio} $endif$ -% Comment these out if you don't want a slide with just the -% part/section/subsection/subsubsection title: +% 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{ - \let\insertsectionnumber\relax - \let\sectionname\relax - \frame{\sectionpage} + \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: @@ -173,6 +187,9 @@ $if(dir)$ \newenvironment{LTR}{\beginL}{\endL} \fi $endif$ +$for(header-includes)$ +$header-includes$ +$endfor$ $if(title)$ \title{$title$} @@ -184,9 +201,6 @@ $if(author)$ \author{$for(author)$$author$$sep$ \and $endfor$} $endif$ \date{$date$} -$for(header-includes)$ -$header-includes$ -$endfor$ \begin{document} $if(title)$ @@ -215,6 +229,7 @@ $else$ $endif$ $endif$ \begin{frame}[allowframebreaks]{$biblio-title$} +\bibliographytrue \bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$} \end{frame} @@ -222,6 +237,7 @@ $endif$ $endif$ $if(biblatex)$ \begin{frame}[allowframebreaks]{$biblio-title$} +\bibliographytrue \printbibliography[heading=none] \end{frame} diff --git a/default.context b/default.context index d4e8d29f0..4a3457934 100644 --- a/default.context +++ b/default.context @@ -8,53 +8,61 @@ $endif$ % Enable hyperlinks \setupinteraction [state=start, - style=$if(style)$$style$$else$normal$endif$, - color=$if(linkcolor)$$linkcolor$$else$black$endif$, - contrastcolor=$if(linkcolor)$$linkcolor$$else$black$endif$$if(title)$, - title=$title$$endif$$if(subtitle)$, - subtitle=$subtitle$$endif$$if(author)$, - author=$for(author)$$author$$sep$; $endfor$$endif$$if(keywords)$, - keyword=$keywords$$endif$] +$if(title)$ + title={$title$}, +$endif$ +$if(subtitle)$ + subtitle={$subtitle$}, +$endif$ +$if(author)$ + author={$for(author)$$author$$sep$; $endfor$}, +$endif$ +$if(keywords)$ + keyword={$for(keywords)$$keywords$$sep$; $endfor$}, +$endif$ + style=$linkstyle$, + color=$linkcolor$, + contrastcolor=$linkcontrastcolor$] % make chapter, section bookmarks visible when opening document \placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section] \setupinteractionscreen[option=bookmark] \setuptagging[state=start] $if(papersize)$ -\setuppapersize[$for(papersize)$$papersize$$sep$, - $endfor$] +\setuppapersize[$for(papersize)$$papersize$$sep$,$endfor$] $endif$ $if(layout)$ -\setuplayout[$for(layout)$$layout$$sep$, - $endfor$] +\setuplayout[$for(layout)$$layout$$sep$,$endfor$] $endif$ $if(pagenumbering)$ -\setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$, - $endfor$] +\setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$,$endfor$] $endif$ -\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes] % use microtypography +% use microtypography +\definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes] +\definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes] \setupalign[hz,hanging] +\setupitaliccorrection[global, always] \setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted +\usemodule[simplefonts$if(fontsize)$,$fontsize$$endif$] +\setmainfontfallback[DejaVu Serif][range={greekandcoptic, greekextended}, force=yes, rscale=auto] $if(mainfont)$ -\definefontfamily[mainfont][serif][$mainfont$] +\setmainfont[$mainfont$] $endif$ $if(sansfont)$ -\definefontfamily[sansfont][sans][$sansfont$] +\setsansfont[$sansfont$][rscale=auto] $endif$ $if(monofont)$ -\definefontfamily[monofont][mono][$monofont$][features=none] +\setmonofont[$monofont$][features=none, rscale=auto] $endif$ $if(mathfont)$ -\definefontfamily[mathfont][math][$mathfont$] +\setmathfont[$mathfont$][rscale=auto] $endif$ -\setupbodyfont[mainfont$if(fontsize)$,$fontsize$$endif$] -$if(whitespace)$ -\setupwhitespace[$whitespace$] -$else$ -\setupwhitespace[medium] +\setupwhitespace[$if(whitespace)$$whitespace$$else$medium$endif$] +$if(indenting)$ +\setupindenting[$for(indenting)$$indenting$$sep$,$endfor$] $endif$ $if(interlinespace)$ -\setupinterlinespace[$interlinespace$] +\setupinterlinespace[$for(interlinespace)$$interlinespace$$sep$,$endfor$] $endif$ \setuphead[chapter] [style=\tfd,header=empty] @@ -65,10 +73,10 @@ $endif$ \setuphead[subsubsubsubsection][style=\it] $if(headertext)$ -\setupheadertexts[$headertext$] +\setupheadertexts$for(headertext)$[$headertext$]$endfor$ $endif$ $if(footertext)$ -\setupfootertexts[$footertext$] +\setupfootertexts$for(footertext)$[$footertext$]$endfor$ $endif$ $if(number-sections)$ $else$ @@ -87,31 +95,28 @@ $endif$ \setupthinrules[width=15em] % width of horizontal rules -\setuphead[title][ - style={\tfd\raggedcenter}, - before={\startalignment[middle]}, - after={ -$if(subtitle)$ - \smallskip - {\tfa $subtitle$} -$endif$ -$if(author)$ - \smallskip - {\tfa $for(author)$$author$$sep$\crlf $endfor$} -$endif$ -$if(date)$ - \smallskip - {\tfa $date$} -$endif$ - \bigskip\stopalignment}] - $for(header-includes)$ $header-includes$ $endfor$ \starttext $if(title)$ -\title{$title$} +\startalignment[middle] + {\tfd $title$} +$if(subtitle)$ + \smallskip + {\tfa $subtitle$} +$endif$ +$if(author)$ + \smallskip + {\tfa $for(author)$$author$$sep$\crlf $endfor$} +$endif$ +$if(date)$ + \smallskip + {\tfa $date$} +$endif$ + \bigskip +\stopalignment $endif$ $if(abstract)$ \midaligned{\it Abstract} diff --git a/default.dzslides b/default.dzslides index a680c1afa..c8c249030 100644 --- a/default.dzslides +++ b/default.dzslides @@ -1,14 +1,21 @@ <!DOCTYPE html> -<head> -<meta charset="utf-8"> +<head$if(lang)$ lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$> + <meta charset="utf-8"> + <meta name="generator" content="pandoc"> $for(author-meta)$ - <meta name="author" content="$author-meta$" /> + <meta name="author" content="$author-meta$"> $endfor$ $if(date-meta)$ - <meta name="dcterms.date" content="$date-meta$" /> + <meta name="dcterms.date" content="$date-meta$"> +$endif$ +$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> +$if(quotes)$ + <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style> +$endif$ $if(highlighting-css)$ <style type="text/css"> $highlighting-css$ @@ -16,40 +23,87 @@ $highlighting-css$ $endif$ $if(css)$ $for(css)$ - <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/> + <link rel="stylesheet" href="$css$"> $endfor$ $else$ +<link href='http://fonts.googleapis.com/css?family=Oswald' rel='stylesheet'> + <style> - html { background-color: black; } - body { background-color: white; border-radius: 12px} + html, .view body { background-color: black; counter-reset: slideidx; } + body, .view section { background-color: white; border-radius: 12px } /* A section is a slide. It's size is 800x600, and this will never change */ - section { - font-family: Arial, serif; - font-size: 20pt; - } - address, blockquote, dl, fieldset, form, h1, h2, h3, h4, h5, h6, hr, ol, p, pre, table, ul, dl { padding: 10px 20px 10px 20px; } - h1, h2, h3 { + section, .view head > title { + /* The font from Google */ + font-family: 'Oswald', arial, serif; + font-size: 30px; + } + + .view section:after { + counter-increment: slideidx; + content: counter(slideidx, decimal-leading-zero); + position: absolute; bottom: -80px; right: 100px; + color: white; + } + + .view head > title { + color: white; + text-align: center; + margin: 1em 0 1em 0; + } + + h1, h2 { + margin-top: 200px; text-align: center; - margin: 10pt 10pt 20pt 10pt; - } - ul, ol { - margin: 10px 10px 10px 50px; - } - section.titleslide h1 { margin-top: 200px; } - h1.title { margin-top: 150px; } - h1 { font-size: 180%; } - h2 { font-size: 120%; } - h3 { font-size: 100%; } - q { quotes: "“" "”" "‘" "’"; } - blockquote { font-style: italic } - /* Figures are displayed full-page, with the caption on - top of the image/video */ + font-size: 80px; + } + h3 { + margin: 100px 0 50px 100px; + } + + ul { + margin: 50px 200px; + } + li > ul { + margin: 15px 50px; + } + + p { + margin: 75px; + font-size: 50px; + } + + blockquote { + height: 100%; + background-color: black; + color: white; + font-size: 60px; + padding: 50px; + } + blockquote:before { + content: open-quote; + } + blockquote:after { + content: close-quote; + } + + /* Figures are displayed full-page, with the caption + on top of the image/video */ figure { background-color: black; + width: 100%; + height: 100%; + } + figure > * { + position: absolute; + } + figure > img, figure > video { + width: 100%; height: 100%; } figcaption { margin: 70px; + font-size: 50px; } + footer { position: absolute; bottom: 0; @@ -66,10 +120,20 @@ $else$ https://developer.mozilla.org/en/CSS/CSS_transitions How to use CSS3 Transitions: */ section { - -moz-transition: left 400ms linear 0s; - -webkit-transition: left 400ms linear 0s; - -ms-transition: left 400ms linear 0s; - transition: left 400ms linear 0s; + -moz-transition: left 400ms linear 0s; + -webkit-transition: left 400ms linear 0s; + -ms-transition: left 400ms linear 0s; + transition: left 400ms linear 0s; + } + .view section { + -moz-transition: none; + -webkit-transition: none; + -ms-transition: none; + transition: none; + } + + .view section[aria-selected] { + border: 5px red solid; } /* Before */ @@ -85,10 +149,17 @@ $else$ .incremental > * { opacity: 1; } /* The current item */ - .incremental > *[aria-selected] { color: red; opacity: 1; } + .incremental > *[aria-selected] { opacity: 1; } /* The items to-be-selected */ - .incremental > *[aria-selected] ~ * { opacity: 0.2; } + .incremental > *[aria-selected] ~ * { opacity: 0; } + + /* The progressbar, at the bottom of the slides, show the global + progress of the presentation. */ + #progress-bar { + height: 2px; + background: #AAA; + } </style> $endif$ $if(math)$ @@ -105,10 +176,9 @@ $if(title)$ $if(subtitle)$ <h1 class="subtitle">$subtitle$</h1> $endif$ -$for(author)$ - <h2 class="author">$author$</h2> -$endfor$ - <h3 class="date">$date$</h3> + <footer> + $if(author)$<span class="author">$for(author)$$author$$sep$, $endfor$</span>$endif$ · $if(date)$<span class="date">$date$</span>$endif$ + </footer> </section> $endif$ $if(toc)$ diff --git a/default.html b/default.html index 0a20a7be8..8caea26c8 100644 --- a/default.html +++ b/default.html @@ -10,6 +10,9 @@ $endfor$ $if(date-meta)$ <meta name="date" content="$date-meta$" /> $endif$ +$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> $if(quotes)$ @@ -21,7 +24,7 @@ $highlighting-css$ </style> $endif$ $for(css)$ - <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/> + <link rel="stylesheet" href="$css$" type="text/css" /> $endfor$ $if(math)$ $math$ diff --git a/default.html5 b/default.html5 index 921e0c31d..6b1fdb38b 100644 --- a/default.html5 +++ b/default.html5 @@ -10,6 +10,9 @@ $endfor$ $if(date-meta)$ <meta name="dcterms.date" content="$date-meta$"> $endif$ +$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> $if(quotes)$ diff --git a/default.latex b/default.latex index 935c2422d..afa679a95 100644 --- a/default.latex +++ b/default.latex @@ -1,6 +1,6 @@ -\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} +\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$paper,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} $if(fontfamily)$ -\usepackage[$fontfamilyoptions$]{$fontfamily$} +\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$} $else$ \usepackage{lmodern} $endif$ @@ -24,22 +24,24 @@ $endif$ \usepackage{fontspec} \fi \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} +$if(euro)$ \newcommand{\euro}{€} +$endif$ $if(mainfont)$ - \setmainfont[$mainfontoptions$]{$mainfont$} + \setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$]{$mainfont$} $endif$ $if(sansfont)$ - \setsansfont[$sansfontoptions$]{$sansfont$} + \setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$]{$sansfont$} $endif$ $if(monofont)$ - \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$monofontoptions$$endif$]{$monofont$} + \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$endif$]{$monofont$} $endif$ $if(mathfont)$ - \setmathfont(Digits,Latin,Greek)[$mathfontoptions$]{$mathfont$} + \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} $endif$ $if(CJKmainfont)$ \usepackage{xeCJK} - \setCJKmainfont[$CJKoptions$]{$CJKmainfont$} + \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} $endif$ \fi % use upquote if available, for straight quotes in verbatim environments @@ -53,24 +55,35 @@ $if(geometry)$ \usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry} $endif$ \usepackage{hyperref} +$if(colorlinks)$ \PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref -\hypersetup{breaklinks=true, - unicode=true,$if(title-meta)$ - pdftitle={$title-meta$},$endif$$if(author-meta)$ - pdfauthor={$author-meta$},$endif$$if(subtitle)$ - pdfsubject={$subtitle$},$endif$$if(keywords)$ - pdfkeywords={$keywords$},$endif$ +$endif$ +\hypersetup{unicode=true, +$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, - citecolor=$if(citecolor)$$citecolor$$else$black$endif$, - urlcolor=$if(urlcolor)$$urlcolor$$else$black$endif$, - linkcolor=$if(linkcolor)$$linkcolor$$else$black$endif$, - pdfborder={0 0 0}$if(hidelinks)$, - hidelinks$endif$} + 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(lang)$ \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex - \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$$sep$,$endfor$,main=$babel-lang$]{babel} + \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$} @@ -84,7 +97,8 @@ $if(natbib)$ \bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} $endif$ $if(biblatex)$ -\usepackage{biblatex} +\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex} +$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$ $for(bibliography)$ \addbibresource{$bibliography$} $endfor$ @@ -127,8 +141,12 @@ $if(strikeout)$ $endif$ $if(indent)$ $else$ +\IfFileExists{parskip.sty}{% +\usepackage{parskip} +}{% else \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} +} $endif$ \setlength{\emergencystretch}{3em} % prevent overfull lines \providecommand{\tightlist}{% @@ -138,6 +156,18 @@ $if(numbersections)$ $else$ \setcounter{secnumdepth}{0} $endif$ +$if(subparagraph)$ +$else$ +% Redefines (sub)paragraphs to behave more like sections +\ifx\paragraph\undefined\else +\let\oldparagraph\paragraph +\renewcommand{\paragraph}[1]{\oldparagraph{#1}\mbox{}} +\fi +\ifx\subparagraph\undefined\else +\let\oldsubparagraph\subparagraph +\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} +\fi +$endif$ $if(dir)$ \ifxetex % load bidi as late as possible as it modifies e.g. graphicx @@ -155,30 +185,21 @@ $if(dir)$ \newenvironment{LTR}{\beginL}{\endL} \fi $endif$ +$for(header-includes)$ +$header-includes$ +$endfor$ $if(title)$ -\title{$title$$if(subtitle)$\\\vspace{0.5em}{\large $subtitle$}$endif$} +\title{$title$$if(thanks)$\thanks{$thanks$}$endif$} +$endif$ +$if(subtitle)$ +\providecommand{\subtitle}[1]{} +\subtitle{$subtitle$} $endif$ $if(author)$ \author{$for(author)$$author$$sep$ \and $endfor$} $endif$ \date{$date$} -$for(header-includes)$ -$header-includes$ -$endfor$ - -$if(subparagraph)$ -$else$ -% Redefines (sub)paragraphs to behave more like sections -\ifx\paragraph\undefined\else -\let\oldparagraph\paragraph -\renewcommand{\paragraph}[1]{\oldparagraph{#1}\mbox{}} -\fi -\ifx\subparagraph\undefined\else -\let\oldsubparagraph\subparagraph -\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} -\fi -$endif$ \begin{document} $if(title)$ @@ -196,7 +217,9 @@ $include-before$ $endfor$ $if(toc)$ { +$if(colorlinks)$ \hypersetup{linkcolor=$if(toccolor)$$toccolor$$else$black$endif$} +$endif$ \setcounter{tocdepth}{$toc-depth$} \tableofcontents } diff --git a/default.man b/default.man index 896e5d7e0..44b59198b 100644 --- a/default.man +++ b/default.man @@ -8,12 +8,12 @@ $endif$ $if(adjusting)$ .ad $adjusting$ $endif$ +.TH "$title$" "$section$" "$date$" "$footer$" "$header$" $if(hyphenate)$ .hy $else$ -.nh +.nh \" Turn off hyphenation by default. $endif$ -.TH "$title$" "$section$" "$date$" "$footer$" "$header$" $for(header-includes)$ $header-includes$ $endfor$ diff --git a/default.opendocument b/default.opendocument index 6a0e11ea1..bb01d4bbb 100644 --- a/default.opendocument +++ b/default.opendocument @@ -3,7 +3,9 @@ <office:font-face-decls> <style:font-face style:name="Courier New" style:font-family-generic="modern" style:font-pitch="fixed" svg:font-family="'Courier New'" /> </office:font-face-decls> - $automatic-styles$ + <office:automatic-styles> + $automatic-styles$ + </office:automatic-styles> $for(header-includes)$ $header-includes$ $endfor$ diff --git a/default.revealjs b/default.revealjs index f2439b984..db16168f9 100644 --- a/default.revealjs +++ b/default.revealjs @@ -9,12 +9,18 @@ $endfor$ $if(date-meta)$ <meta name="dcterms.date" content="$date-meta$"> $endif$ +$if(keywords)$ + <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$"> +$endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui"> - <link rel="stylesheet" href="$revealjs-url$/css/reveal.css"/> + <link rel="stylesheet" href="$revealjs-url$/css/reveal.css"> <style type="text/css">code{white-space: pre;}</style> +$if(quotes)$ + <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style> +$endif$ $if(highlighting-css)$ <style type="text/css"> $highlighting-css$ @@ -55,14 +61,16 @@ $endfor$ $if(title)$ <section> - <h1 class="title">$title$</h1> + <h1 class="title">$title$</h1> $if(subtitle)$ <h1 class="subtitle">$subtitle$</h1> $endif$ $for(author)$ - <h2 class="author">$author$</h2> + <h2 class="author">$author$</h2> $endfor$ - <h3 class="date">$date$</h3> +$if(date)$ + <h3 class="date">$date$</h3> +$endif$ </section> $endif$ $if(toc)$ @@ -190,10 +198,10 @@ $endif$ $if(parallaxBackgroundHorizontal)$ // Amount to move parallax background (horizontal and vertical) on slide change // Number, e.g. 100 - parallaxBackgroundHorizontal: '$parallaxBackgroundHorizontal$', + parallaxBackgroundHorizontal: $parallaxBackgroundHorizontal$, $endif$ $if(parallaxBackgroundVertical)$ - parallaxBackgroundVertical: '$parallaxBackgroundVertical$', + parallaxBackgroundVertical: $parallaxBackgroundVertical$, $endif$ $if(width)$ // The "normal" size of the presentation, aspect ratio will be preserved diff --git a/default.s5 b/default.s5 index 219b129c0..6ab482864 100644 --- a/default.s5 +++ b/default.s5 @@ -1,20 +1,27 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Style-Type" content="text/css" /> <meta name="generator" content="pandoc" /> $for(author-meta)$ + <meta name="version" content="S5 1.1" /> <meta name="author" content="$author-meta$" /> $endfor$ $if(date-meta)$ <meta name="date" content="$date-meta$" /> $endif$ +$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> <!-- configuration parameters --> <meta name="defaultView" content="slideshow" /> <meta name="controlVis" content="hidden" /> +$if(quotes)$ + <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style> +$endif$ $if(highlighting-css)$ <style type="text/css"> $highlighting-css$ @@ -53,12 +60,16 @@ $endfor$ <div class="presentation"> $if(title)$ <div class="titleslide slide"> - <h1>$title$</h1> + <h1 class="title">$title$</h1> $if(subtitle)$ - <h1 class="subtitle">$subtitle$</h1> + <h2 class="subtitle">$subtitle$</h2> +$endif$ +$if(author)$ + <h3 class="author">$for(author)$$author$$sep$<br/>$endfor$</h3> +$endif$ +$if(date)$ + <h4 class="date">$date$</h4> $endif$ - <h2>$for(author)$$author$$sep$<br/>$endfor$</h2> - <h3>$date$</h3> </div> $endif$ $if(toc)$ diff --git a/default.slideous b/default.slideous index 505acea3a..30c93567d 100644 --- a/default.slideous +++ b/default.slideous @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$> +<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Style-Type" content="text/css" /> @@ -12,8 +12,14 @@ $endfor$ $if(date-meta)$ <meta name="date" content="$date-meta$" /> $endif$ +$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> +$if(quotes)$ + <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style> +$endif$ $if(highlighting-css)$ <style type="text/css"> $highlighting-css$ diff --git a/default.slidy b/default.slidy index 796dac485..5f83b40ca 100644 --- a/default.slidy +++ b/default.slidy @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$> +<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Style-Type" content="text/css" /> @@ -12,8 +12,14 @@ $endfor$ $if(date-meta)$ <meta name="date" content="$date-meta$" /> $endif$ +$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> +$if(quotes)$ + <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style> +$endif$ $if(highlighting-css)$ <style type="text/css"> $highlighting-css$ @@ -47,9 +53,11 @@ $if(title)$ $if(subtitle)$ <h1 class="subtitle">$subtitle$</h1> $endif$ +$if(author)$ <p class="author"> $for(author)$$author$$sep$<br/>$endfor$ </p> +$endif$ $if(date)$ <p class="date">$date$</p> $endif$ |