aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2013-03-05 22:43:27 -0800
committerJohn MacFarlane <fiddlosopher@gmail.com>2013-03-05 22:43:27 -0800
commit8b3a81e4dd8bf46a822980781e28d9777a076c6a (patch)
tree27a6756e51a356a92f16c1fd4c53ffe2501f816e /src/Text/Pandoc/Readers
parent3b63cb0903baf4bc551d2b63d884c0fa556f11a0 (diff)
downloadpandoc-8b3a81e4dd8bf46a822980781e28d9777a076c6a.tar.gz
LaTeX reader: Handle language attribute for lstlistings.
Convert it to a highlighting-kate language name.
Diffstat (limited to 'src/Text/Pandoc/Readers')
-rw-r--r--src/Text/Pandoc/Readers/LaTeX.hs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index 887b17068..005120623 100644
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -52,6 +52,7 @@ import Data.List (intercalate)
import qualified Data.Map as M
import qualified Control.Exception as E
import System.FilePath (takeExtension, addExtension)
+import Text.Pandoc.Highlighting (fromListingsLanguage)
-- | Parse LaTeX from string and return 'Pandoc' document.
readLaTeX :: ReaderOptions -- ^ Reader options
@@ -819,11 +820,13 @@ environments = M.fromList
, ("verbatim", codeBlock <$> (verbEnv "verbatim"))
, ("Verbatim", codeBlock <$> (verbEnv "Verbatim"))
, ("lstlisting", do options <- option [] keyvals
- let classes = [ "numberLines" |
- lookup "numbers" options == Just "left" ]
let kvs = [ (if k == "firstnumber"
then "startFrom"
else k, v) | (k,v) <- options ]
+ let classes = [ "numberLines" |
+ lookup "numbers" options == Just "left" ]
+ ++ maybe [] (:[]) (lookup "language" options
+ >>= fromListingsLanguage)
let attr = ("",classes,kvs)
codeBlockWith attr <$> (verbEnv "lstlisting"))
, ("minted", liftA2 (\l c -> codeBlockWith ("",[l],[]) c)