git.iko.soy/typeable/pandoc
on master help sign in
Renamed writerEPUBMetadata -> writerEpubMetadata.

API change for consistency.

commite91bae4f5bf8531e818e5f0b5e8163a635902034 authorJohn MacFarlane <fiddlosopher@gmail.com> dateFri 4 Jan 2013, 22:41 (14 years ago) parent3036130
3 files changed+4−4
compare with master
unifiedsplit
pandoc.hs+1−1 src/Text/Pandoc/Options.hs+2−2 src/Text/Pandoc/Writers/EPUB.hs+1−1
pandoc.hs+1−1
@@ -992,7 +992,6 @@ main = do
992992 let writerOptions = def { writerStandalone = standalone',
993993 writerTemplate = templ,
994994 writerVariables = variables'',
995− writerEPUBMetadata = epubMetadata,
996995 writerTabStop = tabStop,
997996 writerTableOfContents = toc,
998997 writerHTMLMathMethod = mathMethod,
@@ -1018,6 +1017,7 @@ main = do
10181017 writerHighlightStyle = highlightStyle,
10191018 writerSetextHeaders = setextHeaders,
10201019 writerTeXLigatures = texLigatures,
1020+ writerEpubMetadata = epubMetadata,
10211021 writerEpubStylesheet = epubStylesheet,
10221022 writerEpubFonts = epubFonts,
10231023 writerEpubChapterLevel = epubChapterLevel,
src/Text/Pandoc/Options.hs+2−2
@@ -206,7 +206,6 @@ data WriterOptions = WriterOptions
206206 { writerStandalone :: Bool -- ^ Include header and footer
207207 , writerTemplate :: String -- ^ Template to use in standalone mode
208208 , writerVariables :: [(String, String)] -- ^ Variables to set in template
209− , writerEPUBMetadata :: String -- ^ Metadata to include in EPUB
210209 , writerTabStop :: Int -- ^ Tabstop for conversion btw spaces and tabs
211210 , writerTableOfContents :: Bool -- ^ Include table of contents
212211 , writerSlideVariant :: HTMLSlideVariant -- ^ Are we writing S5, Slidy or Slideous?
@@ -235,6 +234,7 @@ data WriterOptions = WriterOptions
235234 , writerHighlightStyle :: Style -- ^ Style to use for highlighting
236235 , writerSetextHeaders :: Bool -- ^ Use setext headers for levels 1-2 in markdown
237236 , writerTeXLigatures :: Bool -- ^ Use tex ligatures quotes, dashes in latex
237+ , writerEpubMetadata :: String -- ^ Metadata to include in EPUB
238238 , writerEpubStylesheet :: Maybe String -- ^ EPUB stylesheet specified at command line
239239 , writerEpubFonts :: [FilePath] -- ^ Paths to fonts to embed
240240 , writerEpubChapterLevel :: Int -- ^ Header level for chapters (separate files)
@@ -247,7 +247,6 @@ instance Default WriterOptions where
247247 def = WriterOptions { writerStandalone = False
248248 , writerTemplate = ""
249249 , writerVariables = []
250− , writerEPUBMetadata = ""
251250 , writerTabStop = 4
252251 , writerTableOfContents = False
253252 , writerSlideVariant = NoSlides
@@ -275,6 +274,7 @@ instance Default WriterOptions where
275274 , writerHighlightStyle = pygments
276275 , writerSetextHeaders = True
277276 , writerTeXLigatures = True
277+ , writerEpubMetadata = ""
278278 , writerEpubStylesheet = Nothing
279279 , writerEpubFonts = []
280280 , writerEpubChapterLevel = 1
src/Text/Pandoc/Writers/EPUB.hs+1−1
@@ -200,7 +200,7 @@ writeEPUB version opts doc@(Pandoc meta _) = do
200200 EPUB3 -> "3.0")
201201 ,("xmlns","http://www.idpf.org/2007/opf")
202202 ,("unique-identifier","BookId")] $
203− [ metadataElement version (writerEPUBMetadata opts')
203+ [ metadataElement version (writerEpubMetadata opts')
204204 uuid lang plainTitle plainAuthors plainDate currentTime mbCoverImage
205205 , unode "manifest" $
206206 [ unode "item" ! [("id","ncx"), ("href","toc.ncx")