Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

EPUB writer: more transition.

Browse source 
Changed toChunks to toChapters.
This commit is contained in:
John MacFarlane 2013-02-23 19:34:04 -08:00
parent 9c40535c47
commit ca6cb04509
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Text/Pandoc/Writers/EPUB.hs
View file

@ -62,6 +62,10 @@ import Text.Blaze.Html.Renderer.Utf8 (renderHtml)
import Text.Blaze.Renderer.Utf8 (renderHtml) import Text.Blaze.Renderer.Utf8 (renderHtml)
#endif #endif
-- A Chapter includes a list of blocks and maybe a display
-- number. Note, some chapters are unnumbered. The display
-- number is different from the index number, which will be used
-- in filenames, chapter0003.xhtml.
data Chapter = Chapter (Maybe [Int]) [Block] data Chapter = Chapter (Maybe [Int]) [Block]
-- | Produce an EPUB file from a Pandoc document. -- | Produce an EPUB file from a Pandoc document.
@ -141,12 +145,12 @@ writeEPUB opts doc@(Pandoc meta _) = do
let isChapterHeader (Header n _ _) = n <= chapterHeaderLevel let isChapterHeader (Header n _ _) = n <= chapterHeaderLevel
isChapterHeader _ = False isChapterHeader _ = False
let toChunks :: [Block] -> [[Block]] let toChapters :: [Block] -> State [Int] [Chapter]
toChunks [] = [] toChapters [] = return []
toChunks (b:bs) = (b:xs) : toChunks ys toChapters (b:bs) = (Chapter Nothing (b:xs) :) `fmap` toChapters ys
where (xs,ys) = break isChapterHeader bs where (xs,ys) = break isChapterHeader bs
let chaps = map (Chapter Nothing) $ toChunks blocks'' -- TODO For now let chapters = evalState (toChapters blocks'') [0,0,0,0,0,0]
let chapToEntry :: Int -> Chapter -> Entry let chapToEntry :: Int -> Chapter -> Entry
chapToEntry num (Chapter mbnum bs) = mkEntry (showChapter num) chapToEntry num (Chapter mbnum bs) = mkEntry (showChapter num)
@ -157,7 +161,7 @@ writeEPUB opts doc@(Pandoc meta _) = do
(Header _ _ xs : _) -> Pandoc (Meta xs [] []) bs (Header _ _ xs : _) -> Pandoc (Meta xs [] []) bs
_ -> Pandoc (Meta [] [] []) bs _ -> Pandoc (Meta [] [] []) bs
let chapterEntries = zipWith chapToEntry [1..] chaps let chapterEntries = zipWith chapToEntry [1..] chapters
-- incredibly inefficient (TODO): -- incredibly inefficient (TODO):
let containsMathML ent = "<math" `isInfixOf` (B8.unpack $ fromEntry ent) let containsMathML ent = "<math" `isInfixOf` (B8.unpack $ fromEntry ent)