From 89fa0e4a08092c2d35038b52adc700fb297f1b7f Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Sat, 12 May 2012 11:21:23 -0700
Subject: DocBook reader: computeroutput is an inline tag, not block.

---
 src/Text/Pandoc/Readers/DocBook.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Text')

diff --git a/src/Text/Pandoc/Readers/DocBook.hs b/src/Text/Pandoc/Readers/DocBook.hs
index 849f769c0..fea9f2d0f 100644
--- a/src/Text/Pandoc/Readers/DocBook.hs
+++ b/src/Text/Pandoc/Readers/DocBook.hs
@@ -557,7 +557,7 @@ isBlockElement (Elem e) = qName (elName e) `elem` blocktags
            "important","caution","note","tip","warning","qandadiv",
            "question","answer","abstract","itemizedlist","orderedlist",
            "variablelist","article","book","table","informaltable",
-           "computeroutput","screen","programlisting"]
+           "screen","programlisting"]
 isBlockElement _ = False
 
 -- Trim leading and trailing newline characters
@@ -697,7 +697,6 @@ parseBlock (Elem e) =
         "table" -> parseTable
         "informaltable" -> parseTable
         "literallayout" -> codeBlockWithLang ["literallayout"]
-        "computeroutput" -> codeBlockWithLang ["computeroutput"]
         "screen" -> codeBlockWithLang ["screen"]
         "programlisting" -> codeBlockWithLang []
         "?xml"  -> return mempty
@@ -842,6 +841,7 @@ parseInline (Elem e) =
         "code" -> codeWithLang []
         "filename" -> codeWithLang ["filename"]
         "literal" -> codeWithLang []
+        "computeroutput" -> codeWithLang ["computeroutput"]
         "prompt" -> codeWithLang ["prompt"]
         "parameter" -> codeWithLang ["parameter"]
         "option" -> codeWithLang ["option"]
-- 
cgit v1.2.3