Merge pull request #1066 from AmpersandTarski/feature/upgradePandoc

Feature/upgrade pandoc
AmpersandTarski · Apr 4, 2020 · 6075d36 · 6075d36
2 parents ae367a2 + 325384e
commit 6075d36
Show file tree

Hide file tree

Showing 119 changed files with 3,775 additions and 3,767 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -11,6 +11,7 @@
 * [Issue #1056](https://github.com/AmpersandTarski/Ampersand/issues/#1056) Bugfix in .xlsx parser
 * [Issue #1054](https://github.com/AmpersandTarski/Ampersand/issues/#1054) Ampersand daemon now also reports type errors
 * [Issue #1063](https://github.com/AmpersandTarski/Ampersand/issues/#1063) Return violations of invariants with standard check
+* [Issue #735](https://github.com/AmpersandTarski/Ampersand/issues/735) Upgrade to pandoc 2.9. 
 
 ## v3.17.4 (13 september 2019)
 

diff --git a/Setup.hs b/Setup.hs
diff --git a/outputTemplates/README.markdown b/outputTemplates/README.markdown
diff --git a/outputTemplates/default.context b/outputTemplates/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,25 +107,44 @@ $endif$
 \setupxtable[body][]
 \setupxtable[foot][bottomframe=on]
 
+$if(csl-refs)$
+\definemeasure[cslhangindent][1.5em]
+\definenarrower[hangingreferences][left=\measure{cslhangindent}]
+\definestartstop [cslreferences] [
+	$if(csl-hanging-indent)$
+	before={%
+	  \starthangingreferences[left]
+      \setupindenting[-\leftskip,yes,first]
+      \doindentation
+  	},
+  	after=\stophangingreferences,
+	$endif$
+]
+$endif$
+$if(includesource)$
+$for(sourcefile)$
+\attachment[file=$curdir$/$sourcefile$,method=hidden]
+$endfor$
+$endif$
 $for(header-includes)$
 $header-includes$
 $endfor$
 
 \starttext
 $if(title)$
 \startalignment[middle]
-  {\tfd $title$}
+  {\tfd\setupinterlinespace $title$}
 $if(subtitle)$
   \smallskip
-  {\tfa $subtitle$}
+  {\tfa\setupinterlinespace $subtitle$}
 $endif$
 $if(author)$
   \smallskip
-  {\tfa $for(author)$$author$$sep$\crlf $endfor$}
+  {\tfa\setupinterlinespace $for(author)$$author$$sep$\crlf $endfor$}
 $endif$
 $if(date)$
   \smallskip
-  {\tfa $date$}
+  {\tfa\setupinterlinespace $date$}
 $endif$
   \bigskip
 \stopalignment

diff --git a/outputTemplates/default.docbook4 b/outputTemplates/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/outputTemplates/default.docbook5 b/outputTemplates/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/outputTemplates/default.dzslides b/outputTemplates/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/outputTemplates/default.epub2 b/outputTemplates/default.epub2
@@ -6,15 +6,6 @@
   <meta http-equiv="Content-Style-Type" content="text/css" />
   <meta name="generator" content="pandoc" />
   <title>$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$
@@ -55,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$
@@ -63,6 +61,7 @@ $for(include-after)$
 $include-after$
 $endfor$
 $endif$
+$endif$
 </body>
 </html>
 
diff --git a/outputTemplates/default.epub3 b/outputTemplates/default.epub3
@@ -5,22 +5,13 @@
   <meta charset="utf-8" />
   <meta name="generator" content="pandoc" />
   <title>$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$
   </style>
 $endif$
 $for(css)$
-  <link rel="stylesheet" href="$css$" />
+  <link rel="stylesheet" type="text/css" href="$css$" />
 $endfor$
 $for(header-includes)$
   $header-includes$
@@ -56,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$
@@ -64,6 +62,7 @@ $for(include-after)$
 $include-after$
 $endfor$
 $endif$
+$endif$
 </body>
 </html>
 
diff --git a/outputTemplates/default.html4 b/outputTemplates/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$
@@ -58,6 +47,9 @@ $endif$
 $endif$
 $if(toc)$
 <div id="$idprefix$TOC">
+$if(toc-title)$
+<h2 id="$idprefix$toc-title">$toc-title$</h2>
+$endif$
 $table-of-contents$
 </div>
 $endif$

diff --git a/outputTemplates/default.html5 b/outputTemplates/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$
@@ -61,6 +50,9 @@ $endif$
 $endif$
 $if(toc)$
 <nav id="$idprefix$TOC" role="doc-toc">
+$if(toc-title)$
+<h2 id="$idprefix$toc-title">$toc-title$</h2>
+$endif$
 $table-of-contents$
 </nav>
 $endif$

diff --git a/outputTemplates/default.icml b/outputTemplates/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" />