From e91bae4f5bf8531e818e5f0b5e8163a635902034 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Fri, 4 Jan 2013 22:41:09 -0800
Subject: Renamed writerEPUBMetadata -> writerEpubMetadata.

API change for consistency.
---
 src/Text/Pandoc/Options.hs      | 4 ++--
 src/Text/Pandoc/Writers/EPUB.hs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Text/Pandoc')

diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs
index 0424b434f..ef8350840 100644
--- a/src/Text/Pandoc/Options.hs
+++ b/src/Text/Pandoc/Options.hs
@@ -206,7 +206,6 @@ data WriterOptions = WriterOptions
   { writerStandalone       :: Bool   -- ^ Include header and footer
   , writerTemplate         :: String -- ^ Template to use in standalone mode
   , writerVariables        :: [(String, String)] -- ^ Variables to set in template
-  , writerEPUBMetadata     :: String -- ^ Metadata to include in EPUB
   , writerTabStop          :: Int    -- ^ Tabstop for conversion btw spaces and tabs
   , writerTableOfContents  :: Bool   -- ^ Include table of contents
   , writerSlideVariant     :: HTMLSlideVariant -- ^ Are we writing S5, Slidy or Slideous?
@@ -235,6 +234,7 @@ data WriterOptions = WriterOptions
   , writerHighlightStyle   :: Style      -- ^ Style to use for highlighting
   , writerSetextHeaders    :: Bool       -- ^ Use setext headers for levels 1-2 in markdown
   , writerTeXLigatures     :: Bool       -- ^ Use tex ligatures quotes, dashes in latex
+  , writerEpubMetadata     :: String     -- ^ Metadata to include in EPUB
   , writerEpubStylesheet   :: Maybe String -- ^ EPUB stylesheet specified at command line
   , writerEpubFonts        :: [FilePath] -- ^ Paths to fonts to embed
   , writerEpubChapterLevel :: Int            -- ^ Header level for chapters (separate files)
@@ -247,7 +247,6 @@ instance Default WriterOptions where
   def = WriterOptions { writerStandalone       = False
                       , writerTemplate         = ""
                       , writerVariables        = []
-                      , writerEPUBMetadata     = ""
                       , writerTabStop          = 4
                       , writerTableOfContents  = False
                       , writerSlideVariant     = NoSlides
@@ -275,6 +274,7 @@ instance Default WriterOptions where
                       , writerHighlightStyle   = pygments
                       , writerSetextHeaders    = True
                       , writerTeXLigatures     = True
+                      , writerEpubMetadata     = ""
                       , writerEpubStylesheet   = Nothing
                       , writerEpubFonts        = []
                       , writerEpubChapterLevel = 1
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs
index 024823b38..a33428c71 100644
--- a/src/Text/Pandoc/Writers/EPUB.hs
+++ b/src/Text/Pandoc/Writers/EPUB.hs
@@ -200,7 +200,7 @@ writeEPUB version opts doc@(Pandoc meta _) = do
                                              EPUB3 -> "3.0")
                           ,("xmlns","http://www.idpf.org/2007/opf")
                           ,("unique-identifier","BookId")] $
-          [ metadataElement version (writerEPUBMetadata opts')
+          [ metadataElement version (writerEpubMetadata opts')
               uuid lang plainTitle plainAuthors plainDate currentTime mbCoverImage
           , unode "manifest" $
              [ unode "item" ! [("id","ncx"), ("href","toc.ncx")
-- 
cgit v1.2.3