@@ -3,6 +3,7 @@ import Text.Pandoc.Parsing (ParserState(..))
33import Text.Pandoc.Definition
44import Text.Pandoc.Builder
55import Text.XML.Light
6+import Data.Maybe (fromMaybe)
67import Data.Monoid
78import Data.Char (isSpace)
89import Control.Monad.State
@@ -45,8 +46,9 @@ parseBlock (Elem e) =
4546 "sect6" -> sect 6
4647 "section" -> gets dbSectionLevel >>= sect . (+1)
4748 "itemizedlist" -> bulletList <$> listitems
49+ "orderedlist" -> orderedList <$> listitems -- TODO list attributes
4850 "articleinfo" -> getTitle >> getAuthors >> getDate >> return mempty
49− "programlisting" -> return $ codeBlock $ strContent e
51+ "programlisting" -> return $ codeBlock $ strContent e -- TODO attrs
5052 "?xml" -> return mempty
5153 _ -> getBlocks e
5254 where getBlocks e' = mconcat <$> (mapM parseBlock $ elContent e')
@@ -93,6 +95,9 @@ parseInline (Elem e) =
9395 case qName (elName e) of
9496 "subscript" -> subscript <$> innerInlines
9597 "superscript" -> superscript <$> innerInlines
98+ "ulink" -> link
99+ (fromMaybe "" (lookupAttrBy (\attr -> qName attr == "url")
100+ (elAttribs e))) "" <$> innerInlines
96101 "emphasis" -> case lookupAttrBy (\attr -> qName attr == "role")
97102 (elAttribs e) of
98103 Just "strong" -> strong <$> innerInlines