Re: Re: textual citation

[Andrea Rossato <andrea.rossato-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 2049 bytes --]

On Tue, Nov 16, 2010 at 08:39:56PM -0800, John MacFarlane wrote:
> +++ Andrea Rossato [Nov 14 10 14:26 ]:
> pandoc-types:  citationPrefix is now [Inline] rather than String.
> citationSuffix has been added (also [Inline]).
> 
> pandoc:  updated for changes in the Citation type in pandoc-types.

I'm attaching a patch that removes stringify and directly passes
[Inline] to citeproc-hs.

There's also a small but important fix for the parser, just to
remember you to be careful not to pass to citeproc empty content in a
non empty list of [Inline]. citeproc will always assume that a
non-empty list of inlines will produce some output (this is relevant,
for instance, to suppress delimiters when suppressing the author's
name).
 
> The pandoc changes don't presuppose any changes in citeproc-hs -- pandoc still
> passes raw strings to citeproc. citeproc should be changed to take [Inline]
> for CSL.citePrefix and CSL.citeSuffix. I'm guessing this will allow a lot
> of code simplification, since citeproc currently uses a custom pandoc-like
> structure (OStr, OSpace, etc.).

Unfortunately this is not the case: the Output data structure is
needed to encode enough information during the evaluation of the style
so to be able to process the output to remove ambiguous cites, to add
year suffixes, and to collapse citations (actually the most difficult
part of the processor code).

> With these changes, I can start working on the parser, and Andrea
> can work on converting citeproc to use [Inline].

I've already pushed the needed changes to citeproc-hs: the [inline]
will be passed back to pandoc as citation affixes.

Andrea

-- 
You received this message because you are subscribed to the Google Groups "pandoc-discuss" group.
To post to this group, send email to pandoc-discuss-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To unsubscribe from this group, send email to pandoc-discuss+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit this group at http://groups.google.com/group/pandoc-discuss?hl=en.


[-- Attachment #2: 0021-update-tp-latest-changes.patch --]
[-- Type: text/plain, Size: 2426 bytes --]

From 0e077fa54824a90bcfccde4eeb912350c9bbca10 Mon Sep 17 00:00:00 2001
From: Andrea Rossato <andrea.rossato-/Q1r7N5in3P/wltNWqQaag@public.gmane.org>
Date: Wed, 17 Nov 2010 22:37:07 +0100
Subject: [PATCH 21/21] update tp latest changes

---
 src/Text/Pandoc/Biblio.hs           |   14 ++------------
 src/Text/Pandoc/Readers/Markdown.hs |    2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/Text/Pandoc/Biblio.hs b/src/Text/Pandoc/Biblio.hs
index 60e0591..dde822d 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
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 8101d30..4975ee0 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -1392,7 +1392,7 @@ citation = try $ do
   key <- citeKey
   loc <- option "" locator
   return $ Citation{ citationId        = key
-                     , citationPrefix  = [Str pref]
+                     , citationPrefix  = if pref /= [] then [Str pref] else []
                      , citationSuffix  = []
                      , citationLocator = loc
                      , citationMode    = if suppress_auth