git.iko.soy/typeable/pandoc
on master help sign in
Minor template & test changes for latest dev doctemplates.
a0aeb13John MacFarlane
cabal.project+1−1
compare with master
unifiedsplit
@@ -16,4 +16,4 @@ source-repository-package
16source-repository-package
16source-repository-package
17 type: git
17 type: git
18 location: https://github.com/jgm/doctemplates.git
18 location: https://github.com/jgm/doctemplates.git
19− tag: 180a5e9318e3cee44c6581f6d8ace14de684b735
19+ tag: 57ef7f3b14868bea9739e1e800b84cb3bc1ea681
data/templates/default.icml+2−2
@@ -4,7 +4,7 @@
4<Document DOMVersion="8.0" Self="pandoc_doc">
4<Document DOMVersion="8.0" Self="pandoc_doc">
5 <RootCharacterStyleGroup Self="pandoc_character_styles">
5 <RootCharacterStyleGroup Self="pandoc_character_styles">
6 <CharacterStyle Self="$$ID/NormalCharacterStyle" Name="Default" />
6 <CharacterStyle Self="$$ID/NormalCharacterStyle" Name="Default" />
7− $charStyles$
7+ $charStyles$
8 </RootCharacterStyleGroup>
8 </RootCharacterStyleGroup>
9 <RootParagraphStyleGroup Self="pandoc_paragraph_styles">
9 <RootParagraphStyleGroup Self="pandoc_paragraph_styles">
10 <ParagraphStyle Self="$$ID/NormalParagraphStyle" Name="$$ID/NormalParagraphStyle"
10 <ParagraphStyle Self="$$ID/NormalParagraphStyle" Name="$$ID/NormalParagraphStyle"
@@ -20,7 +20,7 @@
20 </TabList>
20 </TabList>
21 </Properties>
21 </Properties>
22 </ParagraphStyle>
22 </ParagraphStyle>
23− $parStyles$
23+ $parStyles$
24 </RootParagraphStyleGroup>
24 </RootParagraphStyleGroup>
25 <RootTableStyleGroup Self="pandoc_table_styles">
25 <RootTableStyleGroup Self="pandoc_table_styles">
26 <TableStyle Self="TableStyle/Table" Name="Table" />
26 <TableStyle Self="TableStyle/Table" Name="Table" />
pandoc.cabal+2−2
@@ -408,7 +408,7 @@ library
408 JuicyPixels >= 3.1.6.1 && < 3.4,
408 JuicyPixels >= 3.1.6.1 && < 3.4,
409 Glob >= 0.7 && < 0.11,
409 Glob >= 0.7 && < 0.11,
410 cmark-gfm >= 0.2 && < 0.3,
410 cmark-gfm >= 0.2 && < 0.3,
411− doctemplates >= 0.6.1 && < 0.7,
411+ doctemplates >= 0.7 && < 0.8,
412 network-uri >= 2.6 && < 2.7,
412 network-uri >= 2.6 && < 2.7,
413 network >= 2.6,
413 network >= 2.6,
414 http-client >= 0.4.30 && < 0.7,
414 http-client >= 0.4.30 && < 0.7,
@@ -725,7 +725,7 @@ test-suite test-pandoc
725 executable-path >= 0.0 && < 0.1,
725 executable-path >= 0.0 && < 0.1,
726 zip-archive >= 0.2.3.4 && < 0.5,
726 zip-archive >= 0.2.3.4 && < 0.5,
727 xml >= 1.3.12 && < 1.4,
727 xml >= 1.3.12 && < 1.4,
728− doctemplates >= 0.6.1 && < 0.7,
728+ doctemplates >= 0.7 && < 0.8,
729 Glob >= 0.7 && < 0.11
729 Glob >= 0.7 && < 0.11
730 if impl(ghc < 8.4)
730 if impl(ghc < 8.4)
731 hs-source-dirs: prelude
731 hs-source-dirs: prelude
stack.yaml+1−1
@@ -24,7 +24,7 @@ extra-deps:
24- HsYAML-aeson-0.2.0.0
24- HsYAML-aeson-0.2.0.0
25# - doctemplates-0.6.1
25# - doctemplates-0.6.1
26- git: https://github.com/jgm/doctemplates.git
26- git: https://github.com/jgm/doctemplates.git
27− commit: 180a5e9318e3cee44c6581f6d8ace14de684b735
27+ commit: 57ef7f3b14868bea9739e1e800b84cb3bc1ea681
28ghc-options:
28ghc-options:
29 "$locals": -fhide-source-paths -Wno-missing-home-modules
29 "$locals": -fhide-source-paths -Wno-missing-home-modules
30resolver: lts-14.6
30resolver: lts-14.6
test/writer.icml+2−2
@@ -64,7 +64,7 @@
64 <Properties>
64 <Properties>
65 <BasedOn type="object">$ID/NormalCharacterStyle</BasedOn>
65 <BasedOn type="object">$ID/NormalCharacterStyle</BasedOn>
66 </Properties>
66 </Properties>
67− </CharacterStyle>
67+ </CharacterStyle>
68 </RootCharacterStyleGroup>
68 </RootCharacterStyleGroup>
69 <RootParagraphStyleGroup Self="pandoc_paragraph_styles">
69 <RootParagraphStyleGroup Self="pandoc_paragraph_styles">
70 <ParagraphStyle Self="$ID/NormalParagraphStyle" Name="$ID/NormalParagraphStyle"
70 <ParagraphStyle Self="$ID/NormalParagraphStyle" Name="$ID/NormalParagraphStyle"
@@ -420,7 +420,7 @@
420 <Properties>
420 <Properties>
421 <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn>
421 <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn>
422 </Properties>
422 </Properties>
423− </ParagraphStyle>
423+ </ParagraphStyle>
424 </RootParagraphStyleGroup>
424 </RootParagraphStyleGroup>
425 <RootTableStyleGroup Self="pandoc_table_styles">
425 <RootTableStyleGroup Self="pandoc_table_styles">
426 <TableStyle Self="TableStyle/Table" Name="Table" />
426 <TableStyle Self="TableStyle/Table" Name="Table" />