git.iko.soy/typeable/pandoc
on master help sign in
Merge from master to update #193.
commit36c6c9e49cfdfa63e6044dd6303e682999ac8fd2 authorVaclav Haisman <vhaisman@gmail.com> dateMon 9 Jan 2017, 21:50 (10 years ago) parentc213cef2dc4054
10 files changed+112−24
compare with master
unifiedsplit
default.beamer+26−3 default.docbook5+31 default.dzslides+1−1 default.epub+3−3 default.epub3+3−3 default.html5+3−3 default.latex+21−7 default.revealjs+7−3 default.slidy+1−1 default.zimwiki+16
default.beamer+26−3
@@ -24,6 +24,9 @@ $endif$
2424 \usepackage{fontspec}
2525 \fi
2626 \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
27+$for(fontfamilies)$
28+ \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$}
29+$endfor$
2730$if(euro)$
2831 \newcommand{\euro}{€}
2932$endif$
@@ -45,7 +48,7 @@ $if(CJKmainfont)$
4548$endif$
4649\fi
4750$if(theme)$
48−\usetheme{$theme$}
51+\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$}
4952$endif$
5053$if(colortheme)$
5154\usecolortheme{$colortheme$}
@@ -89,12 +92,30 @@ $if(natbib)$
8992\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
9093$endif$
9194$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}
9496$for(bibliography)$
9597\addbibresource{$bibliography$}
9698$endfor$
9799$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}
98119$if(listings)$
99120\usepackage{listings}
100121$endif$
@@ -162,6 +183,8 @@ $if(strikeout)$
162183% avoid problems with \sout in headers with hyperref:
163184\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
164185$endif$
186+\setlength{\parindent}{0pt}
187+\setlength{\parskip}{6pt plus 2pt minus 1pt}
165188\setlength{\emergencystretch}{3em} % prevent overfull lines
166189\providecommand{\tightlist}{%
167190 \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)$
1212 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">
1313$endif$
1414 <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>
1616$if(quotes)$
1717 <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
1818$endif$
default.epub+3−3
@@ -28,13 +28,13 @@ $else$
2828$endif$
2929$endfor$
3030$if(subtitle)$
31− <h1 class="subtitle">$subtitle$</h1>
31+ <p class="subtitle">$subtitle$</p>
3232$endif$
3333$for(author)$
34− <h2 class="author">$author$</h2>
34+ <p class="author">$author$</p>
3535$endfor$
3636$for(creator)$
37− <h2 class="$creator.role$">$creator.text$</h2>
37+ <p class="$creator.role$">$creator.text$</p>
3838$endfor$
3939$if(publisher)$
4040 <p class="publisher">$publisher$</p>
default.epub3+3−3
@@ -33,13 +33,13 @@ $else$
3333$endif$
3434$endfor$
3535$if(subtitle)$
36− <h1 class="subtitle">$subtitle$</h1>
36+ <p class="subtitle">$subtitle$</p>
3737$endif$
3838$for(author)$
39− <h2 class="author">$author$</h2>
39+ <p class="author">$author$</p>
4040$endfor$
4141$for(creator)$
42− <h2 class="$creator.role$">$creator.text$</h2>
42+ <p class="$creator.role$">$creator.text$</p>
4343$endfor$
4444$if(publisher)$
4545 <p class="publisher">$publisher$</p>
default.html5+3−3
@@ -44,13 +44,13 @@ $if(title)$
4444<header>
4545<h1 class="title">$title$</h1>
4646$if(subtitle)$
47−<h1 class="subtitle">$subtitle$</h1>
47+<p class="subtitle">$subtitle$</p>
4848$endif$
4949$for(author)$
50−<h2 class="author">$author$</h2>
50+<p class="author">$author$</p>
5151$endfor$
5252$if(date)$
53−<h3 class="date">$date$</h3>
53+<p class="date">$date$</p>
5454$endif$
5555</header>
5656$endif$
default.latex+21−7
@@ -1,4 +1,7 @@
11\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$
25$if(fontfamily)$
36\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
47$else$
@@ -24,6 +27,9 @@ $endif$
2427 \usepackage{fontspec}
2528 \fi
2629 \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
30+$for(fontfamilies)$
31+ \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$}
32+$endfor$
2733$if(euro)$
2834 \newcommand{\euro}{€}
2935$endif$
@@ -48,18 +54,18 @@ $endif$
4854\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
4955% use microtype if available
5056\IfFileExists{microtype.sty}{%
51−\usepackage{microtype}
57+\usepackage[$for(microtypeoptions)$$microtypeoptions$$sep$,$endfor$]{microtype}
5258\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
5359}{}
5460$if(geometry)$
5561\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
5662$endif$
5763\PassOptionsToPackage{hyphens}{url} % url is loaded by hyperref
58−\usepackage{hyperref}
64+\usepackage[unicode=true]{hyperref}
5965$if(colorlinks)$
6066\PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
6167$endif$
62−\hypersetup{unicode=true,
68+\hypersetup{
6369$if(title-meta)$
6470 pdftitle={$title-meta$},
6571$endif$
@@ -67,7 +73,7 @@ $if(author-meta)$
6773 pdfauthor={$author-meta$},
6874$endif$
6975$if(keywords)$
70− pdfkeywords={$for(keywords)$$keywords$$sep$; $endfor$},
76+ pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$},
7177$endif$
7278$if(colorlinks)$
7379 colorlinks=true,
@@ -98,8 +104,7 @@ $if(natbib)$
98104\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
99105$endif$
100106$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}
103108$for(bibliography)$
104109\addbibresource{$bibliography$}
105110$endfor$
@@ -119,6 +124,8 @@ $if(verbatim-in-note)$
119124$endif$
120125$if(tables)$
121126\usepackage{longtable,booktabs}
127+% Fix footnotes in tables (requires footnote package)
128+\IfFileExists{footnote.sty}{\usepackage{footnote}\makesavenoteenv{long table}}{}
122129$endif$
123130$if(graphics)$
124131\usepackage{graphicx,grffile}
@@ -153,7 +160,7 @@ $endif$
153160\providecommand{\tightlist}{%
154161 \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
155162$if(numbersections)$
156−\setcounter{secnumdepth}{5}
163+\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$5$endif$}
157164$else$
158165\setcounter{secnumdepth}{0}
159166$endif$
@@ -186,6 +193,12 @@ $if(dir)$
186193 \newenvironment{LTR}{\beginL}{\endL}
187194\fi
188195$endif$
196+
197+% set default figure placement to htbp
198+\makeatletter
199+\def\fps@figure{htbp}
200+\makeatother
201+
189202$for(header-includes)$
190203$header-includes$
191204$endfor$
@@ -201,6 +214,7 @@ $if(author)$
201214\author{$for(author)$$author$$sep$ \and $endfor$}
202215$endif$
203216$if(institute)$
217+\providecommand{\institute}[1]{}
204218\institute{$for(institute)$$institute$$sep$ \and $endfor$}
205219$endif$
206220\date{$date$}
default.revealjs+7−3
@@ -63,13 +63,13 @@ $if(title)$
6363<section>
6464 <h1 class="title">$title$</h1>
6565$if(subtitle)$
66− <h1 class="subtitle">$subtitle$</h1>
66+ <p class="subtitle">$subtitle$</p>
6767$endif$
6868$for(author)$
69− <h2 class="author">$author$</h2>
69+ <p class="author">$author$</p>
7070$endfor$
7171$if(date)$
72− <h3 class="date">$date$</h3>
72+ <p class="date">$date$</p>
7373$endif$
7474</section>
7575$endif$
@@ -228,6 +228,10 @@ $endif$
228228 dependencies: [
229229 { src: '$revealjs-url$/lib/js/classList.js', condition: function() { return !document.body.classList; } },
230230 { 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$
231235 { src: '$revealjs-url$/plugin/notes/notes.js', async: true }
232236 ]
233237 });
default.slidy+1−1
@@ -51,7 +51,7 @@ $if(title)$
5151<div class="slide titlepage">
5252 <h1 class="title">$title$</h1>
5353$if(subtitle)$
54− <h1 class="subtitle">$subtitle$</h1>
54+ <p class="subtitle">$subtitle$</p>
5555$endif$
5656$if(author)$
5757 <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$