git.iko.soy/typeable/pandoc
on master help sign in
Merge remote-tracking branch 'jgm/master' into dokuwiki
commitf3d3f64d31a4ed90b54762feda13f7c5cb67b7cd authorClare Macrae <github@cfmacrae.fastmail.co.uk> dateSat 28 Jun 2014, 18:25 (12 years ago) parentc790efff3b3f2d
9 files changed+139−59
default.beamer+31−18 default.context+3 default.docbook+7−3 default.haddock+1 default.html5+1 default.icml+43 default.latex+31−29 default.opendocument+5−2 default.revealjs+17−7
default.beamer+31−18
@@ -1,24 +1,41 @@
1−\documentclass[$if(fontsize)$$fontsize$,$endif$$if(handout)$handout,$endif$$if(beamer)$ignorenonframetext,$endif$]{$documentclass$}
1+\documentclass[$if(fontsize)$$fontsize$,$endif$$if(handout)$handout,$endif$$if(beamer)$ignorenonframetext,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
22$if(theme)$
33\usetheme{$theme$}
44$endif$
55$if(colortheme)$
66\usecolortheme{$colortheme$}
77$endif$
8+$if(fonttheme)$
9+\usefonttheme{$fonttheme$}
10+$endif$
11+\setbeamertemplate{caption}[numbered]
12+\setbeamertemplate{caption label separator}{:}
13+\setbeamercolor{caption name}{fg=normal text.fg}
814\usepackage{amssymb,amsmath}
915\usepackage{ifxetex,ifluatex}
1016\usepackage{fixltx2e} % provides \textsubscript
17+\usepackage{lmodern}
1118\ifxetex
1219 \usepackage{fontspec,xltxtra,xunicode}
1320 \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
21+ \newcommand{\euro}{€}
1422\else
1523 \ifluatex
1624 \usepackage{fontspec}
1725 \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
26+ \newcommand{\euro}{€}
1827 \else
28+ \usepackage[T1]{fontenc}
1929 \usepackage[utf8]{inputenc}
30+ $if(euro)$
31+ \usepackage{eurosym}
32+ $endif$
2033 \fi
2134\fi
35+% use upquote if available, for straight quotes in verbatim environments
36+\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
37+% use microtype if available
38+\IfFileExists{microtype.sty}{\usepackage{microtype}}{}
2239$if(natbib)$
2340\usepackage{natbib}
2441\bibliographystyle{plainnat}
@@ -42,7 +59,8 @@ $if(verbatim-in-note)$
4259\usepackage{fancyvrb}
4360$endif$
4461$if(tables)$
45−\usepackage{longtable}
62+\usepackage{longtable,booktabs}
63+\usepackage{caption}
4664% These lines are needed to make table captions work with longtable:
4765\makeatletter
4866\def\fnum@table{\tablename~\thetable}
@@ -53,21 +71,14 @@ $if(url)$
5371$endif$
5472$if(graphics)$
5573\usepackage{graphicx}
56−% Redefine \includegraphics so that, unless explicit options are
57−% given, the image width will not exceed the width of the page.
58−% Images get their normal width if they fit onto the page, but
59−% are scaled down if they would overflow the margins.
6074\makeatletter
61−\def\ScaleIfNeeded{%
62− \ifdim\Gin@nat@width>\linewidth
63− \linewidth
64− \else
65− \Gin@nat@width
66− \fi
67−}
75+\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
76+\def\maxheight{\ifdim\Gin@nat@height>\textheight0.8\textheight\else\Gin@nat@height\fi}
6877\makeatother
69−\let\Oldincludegraphics\includegraphics
70−\renewcommand{\includegraphics}[2][]{\Oldincludegraphics[width=\ScaleIfNeeded]{#2}}
78+% Scale images if necessary, so that they will not overflow the page
79+% margins by default, and it is still possible to overwrite the defaults
80+% using explicit options in \includegraphics[width, height, ...]{}
81+\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
7182$endif$
7283
7384% Comment these out if you don't want a slide with just the
@@ -119,9 +130,7 @@ $endif$
119130$if(author)$
120131\author{$for(author)$$author$$sep$ \and $endfor$}
121132$endif$
122−$if(date)$
123133\date{$date$}
124−$endif$
125134
126135\begin{document}
127136$if(title)$
@@ -149,12 +158,16 @@ $else$
149158\renewcommand\refname{$biblio-title$}
150159$endif$
151160$endif$
161+\begin{frame}[allowframebreaks]{$biblio-title$}
152162\bibliography{$biblio-files$}
163+\end{frame}
153164
154165$endif$
155166$endif$
156167$if(biblatex)$
157−\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$
168+\begin{frame}[allowframebreaks]{$biblio-title$}
169+\printbibliography[heading=none]
170+\end{frame}
158171
159172$endif$
160173$for(include-after)$
default.context+3
@@ -36,6 +36,9 @@ $endif$
3636\setupitemize[autointro] % prevent orphan list intro
3737\setupitemize[indentnext=no]
3838
39+\setupfloat[figure][default={here,nonumber}]
40+\setupfloat[table][default={here,nonumber}]
41+
3942\setupthinrules[width=15em] % width of horizontal rules
4043
4144\setupdelimitedtext
default.docbook+7−3
@@ -9,11 +9,15 @@ $endif$
99<article>
1010 <articleinfo>
1111 <title>$title$</title>
12+$if(author)$
13+ <authorgroup>
1214$for(author)$
13− <author>
14− $author$
15− </author>
15+ <author>
16+ $author$
17+ </author>
1618$endfor$
19+ </authorgroup>
20+$endif$
1721$if(date)$
1822 <date>$date$</date>
1923$endif$
default.haddocknew file+1
@@ -0,0 +1 @@
1+$body$
default.html5+1
@@ -3,6 +3,7 @@
33<head>
44 <meta charset="utf-8">
55 <meta name="generator" content="pandoc">
6+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
67$for(author-meta)$
78 <meta name="author" content="$author-meta$">
89$endfor$
default.icmlnew file+43
@@ -0,0 +1,43 @@
1+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+<?aid style="50" type="snippet" readerVersion="6.0" featureSet="513" product="8.0(370)" ?>
3+<?aid SnippetType="InCopyInterchange"?>
4+<Document DOMVersion="8.0" Self="pandoc_doc">
5+ <RootCharacterStyleGroup Self="pandoc_character_styles">
6+ <CharacterStyle Self="$$ID/NormalCharacterStyle" Name="Default" />
7+ $charStyles$
8+ </RootCharacterStyleGroup>
9+ <RootParagraphStyleGroup Self="pandoc_paragraph_styles">
10+ <ParagraphStyle Self="$$ID/NormalParagraphStyle" Name="$$ID/NormalParagraphStyle"
11+ SpaceBefore="6" SpaceAfter="6"> <!-- paragraph spacing -->
12+ <Properties>
13+ <TabList type="list">
14+ <ListItem type="record">
15+ <Alignment type="enumeration">LeftAlign</Alignment>
16+ <AlignmentCharacter type="string">.</AlignmentCharacter>
17+ <Leader type="string"></Leader>
18+ <Position type="unit">10</Position> <!-- first tab stop -->
19+ </ListItem>
20+ </TabList>
21+ </Properties>
22+ </ParagraphStyle>
23+ $parStyles$
24+ </RootParagraphStyleGroup>
25+ <RootTableStyleGroup Self="pandoc_table_styles">
26+ <TableStyle Self="TableStyle/Table" Name="Table" />
27+ </RootTableStyleGroup>
28+ <RootCellStyleGroup Self="pandoc_cell_styles">
29+ <CellStyle Self="CellStyle/Cell" AppliedParagraphStyle="ParagraphStyle/$$ID/[No paragraph style]" Name="Cell" />
30+ </RootCellStyleGroup>
31+ <Story Self="pandoc_story"
32+ TrackChanges="false"
33+ StoryTitle="$if(title-prefix)$$title-prefix$ - $endif$$pagetitle$"
34+ AppliedTOCStyle="n"
35+ AppliedNamedGrid="n" >
36+ <StoryPreference OpticalMarginAlignment="true" OpticalMarginSize="12" />
37+
38+<!-- body needs to be non-indented, otherwise code blocks are indented too far -->
39+$body$
40+
41+ </Story>
42+ $hyperlinks$
43+</Document>
default.latex+31−29
@@ -1,12 +1,18 @@
1−\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$$if(papersize)$$papersize$,$endif$]{$documentclass$}
2−\usepackage[T1]{fontenc}
1+\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
2+$if(fontfamily)$
3+\usepackage{$fontfamily$}
4+$else$
35\usepackage{lmodern}
6+$endif$
7+$if(linestretch)$
8+\usepackage{setspace}
9+\setstretch{$linestretch$}
10+$endif$
411\usepackage{amssymb,amsmath}
512\usepackage{ifxetex,ifluatex}
613\usepackage{fixltx2e} % provides \textsubscript
7−% use upquote if available, for straight quotes in verbatim environments
8−\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
914\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
15+ \usepackage[T1]{fontenc}
1016 \usepackage[utf8]{inputenc}
1117$if(euro)$
1218 \usepackage{eurosym}
@@ -33,6 +39,8 @@ $if(mathfont)$
3339 \setmathfont(Digits,Latin,Greek){$mathfont$}
3440$endif$
3541\fi
42+% use upquote if available, for straight quotes in verbatim environments
43+\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
3644% use microtype if available
3745\IfFileExists{microtype.sty}{\usepackage{microtype}}{}
3846$if(geometry)$
@@ -40,7 +48,7 @@ $if(geometry)$
4048$endif$
4149$if(natbib)$
4250\usepackage{natbib}
43−\bibliographystyle{plainnat}
51+\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
4452$endif$
4553$if(biblatex)$
4654\usepackage{biblatex}
@@ -61,28 +69,18 @@ $if(verbatim-in-note)$
6169\usepackage{fancyvrb}
6270$endif$
6371$if(tables)$
64−\usepackage{longtable}
72+\usepackage{longtable,booktabs}
6573$endif$
6674$if(graphics)$
6775\usepackage{graphicx}
68−% Redefine \includegraphics so that, unless explicit options are
69−% given, the image width will not exceed the width of the page.
70−% Images get their normal width if they fit onto the page, but
71−% are scaled down if they would overflow the margins.
7276\makeatletter
73−\def\ScaleIfNeeded{%
74− \ifdim\Gin@nat@width>\linewidth
75− \linewidth
76− \else
77− \Gin@nat@width
78− \fi
79−}
77+\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
78+\def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}
8079\makeatother
81−\let\Oldincludegraphics\includegraphics
82−{%
83− \catcode`\@=11\relax%
84− \gdef\includegraphics{\@ifnextchar[{\Oldincludegraphics}{\Oldincludegraphics[width=\ScaleIfNeeded]}}%
85−}%
80+% Scale images if necessary, so that they will not overflow the page
81+% margins by default, and it is still possible to overwrite the defaults
82+% using explicit options in \includegraphics[width, height, ...]{}
83+\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
8684$endif$
8785\ifxetex
8886 \usepackage[setpagesize=false, % page size defined by xetex
@@ -129,23 +127,27 @@ $if(lang)$
129127 \usepackage[$lang$]{babel}
130128\fi
131129$endif$
132−$for(header-includes)$
133−$header-includes$
134−$endfor$
135130
136131$if(title)$
137−\title{$title$}
138−$endif$
139−$if(subtitle)$
140−\subtitle{$subtitle$}
132+\title{$title$$if(subtitle)$\\\vspace{0.5em}{\large $subtitle$}$endif$}
141133$endif$
134+$if(author)$
142135\author{$for(author)$$author$$sep$ \and $endfor$}
136+$endif$
143137\date{$date$}
138+$for(header-includes)$
139+$header-includes$
140+$endfor$
144141
145142\begin{document}
146143$if(title)$
147144\maketitle
148145$endif$
146+$if(abstract)$
147+\begin{abstract}
148+$abstract$
149+\end{abstract}
150+$endif$
149151
150152$for(include-before)$
151153$include-before$
default.opendocument+5−2
@@ -1,9 +1,12 @@
11<?xml version="1.0" encoding="utf-8" ?>
2−<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" office:version="1.0">
2+<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" office:version="1.2">
3+ <office:font-face-decls>
4+ <style:font-face style:name="Courier New" style:font-family-generic="modern" style:font-pitch="fixed" svg:font-family="'Courier New'" />
5+ </office:font-face-decls>
36 $automatic-styles$
47$for(header-includes)$
58 $header-includes$
6−$endfor$
9+$endfor$
710<office:body>
811<office:text>
912$if(title)$
default.revealjs+17−7
@@ -27,10 +27,19 @@ $endfor$
2727$else$
2828 <link rel="stylesheet" href="$revealjs-url$/css/theme/simple.css" id="theme">
2929$endif$
30− <link rel="stylesheet" media="print" href="$revealjs-url$/css/print/pdf.css" />
31− <!--[if lt IE 9]>
32− <script src="$revealjs-url$/lib/js/html5shiv.js"></script>
33− <![endif]-->
30+ <!-- If the query includes 'print-pdf', include the PDF print sheet -->
31+ <script>
32+ if( window.location.search.match( /print-pdf/gi ) ) {
33+ var link = document.createElement( 'link' );
34+ link.rel = 'stylesheet';
35+ link.type = 'text/css';
36+ link.href = '$revealjs-url$/css/print/pdf.css';
37+ document.getElementsByTagName( 'head' )[0].appendChild( link );
38+ }
39+ </script>
40+ <!--[if lt IE 9]>
41+ <script src="$revealjs-url$/lib/js/html5shiv.js"></script>
42+ <![endif]-->
3443$if(math)$
3544 $math$
3645$endif$
@@ -66,9 +75,7 @@ $endif$
6675$body$
6776 </div>
6877 </div>
69−$for(include-after)$
70−$include-after$
71−$endfor$
78+
7279
7380 <script src="$revealjs-url$/lib/js/head.min.js"></script>
7481 <script src="$revealjs-url$/js/reveal.min.js"></script>
@@ -94,5 +101,8 @@ $endfor$
94101// { src: '$revealjs-url$/plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }
95102]});
96103 </script>
104+ $for(include-after)$
105+ $include-after$
106+ $endfor$
97107 </body>
98108</html>