@@ -27,7 +27,7 @@ import Text.Pandoc.Error (PandocError(..))
2727import Text.Pandoc.Extensions (pandocExtensions)
2828import Text.Pandoc.Logging (LogMessage(..))
2929import Text.Pandoc.Options (ReaderOptions(..))
30−import Text.Pandoc.Shared (stringify, ordNub, blocksToInlines, tshow)
30+import Text.Pandoc.Shared (stringify, ordNub, tshow)
3131import qualified Text.Pandoc.UTF8 as UTF8
3232import Text.Pandoc.Walk (query, walk, walkM)
3333import Control.Applicative ((<|>))
@@ -49,6 +49,7 @@ import qualified Data.Text as T
4949import System.FilePath (takeExtension)
5050import Safe (lastMay, initSafe)
5151
52+
5253processCitations :: PandocMonad m => Pandoc -> m Pandoc
5354processCitations (Pandoc meta bs) = do
5455 style <- getStyle (Pandoc meta bs)
@@ -90,22 +91,18 @@ processCitations (Pandoc meta bs) = do
9091 walk (convertQuotes locale) .
9192 insertSpace $ out)
9293 (resultBibliography result)
93− let moveNotes = maybe True truish $
94− lookupMeta "notes-after-punctuation" meta
94+ let moveNotes = styleIsNoteStyle sopts &&
95+ maybe True truish (lookupMeta "notes-after-punctuation" meta)
9596 let cits = map (walk (convertQuotes locale)) $
9697 resultCitations result
9798
98− let fixQuotes = case localePunctuationInQuote locale of
99− Just True ->
100− B.toList . movePunctuationInsideQuotes . B.fromList
101− _ -> id
102−
10399 let metanocites = lookupMeta "nocite" meta
104100 let Pandoc meta'' bs' =
105101 maybe id (setMeta "nocite") metanocites .
106− walk (map capitalizeNoteCitation .
107− fixQuotes . mvPunct moveNotes locale) .
108− walk deNote .
102+ walk (mvPunct moveNotes locale) .
103+ (if styleIsNoteStyle sopts
104+ then walk addNote . walk deNote
105+ else id) .
109106 evalState (walkM insertResolvedCitations $ Pandoc meta' bs)
110107 $ cits
111108 return $ Pandoc meta''
@@ -375,7 +372,6 @@ formatFromExtension fp = case dropWhile (== '.') $ takeExtension fp of
375372
376373
377374isNote :: Inline -> Bool
378−isNote (Note _) = True
379375isNote (Cite _ [Note _]) = True
380376 -- the following allows citation styles that are "in-text" but use superscript
381377 -- references to be treated as if they are "notes" for the purposes of moving
@@ -388,6 +384,12 @@ isSpacy Space = True
388384isSpacy SoftBreak = True
389385isSpacy _ = False
390386
387+movePunctInsideQuotes :: Locale -> [Inline] -> [Inline]
388+movePunctInsideQuotes locale
389+ | localePunctuationInQuote locale == Just True
390+ = B.toList . movePunctuationInsideQuotes . B.fromList
391+ | otherwise
392+ = id
391393
392394mvPunct :: Bool -> Locale -> [Inline] -> [Inline]
393395mvPunct moveNotes locale (x : xs)
@@ -400,7 +402,8 @@ mvPunct moveNotes locale (q : s : x : ys)
400402 in if moveNotes
401403 then if T.null spunct
402404 then q : x : mvPunct moveNotes locale ys
403− else q : Str spunct : x : mvPunct moveNotes locale
405+ else movePunctInsideQuotes locale
406+ [q , Str spunct , x] ++ mvPunct moveNotes locale
404407 (B.toList
405408 (dropTextWhile isPunctuation (B.fromList ys)))
406409 else q : x : mvPunct moveNotes locale ys
@@ -412,9 +415,10 @@ mvPunct moveNotes locale (Cite cs ils : ys)
412415 , moveNotes
413416 = let s = stringify ys
414417 spunct = T.takeWhile isPunctuation s
415− in Cite cs (init ils
416− ++ [Str spunct | not (endWithPunct False (init ils))]
417− ++ [last ils]) :
418+ in Cite cs (movePunctInsideQuotes locale $
419+ init ils
420+ ++ [Str spunct | not (endWithPunct False (init ils))]
421+ ++ [last ils]) :
418422 mvPunct moveNotes locale
419423 (B.toList (dropTextWhile isPunctuation (B.fromList ys)))
420424mvPunct moveNotes locale (s : x : ys) | isSpacy s, isNote x =
@@ -560,42 +564,62 @@ extractText (FancyVal x) = toText x
560564extractText (NumVal n) = T.pack (show n)
561565extractText _ = mempty
562566
563−capitalizeNoteCitation :: Inline -> Inline
564−capitalizeNoteCitation (Cite cs [Note [Para ils]]) =
565− Cite cs
566− [Note [Para $ B.toList $ addTextCase Nothing CapitalizeFirst
567− $ B.fromList ils]]
568−capitalizeNoteCitation x = x
569−
570−deNote :: [Inline] -> [Inline]
571−deNote [] = []
572−deNote (Note bs:rest) =
573− Note (walk go bs) : deNote rest
567+-- Here we take the Spans with class csl-note that are left
568+-- after deNote has removed nested ones, and convert them
569+-- into real notes.
570+addNote :: Inline -> Inline
571+addNote (Span ("",["csl-note"],[]) ils) =
572+ Note [Para $
573+ B.toList . addTextCase Nothing CapitalizeFirst . B.fromList $ ils]
574+addNote x = x
575+
576+-- Here we handle citation notes that occur inside footnotes
577+-- or other citation notes, in a note style. We don't want
578+-- notes inside notes, so we convert these to parenthesized
579+-- or comma-separated citations.
580+deNote :: Inline -> Inline
581+deNote (Note bs) =
582+ case bs of
583+ [Para (cit@(Cite (c:_) _) : ils)]
584+ | citationMode c /= AuthorInText ->
585+ -- if citation is first in note, no need to parenthesize.
586+ Note [Para (walk removeNotes $ cit : walk addParens ils)]
587+ _ -> Note (walk removeNotes . walk addParens $ bs)
588+
574589 where
575− go [] = []
576− go (Cite (c:cs) ils : zs)
590+ addParens [] = []
591+ addParens (Cite (c:cs) ils : zs)
577592 | citationMode c == AuthorInText
578− = Cite (c:cs) (concatMap (noteAfterComma (needsPeriod zs)) ils) : go zs
593+ = Cite (c:cs) (concatMap (noteAfterComma (needsPeriod zs)) ils) :
594+ addParens zs
579595 | otherwise
580− = Cite (c:cs) (concatMap noteInParens ils) : go zs
581− go (x:xs) = x : go xs
596+ = Cite (c:cs) (concatMap noteInParens ils) : addParens zs
597+ addParens (x:xs) = x : addParens xs
598+
599+ removeNotes (Span ("",["csl-note"],[]) ils) = Span ("",[],[]) ils
600+ removeNotes x = x
601+
582602 needsPeriod [] = True
583603 needsPeriod (Str t:_) = case T.uncons t of
584604 Nothing -> False
585605 Just (c,_) -> isUpper c
586606 needsPeriod (Space:zs) = needsPeriod zs
587607 needsPeriod _ = False
588− noteInParens (Note bs')
608+
609+ noteInParens (Span ("",["csl-note"],[]) ils)
589610 = Space : Str "(" :
590− removeFinalPeriod (blocksToInlines bs') ++ [Str ")"]
611+ removeFinalPeriod ils ++ [Str ")"]
591612 noteInParens x = [x]
592− noteAfterComma needsPer (Note bs')
613+
614+ noteAfterComma needsPer (Span ("",["csl-note"],[]) ils)
615+ | not (null ils)
593616 = Str "," : Space :
594− (if needsPer
595− then id
596− else removeFinalPeriod) (blocksToInlines bs')
617+ if needsPer
618+ then ils
619+ else removeFinalPeriod ils
597620 noteAfterComma _ x = [x]
598−deNote (x:xs) = x : deNote xs
621+
622+deNote x = x
599623
600624-- Note: we can't use dropTextWhileEnd indiscriminately,
601625-- because this would remove the final period on abbreviations like Ibid.