Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Moved isArgTok to Readers.LaTeX.Parsing.

Browse source
This commit is contained in:
John MacFarlane 2018-10-01 22:09:45 -07:00
parent 799cd5db7a
commit 963ba931a6
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Text/Pandoc/Readers/LaTeX.hs
View file

@ -1533,10 +1533,6 @@ argspecPattern =
(toktype' == Symbol || toktype' == Word) && (toktype' == Symbol || toktype' == Word) &&
(txt /= "{" && txt /= "\\" && txt /= "}"))) (txt /= "{" && txt /= "\\" && txt /= "}")))
isArgTok :: Tok -> Bool
isArgTok (Tok _ (Arg _) _) = True
isArgTok _ = False
newcommand :: PandocMonad m => LP m (Text, Macro) newcommand :: PandocMonad m => LP m (Text, Macro)
newcommand = do newcommand = do
pos <- getPosition pos <- getPosition

7
src/Text/Pandoc/Readers/LaTeX/Parsing.hs
View file

@ -52,8 +52,9 @@ module Text.Pandoc.Readers.LaTeX.Parsing
, setpos , setpos
, anyControlSeq , anyControlSeq
, anySymbol , anySymbol
, isWordTok
, isNewlineTok , isNewlineTok
, isWordTok
, isArgTok
, spaces , spaces
, spaces1 , spaces1
, tokTypeIn , tokTypeIn
@ -476,6 +477,10 @@ isWordTok :: Tok -> Bool
isWordTok (Tok _ Word _) = True isWordTok (Tok _ Word _) = True
isWordTok _ = False isWordTok _ = False
isArgTok :: Tok -> Bool
isArgTok (Tok _ (Arg _) _) = True
isArgTok _ = False
spaces :: PandocMonad m => LP m () spaces :: PandocMonad m => LP m ()
spaces = skipMany (satisfyTok (tokTypeIn [Comment, Spaces, Newline])) spaces = skipMany (satisfyTok (tokTypeIn [Comment, Spaces, Newline]))