diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2012-10-29 22:45:52 -0700 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-01-09 09:30:05 -0800 |
| commit | d599c4cdabd0d71fd9d27161c949b5e1e692436d (patch) | |
| tree | 96b6130be929282f85d0261bbb0e0ef37e4e43ff /src/Text/Pandoc/Writers/FB2.hs | |
| parent | 7a40fa8c08996cb94e7ff3cfafd8ede84972ce70 (diff) | |
| download | pandoc-d599c4cdabd0d71fd9d27161c949b5e1e692436d.tar.gz | |
Added Attr field to Header.
Previously header ids were autogenerated by the writers.
Now they are generated (unless supplied explicitly) in the
markdown parser, if the `header_identifiers` extension is
selected.
In addition, the textile reader now supports id attributes on
headers.
Diffstat (limited to 'src/Text/Pandoc/Writers/FB2.hs')
| -rw-r--r-- | src/Text/Pandoc/Writers/FB2.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Writers/FB2.hs b/src/Text/Pandoc/Writers/FB2.hs index 301d80c54..eeb4616b4 100644 --- a/src/Text/Pandoc/Writers/FB2.hs +++ b/src/Text/Pandoc/Writers/FB2.hs @@ -158,7 +158,7 @@ renderSection level (ttl, body) = do return $ el "section" (title ++ content) where hasSubsections = any isHeader - isHeader (Header _ _) = True + isHeader (Header _ _ _) = True isHeader _ = False -- | Only <p> and <empty-line> are allowed within <title> in FB2. @@ -186,13 +186,13 @@ splitSections level blocks = reverse $ revSplit (reverse blocks) let (lastsec, before) = break sameLevel rblocks (header, prevblocks) = case before of - ((Header n title):prevblocks') -> + ((Header n _ title):prevblocks') -> if n == level then (title, prevblocks') else ([], before) _ -> ([], before) in (header, reverse lastsec) : revSplit prevblocks - sameLevel (Header n _) = n == level + sameLevel (Header n _ _) = n == level sameLevel _ = False -- | Make another FictionBook body with footnotes. @@ -361,7 +361,7 @@ blockToXml (DefinitionList defs) = needsBreak (Para _) = False needsBreak (Plain ins) = LineBreak `notElem` ins needsBreak _ = True -blockToXml (Header _ _) = -- should never happen, see renderSections +blockToXml (Header _ _ _) = -- should never happen, see renderSections error "unexpected header in section text" blockToXml HorizontalRule = return [ el "empty-line" () @@ -413,7 +413,7 @@ indent = indentBlock let s' = unlines . map (spacer++) . lines $ s in CodeBlock a s' indentBlock (BlockQuote bs) = BlockQuote (map indent bs) - indentBlock (Header l ins) = Header l (indentLines ins) + indentBlock (Header l attr' ins) = Header l attr' (indentLines ins) indentBlock everythingElse = everythingElse -- indent every (explicit) line indentLines :: [Inline] -> [Inline] @@ -613,4 +613,4 @@ cMap = concatMap -- | Monadic equivalent of 'concatMap'. cMapM :: (Monad m) => (a -> m [b]) -> [a] -> m [b] -cMapM f xs = concat `liftM` mapM f xs
\ No newline at end of file +cMapM f xs = concat `liftM` mapM f xs |