Merge remote-tracking branch 'jgm/master' into dokuwiki
This commit is contained in:
commit
f3d3f64d31
9 changed files with 141 additions and 61 deletions
|
@ -1,24 +1,41 @@
|
|||
\documentclass[$if(fontsize)$$fontsize$,$endif$$if(handout)$handout,$endif$$if(beamer)$ignorenonframetext,$endif$]{$documentclass$}
|
||||
\documentclass[$if(fontsize)$$fontsize$,$endif$$if(handout)$handout,$endif$$if(beamer)$ignorenonframetext,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
|
||||
$if(theme)$
|
||||
\usetheme{$theme$}
|
||||
$endif$
|
||||
$if(colortheme)$
|
||||
\usecolortheme{$colortheme$}
|
||||
$endif$
|
||||
$if(fonttheme)$
|
||||
\usefonttheme{$fonttheme$}
|
||||
$endif$
|
||||
\setbeamertemplate{caption}[numbered]
|
||||
\setbeamertemplate{caption label separator}{:}
|
||||
\setbeamercolor{caption name}{fg=normal text.fg}
|
||||
\usepackage{amssymb,amsmath}
|
||||
\usepackage{ifxetex,ifluatex}
|
||||
\usepackage{fixltx2e} % provides \textsubscript
|
||||
\usepackage{lmodern}
|
||||
\ifxetex
|
||||
\usepackage{fontspec,xltxtra,xunicode}
|
||||
\defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
|
||||
\newcommand{\euro}{€}
|
||||
\else
|
||||
\ifluatex
|
||||
\usepackage{fontspec}
|
||||
\defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
|
||||
\newcommand{\euro}{€}
|
||||
\else
|
||||
\usepackage[T1]{fontenc}
|
||||
\usepackage[utf8]{inputenc}
|
||||
$if(euro)$
|
||||
\usepackage{eurosym}
|
||||
$endif$
|
||||
\fi
|
||||
\fi
|
||||
% use upquote if available, for straight quotes in verbatim environments
|
||||
\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
|
||||
% use microtype if available
|
||||
\IfFileExists{microtype.sty}{\usepackage{microtype}}{}
|
||||
$if(natbib)$
|
||||
\usepackage{natbib}
|
||||
\bibliographystyle{plainnat}
|
||||
|
@ -42,7 +59,8 @@ $if(verbatim-in-note)$
|
|||
\usepackage{fancyvrb}
|
||||
$endif$
|
||||
$if(tables)$
|
||||
\usepackage{longtable}
|
||||
\usepackage{longtable,booktabs}
|
||||
\usepackage{caption}
|
||||
% These lines are needed to make table captions work with longtable:
|
||||
\makeatletter
|
||||
\def\fnum@table{\tablename~\thetable}
|
||||
|
@ -53,21 +71,14 @@ $if(url)$
|
|||
$endif$
|
||||
$if(graphics)$
|
||||
\usepackage{graphicx}
|
||||
% Redefine \includegraphics so that, unless explicit options are
|
||||
% given, the image width will not exceed the width of the page.
|
||||
% Images get their normal width if they fit onto the page, but
|
||||
% are scaled down if they would overflow the margins.
|
||||
\makeatletter
|
||||
\def\ScaleIfNeeded{%
|
||||
\ifdim\Gin@nat@width>\linewidth
|
||||
\linewidth
|
||||
\else
|
||||
\Gin@nat@width
|
||||
\fi
|
||||
}
|
||||
\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
|
||||
\def\maxheight{\ifdim\Gin@nat@height>\textheight0.8\textheight\else\Gin@nat@height\fi}
|
||||
\makeatother
|
||||
\let\Oldincludegraphics\includegraphics
|
||||
\renewcommand{\includegraphics}[2][]{\Oldincludegraphics[width=\ScaleIfNeeded]{#2}}
|
||||
% Scale images if necessary, so that they will not overflow the page
|
||||
% margins by default, and it is still possible to overwrite the defaults
|
||||
% using explicit options in \includegraphics[width, height, ...]{}
|
||||
\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
|
||||
$endif$
|
||||
|
||||
% Comment these out if you don't want a slide with just the
|
||||
|
@ -119,9 +130,7 @@ $endif$
|
|||
$if(author)$
|
||||
\author{$for(author)$$author$$sep$ \and $endfor$}
|
||||
$endif$
|
||||
$if(date)$
|
||||
\date{$date$}
|
||||
$endif$
|
||||
|
||||
\begin{document}
|
||||
$if(title)$
|
||||
|
@ -149,12 +158,16 @@ $else$
|
|||
\renewcommand\refname{$biblio-title$}
|
||||
$endif$
|
||||
$endif$
|
||||
\begin{frame}[allowframebreaks]{$biblio-title$}
|
||||
\bibliography{$biblio-files$}
|
||||
\end{frame}
|
||||
|
||||
$endif$
|
||||
$endif$
|
||||
$if(biblatex)$
|
||||
\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$
|
||||
\begin{frame}[allowframebreaks]{$biblio-title$}
|
||||
\printbibliography[heading=none]
|
||||
\end{frame}
|
||||
|
||||
$endif$
|
||||
$for(include-after)$
|
||||
|
|
|
@ -36,6 +36,9 @@ $endif$
|
|||
\setupitemize[autointro] % prevent orphan list intro
|
||||
\setupitemize[indentnext=no]
|
||||
|
||||
\setupfloat[figure][default={here,nonumber}]
|
||||
\setupfloat[table][default={here,nonumber}]
|
||||
|
||||
\setupthinrules[width=15em] % width of horizontal rules
|
||||
|
||||
\setupdelimitedtext
|
||||
|
|
|
@ -9,11 +9,15 @@ $endif$
|
|||
<article>
|
||||
<articleinfo>
|
||||
<title>$title$</title>
|
||||
$if(author)$
|
||||
<authorgroup>
|
||||
$for(author)$
|
||||
<author>
|
||||
$author$
|
||||
</author>
|
||||
<author>
|
||||
$author$
|
||||
</author>
|
||||
$endfor$
|
||||
</authorgroup>
|
||||
$endif$
|
||||
$if(date)$
|
||||
<date>$date$</date>
|
||||
$endif$
|
||||
|
|
1
default.haddock
Normal file
1
default.haddock
Normal file
|
@ -0,0 +1 @@
|
|||
$body$
|
|
@ -3,6 +3,7 @@
|
|||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="generator" content="pandoc">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
|
||||
$for(author-meta)$
|
||||
<meta name="author" content="$author-meta$">
|
||||
$endfor$
|
||||
|
|
43
default.icml
Normal file
43
default.icml
Normal file
|
@ -0,0 +1,43 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<?aid style="50" type="snippet" readerVersion="6.0" featureSet="513" product="8.0(370)" ?>
|
||||
<?aid SnippetType="InCopyInterchange"?>
|
||||
<Document DOMVersion="8.0" Self="pandoc_doc">
|
||||
<RootCharacterStyleGroup Self="pandoc_character_styles">
|
||||
<CharacterStyle Self="$$ID/NormalCharacterStyle" Name="Default" />
|
||||
$charStyles$
|
||||
</RootCharacterStyleGroup>
|
||||
<RootParagraphStyleGroup Self="pandoc_paragraph_styles">
|
||||
<ParagraphStyle Self="$$ID/NormalParagraphStyle" Name="$$ID/NormalParagraphStyle"
|
||||
SpaceBefore="6" SpaceAfter="6"> <!-- paragraph spacing -->
|
||||
<Properties>
|
||||
<TabList type="list">
|
||||
<ListItem type="record">
|
||||
<Alignment type="enumeration">LeftAlign</Alignment>
|
||||
<AlignmentCharacter type="string">.</AlignmentCharacter>
|
||||
<Leader type="string"></Leader>
|
||||
<Position type="unit">10</Position> <!-- first tab stop -->
|
||||
</ListItem>
|
||||
</TabList>
|
||||
</Properties>
|
||||
</ParagraphStyle>
|
||||
$parStyles$
|
||||
</RootParagraphStyleGroup>
|
||||
<RootTableStyleGroup Self="pandoc_table_styles">
|
||||
<TableStyle Self="TableStyle/Table" Name="Table" />
|
||||
</RootTableStyleGroup>
|
||||
<RootCellStyleGroup Self="pandoc_cell_styles">
|
||||
<CellStyle Self="CellStyle/Cell" AppliedParagraphStyle="ParagraphStyle/$$ID/[No paragraph style]" Name="Cell" />
|
||||
</RootCellStyleGroup>
|
||||
<Story Self="pandoc_story"
|
||||
TrackChanges="false"
|
||||
StoryTitle="$if(title-prefix)$$title-prefix$ - $endif$$pagetitle$"
|
||||
AppliedTOCStyle="n"
|
||||
AppliedNamedGrid="n" >
|
||||
<StoryPreference OpticalMarginAlignment="true" OpticalMarginSize="12" />
|
||||
|
||||
<!-- body needs to be non-indented, otherwise code blocks are indented too far -->
|
||||
$body$
|
||||
|
||||
</Story>
|
||||
$hyperlinks$
|
||||
</Document>
|
|
@ -1,12 +1,18 @@
|
|||
\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$$if(papersize)$$papersize$,$endif$]{$documentclass$}
|
||||
\usepackage[T1]{fontenc}
|
||||
\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
|
||||
$if(fontfamily)$
|
||||
\usepackage{$fontfamily$}
|
||||
$else$
|
||||
\usepackage{lmodern}
|
||||
$endif$
|
||||
$if(linestretch)$
|
||||
\usepackage{setspace}
|
||||
\setstretch{$linestretch$}
|
||||
$endif$
|
||||
\usepackage{amssymb,amsmath}
|
||||
\usepackage{ifxetex,ifluatex}
|
||||
\usepackage{fixltx2e} % provides \textsubscript
|
||||
% use upquote if available, for straight quotes in verbatim environments
|
||||
\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
|
||||
\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
|
||||
\usepackage[T1]{fontenc}
|
||||
\usepackage[utf8]{inputenc}
|
||||
$if(euro)$
|
||||
\usepackage{eurosym}
|
||||
|
@ -33,6 +39,8 @@ $if(mathfont)$
|
|||
\setmathfont(Digits,Latin,Greek){$mathfont$}
|
||||
$endif$
|
||||
\fi
|
||||
% use upquote if available, for straight quotes in verbatim environments
|
||||
\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
|
||||
% use microtype if available
|
||||
\IfFileExists{microtype.sty}{\usepackage{microtype}}{}
|
||||
$if(geometry)$
|
||||
|
@ -40,7 +48,7 @@ $if(geometry)$
|
|||
$endif$
|
||||
$if(natbib)$
|
||||
\usepackage{natbib}
|
||||
\bibliographystyle{plainnat}
|
||||
\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
|
||||
$endif$
|
||||
$if(biblatex)$
|
||||
\usepackage{biblatex}
|
||||
|
@ -61,28 +69,18 @@ $if(verbatim-in-note)$
|
|||
\usepackage{fancyvrb}
|
||||
$endif$
|
||||
$if(tables)$
|
||||
\usepackage{longtable}
|
||||
\usepackage{longtable,booktabs}
|
||||
$endif$
|
||||
$if(graphics)$
|
||||
\usepackage{graphicx}
|
||||
% Redefine \includegraphics so that, unless explicit options are
|
||||
% given, the image width will not exceed the width of the page.
|
||||
% Images get their normal width if they fit onto the page, but
|
||||
% are scaled down if they would overflow the margins.
|
||||
\makeatletter
|
||||
\def\ScaleIfNeeded{%
|
||||
\ifdim\Gin@nat@width>\linewidth
|
||||
\linewidth
|
||||
\else
|
||||
\Gin@nat@width
|
||||
\fi
|
||||
}
|
||||
\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
|
||||
\def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}
|
||||
\makeatother
|
||||
\let\Oldincludegraphics\includegraphics
|
||||
{%
|
||||
\catcode`\@=11\relax%
|
||||
\gdef\includegraphics{\@ifnextchar[{\Oldincludegraphics}{\Oldincludegraphics[width=\ScaleIfNeeded]}}%
|
||||
}%
|
||||
% Scale images if necessary, so that they will not overflow the page
|
||||
% margins by default, and it is still possible to overwrite the defaults
|
||||
% using explicit options in \includegraphics[width, height, ...]{}
|
||||
\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
|
||||
$endif$
|
||||
\ifxetex
|
||||
\usepackage[setpagesize=false, % page size defined by xetex
|
||||
|
@ -129,23 +127,27 @@ $if(lang)$
|
|||
\usepackage[$lang$]{babel}
|
||||
\fi
|
||||
$endif$
|
||||
|
||||
$if(title)$
|
||||
\title{$title$$if(subtitle)$\\\vspace{0.5em}{\large $subtitle$}$endif$}
|
||||
$endif$
|
||||
$if(author)$
|
||||
\author{$for(author)$$author$$sep$ \and $endfor$}
|
||||
$endif$
|
||||
\date{$date$}
|
||||
$for(header-includes)$
|
||||
$header-includes$
|
||||
$endfor$
|
||||
|
||||
$if(title)$
|
||||
\title{$title$}
|
||||
$endif$
|
||||
$if(subtitle)$
|
||||
\subtitle{$subtitle$}
|
||||
$endif$
|
||||
\author{$for(author)$$author$$sep$ \and $endfor$}
|
||||
\date{$date$}
|
||||
|
||||
\begin{document}
|
||||
$if(title)$
|
||||
\maketitle
|
||||
$endif$
|
||||
$if(abstract)$
|
||||
\begin{abstract}
|
||||
$abstract$
|
||||
\end{abstract}
|
||||
$endif$
|
||||
|
||||
$for(include-before)$
|
||||
$include-before$
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<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">
|
||||
<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">
|
||||
<office:font-face-decls>
|
||||
<style:font-face style:name="Courier New" style:font-family-generic="modern" style:font-pitch="fixed" svg:font-family="'Courier New'" />
|
||||
</office:font-face-decls>
|
||||
$automatic-styles$
|
||||
$for(header-includes)$
|
||||
$header-includes$
|
||||
$endfor$
|
||||
$endfor$
|
||||
<office:body>
|
||||
<office:text>
|
||||
$if(title)$
|
||||
|
|
|
@ -27,10 +27,19 @@ $endfor$
|
|||
$else$
|
||||
<link rel="stylesheet" href="$revealjs-url$/css/theme/simple.css" id="theme">
|
||||
$endif$
|
||||
<link rel="stylesheet" media="print" href="$revealjs-url$/css/print/pdf.css" />
|
||||
<!--[if lt IE 9]>
|
||||
<script src="$revealjs-url$/lib/js/html5shiv.js"></script>
|
||||
<![endif]-->
|
||||
<!-- If the query includes 'print-pdf', include the PDF print sheet -->
|
||||
<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 );
|
||||
}
|
||||
</script>
|
||||
<!--[if lt IE 9]>
|
||||
<script src="$revealjs-url$/lib/js/html5shiv.js"></script>
|
||||
<![endif]-->
|
||||
$if(math)$
|
||||
$math$
|
||||
$endif$
|
||||
|
@ -66,9 +75,7 @@ $endif$
|
|||
$body$
|
||||
</div>
|
||||
</div>
|
||||
$for(include-after)$
|
||||
$include-after$
|
||||
$endfor$
|
||||
|
||||
|
||||
<script src="$revealjs-url$/lib/js/head.min.js"></script>
|
||||
<script src="$revealjs-url$/js/reveal.min.js"></script>
|
||||
|
@ -94,5 +101,8 @@ $endfor$
|
|||
// { src: '$revealjs-url$/plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }
|
||||
]});
|
||||
</script>
|
||||
$for(include-after)$
|
||||
$include-after$
|
||||
$endfor$
|
||||
</body>
|
||||
</html>
|
||||
|
|
Loading…
Add table
Reference in a new issue