@@ -511,11 +511,11 @@ doverb = do
511511 _ -> mzero
512512 withVerbatimMode $
513513 (code . T.unpack . untokenize) <$>
514− manyTill (verbTok marker) (symbol marker)
514+ manyTill (notFollowedBy newlineTok >> verbTok marker) (symbol marker)
515515
516516verbTok :: PandocMonad m => Char -> LP m Tok
517517verbTok stopchar = do
518− t@(Tok pos toktype txt) <- satisfyTok (not . isNewlineTok)
518+ t@(Tok pos toktype txt) <- anyTok
519519 case T.findIndex (== stopchar) txt of
520520 Nothing -> return t
521521 Just i -> do
@@ -545,9 +545,13 @@ doinlinecode classes = do
545545 _ -> mzero
546546 let stopchar = if marker == '{' then '}' else marker
547547 withVerbatimMode $
548− (codeWith ("",classes,[]) . T.unpack . untokenize) <$>
548+ (codeWith ("",classes,[]) . map nlToSpace . T.unpack . untokenize) <$>
549549 manyTill (verbTok stopchar) (symbol stopchar)
550550
551+nlToSpace :: Char -> Char
552+nlToSpace '\n' = ' '
553+nlToSpace x = x
554+
551555keyval :: PandocMonad m => LP m (String, String)
552556keyval = try $ do
553557 Tok _ Word key <- satisfyTok isWordTok