1 files changed, 13 insertions, 9 deletions
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index 04752a194..407ff97db 100644
--- a/src/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
@@ -64,6 +64,7 @@ module Text.Pandoc.Shared (
                      compactify,
                      compactify',
                      compactify'DL,
+                     linesToPara,
                      Element (..),
                      hierarchicalize,
                      uniqueIdent,
@@ -152,7 +153,8 @@ import Paths_pandoc (getDataFileName)
 #ifdef HTTP_CLIENT
 import Network.HTTP.Client (httpLbs, responseBody, responseHeaders,
                             Request(port,host))
-import Network.HTTP.Client (parseRequest, newManager)
+import Network.HTTP.Client (parseRequest)
+import Network.HTTP.Client (newManager)
 import Network.HTTP.Client.Internal (addProxy)
 import Network.HTTP.Client.TLS (tlsManagerSettings)
 import System.Environment (getEnv)
@@ -630,6 +632,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
@@ -947,11 +958,7 @@ openURL u
     in  return $ Right (decodeLenient contents, Just mime)
 #ifdef HTTP_CLIENT
   | otherwise = withSocketsDo $ E.try $ do
-#if MIN_VERSION_http_client(0,4,30)
      let parseReq = parseRequest
-#else
-     let parseReq = parseUrl
-#endif
      (proxy :: Either E.SomeException String) <- E.try $ getEnv "http_proxy"
      req <- parseReq u
      req' <- case proxy of
@@ -959,11 +966,7 @@ openURL u
                      Right pr -> (parseReq pr >>= \r ->
                                   return $ addProxy (host r) (port r) req)
                                   `mplus` return req
-#if MIN_VERSION_http_client(0,4,18)
      resp <- newManager tlsManagerSettings >>= httpLbs req'
-#else
-     resp <- withManager tlsManagerSettings $ httpLbs req'
-#endif
      return (BS.concat $ toChunks $ responseBody resp,
              UTF8.toString `fmap` lookup hContentType (responseHeaders resp))
 #else
@@ -1035,6 +1038,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