f3d3f64 · typeable/pandoc

git.iko.soy/typeable/pandoc

Merge remote-tracking branch 'jgm/master' into dokuwiki

f3d3f64Clare Macrae12 years ago

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$}

2$if(theme)$

3\usetheme{$theme$}

4$endif$

5$if(colortheme)$

6\usecolortheme{$colortheme$}

7$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}

8\usepackage{amssymb,amsmath}

14\usepackage{amssymb,amsmath}

9\usepackage{ifxetex,ifluatex}

15\usepackage{ifxetex,ifluatex}

10\usepackage{fixltx2e} % provides \textsubscript

16\usepackage{fixltx2e} % provides \textsubscript

17+\usepackage{lmodern}

11\ifxetex

18\ifxetex

12 \usepackage{fontspec,xltxtra,xunicode}

19 \usepackage{fontspec,xltxtra,xunicode}

13 \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}

20 \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}

21+ \newcommand{\euro}{€}

14\else

22\else

15 \ifluatex

23 \ifluatex

16 \usepackage{fontspec}

24 \usepackage{fontspec}

17 \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}

25 \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}

26+ \newcommand{\euro}{€}

18 \else

27 \else

28+ \usepackage[T1]{fontenc}

19 \usepackage[utf8]{inputenc}

29 \usepackage[utf8]{inputenc}

30+ $if(euro)$

31+ \usepackage{eurosym}

32+ $endif$

20 \fi

33 \fi

21\fi

34\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}}{}

22$if(natbib)$

39$if(natbib)$

23\usepackage{natbib}

40\usepackage{natbib}

24\bibliographystyle{plainnat}

41\bibliographystyle{plainnat}

@@ -42,7 +59,8 @@ $if(verbatim-in-note)$

42\usepackage{fancyvrb}

59\usepackage{fancyvrb}

43$endif$

60$endif$

44$if(tables)$

61$if(tables)$

45−\usepackage{longtable}

62+\usepackage{longtable,booktabs}

63+\usepackage{caption}

46% These lines are needed to make table captions work with longtable:

64% These lines are needed to make table captions work with longtable:

47\makeatletter

65\makeatletter

48\def\fnum@table{\tablename~\thetable}

66\def\fnum@table{\tablename~\thetable}

@@ -53,21 +71,14 @@ $if(url)$

53$endif$

71$endif$

54$if(graphics)$

72$if(graphics)$

55\usepackage{graphicx}

73\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.

60\makeatletter

74\makeatletter

61−\def\ScaleIfNeeded{%

62− \ifdim\Gin@nat@width>\linewidth

75+\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}

63− \linewidth

76+\def\maxheight{\ifdim\Gin@nat@height>\textheight0.8\textheight\else\Gin@nat@height\fi}

64− \else

65− \Gin@nat@width

66− \fi

67−}

68\makeatother

77\makeatother

69−\let\Oldincludegraphics\includegraphics

78+% Scale images if necessary, so that they will not overflow the page

