diff options
| -rw-r--r-- | default.beamer | 4 | ||||
| -rw-r--r-- | default.html5 | 8 | ||||
| -rw-r--r-- | default.latex | 13 | ||||
| -rw-r--r-- | default.man | 2 | ||||
| -rw-r--r-- | default.revealjs | 182 |
5 files changed, 169 insertions, 40 deletions
diff --git a/default.beamer b/default.beamer index 9198ef010..3a0d76b43 100644 --- a/default.beamer +++ b/default.beamer @@ -29,7 +29,7 @@ $endif$ \usepackage{ifxetex,ifluatex} \usepackage{fixltx2e} % provides \textsubscript \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex - \usepackage[T1]{fontenc} + \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc} \usepackage[utf8]{inputenc} $if(euro)$ \usepackage{eurosym} @@ -40,7 +40,7 @@ $endif$ \else \usepackage{fontspec} \fi - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \newcommand{\euro}{€} $if(mainfont)$ \setmainfont[$mainfontoptions$]{$mainfont$} diff --git a/default.html5 b/default.html5 index 45c6885a1..921e0c31d 100644 --- a/default.html5 +++ b/default.html5 @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html$if(lang)$ lang="$lang$"$endif$> +<html$if(lang)$ lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$> <head> <meta charset="utf-8"> <meta name="generator" content="pandoc"> @@ -12,9 +12,6 @@ $if(date-meta)$ $endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <style type="text/css">code{white-space: pre;}</style> - <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> - <![endif]--> $if(quotes)$ <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style> $endif$ @@ -29,6 +26,9 @@ $endfor$ $if(math)$ $math$ $endif$ + <!--[if lt IE 9]> + <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script> + <![endif]--> $for(header-includes)$ $header-includes$ $endfor$ diff --git a/default.latex b/default.latex index 463b096b6..fd599648f 100644 --- a/default.latex +++ b/default.latex @@ -12,7 +12,7 @@ $endif$ \usepackage{ifxetex,ifluatex} \usepackage{fixltx2e} % provides \textsubscript \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex - \usepackage[T1]{fontenc} + \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc} \usepackage[utf8]{inputenc} $if(euro)$ \usepackage{eurosym} @@ -23,7 +23,7 @@ $endif$ \else \usepackage{fontspec} \fi - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \newcommand{\euro}{€} $if(mainfont)$ \setmainfont[$mainfontoptions$]{$mainfont$} @@ -76,7 +76,8 @@ $endif$ citecolor=$if(citecolor)$$citecolor$$else$blue$endif$, urlcolor=$if(urlcolor)$$urlcolor$$else$blue$endif$, linkcolor=$if(linkcolor)$$linkcolor$$else$magenta$endif$, - pdfborder={0 0 0}} + pdfborder={0 0 0} + $if(hidelinks)$,hidelinks,$endif$} \urlstyle{same} % don't use monospace font for urls $if(lang)$ \ifxetex @@ -135,8 +136,11 @@ $if(strikeout)$ % avoid problems with \sout in headers with hyperref: \pdfstringdefDisableCommands{\renewcommand{\sout}{}} $endif$ +$if(indent)$ +$else$ \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} +$endif$ \setlength{\emergencystretch}{3em} % prevent overfull lines \providecommand{\tightlist}{% \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} @@ -174,6 +178,8 @@ $for(header-includes)$ $header-includes$ $endfor$ +$if(subparagraph)$ +$else$ % Redefines (sub)paragraphs to behave more like sections \ifx\paragraph\undefined\else \let\oldparagraph\paragraph @@ -183,6 +189,7 @@ $endfor$ \let\oldsubparagraph\subparagraph \renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} \fi +$endif$ \begin{document} $if(title)$ diff --git a/default.man b/default.man index bce3f2444..896e5d7e0 100644 --- a/default.man +++ b/default.man @@ -1,8 +1,10 @@ $if(has-tables)$ .\"t $endif$ +$if(pandoc-version)$ .\" Automatically generated by Pandoc $pandoc-version$ .\" +$endif$ $if(adjusting)$ .ad $adjusting$ $endif$ diff --git a/default.revealjs b/default.revealjs index 53d466eb8..f2439b984 100644 --- a/default.revealjs +++ b/default.revealjs @@ -1,18 +1,18 @@ <!DOCTYPE html> -<html$if(lang)$ lang="$lang$"$endif$> +<html$if(lang)$ lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$> <head> <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$ - <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"> + <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"/> <style type="text/css">code{white-space: pre;}</style> $if(highlighting-css)$ @@ -28,15 +28,13 @@ $endif$ $for(css)$ <link rel="stylesheet" href="$css$"/> $endfor$ - <!-- If the query includes 'print-pdf', include the PDF print sheet --> + <!-- Printing and PDF exports --> <script> - if( window.location.search.match( /print-pdf/gi ) ) { - var link = document.createElement( 'link' ); - link.rel = 'stylesheet'; - link.type = 'text/css'; - link.href = '$revealjs-url$/css/print/pdf.css'; - document.getElementsByTagName( 'head' )[0].appendChild( link ); - } + var link = document.createElement( 'link' ); + link.rel = 'stylesheet'; + link.type = 'text/css'; + link.href = window.location.search.match( /print-pdf/gi ) ? '$revealjs-url$/css/print/pdf.css' : '$revealjs-url$/css/print/paper.css'; + document.getElementsByTagName( 'head' )[0].appendChild( link ); </script> <!--[if lt IE 9]> <script src="$revealjs-url$/lib/js/html5shiv.js"></script> @@ -77,32 +75,154 @@ $body$ </div> </div> - <script src="$revealjs-url$/lib/js/head.min.js"></script> <script src="$revealjs-url$/js/reveal.js"></script> <script> - // Full list of configuration options available here: + // Full list of configuration options available at: // https://github.com/hakimel/reveal.js#configuration Reveal.initialize({ - controls: $if(controls)$$controls$$else$true$endif$, // Display controls in the bottom right corner - progress: $if(progress)$$progress$$else$true$endif$, // Display a presentation progress bar - history: true, // Push each slide change to the browser history - center: $if(center)$$center$$else$false$endif$, // Vertical centering of slides - maxScale: $if(maxScale)$$maxScale$$else$1.5$endif$, // Bounds for smallest/largest possible content scale - slideNumber: $if(slideNumber)$true$else$false$endif$, // Display the page number of the current slide - theme: $if(theme)$'$theme$'$else$Reveal.getQueryHash().theme$endif$, // available themes are in /css/theme - transition: $if(transition)$'$transition$'$else$Reveal.getQueryHash().transition || 'default'$endif$, // default/cube/page/concave/zoom/linear/fade/none +$if(controls)$ + // Display controls in the bottom right corner + controls: $controls$, +$endif$ +$if(progress)$ + // Display a presentation progress bar + progress: $progress$, +$endif$ +$if(slideNumber)$ + // Display the page number of the current slide + slideNumber: $slideNumber$, +$endif$ +$if(history)$ + // Push each slide change to the browser history + history: $history$, +$endif$ +$if(keyboard)$ + // Enable keyboard shortcuts for navigation + keyboard: $keyboard$, +$endif$ +$if(overview)$ + // Enable the slide overview mode + overview: $overview$, +$endif$ +$if(center)$ + // Vertical centering of slides + center: $center$, +$endif$ +$if(touch)$ + // Enables touch navigation on devices with touch input + touch: $touch$, +$endif$ +$if(loop)$ + // Loop the presentation + loop: $loop$, +$endif$ +$if(rtl)$ + // Change the presentation direction to be RTL + rtl: $rtl$, +$endif$ +$if(fragments)$ + // Turns fragments on and off globally + fragments: $fragments$, +$endif$ +$if(embedded)$ + // Flags if the presentation is running in an embedded mode, + // i.e. contained within a limited portion of the screen + embedded: $embedded$, +$endif$ +$if(help)$ + // Flags if we should show a help overlay when the questionmark + // key is pressed + help: $help$, +$endif$ +$if(showNotes)$ + // Flags if speaker notes should be visible to all viewers + showNotes: $showNotes$, +$endif$ +$if(autoSlide)$ + // Number of milliseconds between automatically proceeding to the + // next slide, disabled when set to 0, this value can be overwritten + // by using a data-autoslide attribute on your slides + autoSlide: $autoSlide$, +$endif$ +$if(autoSlideStoppable)$ + // Stop auto-sliding after user input + autoSlideStoppable: $autoSlideStoppable$, +$endif$ +$if(mouseWheel)$ + // Enable slide navigation via mouse wheel + mouseWheel: $mouseWheel$, +$endif$ +$if(hideAddressBar)$ + // Hides the address bar on mobile devices + hideAddressBar: $hideAddressBar$, +$endif$ +$if(previewLinks)$ + // Opens links in an iframe preview overlay + previewLinks: $previewLinks$, +$endif$ +$if(transition)$ + // Transition style + transition: '$transition$', // none/fade/slide/convex/concave/zoom +$endif$ +$if(transitionSpeed)$ + // Transition speed + transitionSpeed: '$transitionSpeed$', // default/fast/slow +$endif$ +$if(backgroundTransition)$ + // Transition style for full page slide backgrounds + backgroundTransition: '$backgroundTransition$', // none/fade/slide/convex/concave/zoom +$endif$ +$if(viewDistance)$ + // Number of slides away from the current that are visible + viewDistance: $viewDistance$, +$endif$ +$if(parallaxBackgroundImage)$ + // Parallax background image + parallaxBackgroundImage: '$parallaxBackgroundImage$', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'" +$endif$ +$if(parallaxBackgroundSize)$ + // Parallax background size + parallaxBackgroundSize: '$parallaxBackgroundSize$', // CSS syntax, e.g. "2100px 900px" +$endif$ +$if(parallaxBackgroundHorizontal)$ + // Amount to move parallax background (horizontal and vertical) on slide change + // Number, e.g. 100 + parallaxBackgroundHorizontal: '$parallaxBackgroundHorizontal$', +$endif$ +$if(parallaxBackgroundVertical)$ + parallaxBackgroundVertical: '$parallaxBackgroundVertical$', +$endif$ +$if(width)$ + // The "normal" size of the presentation, aspect ratio will be preserved + // when the presentation is scaled to fit different resolutions. Can be + // specified using percentage units. + width: $width$, +$endif$ +$if(height)$ + height: $height$, +$endif$ +$if(margin)$ + // Factor of the display size that should remain empty around the content + margin: $margin$, +$endif$ +$if(minScale)$ + // Bounds for smallest/largest possible scale to apply to content + minScale: $minScale$, +$endif$ +$if(maxScale)$ + maxScale: $maxScale$, +$endif$ - // Optional libraries used to extend on reveal.js + // Optional reveal.js plugins dependencies: [ { src: '$revealjs-url$/lib/js/classList.js', condition: function() { return !document.body.classList; } }, - { src: '$revealjs-url$/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } }, - { src: '$revealjs-url$/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }, -// { src: '$revealjs-url$/plugin/search/search.js', async: true, condition: function() { return !!document.body.classList; }, } -// { src: '$revealjs-url$/plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } } -]}); + { src: '$revealjs-url$/plugin/zoom-js/zoom.js', async: true }, + { src: '$revealjs-url$/plugin/notes/notes.js', async: true } + ] + }); </script> $for(include-after)$ $include-after$ |