Updated templates for pandoc 2.8

18 files changed, 90 insertions, 107 deletions

diff --git a/default.context b/default.context
index 8792693..1ad5779 100644
--- a/default.context
+++ b/default.context
@@ -27,7 +27,6 @@ $endif$
 % make chapter, section bookmarks visible when opening document
 \placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section]
 \setupinteractionscreen[option=bookmark]
-\setuptagging[state=start]
 
 $if(papersize)$
 \setuppapersize[$for(papersize)$$papersize$$sep$,$endfor$]
@@ -37,14 +36,18 @@ $if(layout)$
 $endif$
 $if(pagenumbering)$
 \setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$,$endfor$]
+$else$
+\setuppagenumbering[location={footer,middle}]
 $endif$
 $if(pdfa)$
 % attempt to generate PDF/A
 \setupbackend
-  [format=PDF/A-1b:2005,
-   intent=sRGB IEC61966-2.1,
-   profile=sRGB.icc]
+  [format=PDF/A-$pdfa$,
+   profile={$if(pdfaiccprofile)$$for(pdfaiccprofile)$$pdfaiccprofile$$sep$,$endfor$$else$sRGB.icc$endif$},
+   intent=$if(pdfaintent)$$pdfaintent$$else$sRGB IEC61966-2.1$endif$]
 $endif$
+\setupbackend[export=yes]
+\setupstructure[state=start,method=auto]
 
 % use microtypography
 \definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes]
@@ -104,6 +107,27 @@ $endif$
 \setupxtable[body][]
 \setupxtable[foot][bottomframe=on]
 
+$if(csl-refs)$
+\newdimen\cslhangindent
+\cslhangindent=1.5em
+\definestartstop [cslreferences] [
+        $if(csl-hanging-indent)$
+        before={%
+                \setupnarrower[left=\cslhangindent]
+        \startnarrower[left]%
+        \setupindenting[-\leftskip,yes,first]%
+        %\setuphead[chapter,section][indentnext=yes]%
+                \indentation%
+        },
+        after=\stopnarrower,
+        $endif$
+]
+$endif$
+$if(includesource)$
+$for(sourcefile)$
+\attachment[file=$curdir$/$sourcefile$,method=hidden]
+$endfor$
+$endif$
 $for(header-includes)$
 $header-includes$
 $endfor$
diff --git a/default.docbook4 b/default.docbook4
index 5313c40..2e7b9fa 100644
--- a/default.docbook4
+++ b/default.docbook4
@@ -23,10 +23,10 @@ $if(date)$
 $endif$
   </articleinfo>
 $for(include-before)$
-$include-before$
+  $include-before$
 $endfor$
-$body$
+  $body$
 $for(include-after)$
-$include-after$
+  $include-after$
 $endfor$
 </article>
diff --git a/default.docbook5 b/default.docbook5
index b2c4079..eec0a53 100644
--- a/default.docbook5
+++ b/default.docbook5
@@ -28,10 +28,10 @@ $if(date)$
 $endif$
   </info>
 $for(include-before)$
-$include-before$
+  $include-before$
 $endfor$
-$body$
+  $body$
 $for(include-after)$
-$include-after$
+  $include-after$
 $endfor$
 </article>
diff --git a/default.dzslides b/default.dzslides
index 96862a2..11103ab 100644
--- a/default.dzslides
+++ b/default.dzslides
@@ -13,19 +13,8 @@ $if(keywords)$
 $endif$
   <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
   <style>
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-$if(quotes)$
-      q { quotes: "“" "”" "‘" "’"; }
-$endif$
-  </style>
-$if(highlighting-css)$
-  <style>
-$highlighting-css$
+    $styles.html()$
   </style>
-$endif$
 $if(css)$
 $for(css)$
   <link rel="stylesheet" href="$css$">
diff --git a/default.epub2 b/default.epub2
index afcf96a..f440134 100644
--- a/default.epub2
+++ b/default.epub2
@@ -46,6 +46,13 @@ $if(rights)$
   <div class="rights">$rights$</div>
 $endif$
 $else$
+$if(coverpage)$
+<div id="cover-image">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="100%" height="100%" viewBox="0 0 $cover-image-width$ $cover-image-height$" preserveAspectRatio="none">
+<image width="$cover-image-width$" height="$cover-image-height$" xlink:href="../media/$cover-image$" />
+</svg>
+</div>
+$else$
 $for(include-before)$
 $include-before$
 $endfor$
@@ -54,6 +61,7 @@ $for(include-after)$
 $include-after$
 $endfor$
 $endif$
+$endif$
 </body>
 </html>
 
diff --git a/default.epub3 b/default.epub3
index f0feb14..4f5bd66 100644
--- a/default.epub3
+++ b/default.epub3
@@ -47,6 +47,13 @@ $if(rights)$
 $endif$
 </section>
 $else$
