diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2010-12-03 23:31:03 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2010-12-03 23:43:47 -0800 |
| commit | 357b965b4455422cfdeb2676befda31d017f944f (patch) | |
| tree | 732d4ad686a0bacd2b50b60dc947aba7d84a020c /src/Text/Pandoc/Parsing.hs | |
| parent | bea62bcab8ff095057a38eb2b8ecfaa3c9efb9e7 (diff) | |
| parent | 38bc3f23166cc3b2088eebb8a234a3f5f5e65bbb (diff) | |
| download | pandoc-357b965b4455422cfdeb2676befda31d017f944f.tar.gz | |
Merge branch 'citeproc' into master.
Conflicts:
src/Text/Pandoc/Definition.hs
Diffstat (limited to 'src/Text/Pandoc/Parsing.hs')
| -rw-r--r-- | src/Text/Pandoc/Parsing.hs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs index dce99fd75..47e97c7cc 100644 --- a/src/Text/Pandoc/Parsing.hs +++ b/src/Text/Pandoc/Parsing.hs @@ -586,9 +586,7 @@ data ParserState = ParserState stateQuoteContext :: QuoteContext, -- ^ Inside quoted environment? stateSanitizeHTML :: Bool, -- ^ Sanitize HTML? stateKeys :: KeyTable, -- ^ List of reference keys -#ifdef _CITEPROC stateCitations :: [String], -- ^ List of available citations -#endif stateNotes :: NoteTable, -- ^ List of notes stateTabStop :: Int, -- ^ Tab stop stateStandalone :: Bool, -- ^ Parse bibliographic info? @@ -616,9 +614,7 @@ defaultParserState = stateQuoteContext = NoQuote, stateSanitizeHTML = False, stateKeys = M.empty, -#ifdef _CITEPROC stateCitations = [], -#endif stateNotes = [], stateTabStop = 4, stateStandalone = False, |