From b5af8eed3877ff0c99e14b12220562db406c1eba Mon Sep 17 00:00:00 2001 From: John MacFarlane <jgm@berkeley.edu> Date: Tue, 4 Jun 2019 09:20:29 -0700 Subject: [PATCH] Fix document section assignments in EPUB writer. For example, introduction should go in bodymatter, not frontmatter, and epigraph, conclusion, and afterward should go in bodymatter, not backmatter. For the full list of assignments, see the manual. Closes #5546. --- MANUAL.txt | 17 ++++++++++++----- src/Text/Pandoc/Writers/EPUB.hs | 11 +++++++---- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/MANUAL.txt b/MANUAL.txt index 0ced3c545..7d5bb799f 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -4944,17 +4944,24 @@ abstract frontmatter acknowledgments frontmatter copyright-page frontmatter dedication frontmatter +credits frontmatter +keywords frontmatter +imprint frontmatter +contributors frontmatter +other-credits frontmatter +errata frontmatter +revision-history frontmatter +titlepage frontmatter +halftitlepage frontmatter +seriespage frontmatter foreword frontmatter -halftitle, frontmatter -introduction frontmatter preface frontmatter seriespage frontmatter titlepage frontmatter -afterword backmatter appendix backmatter colophon backmatter -conclusion backmatter -epigraph backmatter +bibliography backmatter +index backmatter [epub-type]: http://www.idpf.org/epub/31/spec/epub-contentdocs.html#sec-epub-type-attribute diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs index 062ab19ed..82b6e8221 100644 --- a/src/Text/Pandoc/Writers/EPUB.hs +++ b/src/Text/Pandoc/Writers/EPUB.hs @@ -584,11 +584,14 @@ pandocToEPUB version opts doc = do _ -> (Pandoc nullMeta bs, "bodymatter") frontMatterTypes = ["prologue", "abstract", "acknowledgments", "copyright-page", "dedication", - "foreword", "halftitle", - "introduction", "preface", + "credits", "keywords", "imprint", + "contributors", "other-credits", + "errata", "revision-history", + "titlepage", "halftitlepage", "seriespage", + "foreword", "preface", "seriespage", "titlepage"] - backMatterTypes = ["afterword", "appendix", "colophon", - "conclusion", "epigraph"] + backMatterTypes = ["appendix", "colophon", "bibliography", + "index"] chapterEntries <- zipWithM chapToEntry [1..] chapters