+$if(coverpage)$
+<div id="cover-image">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="100%" height="100%" viewBox="0 0 $cover-image-width$ $cover-image-height$" preserveAspectRatio="none">
+<image width="$cover-image-width$" height="$cover-image-height$" xlink:href="../media/$cover-image$" />
+</svg>
+</div>
+$else$
 $for(include-before)$
 $include-before$
 $endfor$
@@ -55,6 +62,7 @@ $for(include-after)$
 $include-after$
 $endfor$
 $endif$
+$endif$
 </body>
 </html>
 
diff --git a/default.html4 b/default.html4
index 714b3ff..5f9b43e 100644
--- a/default.html4
+++ b/default.html4
@@ -15,19 +15,8 @@ $if(keywords)$
 $endif$
   <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
   <style type="text/css">
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-$if(quotes)$
-      q { quotes: "“" "”" "‘" "’"; }
-$endif$
-  </style>
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
+    $styles.html()$
   </style>
-$endif$
 $for(css)$
   <link rel="stylesheet" href="$css$" type="text/css" />
 $endfor$
diff --git a/default.html5 b/default.html5
index 9816fcf..eff6e73 100644
--- a/default.html5
+++ b/default.html5
@@ -15,19 +15,8 @@ $if(keywords)$
 $endif$
   <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
   <style>
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-$if(quotes)$
-      q { quotes: "“" "”" "‘" "’"; }
-$endif$
-  </style>
-$if(highlighting-css)$
-  <style>
-$highlighting-css$
+    $styles.html()$
   </style>
-$endif$
 $for(css)$
   <link rel="stylesheet" href="$css$" />
 $endfor$
diff --git a/default.icml b/default.icml
index b93fa87..2c737c8 100644
--- a/default.icml
+++ b/default.icml
@@ -4,7 +4,7 @@
 <Document DOMVersion="8.0" Self="pandoc_doc">
     <RootCharacterStyleGroup Self="pandoc_character_styles">
       <CharacterStyle Self="$$ID/NormalCharacterStyle" Name="Default" />
-      $charStyles$ 
+      $charStyles$
     </RootCharacterStyleGroup>
     <RootParagraphStyleGroup Self="pandoc_paragraph_styles">
       <ParagraphStyle Self="$$ID/NormalParagraphStyle" Name="$$ID/NormalParagraphStyle"
@@ -20,7 +20,7 @@
           </TabList>
         </Properties>
       </ParagraphStyle>
-      $parStyles$ 
+      $parStyles$
     </RootParagraphStyleGroup>
     <RootTableStyleGroup Self="pandoc_table_styles">
       <TableStyle Self="TableStyle/Table" Name="Table" />
diff --git a/default.jats b/default.jats
index 5fd3590..cdc336b 100644
--- a/default.jats
+++ b/default.jats
@@ -2,12 +2,12 @@
 $if(xml-stylesheet)$
 <?xml-stylesheet type="text/xsl" href="$xml-stylesheet$"?>
 $endif$
-<!DOCTYPE article PUBLIC "-//NLM//DTD JATS (Z39.96) Journal Publishing DTD v1.0 20120330//EN"
+<!DOCTYPE article PUBLIC "-//NLM//DTD JATS (Z39.96) Journal Publishing DTD v1.1 20151215//EN"
                   "JATS-journalpublishing1.dtd">
 $if(article.type)$
-<article xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink" dtd-version="1.0" article-type="$article.type$">
+<article xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink" dtd-version="1.1" article-type="$article.type$">
 $else$
-<article xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink" dtd-version="1.0" article-type="other">
+<article xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink" dtd-version="1.1" article-type="other">
 $endif$
 <front>
 <journal-meta>
@@ -167,6 +167,11 @@ $if(copyright.text)$
 </permissions>
 $endif$
 $endif$
+$if(abstract)$
+<abstract>
+$abstract$
+</abstract>
+$endif$
 $if(tags)$
 <kwd-group kwd-group-type="author">
 $for(tags)$
diff --git a/default.latex b/default.latex
index 4e8911e..20d5493 100644
--- a/default.latex
+++ b/default.latex
@@ -137,7 +137,7 @@ $endif$
 $endif$
 $if(CJKmainfont)$
   \ifxetex
-    \usepackage{xeCJK}
+    \usepackage[space]{xeCJK}
     \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
   \fi
 $endif$
@@ -270,7 +270,7 @@ $else$
 $endif$
 $endif$
 $if(graphics)$
-\usepackage{graphicx,grffile}
+\usepackage{graphicx}
 \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}
@@ -359,6 +359,14 @@ $for(bibliography)$
 \addbibresource{$bibliography$}
 $endfor$
 $endif$
