@@ -511,11 +511,11 @@ doverb = do
511 _ -> mzero
511 _ -> mzero
512 withVerbatimMode $
512 withVerbatimMode $
513 (code . T.unpack . untokenize) <$>
513 (code . T.unpack . untokenize) <$>
514− manyTill (verbTok marker) (symbol marker)
514+ manyTill (notFollowedBy newlineTok >> verbTok marker) (symbol marker)
516verbTok :: PandocMonad m => Char -> LP m Tok
516verbTok :: PandocMonad m => Char -> LP m Tok
517verbTok stopchar = do
517verbTok stopchar = do
518− t@(Tok pos toktype txt) <- satisfyTok (not . isNewlineTok)
518+ t@(Tok pos toktype txt) <- anyTok
519 case T.findIndex (== stopchar) txt of
519 case T.findIndex (== stopchar) txt of
520 Nothing -> return t
520 Nothing -> return t
521 Just i -> do
521 Just i -> do
@@ -545,9 +545,13 @@ doinlinecode classes = do
545 _ -> mzero
545 _ -> mzero
546 let stopchar = if marker == '{' then '}' else marker
546 let stopchar = if marker == '{' then '}' else marker
547 withVerbatimMode $
547 withVerbatimMode $
548− (codeWith ("",classes,[]) . T.unpack . untokenize) <$>
548+ (codeWith ("",classes,[]) . map nlToSpace . T.unpack . untokenize) <$>
549 manyTill (verbTok stopchar) (symbol stopchar)
549 manyTill (verbTok stopchar) (symbol stopchar)
551+nlToSpace :: Char -> Char
551keyval :: PandocMonad m => LP m (String, String)
555keyval :: PandocMonad m => LP m (String, String)
552keyval = try $ do
556keyval = try $ do
553 Tok _ Word key <- satisfyTok isWordTok
557 Tok _ Word key <- satisfyTok isWordTok