From a0aeb135b39687c1a1c6adb4aa6b01dcc9c6e867 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 14 Oct 2019 23:42:04 -0700
Subject: [PATCH] Minor template & test changes for latest dev doctemplates.
---
cabal.project | 2 +-
data/templates/default.icml | 4 ++--
pandoc.cabal | 4 ++--
stack.yaml | 2 +-
test/writer.icml | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cabal.project b/cabal.project
index bf45716d4..ec2ace693 100644
--- a/cabal.project
+++ b/cabal.project
@@ -16,4 +16,4 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/jgm/doctemplates.git
- tag: 180a5e9318e3cee44c6581f6d8ace14de684b735
+ tag: 57ef7f3b14868bea9739e1e800b84cb3bc1ea681
diff --git a/data/templates/default.icml b/data/templates/default.icml
index b93fa87ba..2c737c80a 100644
--- a/data/templates/default.icml
+++ b/data/templates/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/pandoc.cabal b/pandoc.cabal
index 14756844b..c60553e23 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -408,7 +408,7 @@ library
JuicyPixels >= 3.1.6.1 && < 3.4,
Glob >= 0.7 && < 0.11,
cmark-gfm >= 0.2 && < 0.3,
- doctemplates >= 0.6.1 && < 0.7,
+ doctemplates >= 0.7 && < 0.8,
network-uri >= 2.6 && < 2.7,
network >= 2.6,
http-client >= 0.4.30 && < 0.7,
@@ -725,7 +725,7 @@ test-suite test-pandoc
executable-path >= 0.0 && < 0.1,
zip-archive >= 0.2.3.4 && < 0.5,
xml >= 1.3.12 && < 1.4,
- doctemplates >= 0.6.1 && < 0.7,
+ doctemplates >= 0.7 && < 0.8,
Glob >= 0.7 && < 0.11
if impl(ghc < 8.4)
hs-source-dirs: prelude
diff --git a/stack.yaml b/stack.yaml
index 839269525..f5c09afc3 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -24,7 +24,7 @@ extra-deps:
- HsYAML-aeson-0.2.0.0
# - doctemplates-0.6.1
- git: https://github.com/jgm/doctemplates.git
- commit: 180a5e9318e3cee44c6581f6d8ace14de684b735
+ commit: 57ef7f3b14868bea9739e1e800b84cb3bc1ea681
ghc-options:
"$locals": -fhide-source-paths -Wno-missing-home-modules
resolver: lts-14.6
diff --git a/test/writer.icml b/test/writer.icml
index 4c1a2b950..5c0b1813d 100644
--- a/test/writer.icml
+++ b/test/writer.icml
@@ -64,7 +64,7 @@
<Properties>
<BasedOn type="object">$ID/NormalCharacterStyle</BasedOn>
</Properties>
- </CharacterStyle>
+ </CharacterStyle>
</RootCharacterStyleGroup>
<RootParagraphStyleGroup Self="pandoc_paragraph_styles">
<ParagraphStyle Self="$ID/NormalParagraphStyle" Name="$ID/NormalParagraphStyle"
@@ -420,7 +420,7 @@
<Properties>
<BasedOn type="object">$ID/NormalParagraphStyle</BasedOn>
</Properties>
- </ParagraphStyle>
+ </ParagraphStyle>
</RootParagraphStyleGroup>
<RootTableStyleGroup Self="pandoc_table_styles">
<TableStyle Self="TableStyle/Table" Name="Table" />