@@ -949,8 +949,8 @@ verbatimEnv' = fmap snd <$>
949 withRaw $ try $ do
949 withRaw $ try $ do
950 string "\\begin"
950 string "\\begin"
951 name <- braced'
951 name <- braced'
952− guard $ name `elem` ["verbatim", "Verbatim", "lstlisting",
952+ guard $ name `elem` ["verbatim", "Verbatim", "BVerbatim",
953− "minted", "alltt", "comment"]
953+ "lstlisting", "minted", "alltt", "comment"]
954 manyTill anyChar (try $ string $ "\\end{" ++ name ++ "}")
954 manyTill anyChar (try $ string $ "\\end{" ++ name ++ "}")
956blob' :: IncludeParser
956blob' :: IncludeParser
@@ -1105,14 +1105,8 @@ environments = M.fromList
1105 verbEnv "code"))
1105 verbEnv "code"))
1106 , ("comment", mempty <$ verbEnv "comment")
1106 , ("comment", mempty <$ verbEnv "comment")
1107 , ("verbatim", codeBlock <$> verbEnv "verbatim")
1107 , ("verbatim", codeBlock <$> verbEnv "verbatim")
1108− , ("Verbatim", do options <- option [] keyvals
1108+ , ("Verbatim", fancyverbEnv "Verbatim")
1109− let kvs = [ (if k == "firstnumber"
1109+ , ("BVerbatim", fancyverbEnv "BVerbatim")
1111− else k, v) | (k,v) <- options ]
1112− let classes = [ "numberLines" |
1113− lookup "numbers" options == Just "left" ]
1114− let attr = ("",classes,kvs)
1115− codeBlockWith attr <$> verbEnv "Verbatim")
1116 , ("lstlisting", do options <- option [] keyvals
1110 , ("lstlisting", do options <- option [] keyvals
1117 let kvs = [ (if k == "firstnumber"
1111 let kvs = [ (if k == "firstnumber"
1118 then "startFrom"
1112 then "startFrom"
@@ -1223,6 +1217,17 @@ verbEnv name = do
1223 res <- manyTill anyChar endEnv
1217 res <- manyTill anyChar endEnv
1224 return $ stripTrailingNewlines res
1218 return $ stripTrailingNewlines res
1220+fancyverbEnv :: String -> LP Blocks
1221+fancyverbEnv name = do
1222+ options <- option [] keyvals
1223+ let kvs = [ (if k == "firstnumber"
1225+ else k, v) | (k,v) <- options ]
1226+ let classes = [ "numberLines" |
1227+ lookup "numbers" options == Just "left" ]
1228+ let attr = ("",classes,kvs)
1229+ codeBlockWith attr <$> verbEnv name
1226orderedList' :: LP Blocks
1231orderedList' :: LP Blocks
1227orderedList' = do
1232orderedList' = do
1228 optional sp
1233 optional sp