70−\renewcommand{\includegraphics}[2][]{\Oldincludegraphics[width=\ScaleIfNeeded]{#2}}

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}

71$endif$

82$endif$

73% Comment these out if you don't want a slide with just the

84% Comment these out if you don't want a slide with just the

@@ -119,9 +130,7 @@ $endif$

119$if(author)$

130$if(author)$

120\author{$for(author)$$author$$sep$ \and $endfor$}

131\author{$for(author)$$author$$sep$ \and $endfor$}

121$endif$

132$endif$

122−$if(date)$

123\date{$date$}

133\date{$date$}

124−$endif$

125

134

126\begin{document}

135\begin{document}

127$if(title)$

136$if(title)$

@@ -149,12 +158,16 @@ $else$

149\renewcommand\refname{$biblio-title$}

158\renewcommand\refname{$biblio-title$}

150$endif$

159$endif$

151$endif$

160$endif$

161+\begin{frame}[allowframebreaks]{$biblio-title$}

152\bibliography{$biblio-files$}

162\bibliography{$biblio-files$}

163+\end{frame}

153

164

154$endif$

165$endif$

155$endif$

166$endif$

156$if(biblatex)$

167$if(biblatex)$

168+\begin{frame}[allowframebreaks]{$biblio-title$}

157−\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$

169+\printbibliography[heading=none]

170+\end{frame}

158

171

159$endif$

172$endif$

160$for(include-after)$

173$for(include-after)$

default.context+3

@@ -36,6 +36,9 @@ $endif$

36\setupitemize[autointro] % prevent orphan list intro

37\setupitemize[indentnext=no]

39+\setupfloat[figure][default={here,nonumber}]

40+\setupfloat[table][default={here,nonumber}]

41+

39\setupthinrules[width=15em] % width of horizontal rules

42\setupthinrules[width=15em] % width of horizontal rules

41\setupdelimitedtext

44\setupdelimitedtext

default.docbook+7−3

@@ -9,11 +9,15 @@ $endif$

9<article>

10 <articleinfo>

11 <title>$title$</title>

12+$if(author)$

13+ <authorgroup>

12$for(author)$

14$for(author)$

13− <author>

15+ <author>

14− $author$

16+ $author$

15− </author>

17+ </author>

16$endfor$

18$endfor$

19+ </authorgroup>

20+$endif$

17$if(date)$

21$if(date)$

18 <date>$date$</date>

22 <date>$date$</date>

19$endif$

23$endif$

default.haddocknew file+1

@@ -0,0 +1 @@

1+$body$

default.html5+1

@@ -3,6 +3,7 @@

3<head>

4 <meta charset="utf-8">

5 <meta name="generator" content="pandoc">

6+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">

6$for(author-meta)$

7$for(author-meta)$

7 <meta name="author" content="$author-meta$">

8 <meta name="author" content="$author-meta$">

8$endfor$

9$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">

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>

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+

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$}

1+\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}

2+$if(fontfamily)$

2−\usepackage[T1]{fontenc}

3+\usepackage{$fontfamily$}

4+$else$

3\usepackage{lmodern}

5\usepackage{lmodern}

6+$endif$

7+$if(linestretch)$

8+\usepackage{setspace}

9+\setstretch{$linestretch$}

10+$endif$

4\usepackage{amssymb,amsmath}

11\usepackage{amssymb,amsmath}

5\usepackage{ifxetex,ifluatex}

12\usepackage{ifxetex,ifluatex}

6\usepackage{fixltx2e} % provides \textsubscript

13\usepackage{fixltx2e} % provides \textsubscript

7−% use upquote if available, for straight quotes in verbatim environments

8−\IfFileExists{upquote.sty}{\usepackage{upquote}}{}

9\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex

14\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex

15+ \usepackage[T1]{fontenc}

10 \usepackage[utf8]{inputenc}

16 \usepackage[utf8]{inputenc}

11$if(euro)$

17$if(euro)$

12 \usepackage{eurosym}

18 \usepackage{eurosym}

@@ -33,6 +39,8 @@ $if(mathfont)$

33 \setmathfont(Digits,Latin,Greek){$mathfont$}

39 \setmathfont(Digits,Latin,Greek){$mathfont$}

34$endif$

40$endif$

35\fi

41\fi

42+% use upquote if available, for straight quotes in verbatim environments

43+\IfFileExists{upquote.sty}{\usepackage{upquote}}{}

36% use microtype if available

44% use microtype if available

37\IfFileExists{microtype.sty}{\usepackage{microtype}}{}

45\IfFileExists{microtype.sty}{\usepackage{microtype}}{}

38$if(geometry)$

46$if(geometry)$

@@ -40,7 +48,7 @@ $if(geometry)$

40$endif$

48$endif$

41$if(natbib)$

49$if(natbib)$

42\usepackage{natbib}

50\usepackage{natbib}

43−\bibliographystyle{plainnat}

51+\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}

44$endif$

52$endif$

45$if(biblatex)$

53$if(biblatex)$

46\usepackage{biblatex}

54\usepackage{biblatex}

@@ -61,28 +69,18 @@ $if(verbatim-in-note)$

61\usepackage{fancyvrb}

69\usepackage{fancyvrb}

62$endif$

70$endif$

63$if(tables)$

71$if(tables)$

64−\usepackage{longtable}

72+\usepackage{longtable,booktabs}

65$endif$

73$endif$

66$if(graphics)$

74$if(graphics)$

67\usepackage{graphicx}

75\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.

72\makeatletter

76\makeatletter