+$if(csl-refs)$
+\newlength{\cslhangindent}
+\setlength{\cslhangindent}{1.5em}
+\newenvironment{cslreferences}%
+  {$if(csl-hanging-indent)$\setlength{\parindent}{0pt}%
+  \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
+  {\par}
+$endif$
 
 $if(title)$
 \title{$title$$if(thanks)$\thanks{$thanks$}$endif$}
diff --git a/default.man b/default.man
index 44b5919..f257ec3 100644
--- a/default.man
+++ b/default.man
@@ -12,7 +12,7 @@ $endif$
 $if(hyphenate)$
 .hy
 $else$
-.nh \" Turn off hyphenation by default.
+.nh
 $endif$
 $for(header-includes)$
 $header-includes$
diff --git a/default.ms b/default.ms
index 02bbc62..96af30f 100644
--- a/default.ms
+++ b/default.ms
@@ -31,11 +31,11 @@ $endif$
 .\" line height
 .nr VS $if(lineheight)$$lineheight$$else$12p$endif$
 .\" font family: A, BM, H, HN, N, P, T, ZCM
-.fam $if(fontfamily)$$fontfamily$$else$T$endif$
+.fam $if(fontfamily)$$fontfamily$$else$P$endif$
 .\" paragraph indent
-.nr PI $if(indent)$$indent$$else$2m$endif$
+.nr PI $if(indent)$$indent$$else$0m$endif$
 .\" interparagraph space
-.nr PD 0.33v
+.nr PD 0.4v
 .\" footnote width
 .nr FL \n[LL]
 .\" footnote point size
@@ -57,6 +57,9 @@ $endif$
 .\" comment these out if you want a dot after section numbers:
 .als SN SN-NO-DOT
 .als SN-STYLE SN-NO-DOT
+.\" page numbers in footer, centered
+.rm CH
+.ds CF %
 .\" pdf outline fold level
 .nr PDFOUTLINE.FOLDLEVEL 3
 .\" start out in outline view
@@ -71,7 +74,7 @@ $endif$
 $if(hyphenate)$
 .hy
 $else$
-.nh \" Turn off hyphenation by default.
+.nh
 $endif$
 $if(has-inline-math)$
 .EQ
diff --git a/default.muse b/default.muse
index 05534ad..3bae4d0 100644
--- a/default.muse
+++ b/default.muse
@@ -1,5 +1,5 @@
 $if(author)$
-#author $author$
+#author $for(author)$$author$$sep$; $endfor$
 $endif$
 $if(title)$
 #title $title$
diff --git a/default.revealjs b/default.revealjs
index b8bbbb0..f63fc14 100644
--- a/default.revealjs
+++ b/default.revealjs
@@ -19,19 +19,8 @@ $endif$
   <link rel="stylesheet" href="$revealjs-url$/css/reset.css">
   <link rel="stylesheet" href="$revealjs-url$/css/reveal.css">
   <style>
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-$if(quotes)$
-      q { quotes: "“" "”" "‘" "’"; }
-$endif$
-  </style>
-$if(highlighting-css)$
-  <style>
-$highlighting-css$
+    $styles.html()$
   </style>
-$endif$
 $if(theme)$
   <link rel="stylesheet" href="$revealjs-url$/css/theme/$theme$.css" id="theme">
 $else$
@@ -138,6 +127,10 @@ $if(rtl)$
         // Change the presentation direction to be RTL
         rtl: $rtl$,
 $endif$
+$if(navigationMode)$
+        // see https://github.com/hakimel/reveal.js/#navigation-mode
+        navigationMode: '$navigationMode$',
+$endif$
 $if(fragments)$
         // Turns fragments on and off globally
         fragments: $fragments$,
diff --git a/default.s5 b/default.s5
index e9c36b4..d761112 100644
--- a/default.s5
+++ b/default.s5
@@ -16,22 +16,11 @@ $if(keywords)$
 $endif$
   <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
   <style type="text/css">
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-$if(quotes)$
-      q { quotes: "“" "”" "‘" "’"; }
-$endif$
+    $styles.html()$
   </style>
   <!-- configuration parameters -->
   <meta name="defaultView" content="slideshow" />
   <meta name="controlVis" content="hidden" />
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
-  </style>
-$endif$
 $for(css)$
   <link rel="stylesheet" href="$css$" type="text/css" />
 $endfor$
diff --git a/default.slideous b/default.slideous
index ad58272..ebf582d 100644
--- a/default.slideous
+++ b/default.slideous
@@ -17,19 +17,8 @@ $if(keywords)$
 $endif$
   <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
   <style type="text/css">
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-$if(quotes)$
-      q { quotes: "“" "”" "‘" "’"; }
-$endif$
-  </style>
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
+    $styles.html()$
   </style>
-$endif$
   <link rel="stylesheet" type="text/css" media="screen, projection, print"
     href="$slideous-url$/slideous.css" />
 $for(css)$
diff --git a/default.slidy b/default.slidy
index 98b8d66..6b97768 100644
--- a/default.slidy
+++ b/default.slidy
@@ -17,19 +17,8 @@ $if(keywords)$
 $endif$
   <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
   <style type="text/css">
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-$if(quotes)$
-      q { quotes: "“" "”" "‘" "’"; }
-$endif$
-  </style>
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
+    $styles.html()$
   </style>
-$endif$
   <link rel="stylesheet" type="text/css" media="screen, projection, print"
     href="$slidy-url$/styles/slidy.css" />
 $for(css)$