git.iko.soy/typeable/pandoc
on master help sign in
LaTeX reader: Improved messages for skipped environments.
commitc76eec97d4a8f78d3c1c212664364015a21b7404 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 10 Feb 2017, 10:00 (10 years ago) parent29b1ed0
1 file changed+13−5
src/Text/Pandoc/Readers/LaTeX.hs+13−5
src/Text/Pandoc/Readers/LaTeX.hs+13−5
@@ -938,12 +938,20 @@ inlineEnvironment = try $ do
938938rawEnv :: PandocMonad m => String -> LP m Blocks
939939rawEnv name = do
940940 exts <- getOption readerExtensions
941+ let parseRaw = extensionEnabled Ext_raw_tex exts
941942 rawOptions <- mconcat <$> many rawopt
942− let addBegin x = "\\begin{" ++ name ++ "}" ++ rawOptions ++ x
943− if extensionEnabled Ext_raw_tex exts
944− then (rawBlock "latex" . addBegin) <$>
945− (withRaw (env name blocks) >>= applyMacros' . snd)
946− else env name blocks
943+ let beginCommand = "\\begin{" ++ name ++ "}" ++ rawOptions
944+ unless parseRaw $ do
945+ pos1 <- getPosition
946+ warningWithPos pos1 $ "Skipped " ++ beginCommand
947+ (bs, raw) <- withRaw $ env name blocks
948+ raw' <- applyMacros' raw
949+ if parseRaw
950+ then return $ rawBlock "latex" $ beginCommand ++ raw'
951+ else do
952+ pos2 <- getPosition
953+ warningWithPos pos2 $ "Skipped \\end{" ++ name ++ "}"
954+ return bs
947955
948956----
949957