73−\def\ScaleIfNeeded{%

74− \ifdim\Gin@nat@width>\linewidth

77+\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}

75− \linewidth

78+\def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}

76− \else

77− \Gin@nat@width

78− \fi

79−}

80\makeatother

79\makeatother

81−\let\Oldincludegraphics\includegraphics

80+% Scale images if necessary, so that they will not overflow the page

82−{%

81+% margins by default, and it is still possible to overwrite the defaults

83− \catcode`\@=11\relax%

82+% using explicit options in \includegraphics[width, height, ...]{}

84− \gdef\includegraphics{\@ifnextchar[{\Oldincludegraphics}{\Oldincludegraphics[width=\ScaleIfNeeded]}}%

83+\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}

85−}%

86$endif$

84$endif$

87\ifxetex

85\ifxetex

88 \usepackage[setpagesize=false, % page size defined by xetex

86 \usepackage[setpagesize=false, % page size defined by xetex

@@ -129,23 +127,27 @@ $if(lang)$

129 \usepackage[$lang$]{babel}

127 \usepackage[$lang$]{babel}

130\fi

128\fi

131$endif$

129$endif$

132−$for(header-includes)$

133−$header-includes$

134−$endfor$

135

130

136$if(title)$

131$if(title)$

137−\title{$title$}

132+\title{$title$$if(subtitle)$\\\vspace{0.5em}{\large $subtitle$}$endif$}

138−$endif$

139−$if(subtitle)$

140−\subtitle{$subtitle$}

141$endif$

133$endif$

134+$if(author)$

142\author{$for(author)$$author$$sep$ \and $endfor$}

135\author{$for(author)$$author$$sep$ \and $endfor$}

136+$endif$

143\date{$date$}

137\date{$date$}

138+$for(header-includes)$

139+$header-includes$

140+$endfor$

144

141

145\begin{document}

142\begin{document}

146$if(title)$

143$if(title)$

147\maketitle

144\maketitle

148$endif$

145$endif$

146+$if(abstract)$

147+\begin{abstract}

148+$abstract$

149+\end{abstract}

150+$endif$

149

151

150$for(include-before)$

152$for(include-before)$

151$include-before$

153$include-before$

default.opendocument+5−2

@@ -1,9 +1,12 @@

1<?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>

3 $automatic-styles$

6 $automatic-styles$

4$for(header-includes)$

7$for(header-includes)$

5 $header-includes$

8 $header-includes$

6−$endfor$

9+$endfor$

7<office:body>

10<office:body>

8<office:text>

11<office:text>

9$if(title)$

12$if(title)$

default.revealjs+17−7

@@ -27,10 +27,19 @@ $endfor$

27$else$

28 <link rel="stylesheet" href="$revealjs-url$/css/theme/simple.css" id="theme">

29$endif$

30+

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';

30− <link rel="stylesheet" media="print" href="$revealjs-url$/css/print/pdf.css" />

36+ link.href = '$revealjs-url$/css/print/pdf.css';

37+ document.getElementsByTagName( 'head' )[0].appendChild( link );

38+ }

39+ </script>

31− <!--[if lt IE 9]>

40+ <!--[if lt IE 9]>

32− <script src="$revealjs-url$/lib/js/html5shiv.js"></script>

41+ <script src="$revealjs-url$/lib/js/html5shiv.js"></script>

33− <![endif]-->

42+ <![endif]-->

34$if(math)$

43$if(math)$

35 $math$

44 $math$

36$endif$

45$endif$

@@ -66,9 +75,7 @@ $endif$

66$body$

75$body$

67 </div>

76 </div>

68 </div>

77 </div>

69−$for(include-after)$

78+

70−$include-after$

71−$endfor$

73 <script src="$revealjs-url$/lib/js/head.min.js"></script>

80 <script src="$revealjs-url$/lib/js/head.min.js"></script>

74 <script src="$revealjs-url$/js/reveal.min.js"></script>

81 <script src="$revealjs-url$/js/reveal.min.js"></script>

@@ -94,5 +101,8 @@ $endfor$

94// { src: '$revealjs-url$/plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }

101// { src: '$revealjs-url$/plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }

95]});

102]});

96 </script>

103 </script>

104+ $for(include-after)$

105+ $include-after$

106+ $endfor$

97 </body>

107 </body>

98</html>

108</html>