diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/LaTeX.hs | 13 | ||||
| -rw-r--r-- | test/command/3422.md | 9 |
2 files changed, 18 insertions, 4 deletions
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 diff --git a/test/command/3422.md b/test/command/3422.md new file mode 100644 index 000000000..a010320e9 --- /dev/null +++ b/test/command/3422.md @@ -0,0 +1,9 @@ +See #3422 + +``` +% pandoc -t latex --listings +`int main(int argc, const char *argv[]);`{.c} +^D +\lstinline[language=C]!int main(int argc, const char *argv[]);! +``` + |