DocBook reader: Improved def lists with multiple defs.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/Text/Pandoc/Readers/DocBook.hs b/src/Text/Pandoc/Readers/DocBook.hs
index 6a2eedfaf..665d89a6a 100644
--- a/src/Text/Pandoc/Readers/DocBook.hs
+++ b/src/Text/Pandoc/Readers/DocBook.hs
@@ -651,13 +651,11 @@ parseBlock (Elem e) =
          deflistitems = mapM parseVarListEntry $ filterChildren
                      (named "varlistentry") e
          parseVarListEntry e' = do
-                     let defs = filterChildren (named "term") e'
+                     let terms = filterChildren (named "term") e'
                      let items = filterChildren (named "listitem") e'
-                     defs' <- mapM ((mconcat <$>) . mapM parseInline)
-                                 $ map elContent defs
-                     items' <- mapM ((mconcat <$>) . mapM parseBlock)
-                                 $ map elContent items
-                     return (trimInlines $ mconcat $ intersperse (str "; ") defs', items')
+                     terms' <- mapM ((trimInlines . mconcat <$>) . mapM parseInline . elContent) terms
+                     items' <- mapM ((mconcat <$>) . mapM parseBlock . elContent) items
+                     return (mconcat $ intersperse (str "; ") terms', items')
          getTitle = case filterChild (named "title") e of
                          Just t  -> do
                             tit <- getInlines t