git.iko.soy/typeable/pandoc
on master help sign in
Merge from master to update #193.
36c6c9eVaclav Haisman
default.beamer+26−3
@@ -24,6 +24,9 @@ $endif$
24 \usepackage{fontspec}
24 \usepackage{fontspec}
25 \fi
25 \fi
26 \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
26 \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
27+$for(fontfamilies)$
28+ \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$}
29+$endfor$
27$if(euro)$
30$if(euro)$
28 \newcommand{\euro}{€}
31 \newcommand{\euro}{€}
29$endif$
32$endif$
@@ -45,7 +48,7 @@ $if(CJKmainfont)$
45$endif$
48$endif$
46\fi
49\fi
47$if(theme)$
50$if(theme)$
48−\usetheme{$theme$}
51+\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$}
49$endif$
52$endif$
50$if(colortheme)$
53$if(colortheme)$
51\usecolortheme{$colortheme$}
54\usecolortheme{$colortheme$}
@@ -89,12 +92,30 @@ $if(natbib)$
89\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
92\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
90$endif$
93$endif$
91$if(biblatex)$
94$if(biblatex)$
92−\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex}
93−$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$
95+\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex}
94$for(bibliography)$
96$for(bibliography)$
95\addbibresource{$bibliography$}
97\addbibresource{$bibliography$}
96$endfor$
98$endfor$
97$endif$
99$endif$
100+\hypersetup{
101+$if(title-meta)$
102+ pdftitle={$title-meta$},
103+$endif$
104+$if(author-meta)$
105+ pdfauthor={$author-meta$},
106+$endif$
107+$if(keywords)$
108+ pdfkeywords={$for(keywords)$$keywords$$sep$; $endfor$},
109+$endif$
110+$if(colorlinks)$
111+ colorlinks=true,
112+ linkcolor=$if(linkcolor)$$linkcolor$$else$Maroon$endif$,
113+ citecolor=$if(citecolor)$$citecolor$$else$Blue$endif$,
114+ urlcolor=$if(urlcolor)$$urlcolor$$else$Blue$endif$,
115+$else$
116+ pdfborder={0 0 0},
117+$endif$
118+ breaklinks=true}
98$if(listings)$
119$if(listings)$
99\usepackage{listings}
120\usepackage{listings}
100$endif$
121$endif$
@@ -162,6 +183,8 @@ $if(strikeout)$
162% avoid problems with \sout in headers with hyperref:
183% avoid problems with \sout in headers with hyperref:
163\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
184\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
164$endif$
185$endif$
186+\setlength{\parindent}{0pt}
187+\setlength{\parskip}{6pt plus 2pt minus 1pt}
165\setlength{\emergencystretch}{3em} % prevent overfull lines
188\setlength{\emergencystretch}{3em} % prevent overfull lines
166\providecommand{\tightlist}{%
189\providecommand{\tightlist}{%
167 \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
190 \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
default.docbook5new file+31
@@ -0,0 +1,31 @@
1+<?xml version="1.0" encoding="utf-8" ?>
2+<!DOCTYPE article>
3+<article
4+ xmlns="http://docbook.org/ns/docbook" version="5.0"
5+$if(mathml)$
6+ xmlns:mml="http://www.w3.org/1998/Math/MathML"
7+$endif$
8+ xmlns:xlink="http://www.w3.org/1999/xlink" >
9+ <info>
10+ <title>$title$</title>
11+$if(author)$
12+ <authorgroup>
13+$for(author)$
14+ <author>
15+ $author$
16+ </author>
17+$endfor$
18+ </authorgroup>
19+$endif$
20+$if(date)$
21+ <date>$date$</date>
22+$endif$
23+ </info>
24+$for(include-before)$
25+$include-before$
26+$endfor$
27+$body$
28+$for(include-after)$
29+$include-after$
30+$endfor$
31+</article>
default.dzslides+1−1
@@ -12,7 +12,7 @@ $if(keywords)$
12 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">
12 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">
13$endif$
13$endif$
14 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
14 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
15− <style type="text/css">code{white-space: pre;}</style>
15+ <style type="text/css">code{white-space: pre-wrap;}</style>
16$if(quotes)$
16$if(quotes)$
17 <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
17 <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
18$endif$
18$endif$
default.epub+3−3
@@ -28,13 +28,13 @@ $else$
28$endif$
28$endif$
29$endfor$
29$endfor$
30$if(subtitle)$
30$if(subtitle)$
31− <h1 class="subtitle">$subtitle$</h1>
31+ <p class="subtitle">$subtitle$</p>
32$endif$
32$endif$
33$for(author)$
33$for(author)$
34− <h2 class="author">$author$</h2>
34+ <p class="author">$author$</p>
35$endfor$
35$endfor$
36$for(creator)$
36$for(creator)$
37− <h2 class="$creator.role$">$creator.text$</h2>
37+ <p class="$creator.role$">$creator.text$</p>
38$endfor$
38$endfor$
39$if(publisher)$
39$if(publisher)$
40 <p class="publisher">$publisher$</p>
40 <p class="publisher">$publisher$</p>
default.epub3+3−3
@@ -33,13 +33,13 @@ $else$
33$endif$
33$endif$
34$endfor$
34$endfor$
35$if(subtitle)$
35$if(subtitle)$
36− <h1 class="subtitle">$subtitle$</h1>
36+ <p class="subtitle">$subtitle$</p>
37$endif$
37$endif$
38$for(author)$
38$for(author)$
39− <h2 class="author">$author$</h2>
39+ <p class="author">$author$</p>
40$endfor$
40$endfor$
41$for(creator)$
41$for(creator)$
42− <h2 class="$creator.role$">$creator.text$</h2>
42+ <p class="$creator.role$">$creator.text$</p>
43$endfor$
43$endfor$
44$if(publisher)$
44$if(publisher)$
45 <p class="publisher">$publisher$</p>
45 <p class="publisher">$publisher$</p>
default.html5+3−3
@@ -44,13 +44,13 @@ $if(title)$
44<header>
44<header>
45<h1 class="title">$title$</h1>
45<h1 class="title">$title$</h1>
46$if(subtitle)$
46$if(subtitle)$
47−<h1 class="subtitle">$subtitle$</h1>
47+<p class="subtitle">$subtitle$</p>
48$endif$
48$endif$
49$for(author)$
49$for(author)$
50−<h2 class="author">$author$</h2>
50+<p class="author">$author$</p>
51$endfor$
51$endfor$
52$if(date)$
52$if(date)$
53−<h3 class="date">$date$</h3>
53+<p class="date">$date$</p>
54$endif$
54$endif$
55</header>
55</header>
56$endif$
56$endif$
default.latex+21−7
@@ -1,4 +1,7 @@
1\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$paper,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
1\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$paper,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
2+$if(beamerarticle)$
3+\usepackage{beamerarticle} % needs to be loaded first
4+$endif$
2$if(fontfamily)$
5$if(fontfamily)$
3\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
6\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
4$else$
7$else$
@@ -24,6 +27,9 @@ $endif$
24 \usepackage{fontspec}
27 \usepackage{fontspec}
25 \fi
28 \fi
26 \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
29 \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
30+$for(fontfamilies)$
31+ \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$}
32+$endfor$
27$if(euro)$
33$if(euro)$
28 \newcommand{\euro}{€}
34 \newcommand{\euro}{€}
29$endif$
35$endif$
@@ -48,18 +54,18 @@ $endif$
48\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
54\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
49% use microtype if available
55% use microtype if available
50\IfFileExists{microtype.sty}{%
56\IfFileExists{microtype.sty}{%
51−\usepackage{microtype}
57+\usepackage[$for(microtypeoptions)$$microtypeoptions$$sep$,$endfor$]{microtype}
52\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
58\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
53}{}
59}{}
54$if(geometry)$
60$if(geometry)$
55\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
61\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
56$endif$
62$endif$
57\PassOptionsToPackage{hyphens}{url} % url is loaded by hyperref
63\PassOptionsToPackage{hyphens}{url} % url is loaded by hyperref
58−\usepackage{hyperref}
64+\usepackage[unicode=true]{hyperref}
59$if(colorlinks)$
65$if(colorlinks)$
60\PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
66\PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
61$endif$
67$endif$
62−\hypersetup{unicode=true,
68+\hypersetup{
63$if(title-meta)$
69$if(title-meta)$
64 pdftitle={$title-meta$},
70 pdftitle={$title-meta$},
65$endif$
71$endif$
@@ -67,7 +73,7 @@ $if(author-meta)$
67 pdfauthor={$author-meta$},
73 pdfauthor={$author-meta$},
68$endif$
74$endif$
69$if(keywords)$
75$if(keywords)$
70− pdfkeywords={$for(keywords)$$keywords$$sep$; $endfor$},
76+ pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$},
71$endif$
77$endif$
72$if(colorlinks)$
78$if(colorlinks)$
73 colorlinks=true,
79 colorlinks=true,
@@ -98,8 +104,7 @@ $if(natbib)$
98\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
104\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
99$endif$
105$endif$
100$if(biblatex)$
106$if(biblatex)$
101−\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex}
102−$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$
107+\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex}
103$for(bibliography)$
108$for(bibliography)$
104\addbibresource{$bibliography$}
109\addbibresource{$bibliography$}
105$endfor$
110$endfor$
@@ -119,6 +124,8 @@ $if(verbatim-in-note)$
119$endif$
124$endif$
120$if(tables)$
125$if(tables)$
121\usepackage{longtable,booktabs}
126\usepackage{longtable,booktabs}
127+% Fix footnotes in tables (requires footnote package)
128+\IfFileExists{footnote.sty}{\usepackage{footnote}\makesavenoteenv{long table}}{}
122$endif$
129$endif$
123$if(graphics)$
130$if(graphics)$
124\usepackage{graphicx,grffile}
131\usepackage{graphicx,grffile}
@@ -153,7 +160,7 @@ $endif$
153\providecommand{\tightlist}{%
160\providecommand{\tightlist}{%
154 \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
161 \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
155$if(numbersections)$
162$if(numbersections)$
156−\setcounter{secnumdepth}{5}
163+\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$5$endif$}
157$else$
164$else$
158\setcounter{secnumdepth}{0}
165\setcounter{secnumdepth}{0}
159$endif$
166$endif$
@@ -186,6 +193,12 @@ $if(dir)$
186 \newenvironment{LTR}{\beginL}{\endL}
193 \newenvironment{LTR}{\beginL}{\endL}
187\fi
194\fi
188$endif$
195$endif$
196+
197+% set default figure placement to htbp
198+\makeatletter
199+\def\fps@figure{htbp}
200+\makeatother
201+
189$for(header-includes)$
202$for(header-includes)$
190$header-includes$
203$header-includes$
191$endfor$
204$endfor$
@@ -201,6 +214,7 @@ $if(author)$
201\author{$for(author)$$author$$sep$ \and $endfor$}
214\author{$for(author)$$author$$sep$ \and $endfor$}
202$endif$
215$endif$
203$if(institute)$
216$if(institute)$
217+\providecommand{\institute}[1]{}
204\institute{$for(institute)$$institute$$sep$ \and $endfor$}
218\institute{$for(institute)$$institute$$sep$ \and $endfor$}
205$endif$
219$endif$
206\date{$date$}
220\date{$date$}
default.revealjs+7−3
@@ -63,13 +63,13 @@ $if(title)$
63<section>
63<section>
64 <h1 class="title">$title$</h1>
64 <h1 class="title">$title$</h1>
65$if(subtitle)$
65$if(subtitle)$
66− <h1 class="subtitle">$subtitle$</h1>
66+ <p class="subtitle">$subtitle$</p>
67$endif$
67$endif$
68$for(author)$
68$for(author)$
69− <h2 class="author">$author$</h2>
69+ <p class="author">$author$</p>
70$endfor$
70$endfor$
71$if(date)$
71$if(date)$
72− <h3 class="date">$date$</h3>
72+ <p class="date">$date$</p>
73$endif$
73$endif$
74</section>
74</section>
75$endif$
75$endif$
@@ -228,6 +228,10 @@ $endif$
228 dependencies: [
228 dependencies: [
229 { src: '$revealjs-url$/lib/js/classList.js', condition: function() { return !document.body.classList; } },
229 { src: '$revealjs-url$/lib/js/classList.js', condition: function() { return !document.body.classList; } },
230 { src: '$revealjs-url$/plugin/zoom-js/zoom.js', async: true },
230 { src: '$revealjs-url$/plugin/zoom-js/zoom.js', async: true },
231+ $if(notes-server)$
232+ { src: '$revealjs-url$/socket.io/socker.io.js', async: true },
233+ { src: '$revealjs-url$/plugin/notes-server/client.js', async: true },
234+ $endif$
231 { src: '$revealjs-url$/plugin/notes/notes.js', async: true }
235 { src: '$revealjs-url$/plugin/notes/notes.js', async: true }
232 ]
236 ]
233 });
237 });
default.slidy+1−1
@@ -51,7 +51,7 @@ $if(title)$
51<div class="slide titlepage">
51<div class="slide titlepage">
52 <h1 class="title">$title$</h1>
52 <h1 class="title">$title$</h1>
53$if(subtitle)$
53$if(subtitle)$
54− <h1 class="subtitle">$subtitle$</h1>
54+ <p class="subtitle">$subtitle$</p>
55$endif$
55$endif$
56$if(author)$
56$if(author)$
57 <p class="author">
57 <p class="author">
default.zimwikinew file+16
@@ -0,0 +1,16 @@
1+Content-Type: text/x-zim-wiki
2+Wiki-Format: zim 0.4
3+
4+$for(include-before)$
5+$include-before$
6+
7+$endfor$
8+$if(toc)$
9+__TOC__
10+
11+$endif$
12+$body$
13+$for(include-after)$
14+
15+$include-after$
16+$endfor$