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

Support orderedlist and ulink in docbook reader.

Browse source
This commit is contained in:
John MacFarlane 2012-04-14 21:43:07 -07:00
parent d556840fc8
commit f0a1760d41
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Text/Pandoc/Readers/DocBook.hs
View file

@ -3,6 +3,7 @@ import Text.Pandoc.Parsing (ParserState(..))
import Text.Pandoc.Definition import Text.Pandoc.Definition
import Text.Pandoc.Builder import Text.Pandoc.Builder
import Text.XML.Light import Text.XML.Light
import Data.Maybe (fromMaybe)
import Data.Monoid import Data.Monoid
import Data.Char (isSpace) import Data.Char (isSpace)
import Control.Monad.State import Control.Monad.State
@ -45,8 +46,9 @@ parseBlock (Elem e) =
"sect6" -> sect 6 "sect6" -> sect 6
"section" -> gets dbSectionLevel >>= sect . (+1) "section" -> gets dbSectionLevel >>= sect . (+1)
"itemizedlist" -> bulletList <$> listitems "itemizedlist" -> bulletList <$> listitems
"orderedlist" -> orderedList <$> listitems -- TODO list attributes
"articleinfo" -> getTitle >> getAuthors >> getDate >> return mempty "articleinfo" -> getTitle >> getAuthors >> getDate >> return mempty
"programlisting" -> return $ codeBlock $ strContent e "programlisting" -> return $ codeBlock $ strContent e -- TODO attrs
"?xml" -> return mempty "?xml" -> return mempty
_ -> getBlocks e _ -> getBlocks e
where getBlocks e' = mconcat <$> (mapM parseBlock $ elContent e') where getBlocks e' = mconcat <$> (mapM parseBlock $ elContent e')
@ -93,6 +95,9 @@ parseInline (Elem e) =
case qName (elName e) of case qName (elName e) of
"subscript" -> subscript <$> innerInlines "subscript" -> subscript <$> innerInlines
"superscript" -> superscript <$> innerInlines "superscript" -> superscript <$> innerInlines
"ulink" -> link
(fromMaybe "" (lookupAttrBy (\attr -> qName attr == "url")
(elAttribs e))) "" <$> innerInlines
"emphasis" -> case lookupAttrBy (\attr -> qName attr == "role") "emphasis" -> case lookupAttrBy (\attr -> qName attr == "role")
(elAttribs e) of (elAttribs e) of
Just "strong" -> strong <$> innerInlines Just "strong" -> strong <$> innerInlines