Merge pull request #3072 from tarleb/lineblock

Read and write LineBlock elements

pandoc.cabal

@@ -205,8 +205,8 @@ Extra-Source-Files:
                  tests/lhs-test.html+lhs
                  tests/lhs-test.fragment.html+lhs
                  tests/pipe-tables.txt
-		 tests/dokuwiki_external_images.dokuwiki
+                 tests/dokuwiki_external_images.dokuwiki
-		 tests/dokuwiki_external_images.native
+                 tests/dokuwiki_external_images.native
                  tests/dokuwiki_multiblock_table.dokuwiki
                  tests/dokuwiki_multiblock_table.native
                  tests/fb2/*.markdown
@@ -267,7 +267,7 @@ Library
                  xml >= 1.3.12 && < 1.4,
                  random >= 1 && < 1.2,
                  extensible-exceptions >= 0.1 && < 0.2,
-                 pandoc-types >= 1.16 && < 1.17,
+                 pandoc-types >= 1.17 && < 1.18,
                  aeson >= 0.7 && < 1.1,
                  tagsoup >= 0.13.7 && < 0.15,
                  base64-bytestring >= 0.1 && < 1.1,
@@ -422,7 +422,7 @@ Library
 
 Executable pandoc
   Build-Depends: pandoc,
-                 pandoc-types >= 1.16 && < 1.17,
+                 pandoc-types >= 1.17 && < 1.18,
                  base >= 4.2 && <5,
                  directory >= 1.2 && < 1.3,
                  filepath >= 1.1 && < 1.5,
@@ -479,7 +479,7 @@ Test-Suite test-pandoc
   Build-Depends:  base >= 4.2 && < 5,
                   syb >= 0.1 && < 0.7,
                   pandoc,
-                  pandoc-types >= 1.16 && < 1.17,
+                  pandoc-types >= 1.17 && < 1.18,
                   bytestring >= 0.9 && < 0.11,
                   text >= 0.11 && < 1.3,
                   directory >= 1 && < 1.3,

src/Text/Pandoc/Parsing.hs

@@ -718,11 +718,14 @@ lineBlockLine = try $ do
   continuations <- many (try $ char ' ' >> anyLine)
   return $ white ++ unwords (line : continuations)
 
+blankLineBlockLine :: Stream [Char] m Char => ParserT [Char] st m Char
+blankLineBlockLine = try (char '|' >> blankline)
+
 -- | Parses an RST-style line block and returns a list of strings.
 lineBlockLines :: Stream [Char] m Char => ParserT [Char] st m [String]
 lineBlockLines = try $ do
-  lines' <- many1 lineBlockLine
+  lines' <- many1 (lineBlockLine <|> ((:[]) <$> blankLineBlockLine))
-  skipMany1 $ blankline <|> try (char '|' >> blankline)
+  skipMany1 $ blankline <|> blankLineBlockLine
   return lines'
 
 -- | Parse a table using 'headerParser', 'rowParser',

src/Text/Pandoc/Readers/DocBook.hs

@@ -592,8 +592,6 @@ checkInMeta p = do
   when accepts p
   return mempty
 
-
-
 addMeta :: ToMetaValue a => String -> a -> DB ()
 addMeta field val = modify (setMeta field val)
 
@@ -612,7 +610,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",
-           "informalexample",
+           "informalexample", "linegroup",
            "screen","programlisting","example","calloutlist"]
 isBlockElement _ = False
 
@@ -779,6 +777,7 @@ parseBlock (Elem e) =
         "informaltable" -> parseTable
         "informalexample" -> divWith ("", ["informalexample"], []) <$>
                              getBlocks e
+        "linegroup" -> lineBlock <$> lineItems
         "literallayout" -> codeBlockWithLang
         "screen" -> codeBlockWithLang
         "programlisting" -> codeBlockWithLang
@@ -900,6 +899,7 @@ parseBlock (Elem e) =
                      let ident = attrValue "id" e
                      modify $ \st -> st{ dbSectionLevel = n - 1 }
                      return $ headerWith (ident,[],[]) n' headerText <> b
+         lineItems = mapM getInlines $ filterChildren (named "line") e
          metaBlock = acceptingMetadata (getBlocks e) >> return mempty
 
 getInlines :: Element -> DB Inlines

src/Text/Pandoc/Readers/Markdown.hs

@@ -32,7 +32,7 @@ Conversion of markdown-formatted plain text to 'Pandoc' document.
 module Text.Pandoc.Readers.Markdown ( readMarkdown,
                                       readMarkdownWithWarnings ) where
 
-import Data.List ( transpose, sortBy, findIndex, intersperse, intercalate )
+import Data.List ( transpose, sortBy, findIndex, intercalate )
 import qualified Data.Map as M
 import Data.Scientific (coefficient, base10Exponent)
 import Data.Ord ( comparing )
@@ -1106,7 +1106,7 @@ lineBlock = try $ do
   guardEnabled Ext_line_blocks
   lines' <- lineBlockLines >>=
             mapM (parseFromString (trimInlinesF . mconcat <$> many inline))
-  return $ B.para <$> (mconcat $ intersperse (return B.linebreak) lines')
+  return $ B.lineBlock <$> sequence lines'
 
 --
 -- Tables

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 ((<>))
 
@@ -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

src/Text/Pandoc/Readers/RST.hs

@@ -39,7 +39,7 @@ import Text.Pandoc.Shared
 import Text.Pandoc.Parsing
 import Text.Pandoc.Options
 import Control.Monad ( when, liftM, guard, mzero )
-import Data.List ( findIndex, intersperse, intercalate,
+import Data.List ( findIndex, intercalate,
                    transpose, sort, deleteFirstsBy, isSuffixOf , nub, union)
 import Data.Maybe (fromMaybe)
 import qualified Data.Map as M
@@ -228,7 +228,7 @@ lineBlock :: RSTParser Blocks
 lineBlock = try $ do
   lines' <- lineBlockLines
   lines'' <- mapM parseInlineFromString lines'
-  return $ B.para (mconcat $ intersperse B.linebreak lines'')
+  return $ B.lineBlock lines''
 
 --
 -- paragraph block

src/Text/Pandoc/Shared.hs

@@ -64,6 +64,7 @@ module Text.Pandoc.Shared (
                      compactify,
                      compactify',
                      compactify'DL,
+                     linesToPara,
                      Element (..),
                      hierarchicalize,
                      uniqueIdent,
@@ -630,6 +631,15 @@ compactify'DL items =
              | otherwise           -> items
            _                       -> items
 
+-- | Combine a list of lines by adding hard linebreaks.
+combineLines :: [[Inline]] -> [Inline]
+combineLines = intercalate [LineBreak]
+
+-- | Convert a list of lines into a paragraph with hard line breaks. This is
+--   useful e.g. for rudimentary support of LineBlock elements in writers.
+linesToPara :: [[Inline]] -> Block
+linesToPara = Para . combineLines
+
 isPara :: Block -> Bool
 isPara (Para _) = True
 isPara _        = False
@@ -1035,6 +1045,7 @@ collapseFilePath = Posix.joinPath . reverse . foldl go [] . splitDirectories
 blockToInlines :: Block -> [Inline]
 blockToInlines (Plain ils) = ils
 blockToInlines (Para ils) = ils
+blockToInlines (LineBlock lns) = combineLines lns
 blockToInlines (CodeBlock attr str) = [Code attr str]
 blockToInlines (RawBlock fmt str) = [RawInline fmt str]
 blockToInlines (BlockQuote blks) = blocksToInlines blks

src/Text/Pandoc/Writers/AsciiDoc.hs

@@ -137,6 +137,13 @@ blockToAsciiDoc opts (Para inlines) = do
                then text "\\"
                else empty
   return $ esc <> contents <> blankline
+blockToAsciiDoc opts (LineBlock lns) = do
+  let docify line = if null line
+                    then return blankline
+                    else inlineListToAsciiDoc opts line
+  let joinWithLinefeeds = nowrap . mconcat . intersperse cr
+  contents <- joinWithLinefeeds <$> mapM docify lns
+  return $ "[verse]" $$ text "--" $$ contents $$ text "--" $$ blankline
 blockToAsciiDoc _ (RawBlock f s)
   | f == "asciidoc" = return $ text s
   | otherwise       = return empty
@@ -459,4 +466,3 @@ inlineToAsciiDoc opts (Span (ident,_,_) ils) = do
   let identifier = if (null ident) then empty else ("[[" <> text ident <> "]]")
   contents <- inlineListToAsciiDoc opts ils
   return $ identifier <> contents
-

src/Text/Pandoc/Writers/CommonMark.hs

@@ -33,7 +33,7 @@ module Text.Pandoc.Writers.CommonMark (writeCommonMark) where
 
 import Text.Pandoc.Writers.HTML (writeHtmlString)
 import Text.Pandoc.Definition
-import Text.Pandoc.Shared (isTightList)
+import Text.Pandoc.Shared (isTightList, linesToPara)
 import Text.Pandoc.Templates (renderTemplate')
 import Text.Pandoc.Writers.Shared
 import Text.Pandoc.Options
@@ -94,6 +94,7 @@ blocksToNodes = foldr blockToNodes []
 blockToNodes :: Block -> [Node] -> [Node]
 blockToNodes (Plain xs) = (node PARAGRAPH (inlinesToNodes xs) :)
 blockToNodes (Para xs) = (node PARAGRAPH (inlinesToNodes xs) :)
+blockToNodes (LineBlock lns) = blockToNodes $ linesToPara lns
 blockToNodes (CodeBlock (_,classes,_) xs) =
   (node (CODE_BLOCK (T.pack (unwords classes)) (T.pack xs)) [] :)
 blockToNodes (RawBlock fmt xs)

src/Text/Pandoc/Writers/ConTeXt.hs

@@ -163,6 +163,9 @@ blockToConTeXt (Para [Image attr txt (src,'f':'i':'g':':':_)]) = do
 blockToConTeXt (Para lst) = do
   contents <- inlineListToConTeXt lst
   return $ contents <> blankline
+blockToConTeXt (LineBlock lns) = do
+  doclines <- nowrap . vcat <$> mapM inlineListToConTeXt lns
+  return $ "\\startlines" $$ doclines $$ "\\stoplines" <> blankline
 blockToConTeXt (BlockQuote lst) = do
   contents <- blockListToConTeXt lst
   return $ "\\startblockquote" $$ nest 0 contents $$ "\\stopblockquote" <> blankline
@@ -467,4 +470,3 @@ fromBcp47 x               = fromIso $ head x
     fromIso "vi" = "vn"
     fromIso "zh" = "cn"
     fromIso l    = l
-

src/Text/Pandoc/Writers/Custom.hs

@@ -227,6 +227,8 @@ blockToCustom lua (Para [Image attr txt (src,tit)]) =
 
 blockToCustom lua (Para inlines) = callfunc lua "Para" inlines
 
+blockToCustom lua (LineBlock linesList) = callfunc lua "LineBlock" linesList
+
 blockToCustom lua (RawBlock format str) =
   callfunc lua "RawBlock" format str
 

src/Text/Pandoc/Writers/Docbook.hs

@@ -198,6 +198,8 @@ blockToDocbook opts (Para [Image attr txt (src,'f':'i':'g':':':_)]) =
 blockToDocbook opts (Para lst)
   | hasLineBreaks lst = flush $ nowrap $ inTagsSimple "literallayout" $ inlinesToDocbook opts lst
   | otherwise         = inTagsIndented "para" $ inlinesToDocbook opts lst
+blockToDocbook opts (LineBlock lns) =
+  blockToDocbook opts $ linesToPara lns
 blockToDocbook opts (BlockQuote blocks) =
   inTagsIndented "blockquote" $ blocksToDocbook opts blocks
 blockToDocbook _ (CodeBlock (_,classes,_) str) =
@@ -385,4 +387,3 @@ idAndRole (id',cls,_) = ident ++ role
     role  = if null cls
                then []
                else [("role", unwords cls)]
-

src/Text/Pandoc/Writers/Docx.hs

@@ -275,7 +275,7 @@ writeDocx opts doc@(Pandoc meta _) = do
         }
 
 
-  ((contents, footnotes), st) <- runStateT 
+  ((contents, footnotes), st) <- runStateT
                                  (runReaderT
                                   (writeOpenXML opts{writerWrapText = WrapNone} doc')
                                   env)
@@ -446,7 +446,7 @@ writeDocx opts doc@(Pandoc meta _) = do
 
   let newstyles = map newParaPropToOpenXml newDynamicParaProps ++
                   map newTextPropToOpenXml newDynamicTextProps ++
-                  (styleToOpenXml styleMaps $ writerHighlightStyle opts) 
+                  (styleToOpenXml styleMaps $ writerHighlightStyle opts)
   let styledoc' = styledoc{ elContent = modifyContent (elContent styledoc) }
                   where
                     modifyContent
@@ -859,6 +859,7 @@ blockToOpenXML' opts (Para lst) = do
   modify $ \s -> s { stFirstPara = False }
   contents <- inlinesToOpenXML opts lst
   return [mknode "w:p" [] (paraProps' ++ contents)]
+blockToOpenXML' opts (LineBlock lns) = blockToOpenXML opts $ linesToPara lns
 blockToOpenXML' _ (RawBlock format str)
   | format == Format "openxml" = return [ x | Elem x <- parseXML str ]
   | otherwise                  = return []
@@ -1032,7 +1033,7 @@ setFirstPara =  modify $ \s -> s { stFirstPara = True }
 
 -- | Convert an inline element to OpenXML.
 inlineToOpenXML :: WriterOptions -> Inline -> WS [Element]
-inlineToOpenXML opts il = withDirection $ inlineToOpenXML' opts il 
+inlineToOpenXML opts il = withDirection $ inlineToOpenXML' opts il
 
 inlineToOpenXML' :: WriterOptions -> Inline -> WS [Element]
 inlineToOpenXML' _ (Str str) = formattedString str
@@ -1286,7 +1287,7 @@ withDirection x = do
   textProps <- asks envTextProperties
   -- We want to clean all bidirection (bidi) and right-to-left (rtl)
   -- properties from the props first. This is because we don't want
-  -- them to stack up. 
+  -- them to stack up.
   let paraProps' = filter (\e -> (qName . elName) e /= "bidi") paraProps
       textProps' = filter (\e -> (qName . elName) e /= "rtl") textProps
   if isRTL
@@ -1298,5 +1299,3 @@ withDirection x = do
     else flip local x $ \env -> env { envParaProperties = paraProps'
                                     , envTextProperties = textProps'
                                     }
-            
-

src/Text/Pandoc/Writers/DokuWiki.hs

@@ -45,8 +45,8 @@ import Text.Pandoc.Options ( WriterOptions(
                               , writerStandalone
                               , writerTemplate
                               , writerWrapText), WrapOption(..) )
-import Text.Pandoc.Shared ( escapeURI, removeFormatting, camelCaseToHyphenated
+import Text.Pandoc.Shared ( escapeURI, linesToPara, removeFormatting
-                          , trimr, normalize, substitute  )
+                          , camelCaseToHyphenated, trimr, normalize, substitute )
 import Text.Pandoc.Writers.Shared ( defField, metaToJSON )
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Templates ( renderTemplate' )
@@ -147,6 +147,9 @@ blockToDokuWiki opts (Para inlines) = do
               then "<HTML><p></HTML>" ++ contents ++ "<HTML></p></HTML>"
               else contents ++ if null indent then "\n" else ""
 
+blockToDokuWiki opts (LineBlock lns) =
+  blockToDokuWiki opts $ linesToPara lns
+
 blockToDokuWiki _ (RawBlock f str)
   | f == Format "dokuwiki" = return str
   -- See https://www.dokuwiki.org/wiki:syntax

src/Text/Pandoc/Writers/FB2.hs

@@ -46,7 +46,8 @@ import qualified Text.XML.Light.Cursor as XC
 
 import Text.Pandoc.Definition
 import Text.Pandoc.Options (WriterOptions(..), HTMLMathMethod(..), def)
-import Text.Pandoc.Shared (orderedListMarkers, isHeaderBlock, capitalize)
+import Text.Pandoc.Shared (orderedListMarkers, isHeaderBlock, capitalize,
+                           linesToPara)
 
 -- | Data to be written at the end of the document:
 -- (foot)notes, URLs, references, images.
@@ -323,6 +324,7 @@ blockToXml (RawBlock _ s) = return . spaceBeforeAfter .
                             map (el "p" . el "code") . lines $ s
 blockToXml (Div _ bs) = cMapM blockToXml bs
 blockToXml (BlockQuote bs) = liftM (list . el "cite") $ cMapM blockToXml bs
+blockToXml (LineBlock lns) = blockToXml $ linesToPara lns
 blockToXml (OrderedList a bss) = do
     state <- get
     let pmrk = parentListMarker state

src/Text/Pandoc/Writers/HTML.hs

@@ -463,6 +463,13 @@ blockToHtml opts (Para [Image attr txt (s,'f':'i':'g':':':tit)]) = do
 blockToHtml opts (Para lst) = do
   contents <- inlineListToHtml opts lst
   return $ H.p contents
+blockToHtml opts (LineBlock lns) =
+  if writerWrapText opts == WrapNone
+  then blockToHtml opts $ linesToPara lns
+  else do
+    let lf = preEscapedString "\n"
+    htmlLines <- mconcat . intersperse lf <$> mapM (inlineListToHtml opts) lns
+    return $ H.div ! A.style "white-space: pre-line;" $ htmlLines
 blockToHtml opts (Div attr@(ident, classes, kvs) bs) = do
   let speakerNotes = "notes" `elem` classes
   -- we don't want incremental output inside speaker notes, see #1394
@@ -807,7 +814,7 @@ inlineToHtml opts inline =
               let brtag = if writerHtml5 opts then H5.br else H.br
               return  $ case t of
                          InlineMath  -> m
-                         DisplayMath -> brtag >> m >> brtag 
+                         DisplayMath -> brtag >> m >> brtag
     (RawInline f str)
       | f == Format "html" -> return $ preEscapedString str
       | otherwise          -> return mempty

src/Text/Pandoc/Writers/Haddock.hs

@@ -108,6 +108,8 @@ blockToHaddock opts (Para [Image attr alt (src,'f':'i':'g':':':tit)]) =
 blockToHaddock opts (Para inlines) =
   -- TODO:  if it contains linebreaks, we need to use a @...@ block
   (<> blankline) `fmap` blockToHaddock opts (Plain inlines)
+blockToHaddock opts (LineBlock lns) =
+  blockToHaddock opts $ linesToPara lns
 blockToHaddock _ (RawBlock f str)
   | f == "haddock" = do
       return $ text str <> text "\n"

src/Text/Pandoc/Writers/ICML.hs

@@ -2,7 +2,7 @@
 
 {- |
    Module      : Text.Pandoc.Writers.ICML
-   Copyright   : Copyright (C) 2013 github.com/mb21
+   Copyright   : Copyright (C) 2013-2016 github.com/mb21
    License     : GNU GPL, version 2 or above
 
    Stability   : alpha
@@ -18,7 +18,7 @@ import Text.Pandoc.Definition
 import Text.Pandoc.XML
 import Text.Pandoc.Readers.TeXMath (texMathToInlines)
 import Text.Pandoc.Writers.Shared
-import Text.Pandoc.Shared (splitBy, fetchItem, warn)
+import Text.Pandoc.Shared (linesToPara, splitBy, fetchItem, warn)
 import Text.Pandoc.Options
 import Text.Pandoc.Templates (renderTemplate')
 import Text.Pandoc.Pretty
@@ -297,6 +297,8 @@ blockToICML opts style (Para img@[Image _ txt (_,'f':'i':'g':':':_)]) = do
   caption <- parStyle opts (imgCaptionName:style) txt
   return $ intersperseBrs [figure, caption]
 blockToICML opts style (Para lst) = parStyle opts (paragraphName:style) lst
+blockToICML opts style (LineBlock lns) =
+  blockToICML opts style $ linesToPara lns
 blockToICML opts style (CodeBlock _ str) = parStyle opts (codeBlockName:style) $ [Str str]
 blockToICML _ _ (RawBlock f str)
   | f == Format "icml" = return $ text str

src/Text/Pandoc/Writers/LaTeX.hs

@@ -437,6 +437,8 @@ blockToLaTeX (Para [Str ".",Space,Str ".",Space,Str "."]) = do
      else inlineListToLaTeX [Str ".",Space,Str ".",Space,Str "."]
 blockToLaTeX (Para lst) =
   inlineListToLaTeX $ dropWhile isLineBreakOrSpace lst
+blockToLaTeX (LineBlock lns) = do
+  blockToLaTeX $ linesToPara lns
 blockToLaTeX (BlockQuote lst) = do
   beamer <- writerBeamer `fmap` gets stOptions
   case lst of

src/Text/Pandoc/Writers/Man.hs

@@ -171,6 +171,8 @@ blockToMan opts (Para inlines) = do
   contents <- liftM vcat $ mapM (inlineListToMan opts) $
     splitSentences inlines
   return $ text ".PP" $$ contents
+blockToMan opts (LineBlock lns) =
+  blockToMan opts $ linesToPara lns
 blockToMan _ (RawBlock f str)
   | f == Format "man" = return $ text str
   | otherwise         = return empty
@@ -367,4 +369,3 @@ inlineToMan _ (Note contents) = do
   notes <- liftM stNotes get
   let ref = show $ (length notes)
   return $ char '[' <> text ref <> char ']'
-

src/Text/Pandoc/Writers/Markdown.hs

@@ -79,7 +79,7 @@ instance Default WriterEnv
                         , envRefShortcutable = True
                         , envBlockLevel      = 0
                         }
-        
+
 data WriterState = WriterState { stNotes :: Notes
                                , stRefs  :: Refs
                                , stIds   :: Set.Set String
@@ -390,6 +390,12 @@ blockToMarkdown' opts (Para [Image attr alt (src,'f':'i':'g':':':tit)]) =
   blockToMarkdown opts (Para [Image attr alt (src,tit)])
 blockToMarkdown' opts (Para inlines) =
   (<> blankline) `fmap` blockToMarkdown opts (Plain inlines)
+blockToMarkdown' opts (LineBlock lns) =
+  if isEnabled Ext_line_blocks opts
+  then do
+    mdLines <- mapM (inlineListToMarkdown opts) lns
+    return $ (vcat $ map (hang 2 (text "| ")) mdLines) <> blankline
+  else blockToMarkdown opts $ linesToPara lns
 blockToMarkdown' opts (RawBlock f str)
   | f == "markdown" = return $ text str <> text "\n"
   | f == "html" && isEnabled Ext_raw_html opts = do

src/Text/Pandoc/Writers/MediaWiki.hs

@@ -120,6 +120,9 @@ blockToMediaWiki (Para inlines) = do
               then  "<p>" ++ contents ++ "</p>"
               else contents ++ if null lev then "\n" else ""
 
+blockToMediaWiki (LineBlock lns) =
+  blockToMediaWiki $ linesToPara lns
+
 blockToMediaWiki (RawBlock f str)
   | f == Format "mediawiki" = return str
   | f == Format "html"      = return str

src/Text/Pandoc/Writers/Native.hs

@@ -45,6 +45,8 @@ prettyList ds =
 
 -- | Prettyprint Pandoc block element.
 prettyBlock :: Block -> Doc
+prettyBlock (LineBlock lines') =
+  "LineBlock" $$ prettyList (map (text . show) lines')
 prettyBlock (BlockQuote blocks) =
   "BlockQuote" $$ prettyList (map prettyBlock blocks)
 prettyBlock (OrderedList attribs blockLists) =

src/Text/Pandoc/Writers/OpenDocument.hs

@@ -33,6 +33,7 @@ module Text.Pandoc.Writers.OpenDocument ( writeOpenDocument ) where
 import Text.Pandoc.Definition
 import Text.Pandoc.Options
 import Text.Pandoc.XML
+import Text.Pandoc.Shared (linesToPara)
 import Text.Pandoc.Templates (renderTemplate')
 import Text.Pandoc.Readers.TeXMath
 import Text.Pandoc.Pretty
@@ -291,6 +292,7 @@ blockToOpenDocument o bs
     | Para           b <- bs = if null b
                                   then return empty
                                   else inParagraphTags =<< inlinesToOpenDocument o b
+    | LineBlock      b <- bs = blockToOpenDocument o $ linesToPara b
     | Div _ xs         <- bs = blocksToOpenDocument o xs
     | Header     i _ b <- bs = setFirstPara >>
                                (inHeaderTags  i =<< inlinesToOpenDocument o b)

src/Text/Pandoc/Writers/Org.hs

@@ -164,6 +164,17 @@ blockToOrg (Para [Image attr txt (src,'f':'i':'g':':':tit)]) = do
 blockToOrg (Para inlines) = do
   contents <- inlineListToOrg inlines
   return $ contents <> blankline
+blockToOrg (LineBlock lns) = do
+  let splitStanza [] = []
+      splitStanza xs = case break (== mempty) xs of
+        (l, [])  -> l : []
+        (l, _:r) -> l : splitStanza r
+  let joinWithLinefeeds  = nowrap . mconcat . intersperse cr
+  let joinWithBlankLines = mconcat . intersperse blankline
+  let prettyfyStanza ls  = joinWithLinefeeds <$> mapM inlineListToOrg ls
+  contents <- joinWithBlankLines <$> mapM prettyfyStanza (splitStanza lns)
+  return $ blankline $$ "#+BEGIN_VERSE" $$
+           nest 2 contents $$ "#+END_VERSE" <> blankline
 blockToOrg (RawBlock "html" str) =
   return $ blankline $$ "#+BEGIN_HTML" $$
            nest 2 (text str) $$ "#+END_HTML" $$ blankline

src/Text/Pandoc/Writers/RST.hs

@@ -201,11 +201,12 @@ blockToRST (Para [Image attr txt (src,'f':'i':'g':':':tit)]) = do
   return $ hang 3 ".. " (fig $$ alt $$ classes $$ dims $+$ capt) $$ blankline
 blockToRST (Para inlines)
   | LineBreak `elem` inlines = do -- use line block if LineBreaks
-      lns <- mapM inlineListToRST $ splitBy (==LineBreak) inlines
+      linesToLineBlock $ splitBy (==LineBreak) inlines
-      return $ (vcat $ map (hang 2 (text "| ")) lns) <> blankline
   | otherwise = do
       contents <- inlineListToRST inlines
       return $ contents <> blankline
+blockToRST (LineBlock lns) =
+  linesToLineBlock lns
 blockToRST (RawBlock f@(Format f') str)
   | f == "rst" = return $ text str
   | otherwise  = return $ blankline <> ".. raw:: " <>
@@ -328,6 +329,12 @@ definitionListItemToRST (label, defs) = do
   tabstop <- get >>= (return . writerTabStop . stOptions)
   return $ label' $$ nest tabstop (nestle contents <> cr)
 
+-- | Format a list of lines as line block.
+linesToLineBlock :: [[Inline]] -> State WriterState Doc
+linesToLineBlock inlineLines = do
+  lns <- mapM inlineListToRST inlineLines
+  return $ (vcat $ map (hang 2 (text "| ")) lns) <> blankline
+
 -- | Convert list of Pandoc block elements to RST.
 blockListToRST' :: Bool
                 -> [Block]       -- ^ List of block elements

src/Text/Pandoc/Writers/RTF.hs

@@ -233,6 +233,8 @@ blockToRTF indent alignment (Plain lst) =
   rtfCompact indent 0 alignment $ inlineListToRTF lst
 blockToRTF indent alignment (Para lst) =
   rtfPar indent 0 alignment $ inlineListToRTF lst
+blockToRTF indent alignment (LineBlock lns) =
+  blockToRTF indent alignment $ linesToPara lns
 blockToRTF indent alignment (BlockQuote lst) =
   concatMap (blockToRTF (indent + indentIncrement) alignment) lst
 blockToRTF indent _ (CodeBlock _ str) =

src/Text/Pandoc/Writers/TEI.hs

@@ -108,7 +108,7 @@ plainToPara :: Block -> Block
 plainToPara (Plain x) = Para x
 plainToPara x         = x
 
--- | Convert a list of pairs of terms and definitions into a TEI 
+-- | Convert a list of pairs of terms and definitions into a TEI
 -- list with labels and items.
 deflistItemsToTEI :: WriterOptions -> [([Inline],[[Block]])] -> Doc
 deflistItemsToTEI opts items =
@@ -167,6 +167,8 @@ blockToTEI opts (Plain lst) = blockToTEI opts $ Para lst
 --           inTagsSimple "textobject" (inTagsSimple "phrase" alt))
 blockToTEI opts (Para lst) =
   inTags False "p" [] $ inlinesToTEI opts lst
+blockToTEI opts (LineBlock lns) =
+  blockToTEI opts $ linesToPara lns
 blockToTEI opts (BlockQuote blocks) =
   inTagsIndented "quote" $ blocksToTEI opts blocks
 blockToTEI _ (CodeBlock (_,classes,_) str) =
@@ -174,7 +176,7 @@ blockToTEI _ (CodeBlock (_,classes,_) str) =
      flush (text (escapeStringForXML str) <> cr <> text "</ab>")
     where lang  = if null langs
                      then ""
-                     else escapeStringForXML (head langs) 
+                     else escapeStringForXML (head langs)
           isLang l    = map toLower l `elem` map (map toLower) languages
           langsFrom s = if isLang s
                            then [s]
@@ -210,7 +212,7 @@ blockToTEI _ HorizontalRule =
   selfClosingTag "milestone" [("unit","undefined"), ("type","separator"),("rendition","line")]
 
 -- | TEI Tables
--- TEI Simple's tables are composed of cells and rows; other 
+-- TEI Simple's tables are composed of cells and rows; other
 -- table info in the AST is here lossily discard.
 blockToTEI opts (Table _ _ _ headers rows) =
   let
@@ -219,8 +221,8 @@ blockToTEI opts (Table _ _ _ headers rows) =
 --               then return empty
 --               else tableRowToTEI opts headers
   in
-    inTags True "table" [] $ 
+    inTags True "table" [] $
-    vcat $ [headers'] <> map (tableRowToTEI opts) rows 
+    vcat $ [headers'] <> map (tableRowToTEI opts) rows
 
 tableRowToTEI :: WriterOptions
                   -> [[Block]]
@@ -276,7 +278,7 @@ inlineToTEI _ (Math t str) =
                    text (str)
     DisplayMath -> inTags True "figure" [("type","math")] $
                    inTags False "formula" [("notation","TeX")] $ text (str)
-      
+
 inlineToTEI _ (RawInline f x) | f == "tei"     = text x
                               | otherwise      = empty
 inlineToTEI _ LineBreak = selfClosingTag "lb" []
@@ -317,4 +319,3 @@ idAndRole (id',cls,_) = ident ++ role
     role  = if null cls
                then []
                else [("role", unwords cls)]
-

src/Text/Pandoc/Writers/Texinfo.hs

@@ -145,6 +145,9 @@ blockToTexinfo (Para [Image attr txt (src,'f':'i':'g':':':tit)]) = do
 blockToTexinfo (Para lst) =
   inlineListToTexinfo lst    -- this is handled differently from Plain in blockListToTexinfo
 
+blockToTexinfo (LineBlock lns) =
+  blockToTexinfo $ linesToPara lns
+
 blockToTexinfo (BlockQuote lst) = do
   contents <- blockListToTexinfo lst
   return $ text "@quotation" $$

src/Text/Pandoc/Writers/Textile.hs

@@ -130,6 +130,9 @@ blockToTextile opts (Para inlines) = do
               then "<p>" ++ contents ++ "</p>"
               else contents ++ if null listLevel then "\n" else ""
 
+blockToTextile opts (LineBlock lns) =
+  blockToTextile opts $ linesToPara lns
+
 blockToTextile _ (RawBlock f str)
   | f == Format "html" || f == Format "textile" = return str
   | otherwise                                   = return ""

src/Text/Pandoc/Writers/ZimWiki.hs

@@ -33,7 +33,8 @@ http://zim-wiki.org/manual/Help/Wiki_Syntax.html
 module Text.Pandoc.Writers.ZimWiki ( writeZimWiki ) where
 import Text.Pandoc.Definition
 import Text.Pandoc.Options ( WriterOptions(writerTableOfContents, writerStandalone, writerTemplate, writerWrapText), WrapOption(..) )
-import Text.Pandoc.Shared ( escapeURI, removeFormatting, trimr, substitute )
+import Text.Pandoc.Shared ( escapeURI, linesToPara, removeFormatting, trimr
+                          , substitute )
 import Text.Pandoc.Writers.Shared ( defField, metaToJSON )
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Templates ( renderTemplate' )
@@ -111,6 +112,9 @@ blockToZimWiki opts (Para inlines) = do
   contents <- inlineListToZimWiki opts inlines
   return $ contents ++ if null indent then "\n" else ""
 
+blockToZimWiki opts (LineBlock lns) = do
+  blockToZimWiki opts $ linesToPara lns
+
 blockToZimWiki opts (RawBlock f str)
   | f == Format "zimwiki"  = return str
   | f == Format "html"     = do cont <- indentFromHTML opts str; return cont

tests/Tests/Readers/Org.hs

@@ -1490,14 +1490,11 @@ tests =
           mconcat
           [ para $ spcSep [ "The", "first", "lines", "of"
                           , "Goethe's", emph "Faust" <> ":"]
-          , para $ mconcat
+          , lineBlock
-              [ spcSep [ "Habe", "nun,", "ach!", "Philosophie," ]
+              [ "Habe nun, ach! Philosophie,"
-              , linebreak
+              , "Juristerei und Medizin,"
-              , spcSep [ "Juristerei", "und", "Medizin," ]
+              , "Und leider auch Theologie!"
-              , linebreak
+              , "Durchaus studiert, mit heißem Bemühn."
-              , spcSep [ "Und", "leider", "auch", "Theologie!" ]
-              , linebreak
-              , spcSep [ "Durchaus", "studiert,", "mit", "heißem", "Bemühn." ]
               ]
           ]
 
@@ -1508,7 +1505,7 @@ tests =
                   , "bar"
                   , "#+END_VERSE"
                   ] =?>
-          para ("foo" <> linebreak <> linebreak <> "bar")
+          lineBlock [ "foo", mempty, "bar" ]
 
       , "Verse block with varying indentation" =:
           unlines [ "#+BEGIN_VERSE"
@@ -1516,7 +1513,7 @@ tests =
                   , "my old friend"
                   , "#+END_VERSE"
                   ] =?>
-          para ("\160\160hello darkness" <> linebreak <> "my old friend")
+          lineBlock [ "\160\160hello darkness", "my old friend" ]
 
       , "Raw block LaTeX" =:
           unlines [ "#+BEGIN_LaTeX"

tests/Tests/Readers/RST.hs

@@ -19,8 +19,7 @@ infix 4 =:
 
 tests :: [Test]
 tests = [ "line block with blank line" =:
-          "| a\n|\n|  b" =?> para (str "a") <>
+          "| a\n|\n|  b" =?> lineBlock [ "a", mempty, "\160b" ]
-                             para (str "\160b")
         , testGroup "field list"
           [ "general" =: unlines
              [ "para"
@@ -135,7 +134,7 @@ tests = [ "line block with blank line" =:
                  codeBlock "block quotes\n\ncan go on for many lines" <>
                  para "but must stop here")
           , "line block with 3 lines" =: "| a\n| b\n| c"
-            =?> para ("a" <> linebreak <>  "b" <> linebreak <> "c")
+            =?> lineBlock ["a", "b", "c"]
           , "quoted literal block using >" =: "::\n\n> quoted\n> block\n\nOrdinary paragraph"
             =?> codeBlock "> quoted\n> block" <> para "Ordinary paragraph"
           , "quoted literal block using | (not  a line block)" =: "::\n\n| quoted\n| block\n\nOrdinary paragraph"

tests/markdown-reader-more.native

@@ -84,8 +84,14 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "Author",S
 ,BlockQuote
  [Header 2 ("foobar",["baz"],[("key","val")]) [Str "Header",Space,Str "attributes",Space,Str "inside",Space,Str "block",Space,Str "quote"]]
 ,Header 2 ("line-blocks",[],[]) [Str "Line",Space,Str "blocks"]
-,Para [Str "But",Space,Str "can",Space,Str "a",Space,Str "bee",Space,Str "be",Space,Str "said",Space,Str "to",Space,Str "be",LineBreak,Str "\160\160\160\160or",Space,Str "not",Space,Str "to",Space,Str "be",Space,Str "an",Space,Str "entire",Space,Str "bee,",LineBreak,Str "\160\160\160\160\160\160\160\160when",Space,Str "half",Space,Str "the",Space,Str "bee",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "bee,",LineBreak,Str "\160\160\160\160\160\160\160\160\160\160\160\160due",Space,Str "to",Space,Str "some",Space,Str "ancient",Space,Str "injury?"]
+,LineBlock
-,Para [Str "Continuation",Space,Str "line",LineBreak,Str "\160\160and",Space,Str "another"]
+ [[Str "But",Space,Str "can",Space,Str "a",Space,Str "bee",Space,Str "be",Space,Str "said",Space,Str "to",Space,Str "be"]
+ ,[Str "\160\160\160\160or",Space,Str "not",Space,Str "to",Space,Str "be",Space,Str "an",Space,Str "entire",Space,Str "bee,"]
+ ,[Str "\160\160\160\160\160\160\160\160when",Space,Str "half",Space,Str "the",Space,Str "bee",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "bee,"]
+ ,[Str "\160\160\160\160\160\160\160\160\160\160\160\160due",Space,Str "to",Space,Str "some",Space,Str "ancient",Space,Str "injury?"]
+ ,[]
+ ,[Str "Continuation",Space,Str "line"]
+ ,[Str "\160\160and",Space,Str "another"]]
 ,Header 2 ("grid-tables",[],[]) [Str "Grid",Space,Str "Tables"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
  [[Plain [Str "col",Space,Str "1"]]

tests/rst-reader.native

@@ -230,8 +230,14 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa
 ,Para [Str "Another",Space,Str "paragraph"]
 ,Para [Str "A",Space,Str "third",Space,Str "paragraph"]
 ,Header 1 ("line-blocks",[],[]) [Str "Line",Space,Str "blocks"]
-,Para [Str "But",Space,Str "can",Space,Str "a",Space,Str "bee",Space,Str "be",Space,Str "said",Space,Str "to",Space,Str "be",LineBreak,Str "\160\160\160\160or",Space,Str "not",Space,Str "to",Space,Str "be",Space,Str "an",Space,Str "entire",Space,Str "bee,",LineBreak,Str "\160\160\160\160\160\160\160\160when",Space,Str "half",Space,Str "the",Space,Str "bee",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "bee,",LineBreak,Str "\160\160\160\160\160\160\160\160\160\160\160\160due",Space,Str "to",Space,Str "some",Space,Str "ancient",Space,Str "injury?"]
+,LineBlock
-,Para [Str "Continuation",Space,Str "line",LineBreak,Str "\160\160and",Space,Str "another"]
+ [[Str "But",Space,Str "can",Space,Str "a",Space,Str "bee",Space,Str "be",Space,Str "said",Space,Str "to",Space,Str "be"]
+ ,[Str "\160\160\160\160or",Space,Str "not",Space,Str "to",Space,Str "be",Space,Str "an",Space,Str "entire",Space,Str "bee,"]
+ ,[Str "\160\160\160\160\160\160\160\160when",Space,Str "half",Space,Str "the",Space,Str "bee",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "bee,"]
+ ,[Str "\160\160\160\160\160\160\160\160\160\160\160\160due",Space,Str "to",Space,Str "some",Space,Str "ancient",Space,Str "injury?"]
+ ,[]
+ ,[Str "Continuation",Space,Str "line"]
+ ,[Str "\160\160and",Space,Str "another"]]
 ,Header 1 ("simple-tables",[],[]) [Str "Simple",Space,Str "Tables"]
 ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
  [[Plain [Str "col",Space,Str "1"]]