git.iko.soy/typeable/pandoc
on master help sign in
Removed CITEPROC CPP conditionals from library code.
23c6f56John MacFarlane
src/Text/Pandoc/Parsing.hs−4
compare with master
unifiedsplit
@@ -586,9 +586,7 @@ data ParserState = ParserState
586 stateQuoteContext :: QuoteContext, -- ^ Inside quoted environment?
586 stateQuoteContext :: QuoteContext, -- ^ Inside quoted environment?
587 stateSanitizeHTML :: Bool, -- ^ Sanitize HTML?
587 stateSanitizeHTML :: Bool, -- ^ Sanitize HTML?
588 stateKeys :: KeyTable, -- ^ List of reference keys
588 stateKeys :: KeyTable, -- ^ List of reference keys
589−#ifdef _CITEPROC
590 stateCitations :: [String], -- ^ List of available citations
589 stateCitations :: [String], -- ^ List of available citations
591−#endif
592 stateNotes :: NoteTable, -- ^ List of notes
590 stateNotes :: NoteTable, -- ^ List of notes
593 stateTabStop :: Int, -- ^ Tab stop
591 stateTabStop :: Int, -- ^ Tab stop
594 stateStandalone :: Bool, -- ^ Parse bibliographic info?
592 stateStandalone :: Bool, -- ^ Parse bibliographic info?
@@ -616,9 +614,7 @@ defaultParserState =
616 stateQuoteContext = NoQuote,
614 stateQuoteContext = NoQuote,
617 stateSanitizeHTML = False,
615 stateSanitizeHTML = False,
618 stateKeys = M.empty,
616 stateKeys = M.empty,
619−#ifdef _CITEPROC
620 stateCitations = [],
617 stateCitations = [],
621−#endif
622 stateNotes = [],
618 stateNotes = [],
623 stateTabStop = 4,
619 stateTabStop = 4,
624 stateStandalone = False,
620 stateStandalone = False,
src/Text/Pandoc/Readers/Markdown.hs−4
@@ -912,9 +912,7 @@ inlineParsers = [ str
912 , note
912 , note
913 , inlineNote
913 , inlineNote
914 , link
914 , link
915−#ifdef _CITEPROC
916 , inlineCitation
915 , inlineCitation
917−#endif
918 , image
916 , image
919 , math
917 , math
920 , strikeout
918 , strikeout
@@ -1305,7 +1303,6 @@ rawHtmlInline' = do
1305 else anyHtmlInlineTag
1303 else anyHtmlInlineTag
1306 return $ HtmlInline result
1304 return $ HtmlInline result
1307
1305
1308−#ifdef _CITEPROC
1309inlineCitation :: GenParser Char ParserState Inline
1306inlineCitation :: GenParser Char ParserState Inline
1310inlineCitation = try $ do
1307inlineCitation = try $ do
1311 failIfStrict
1308 failIfStrict
@@ -1351,4 +1348,3 @@ parseLabel = try $ do
1351 (False,True ) -> AuthorOnly
1348 (False,True ) -> AuthorOnly
1352 _ -> NormalCitation
1349 _ -> NormalCitation
1353 return $ Citation cit (trim p') (trim loc) mode 0 0
1350 return $ Citation cit (trim p') (trim loc) mode 0 0
1354−#endif