git.iko.soy/typeable/pandoc
on master help sign in
LaTeX reader: Improved messages for skipped environments.
c76eec9John MacFarlane
src/Text/Pandoc/Readers/LaTeX.hs+13−5
@@ -938,12 +938,20 @@ inlineEnvironment = try $ do
938rawEnv :: PandocMonad m => String -> LP m Blocks
938rawEnv :: PandocMonad m => String -> LP m Blocks
939rawEnv name = do
939rawEnv name = do
940 exts <- getOption readerExtensions
940 exts <- getOption readerExtensions
941+ let parseRaw = extensionEnabled Ext_raw_tex exts
941 rawOptions <- mconcat <$> many rawopt
942 rawOptions <- mconcat <$> many rawopt
942− let addBegin x = "\\begin{" ++ name ++ "}" ++ rawOptions ++ x
943+ let beginCommand = "\\begin{" ++ name ++ "}" ++ rawOptions
943− if extensionEnabled Ext_raw_tex exts
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
944− then (rawBlock "latex" . addBegin) <$>
950+ then return $ rawBlock "latex" $ beginCommand ++ raw'
945− (withRaw (env name blocks) >>= applyMacros' . snd)
951+ else do
946− else env name blocks
952+ pos2 <- getPosition
953+ warningWithPos pos2 $ "Skipped \\end{" ++ name ++ "}"
954+ return bs
947
955
948----
956----
949
957