diff options
| -rw-r--r-- | default.beamer | 12 | ||||
| -rw-r--r-- | default.epub | 9 | ||||
| -rw-r--r-- | default.epub3 | 9 | ||||
| -rw-r--r-- | default.latex | 24 | ||||
| -rw-r--r-- | default.opendocument | 2 | ||||
| -rw-r--r-- | default.revealjs | 6 | ||||
| -rw-r--r-- | default.rst | 6 |
7 files changed, 53 insertions, 15 deletions
diff --git a/default.beamer b/default.beamer index 58f8b7361..045f8c5db 100644 --- a/default.beamer +++ b/default.beamer @@ -42,9 +42,9 @@ $if(natbib)$ $endif$ $if(biblatex)$ \usepackage{biblatex} -$if(biblio-files)$ -\bibliography{$biblio-files$} -$endif$ +$for(bibliography)$ +\addbibresource{$bibliography$} +$endfor$ $endif$ $if(listings)$ \usepackage{listings} @@ -107,6 +107,8 @@ $endif$ \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} \setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} $if(numbersections)$ $else$ \setcounter{secnumdepth}{0} @@ -150,7 +152,7 @@ $endif$ $body$ $if(natbib)$ -$if(biblio-files)$ +$if(bibliography)$ $if(biblio-title)$ $if(book-class)$ \renewcommand\bibname{$biblio-title$} @@ -159,7 +161,7 @@ $else$ $endif$ $endif$ \begin{frame}[allowframebreaks]{$biblio-title$} -\bibliography{$biblio-files$} +\bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$} \end{frame} $endif$ diff --git a/default.epub b/default.epub index a30de3a45..74c1dc6aa 100644 --- a/default.epub +++ b/default.epub @@ -14,6 +14,9 @@ $endif$ $for(css)$ <link rel="stylesheet" type="text/css" href="$css$" /> $endfor$ +$for(header-includes)$ + $header-includes$ +$endfor$ </head> <body$if(coverpage)$ id="cover"$endif$> $if(titlepage)$ @@ -43,7 +46,13 @@ $if(rights)$ <div class="rights">$rights$</div> $endif$ $else$ +$for(include-before)$ +$include-before$ +$endfor$ $body$ +$for(include-after)$ +$include-after$ +$endfor$ $endif$ </body> </html> diff --git a/default.epub3 b/default.epub3 index 421088ec2..a8d6c1716 100644 --- a/default.epub3 +++ b/default.epub3 @@ -18,6 +18,9 @@ $endif$ $for(css)$ <link rel="stylesheet" type="text/css" href="$css$" /> $endfor$ +$for(header-includes)$ + $header-includes$ +$endfor$ </head> <body$if(coverpage)$ id="cover"$endif$> $if(titlepage)$ @@ -49,7 +52,13 @@ $if(rights)$ $endif$ </section> $else$ +$for(include-before)$ +$include-before$ +$endfor$ $body$ +$for(include-after)$ +$include-after$ +$endfor$ $endif$ </body> </html> diff --git a/default.latex b/default.latex index b993e6f9b..cd45cf895 100644 --- a/default.latex +++ b/default.latex @@ -63,9 +63,9 @@ $if(natbib)$ $endif$ $if(biblatex)$ \usepackage{biblatex} -$if(biblio-files)$ -\bibliography{$biblio-files$} -$endif$ +$for(bibliography)$ +\addbibresource{$bibliography$} +$endfor$ $endif$ $if(listings)$ \usepackage{listings} @@ -84,7 +84,7 @@ $if(tables)$ \usepackage{longtable,booktabs} $endif$ $if(graphics)$ -\usepackage{graphicx} +\usepackage{graphicx,grffile} \makeatletter \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} @@ -123,6 +123,8 @@ $endif$ \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} \setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} $if(numbersections)$ \setcounter{secnumdepth}{5} $else$ @@ -143,6 +145,16 @@ $for(header-includes)$ $header-includes$ $endfor$ +% Redefines (sub)paragraphs to behave more like sections +\ifx\paragraph\undefined\else +\let\oldparagraph\paragraph +\renewcommand{\paragraph}[1]{\oldparagraph{#1}\mbox{}} +\fi +\ifx\subparagraph\undefined\else +\let\oldsubparagraph\subparagraph +\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} +\fi + \begin{document} $if(title)$ \maketitle @@ -173,7 +185,7 @@ $endif$ $body$ $if(natbib)$ -$if(biblio-files)$ +$if(bibliography)$ $if(biblio-title)$ $if(book-class)$ \renewcommand\bibname{$biblio-title$} @@ -181,7 +193,7 @@ $else$ \renewcommand\refname{$biblio-title$} $endif$ $endif$ -\bibliography{$biblio-files$} +\bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$} $endif$ $endif$ diff --git a/default.opendocument b/default.opendocument index afed83b76..6a0e11ea1 100644 --- a/default.opendocument +++ b/default.opendocument @@ -10,7 +10,7 @@ $endfor$ <office:body> <office:text> $if(title)$ -<text:h text:style-name="Title">$title$</text:h> +<text:p text:style-name="Title">$title$</text:p> $endif$ $for(author)$ <text:p text:style-name="Author">$author$</text:p> diff --git a/default.revealjs b/default.revealjs index 7e2a3b30e..c3fd3532f 100644 --- a/default.revealjs +++ b/default.revealjs @@ -20,14 +20,14 @@ $if(highlighting-css)$ $highlighting-css$ </style> $endif$ -$for(css)$ - <link rel="stylesheet" href="$css$"/> -$endfor$ $if(theme)$ <link rel="stylesheet" href="$revealjs-url$/css/theme/$theme$.css" id="theme"> $else$ <link rel="stylesheet" href="$revealjs-url$/css/theme/black.css" id="theme"> $endif$ +$for(css)$ + <link rel="stylesheet" href="$css$"/> +$endfor$ <!-- If the query includes 'print-pdf', include the PDF print sheet --> <script> if( window.location.search.match( /print-pdf/gi ) ) { diff --git a/default.rst b/default.rst index ca9d2833d..30005d19b 100644 --- a/default.rst +++ b/default.rst @@ -21,6 +21,12 @@ $if(math)$ .. $endif$ +$if(rawtex)$ +.. role:: raw-latex(raw) + :format: latex +.. + +$endif$ $for(include-before)$ $include-before$ |