From 5fe734d452976ff66ede965984954c6d3755d5c2 Mon Sep 17 00:00:00 2001 From: schrieveslaach Date: Wed, 29 Mar 2017 14:49:46 +0200 Subject: lstinline with braces can be used (verb cannot be used with braces) (#3535) * Fix lstinline handling: lstinline with braces can be used (verb cannot be used with braces) * Use codeWith and determine the language from lstinline * Improve code * Add another test: convert lstinline without language option --- src/Text/Pandoc/Readers/LaTeX.hs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/Text/Pandoc/Readers/LaTeX.hs') diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index 9c028faa4..e85002ba3 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -601,7 +601,7 @@ inlineCommands = M.fromList $ , ("thanks", note <$> grouped block) , ("footnote", note <$> grouped block) , ("verb", doverb) - , ("lstinline", skipopts *> doverb) + , ("lstinline", dolstinline) , ("Verb", doverb) , ("url", (unescapeURL <$> braced) >>= \url -> pure (link url "" (str url))) @@ -716,6 +716,13 @@ doverb = do marker <- anyChar code <$> manyTill (satisfy (/='\n')) (char marker) +dolstinline :: PandocMonad m => LP m Inlines +dolstinline = do + options <- option [] keyvals + let classes = maybeToList $ lookup "language" options >>= fromListingsLanguage + marker <- char '{' <|> anyChar + codeWith ("",classes,[]) <$> manyTill (satisfy (/='\n')) (char '}' <|> char marker) + doLHSverb :: PandocMonad m => LP m Inlines doLHSverb = codeWith ("",["haskell"],[]) <$> manyTill (satisfy (/='\n')) (char '|') -- cgit v1.2.3