@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1919{- |
2020 Module : Text.Pandoc.Parsing
2121 Copyright : Copyright (C) 2006-2010 John MacFarlane
22− License : GNU GPL, version 2 or above
22+ License : GNU GPL, version 2 or above
2323
2424 Maintainer : John MacFarlane <jgm@berkeley.edu>
2525 Stability : alpha
@@ -27,7 +27,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2727
2828A utility library with parsers used in pandoc readers.
2929-}
30−module Text.Pandoc.Parsing ( (>>~),
30+module Text.Pandoc.Parsing ( GeneralParser,
31+ PandocParser,
32+ (>>~),
3133 anyLine,
3234 many1Till,
3335 notFollowedBy',
@@ -86,64 +88,68 @@ import Text.Pandoc.Shared
8688import qualified Data.Map as M
8789import Text.TeXMath.Macros (applyMacros, Macro, parseMacroDefinitions)
8890
91+type GeneralParser st a = GenParser Char st a
92+
93+type PandocParser a = GeneralParser ParserState a
94+
8995-- | Like >>, but returns the operation on the left.
9096-- (Suggested by Tillmann Rendel on Haskell-cafe list.)
9197(>>~) :: (Monad m) => m a -> m b -> m a
9298a >>~ b = a >>= \x -> b >> return x
9399
94100-- | Parse any line of text
95−anyLine :: GenParser Char st [Char]
101+anyLine :: GeneralParser st String
96102anyLine = manyTill anyChar newline
97103
98104-- | Like @manyTill@, but reads at least one item.
99−many1Till :: GenParser tok st a
100− -> GenParser tok st end
101− -> GenParser tok st [a]
105+many1Till :: GeneralParser st a
106+ -> GeneralParser st end
107+ -> GeneralParser st [a]
102108many1Till p end = do
103109 first <- p
104110 rest <- manyTill p end
105111 return (first:rest)
106112
107−-- | A more general form of @notFollowedBy@. This one allows any
113+-- | A more general form of @notFollowedBy@. This one allows any
108114-- type of parser to be specified, and succeeds only if that parser fails.
109115-- It does not consume any input.
110−notFollowedBy' :: Show b => GenParser a st b -> GenParser a st ()
116+notFollowedBy' :: Show b => GeneralParser st b -> GeneralParser st ()
111117notFollowedBy' p = try $ join $ do a <- try p
112118 return (unexpected (show a))
113119 <|>
114120 return (return ())
115121-- (This version due to Andrew Pimlott on the Haskell mailing list.)
116122
117−-- | Parses one of a list of strings (tried in order).
118−oneOfStrings :: [String] -> GenParser Char st String
123+-- | Parses one of a list of strings (tried in order).
124+oneOfStrings :: [String] -> GeneralParser st String
119125oneOfStrings listOfStrings = choice $ map (try . string) listOfStrings
120126
121127-- | Parses a space or tab.
122−spaceChar :: CharParser st Char
128+spaceChar :: GeneralParser st Char
123129spaceChar = satisfy $ \c -> c == ' ' || c == '\t'
124130
125131-- | Skips zero or more spaces or tabs.
126−skipSpaces :: GenParser Char st ()
132+skipSpaces :: GeneralParser st ()
127133skipSpaces = skipMany spaceChar
128134
129135-- | Skips zero or more spaces or tabs, then reads a newline.
130−blankline :: GenParser Char st Char
136+blankline :: GeneralParser st Char
131137blankline = try $ skipSpaces >> newline
132138
133139-- | Parses one or more blank lines and returns a string of newlines.
134−blanklines :: GenParser Char st [Char]
140+blanklines :: GeneralParser st [Char]
135141blanklines = many1 blankline
136142
137143-- | Parses material enclosed between start and end parsers.
138−enclosed :: GenParser Char st t -- ^ start parser
139− -> GenParser Char st end -- ^ end parser
140− -> GenParser Char st a -- ^ content parser (to be used repeatedly)
141− -> GenParser Char st [a]
142−enclosed start end parser = try $
144+enclosed :: GeneralParser st t -- ^ start parser
145+ -> GeneralParser st end -- ^ end parser
146+ -> GeneralParser st a -- ^ content parser (to be used repeatedly)
147+ -> GeneralParser st [a]
148+enclosed start end parser = try $
143149 start >> notFollowedBy space >> many1Till parser end
144150
145151-- | Parse string, case insensitive.
146−stringAnyCase :: [Char] -> CharParser st String
152+stringAnyCase :: [Char] -> GeneralParser st String
147153stringAnyCase [] = string ""
148154stringAnyCase (x:xs) = do
149155 firstChar <- char (toUpper x) <|> char (toLower x)
@@ -151,7 +157,7 @@ stringAnyCase (x:xs) = do
151157 return (firstChar:rest)
152158
153159-- | Parse contents of 'str' using 'parser' and return result.
154−parseFromString :: GenParser tok st a -> [tok] -> GenParser tok st a
160+parseFromString :: GeneralParser st a -> String -> GeneralParser st a
155161parseFromString parser str = do
156162 oldPos <- getPosition
157163 oldInput <- getInput
@@ -162,8 +168,8 @@ parseFromString parser str = do
162168 return result
163169
164170-- | Parse raw line block up to and including blank lines.
165−lineClump :: GenParser Char st String
166−lineClump = blanklines
171+lineClump :: GeneralParser st String
172+lineClump = blanklines
167173 <|> (many1 (notFollowedBy blankline >> anyLine) >>= return . unlines)
168174
169175-- | Parse a string of characters between an open character
@@ -172,7 +178,7 @@ lineClump = blanklines
172178-- @charsInBalanced '(' ')'@ will parse "(hello (there))"
173179-- and return "hello (there)". Stop if a blank line is
174180-- encountered.
175−charsInBalanced :: Char -> Char -> GenParser Char st String
181+charsInBalanced :: Char -> Char -> GeneralParser st String
176182charsInBalanced open close = try $ do
177183 char open
178184 raw <- many $ (many1 (satisfy $ \c ->
@@ -184,7 +190,7 @@ charsInBalanced open close = try $ do
184190 return $ concat raw
185191
186192-- | Like @charsInBalanced@, but allow blank lines in the content.
187−charsInBalanced' :: Char -> Char -> GenParser Char st String
193+charsInBalanced' :: Char -> Char -> GeneralParser st String
188194charsInBalanced' open close = try $ do
189195 char open
190196 raw <- many $ (many1 (satisfy $ \c -> c /= open && c /= close))
@@ -203,13 +209,13 @@ uppercaseRomanDigits = map toUpper lowercaseRomanDigits
203209
204210-- | Parses a roman numeral (uppercase or lowercase), returns number.
205211romanNumeral :: Bool -- ^ Uppercase if true
206− -> GenParser Char st Int
212+ -> GeneralParser st Int
207213romanNumeral upperCase = do
208− let romanDigits = if upperCase
209− then uppercaseRomanDigits
214+ let romanDigits = if upperCase
215+ then uppercaseRomanDigits
210216 else lowercaseRomanDigits
211217 lookAhead $ oneOf romanDigits
212− let [one, five, ten, fifty, hundred, fivehundred, thousand] =
218+ let [one, five, ten, fifty, hundred, fivehundred, thousand] =
213219 map char romanDigits
214220 thousands <- many thousand >>= (return . (1000 *) . length)
215221 ninehundreds <- option 0 $ try $ hundred >> thousand >> return 900
@@ -233,14 +239,14 @@ romanNumeral upperCase = do
233239
234240-- Parsers for email addresses and URIs
235241
236−emailChar :: GenParser Char st Char
242+emailChar :: GeneralParser st Char
237243emailChar = alphaNum <|>
238244 satisfy (\c -> c == '-' || c == '+' || c == '_' || c == '.')
239245
240−domainChar :: GenParser Char st Char
246+domainChar :: GeneralParser st Char
241247domainChar = alphaNum <|> char '-'
242248
243−domain :: GenParser Char st [Char]
249+domain :: GeneralParser st [Char]
244250domain = do
245251 first <- many1 domainChar
246252 dom <- many1 $ try (char '.' >> many1 domainChar )
@@ -248,7 +254,7 @@ domain = do
248254
249255-- | Parses an email address; returns original and corresponding
250256-- escaped mailto: URI.
251−emailAddress :: GenParser Char st (String, String)
257+emailAddress :: GeneralParser st (String, String)
252258emailAddress = try $ do
253259 firstLetter <- alphaNum
254260 restAddr <- many emailChar
@@ -259,7 +265,7 @@ emailAddress = try $ do
259265 return (full, escapeURI $ "mailto:" ++ full)
260266
261267-- | Parses a URI. Returns pair of original and URI-escaped version.
262−uri :: GenParser Char st (String, String)
268+uri :: GeneralParser st (String, String)
263269uri = try $ do
264270 let protocols = [ "http:", "https:", "ftp:", "file:", "mailto:",
265271 "news:", "telnet:" ]
@@ -293,8 +299,8 @@ uri = try $ do
293299-- displacement (the difference between the source column at the end
294300-- and the source column at the beginning). Vertical displacement
295301-- (source row) is ignored.
296−withHorizDisplacement :: GenParser Char st a -- ^ Parser to apply
297− -> GenParser Char st (a, Int) -- ^ (result, displacement)
302+withHorizDisplacement :: GeneralParser st a -- ^ Parser to apply
303+ -> GeneralParser st (a, Int) -- ^ (result, displacement)
298304withHorizDisplacement parser = do
299305 pos1 <- getPosition
300306 result <- parser
@@ -303,43 +309,43 @@ withHorizDisplacement parser = do
303309
304310-- | Parses a character and returns 'Null' (so that the parser can move on
305311-- if it gets stuck).
306−nullBlock :: GenParser Char st Block
312+nullBlock :: GeneralParser st Block
307313nullBlock = anyChar >> return Null
308314
309315-- | Fail if reader is in strict markdown syntax mode.
310−failIfStrict :: GenParser a ParserState ()
316+failIfStrict :: PandocParser ()
311317failIfStrict = do
312318 state <- getState
313319 if stateStrict state then fail "strict mode" else return ()
314320
315321-- | Fail unless we're in literate haskell mode.
316−failUnlessLHS :: GenParser tok ParserState ()
322+failUnlessLHS :: PandocParser ()
317323failUnlessLHS = do
318324 state <- getState
319325 if stateLiterateHaskell state then return () else fail "Literate haskell feature"
320326
321327-- | Parses backslash, then applies character parser.
322−escaped :: GenParser Char st Char -- ^ Parser for character to escape
323− -> GenParser Char st Inline
328+escaped :: GeneralParser st Char -- ^ Parser for character to escape
329+ -> GeneralParser st Inline
324330escaped parser = try $ do
325331 char '\\'
326332 result <- parser
327333 return (Str [result])
328334
329335-- | Parses an uppercase roman numeral and returns (UpperRoman, number).
330−upperRoman :: GenParser Char st (ListNumberStyle, Int)
336+upperRoman :: GeneralParser st (ListNumberStyle, Int)
331337upperRoman = do
332338 num <- romanNumeral True
333339 return (UpperRoman, num)
334340
335341-- | Parses a lowercase roman numeral and returns (LowerRoman, number).
336−lowerRoman :: GenParser Char st (ListNumberStyle, Int)
342+lowerRoman :: GeneralParser st (ListNumberStyle, Int)
337343lowerRoman = do
338344 num <- romanNumeral False
339345 return (LowerRoman, num)
340346
341347-- | Parses a decimal numeral and returns (Decimal, number).
342−decimal :: GenParser Char st (ListNumberStyle, Int)
348+decimal :: GeneralParser st (ListNumberStyle, Int)
343349decimal = do
344350 num <- many1 digit
345351 return (Decimal, read num)
@@ -348,7 +354,7 @@ decimal = do
348354-- returns (DefaultStyle, [next example number]). The next
349355-- example number is incremented in parser state, and the label
350356-- (if present) is added to the label table.
351−exampleNum :: GenParser Char ParserState (ListNumberStyle, Int)
357+exampleNum :: PandocParser (ListNumberStyle, Int)
352358exampleNum = do
353359 char '@'
354360 lab <- many (alphaNum <|> satisfy (\c -> c == '_' || c == '-'))
@@ -362,38 +368,38 @@ exampleNum = do
362368 return (Example, num)
363369
364370-- | Parses a '#' returns (DefaultStyle, 1).
365−defaultNum :: GenParser Char st (ListNumberStyle, Int)
371+defaultNum :: GeneralParser st (ListNumberStyle, Int)
366372defaultNum = do
367373 char '#'
368374 return (DefaultStyle, 1)
369375
370376-- | Parses a lowercase letter and returns (LowerAlpha, number).
371−lowerAlpha :: GenParser Char st (ListNumberStyle, Int)
377+lowerAlpha :: GeneralParser st (ListNumberStyle, Int)
372378lowerAlpha = do
373379 ch <- oneOf ['a'..'z']
374380 return (LowerAlpha, ord ch - ord 'a' + 1)
375381
376382-- | Parses an uppercase letter and returns (UpperAlpha, number).
377−upperAlpha :: GenParser Char st (ListNumberStyle, Int)
383+upperAlpha :: GeneralParser st (ListNumberStyle, Int)
378384upperAlpha = do
379385 ch <- oneOf ['A'..'Z']
380386 return (UpperAlpha, ord ch - ord 'A' + 1)
381387
382388-- | Parses a roman numeral i or I
383−romanOne :: GenParser Char st (ListNumberStyle, Int)
389+romanOne :: GeneralParser st (ListNumberStyle, Int)
384390romanOne = (char 'i' >> return (LowerRoman, 1)) <|>
385391 (char 'I' >> return (UpperRoman, 1))
386392
387393-- | Parses an ordered list marker and returns list attributes.
388−anyOrderedListMarker :: GenParser Char ParserState ListAttributes
389−anyOrderedListMarker = choice $
394+anyOrderedListMarker :: PandocParser ListAttributes
395+anyOrderedListMarker = choice $
390396 [delimParser numParser | delimParser <- [inPeriod, inOneParen, inTwoParens],
391397 numParser <- [decimal, exampleNum, defaultNum, romanOne,
392398 lowerAlpha, lowerRoman, upperAlpha, upperRoman]]
393399
394400-- | Parses a list number (num) followed by a period, returns list attributes.
395−inPeriod :: GenParser Char st (ListNumberStyle, Int)
396− -> GenParser Char st ListAttributes
401+inPeriod :: GeneralParser st (ListNumberStyle, Int)
402+ -> GeneralParser st ListAttributes
397403inPeriod num = try $ do
398404 (style, start) <- num
399405 char '.'
@@ -401,18 +407,18 @@ inPeriod num = try $ do
401407 then DefaultDelim
402408 else Period
403409 return (start, style, delim)
404−
410+
405411-- | Parses a list number (num) followed by a paren, returns list attributes.
406−inOneParen :: GenParser Char st (ListNumberStyle, Int)
407− -> GenParser Char st ListAttributes
412+inOneParen :: GeneralParser st (ListNumberStyle, Int)
413+ -> GeneralParser st ListAttributes
408414inOneParen num = try $ do
409415 (style, start) <- num
410416 char ')'
411417 return (start, style, OneParen)
412418
413419-- | Parses a list number (num) enclosed in parens, returns list attributes.
414−inTwoParens :: GenParser Char st (ListNumberStyle, Int)
415− -> GenParser Char st ListAttributes
420+inTwoParens :: GeneralParser st (ListNumberStyle, Int)
421+ -> GeneralParser st ListAttributes
416422inTwoParens num = try $ do
417423 char '('
418424 (style, start) <- num
@@ -421,9 +427,9 @@ inTwoParens num = try $ do
421427
422428-- | Parses an ordered list marker with a given style and delimiter,
423429-- returns number.
424−orderedListMarker :: ListNumberStyle
425− -> ListNumberDelim
426− -> GenParser Char ParserState Int
430+orderedListMarker :: ListNumberStyle
431+ -> ListNumberDelim
432+ -> PandocParser Int
427433orderedListMarker style delim = do
428434 let num = defaultNum <|> -- # can continue any kind of list
429435 case style of
@@ -443,19 +449,19 @@ orderedListMarker style delim = do
443449 return start
444450
445451-- | Parses a character reference and returns a Str element.
446−charRef :: GenParser Char st Inline
452+charRef :: GeneralParser st Inline
447453charRef = do
448454 c <- characterReference
449455 return $ Str [c]
450456
451457-- | Parse a table using 'headerParser', 'rowParser',
452458-- 'lineParser', and 'footerParser'.
453−tableWith :: GenParser Char ParserState ([[Block]], [Alignment], [Int])
454− -> ([Int] -> GenParser Char ParserState [[Block]])
455− -> GenParser Char ParserState sep
456− -> GenParser Char ParserState end
457− -> GenParser Char ParserState [Inline]
458− -> GenParser Char ParserState Block
459+tableWith :: PandocParser ([[Block]], [Alignment], [Int])
460+ -> ([Int] -> PandocParser [[Block]])
461+ -> PandocParser sep
462+ -> PandocParser end
463+ -> PandocParser [Inline]
464+ -> PandocParser Block
459465tableWith headerParser rowParser lineParser footerParser captionParser = try $ do
460466 caption' <- option [] captionParser
461467 (heads, aligns, indices) <- headerParser
@@ -473,8 +479,8 @@ tableWith headerParser rowParser lineParser footerParser captionParser = try $ d
473479widthsFromIndices :: Int -- Number of columns on terminal
474480 -> [Int] -- Indices
475481 -> [Double] -- Fractional relative sizes of columns
476−widthsFromIndices _ [] = []
477−widthsFromIndices numColumns' indices =
482+widthsFromIndices _ [] = []
483+widthsFromIndices numColumns' indices =
478484 let numColumns = max numColumns' (if null indices then 0 else last indices)
479485 lengths' = zipWith (-) indices (0:indices)
480486 lengths = reverse $
@@ -498,10 +504,10 @@ widthsFromIndices numColumns' indices =
498504-- (which may be grid), then the rows,
499505-- which may be grid, separated by blank lines, and
500506-- ending with a footer (dashed line followed by blank line).
501−gridTableWith :: GenParser Char ParserState Block -- ^ Block parser
502− -> GenParser Char ParserState [Inline] -- ^ Caption parser
507+gridTableWith :: PandocParser Block -- ^ Block parser
508+ -> PandocParser [Inline] -- ^ Caption parser
503509 -> Bool -- ^ Headerless table
504− -> GenParser Char ParserState Block
510+ -> PandocParser Block
505511gridTableWith block tableCaption headless =
506512 tableWith (gridTableHeader headless block) (gridTableRow block) (gridTableSep '-') gridTableFooter tableCaption
507513
@@ -509,13 +515,13 @@ gridTableSplitLine :: [Int] -> String -> [String]
509515gridTableSplitLine indices line = map removeFinalBar $ tail $
510516 splitByIndices (init indices) $ removeTrailingSpace line
511517
512−gridPart :: Char -> GenParser Char st (Int, Int)
518+gridPart :: Char -> GeneralParser st (Int, Int)
513519gridPart ch = do
514520 dashes <- many1 (char ch)
515521 char '+'
516522 return (length dashes, length dashes + 1)
517523
518−gridDashedLines :: Char -> GenParser Char st [(Int,Int)]
524+gridDashedLines :: Char -> GeneralParser st [(Int,Int)]
519525gridDashedLines ch = try $ char '+' >> many1 (gridPart ch) >>~ blankline
520526
521527removeFinalBar :: String -> String
@@ -523,18 +529,18 @@ removeFinalBar =
523529 reverse . dropWhile (`elem` " \t") . dropWhile (=='|') . reverse
524530
525531-- | Separator between rows of grid table.
526−gridTableSep :: Char -> GenParser Char ParserState Char
532+gridTableSep :: Char -> PandocParser Char
527533gridTableSep ch = try $ gridDashedLines ch >> return '\n'
528534
529535-- | Parse header for a grid table.
530536gridTableHeader :: Bool -- ^ Headerless table
531− -> GenParser Char ParserState Block
532− -> GenParser Char ParserState ([[Block]], [Alignment], [Int])
537+ -> PandocParser Block
538+ -> PandocParser ([[Block]], [Alignment], [Int])
533539gridTableHeader headless block = try $ do
534540 optional blanklines
535541 dashes <- gridDashedLines '-'
536542 rawContent <- if headless
537− then return $ repeat ""
543+ then return $ repeat ""
538544 else many1
539545 (notFollowedBy (gridTableSep '=') >> char '|' >>
540546 many1Till anyChar newline)
@@ -553,16 +559,16 @@ gridTableHeader headless block = try $ do
553559 map removeLeadingTrailingSpace rawHeads
554560 return (heads, aligns, indices)
555561
556−gridTableRawLine :: [Int] -> GenParser Char ParserState [String]
562+gridTableRawLine :: [Int] -> PandocParser [String]
557563gridTableRawLine indices = do
558564 char '|'
559565 line <- many1Till anyChar newline
560566 return (gridTableSplitLine indices line)
561567
562568-- | Parse row of grid table.
563−gridTableRow :: GenParser Char ParserState Block
569+gridTableRow :: PandocParser Block
564570 -> [Int]
565− -> GenParser Char ParserState [[Block]]
571+ -> PandocParser [[Block]]
566572gridTableRow block indices = do
567573 colLines <- many1 (gridTableRawLine indices)
568574 let cols = map ((++ "\n") . unlines . removeOneLeadingSpace) $
@@ -581,23 +587,23 @@ compactifyCell :: [Block] -> [Block]
581587compactifyCell bs = head $ compactify [bs]
582588
583589-- | Parse footer for a grid table.
584−gridTableFooter :: GenParser Char ParserState [Char]
590+gridTableFooter :: PandocParser [Char]
585591gridTableFooter = blanklines
586592
587593---
588594
589595-- | Parse a string with a given parser and state.
590−readWith :: GenParser t ParserState a -- ^ parser
596+readWith :: PandocParser a -- ^ parser
591597 -> ParserState -- ^ initial state
592− -> [t] -- ^ input
598+ -> String -- ^ input
593599 -> a
594−readWith parser state input =
600+readWith parser state input =
595601 case runParser parser state "source" input of
596602 Left err -> error $ "\nError:\n" ++ show err
597603 Right result -> result
598604
599605-- | Parse a string with @parser@ (for testing).
600−testStringWith :: (Show a) => GenParser Char ParserState a
606+testStringWith :: (Show a) => PandocParser a
601607 -> String
602608 -> IO ()
603609testStringWith parser str = UTF8.putStrLn $ show $
@@ -623,7 +629,7 @@ data ParserState = ParserState
623629 stateHeaderTable :: [HeaderType], -- ^ Ordered list of header types used
624630 stateIndentedCodeClasses :: [String], -- ^ Classes to use for indented code blocks
625631 stateNextExample :: Int, -- ^ Number of next example
626− stateExamples :: M.Map String Int, -- ^ Map from example labels to numbers
632+ stateExamples :: M.Map String Int, -- ^ Map from example labels to numbers
627633 stateHasChapters :: Bool, -- ^ True if \chapter encountered
628634 stateApplyMacros :: Bool, -- ^ Apply LaTeX macros?
629635 stateMacros :: [Macro] -- ^ List of macros defined so far
@@ -631,7 +637,7 @@ data ParserState = ParserState
631637 deriving Show
632638
633639defaultParserState :: ParserState
634−defaultParserState =
640+defaultParserState =
635641 ParserState { stateParseRaw = False,
636642 stateParserContext = NullState,
637643 stateQuoteContext = NoQuote,
@@ -655,12 +661,12 @@ defaultParserState =
655661 stateApplyMacros = True,
656662 stateMacros = []}
657663
658−data HeaderType
664+data HeaderType
659665 = SingleHeader Char -- ^ Single line of characters underneath
660666 | DoubleHeader Char -- ^ Lines of characters above and below
661667 deriving (Eq, Show)
662668
663−data ParserContext
669+data ParserContext
664670 = ListItemState -- ^ Used when running parser on list item contents
665671 | NullState -- ^ Default state
666672 deriving (Eq, Show)
@@ -699,25 +705,25 @@ lookupKeySrc table key = case M.lookup key table of
699705 Just src -> Just src
700706
701707-- | Fail unless we're in "smart typography" mode.
702−failUnlessSmart :: GenParser tok ParserState ()
708+failUnlessSmart :: PandocParser ()
703709failUnlessSmart = getState >>= guard . stateSmart
704710
705−smartPunctuation :: GenParser Char ParserState Inline
706− -> GenParser Char ParserState Inline
711+smartPunctuation :: PandocParser Inline
712+ -> PandocParser Inline
707713smartPunctuation inlineParser = do
708714 failUnlessSmart
709715 choice [ quoted inlineParser, apostrophe, dash, ellipses ]
710716
711−apostrophe :: GenParser Char ParserState Inline
717+apostrophe :: PandocParser Inline
712718apostrophe = (char '\'' <|> char '\8217') >> return Apostrophe
713719
714−quoted :: GenParser Char ParserState Inline
715− -> GenParser Char ParserState Inline
720+quoted :: PandocParser Inline
721+ -> PandocParser Inline
716722quoted inlineParser = doubleQuoted inlineParser <|> singleQuoted inlineParser
717723
718724withQuoteContext :: QuoteContext
719− -> (GenParser Char ParserState Inline)
720− -> GenParser Char ParserState Inline
725+ -> (PandocParser Inline)
726+ -> PandocParser Inline
721727withQuoteContext context parser = do
722728 oldState <- getState
723729 let oldQuoteContext = stateQuoteContext oldState
@@ -727,75 +733,75 @@ withQuoteContext context parser = do
727733 setState newState { stateQuoteContext = oldQuoteContext }
728734 return result
729735
730−singleQuoted :: GenParser Char ParserState Inline
731− -> GenParser Char ParserState Inline
736+singleQuoted :: PandocParser Inline
737+ -> PandocParser Inline
732738singleQuoted inlineParser = try $ do
733739 singleQuoteStart
734740 withQuoteContext InSingleQuote $ many1Till inlineParser singleQuoteEnd >>=
735741 return . Quoted SingleQuote . normalizeSpaces
736742
737−doubleQuoted :: GenParser Char ParserState Inline
738− -> GenParser Char ParserState Inline
743+doubleQuoted :: PandocParser Inline
744+ -> PandocParser Inline
739745doubleQuoted inlineParser = try $ do
740746 doubleQuoteStart
741747 withQuoteContext InDoubleQuote $ do
742748 contents <- manyTill inlineParser doubleQuoteEnd
743749 return . Quoted DoubleQuote . normalizeSpaces $ contents
744750
745−failIfInQuoteContext :: QuoteContext -> GenParser tok ParserState ()
751+failIfInQuoteContext :: QuoteContext -> PandocParser ()
746752failIfInQuoteContext context = do
747753 st <- getState
748754 if stateQuoteContext st == context
749755 then fail "already inside quotes"
750756 else return ()
751757
752−charOrRef :: [Char] -> GenParser Char st Char
758+charOrRef :: [Char] -> GeneralParser st Char
753759charOrRef cs =
754760 oneOf cs <|> try (do c <- characterReference
755761 guard (c `elem` cs)
756762 return c)
757763
758−singleQuoteStart :: GenParser Char ParserState ()
759−singleQuoteStart = do
764+singleQuoteStart :: PandocParser ()
765+singleQuoteStart = do
760766 failIfInQuoteContext InSingleQuote
761767 try $ do charOrRef "'\8216"
762768 notFollowedBy (oneOf ")!],.;:-? \t\n")
763769 notFollowedBy (try (oneOfStrings ["s","t","m","ve","ll","re"] >>
764− satisfy (not . isAlphaNum)))
770+ satisfy (not . isAlphaNum)))
765771 -- possess/contraction
766772 return ()
767773
768−singleQuoteEnd :: GenParser Char st ()
774+singleQuoteEnd :: GeneralParser st ()
769775singleQuoteEnd = try $ do
770776 charOrRef "'\8217"
771777 notFollowedBy alphaNum
772778
773−doubleQuoteStart :: GenParser Char ParserState ()
779+doubleQuoteStart :: PandocParser ()
774780doubleQuoteStart = do
775781 failIfInQuoteContext InDoubleQuote
776782 try $ do charOrRef "\"\8220"
777783 notFollowedBy (satisfy (\c -> c == ' ' || c == '\t' || c == '\n'))
778784
779−doubleQuoteEnd :: GenParser Char st ()
785+doubleQuoteEnd :: GeneralParser st ()
780786doubleQuoteEnd = do
781787 charOrRef "\"\8221"
782788 return ()
783789
784−ellipses :: GenParser Char st Inline
790+ellipses :: GeneralParser st Inline
785791ellipses = do
786792 try (charOrRef "…") <|> try (string "..." >> return '…')
787793 return Ellipses
788794
789−dash :: GenParser Char st Inline
795+dash :: GeneralParser st Inline
790796dash = enDash <|> emDash
791797
792−enDash :: GenParser Char st Inline
798+enDash :: GeneralParser st Inline
793799enDash = do
794800 try (charOrRef "–") <|>
795801 try (char '-' >> lookAhead (satisfy isDigit) >> return '–')
796802 return EnDash
797803
798−emDash :: GenParser Char st Inline
804+emDash :: GeneralParser st Inline
799805emDash = do
800806 try (charOrRef "—") <|> (try $ string "--" >> optional (char '-') >> return '—')
801807 return EmDash
@@ -805,7 +811,7 @@ emDash = do
805811--
806812
807813-- | Parse a \newcommand or \renewcommand macro definition.
808−macro :: GenParser Char ParserState Block
814+macro :: PandocParser Block
809815macro = do
810816 getState >>= guard . stateApplyMacros
811817 inp <- getInput
@@ -817,11 +823,10 @@ macro = do
817823 return Null
818824
819825-- | Apply current macros to string.
820−applyMacros' :: String -> GenParser Char ParserState String
826+applyMacros' :: String -> PandocParser String
821827applyMacros' target = do
822828 apply <- liftM stateApplyMacros getState
823829 if apply
824830 then do macros <- liftM stateMacros getState
825831 return $ applyMacros macros target
826832 else return target
827−