aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2010-11-17 15:36:17 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2010-11-17 15:36:17 -0800
commitdbe0cefc9a63af4333b17c06ad6308a9e0d85799 (patch)
tree72eeb4361c91c60fee80ecb9162d225602fc5979
parent47c64d4fc4be8733615f3378e9a68c513c5710c2 (diff)
downloadpandoc-dbe0cefc9a63af4333b17c06ad6308a9e0d85799.tar.gz
Biblio: Removed stringify; pass inline list to citeproc.
-rw-r--r--src/Text/Pandoc/Biblio.hs14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/Text/Pandoc/Biblio.hs b/src/Text/Pandoc/Biblio.hs
index 60e059175..dde822da8 100644
--- a/src/Text/Pandoc/Biblio.hs
+++ b/src/Text/Pandoc/Biblio.hs
@@ -150,16 +150,6 @@ setCiteNoteNum _ _ = []
setCitationNoteNum :: Int -> [Citation] -> [Citation]
setCitationNoteNum i = map $ \c -> c { citationNoteNum = i}
--- a temporary function to tide us over until citeproc is
--- changed to use Inline lists for prefixes and suffixes...
-stringify :: [Inline] -> String
-stringify = queryWith go
- where go :: Inline -> [Char]
- go Space = " "
- go (Str x) = x
- go (Code x) = x
- go _ = ""
-
toCslCite :: Citation -> CSL.Cite
toCslCite c
= let (la,lo) = parseLocator $ citationLocator c
@@ -168,8 +158,8 @@ toCslCite c
SuppressAuthor -> (False,True )
NormalCitation -> (False,False)
in emptyCite { CSL.citeId = citationId c
- , CSL.citePrefix = stringify $ citationPrefix c
- , CSL.citeSuffix = stringify $ citationSuffix c
+ , CSL.citePrefix = PandocText $ citationPrefix c
+ , CSL.citeSuffix = PandocText $ citationSuffix c
, CSL.citeLabel = la
, CSL.citeLocator = lo
, CSL.citeNoteNumber = show $ citationNoteNum c