85394d4 · typeable/pandoc

1525

1526argspecArg :: PandocMonad m => LP m ArgSpec

1527argspecArg = do

1528− Tok _ (Arg i) _ <- withVerbatimMode $ satisfyTok isArgTok

1528+ Tok _ (Arg i) _ <- satisfyTok isArgTok

1529 return $ ArgNum i

1530

1531argspecPattern :: PandocMonad m => LP m ArgSpec

1532−argspecPattern = withVerbatimMode $

1532+argspecPattern =

1533 Pattern <$> many1 (satisfyTok (\(Tok _ toktype' txt) ->

1534 (toktype' == Symbol || toktype' == Word) &&

1535 (txt /= "{" && txt /= "\\" && txt /= "}")))

1566 Tok _ (CtrlSeq mtype) _ <- controlSeq "newenvironment" <|>

1567 controlSeq "renewenvironment" <|>

1568 controlSeq "provideenvironment"

1569− name <- withVerbatimMode $ do

1569+ withVerbatimMode $ do

1570 optional $ symbol '*'

1571 spaces

1572− untokenize <$> braced

1572+ name <- untokenize <$> braced

1573− numargs <- withVerbatimMode $ do

1574 spaces

1573 spaces

1575− option 0 $ try bracketedNum

1574+ numargs <- option 0 $ try bracketedNum

1576− let argspecs = map (\i -> ArgNum i) [1..numargs]

1577− optarg <- withVerbatimMode $ do

1578 spaces

1575 spaces

1579− option Nothing $ Just <$> try bracketedToks

1576+ optarg <- option Nothing $ Just <$> try bracketedToks

1577+ let argspecs = map (\i -> ArgNum i) [1..numargs]

1580− startcontents <- withVerbatimMode $ spaces >> bracedOrToken

1578+ startcontents <- spaces >> bracedOrToken

1581− endcontents <- withVerbatimMode $ spaces >> bracedOrToken

1579+ endcontents <- spaces >> bracedOrToken

1582− when (mtype == "newenvironment") $ do

1580+ when (mtype == "newenvironment") $ do

1583− macros <- sMacros <$> getState

1581+ macros <- sMacros <$> getState

1584− case M.lookup name macros of

1582+ case M.lookup name macros of

1585− Just _ -> report $ MacroAlreadyDefined (T.unpack name) pos

1583+ Just _ -> report $ MacroAlreadyDefined (T.unpack name) pos

1586− Nothing -> return ()

1584+ Nothing -> return ()

1587− return (name, Macro ExpandWhenUsed argspecs optarg startcontents,

1585+ return (name, Macro ExpandWhenUsed argspecs optarg startcontents,

1588 Macro ExpandWhenUsed [] Nothing endcontents)

1586 Macro ExpandWhenUsed [] Nothing endcontents)

1589

1587

1590bracketedNum :: PandocMonad m => LP m Int

1588bracketedNum :: PandocMonad m => LP m Int