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

AsciiDoc writer: prevent illegal nestings.

Browse source 
In asciidoc you can only have level n+1 headers directly under
level n headers.
This commit is contained in:
John MacFarlane 2018-11-03 12:22:01 -07:00
parent 2f65263851
commit 7ac9c39996
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Text/Pandoc/Writers/AsciiDoc.hs
View file

@ -90,7 +90,7 @@ pandocToAsciiDoc opts (Pandoc meta blocks) = do
(fmap render' . blockListToAsciiDoc opts) (fmap render' . blockListToAsciiDoc opts)
(fmap render' . inlineListToAsciiDoc opts) (fmap render' . inlineListToAsciiDoc opts)
meta meta
body <- blockListToAsciiDoc opts blocks body <- vcat <$> mapM (elementToAsciiDoc 1 opts) (hierarchicalize blocks)
let main = render colwidth body let main = render colwidth body
let context = defField "body" main let context = defField "body" main
$ defField "toc" $ defField "toc"
@ -101,6 +101,14 @@ pandocToAsciiDoc opts (Pandoc meta blocks) = do
Nothing -> return main Nothing -> return main
Just tpl -> renderTemplate' tpl context Just tpl -> renderTemplate' tpl context
elementToAsciiDoc :: PandocMonad m
=> Int -> WriterOptions -> Element -> ADW m Doc
elementToAsciiDoc _ opts (Blk b) = blockToAsciiDoc opts b
elementToAsciiDoc nestlevel opts (Sec _lvl _num attr label children) = do
hdr <- blockToAsciiDoc opts (Header nestlevel attr label)
rest <- vcat <$> mapM (elementToAsciiDoc (nestlevel + 1) opts) children
return $ hdr $$ rest
-- | Escape special characters for AsciiDoc. -- | Escape special characters for AsciiDoc.
escapeString :: String -> String escapeString :: String -> String
escapeString = escapeStringUsing escs escapeString = escapeStringUsing escs