From c93ecfc3c5d7c9ed0b4b7bdab943a0fedd185601 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 5 Feb 2017 22:22:42 +0100
Subject: Handle language in inline code with --listings.

Closes #3422.
---
 src/Text/Pandoc/Writers/LaTeX.hs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs
index 67318a549..9e987406a 100644
--- a/src/Text/Pandoc/Writers/LaTeX.hs
+++ b/src/Text/Pandoc/Writers/LaTeX.hs
@@ -523,9 +523,6 @@ blockToLaTeX (CodeBlock (identifier,classes,keyvalAttr) str) = do
                                 else [ "label=" ++ ref ])
 
                      else []
-            mbBraced x = if not (all isAlphaNum x)
-                            then "{" <> x <> "}"
-                            else x
             printParams
                 | null params = empty
                 | otherwise   = brackets $ hcat (intersperse ", "
@@ -937,12 +934,15 @@ inlineToLaTeX (Code (_,classes,_) str) = do
                                                     -> highlightCode
        | otherwise                                  -> rawCode
    where listingsCode = do
+           let listingsopt = case getListingsLanguage classes of
+                                  Just l -> "[language=" ++ mbBraced l ++ "]"
+                                  Nothing -> ""
            inNote <- gets stInNote
            when inNote $ modify $ \s -> s{ stVerbInNote = True }
            let chr = case "!\"&'()*,-./:;?@_" \\ str of
                           (c:_) -> c
                           []    -> '!'
-           return $ text $ "\\lstinline" ++ [chr] ++ str ++ [chr]
+           return $ text $ "\\lstinline" ++ listingsopt ++ [chr] ++ str ++ [chr]
          highlightCode = do
            case highlight formatLaTeXInline ("",classes,[]) str of
                   Nothing -> rawCode
@@ -1167,6 +1167,11 @@ getListingsLanguage :: [String] -> Maybe String
 getListingsLanguage [] = Nothing
 getListingsLanguage (x:xs) = toListingsLanguage x <|> getListingsLanguage xs
 
+mbBraced :: String -> String
+mbBraced x = if not (all isAlphaNum x)
+                then "{" <> x <> "}"
+                else x
+
 -- Extract a key from divs and spans
 extract :: String -> Block -> [String]
 extract key (Div attr _)     = lookKey key attr
-- 
cgit v1.2.3