1 files changed, 9 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs
index 8961f73f1..61978f79f 100644
--- a/src/Text/Pandoc/Readers/Org/Blocks.hs
+++ b/src/Text/Pandoc/Readers/Org/Blocks.hs
@@ -50,7 +50,7 @@ import           Text.Pandoc.Shared ( compactify', compactify'DL )
 
 import           Control.Monad ( foldM, guard, mzero, void )
 import           Data.Char ( isSpace, toLower, toUpper)
-import           Data.List ( foldl', intersperse, isPrefixOf )
+import           Data.List ( foldl', isPrefixOf )
 import           Data.Maybe ( fromMaybe, isNothing )
 import           Data.Monoid ((<>))
 
@@ -288,9 +288,9 @@ blockAttributes = try $ do
   let kvAttrs = foldl' (appendValues "ATTR_HTML") Nothing kv
   let name    = lookup "NAME" kv
   let label   = lookup "LABEL" kv
-  caption' <- maybe (return Nothing)
-                    (fmap Just . parseFromString inlines)
-                    caption
+  caption' <- case caption of
+                   Nothing -> return Nothing
+                   Just s  -> Just <$> parseFromString inlines (s ++ "\n")
   kvAttrs' <- parseFromString keyValues . (++ "\n") $ fromMaybe mempty kvAttrs
   return $ BlockAttributes
            { blockAttrName = name
@@ -427,7 +427,7 @@ verseBlock :: String -> OrgParser (F Blocks)
 verseBlock blockType = try $ do
   ignHeaders
   content <- rawBlockContent blockType
-  fmap B.para . mconcat . intersperse (pure B.linebreak)
+  fmap B.lineBlock . sequence
     <$> mapM parseVerseLine (lines content)
  where
    -- replace initial spaces with nonbreaking spaces to preserve
@@ -435,9 +435,11 @@ verseBlock blockType = try $ do
    parseVerseLine :: String -> OrgParser (F Inlines)
    parseVerseLine cs = do
      let (initialSpaces, indentedLine) = span isSpace cs
-     let nbspIndent = B.str $ map (const '\160') initialSpaces
+     let nbspIndent = if null initialSpaces
+                      then mempty
+                      else B.str $ map (const '\160') initialSpaces
      line <- parseFromString inlines (indentedLine ++ "\n")
-     return (pure nbspIndent <> line)
+     return (trimInlinesF $ pure nbspIndent <> line)
 
 -- | Read a code block and the associated results block if present.  Which of
 -- boths blocks is included in the output is determined using the "exports"