diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
# citeproc changelog
+## 0.1.1.1
+
+ * Pay attention to citationNoteNumber in computing position.
+ In calculating whether an item is alone in its citation,
+ we need to take into account citationNoteNumber, since
+ two citations may occur in the same note and they should
+ not be ranked "alone." See jgm/pandoc#6813,
+ citation-style-language/documentation#121
+
## 0.1.1
* Ensure that uncited references are sorted last
diff --git a/citeproc.cabal b/citeproc.cabal
--- a/citeproc.cabal
+++ b/citeproc.cabal
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: citeproc
-version: 0.1.1
+version: 0.1.1.1
synopsis: Generates citations and bibliography from CSL styles.
description: citeproc parses CSL style files and uses them to
generate a list of formatted citations and bibliography
diff --git a/src/Citeproc/Eval.hs b/src/Citeproc/Eval.hs
--- a/src/Citeproc/Eval.hs
+++ b/src/Citeproc/Eval.hs
@@ -63,6 +63,7 @@
Bool, Maybe Text, Maybe Text)
-- (citegroup, noteNum, posInGroup,
-- aloneInCitation, label, locator)
+ , stateNoteMap :: M.Map Int (Set.Set ItemId) -- ids cited in note
, stateRefMap :: ReferenceMap a
, stateReference :: Reference a
, stateUsedYearSuffix :: Bool
@@ -103,6 +104,7 @@
EvalState
{ stateVarCount = VarCount 0 0
, stateLastCitedMap = mempty
+ , stateNoteMap = mempty
, stateRefMap = makeReferenceMap refs
, stateReference = Reference mempty mempty Nothing mempty
, stateUsedYearSuffix = False
@@ -394,7 +396,8 @@
| ident <- refIds
, not (ident `Set.member` citeIds)]
allCites <- withRWST (\ctx st -> (ctx,
- st { stateLastCitedMap = mempty })) $
+ st { stateLastCitedMap = mempty
+ , stateNoteMap = mempty })) $
mapM (evalLayout False (styleCitation style))
(zip [1..] (citations ++ ghostCitations))
@@ -452,7 +455,8 @@
refIds }
-- redo citations
withRWST (\ctx st -> (ctx,
- st { stateLastCitedMap = mempty })) $
+ st { stateLastCitedMap = mempty
+ , stateNoteMap = mempty })) $
mapM (evalLayout False (styleCitation style))
(zip [1..] (citations ++ ghostCitations))
@@ -461,7 +465,8 @@
ambiguities -> do
analyzeAmbiguities bibSortKeyMap strategy (map snd ambiguities)
withRWST (\ctx st -> (ctx,
- st { stateLastCitedMap = mempty })) $
+ st { stateLastCitedMap = mempty
+ , stateNoteMap = mempty })) $
mapM (evalLayout False (styleCitation style)) (zip [1..] citations)
where
@@ -974,6 +979,18 @@
unless isBibliography $ do
lastCitedMap <- gets stateLastCitedMap
let notenum = NumVal $ fromMaybe citationGroupNumber mbNoteNumber
+ -- keep track of how many citations in each note.
+ -- two citations from the same note don't count as "alone"
+ -- for ibid purposes. See citation-style-language/documentation#121
+ case mbNoteNumber of
+ Nothing -> return ()
+ Just n -> modify $ \st ->
+ st{ stateNoteMap = M.alter
+ (maybe
+ (Just (Set.singleton (citationItemId item)))
+ (Just . Set.insert (citationItemId item)))
+ n
+ (stateNoteMap st) }
case M.lookup (citationItemId item) lastCitedMap of
Nothing | isNote -> -- first citation
modify $ \st ->
@@ -990,12 +1007,12 @@
st{ stateLastCitedMap =
M.insert (citationItemId item)
(citationGroupNumber, mbNoteNumber, positionInCitation,
- case citationItems citation of
+ (case citationItems citation of
[_] -> True
[x,y] -> citationItemId x == citationItemId y
&& citationItemType x == AuthorOnly
&& citationItemType y == SuppressAuthor
- _ -> False,
+ _ -> False),
citationItemLabel item,
citationItemLocator item)
lastCitedMap }
@@ -1054,6 +1071,7 @@
getPosition :: CitationItem a -> Int -> Maybe Int -> Int -> Eval a [Position]
getPosition item groupNum mbNoteNum posInGroup = do
lastCitedMap <- gets stateLastCitedMap
+ noteMap <- gets stateNoteMap
case M.lookup (citationItemId item) lastCitedMap of
Nothing -> return [FirstPosition]
Just (prevGroupNum, mbPrevNoteNum,
@@ -1063,6 +1081,11 @@
asks (styleNearNoteDistance . contextStyleOptions)
let noteNum = fromMaybe groupNum mbNoteNum
let prevNoteNum = fromMaybe prevGroupNum mbPrevNoteNum
+ let prevAloneInNote =
+ case M.lookup prevNoteNum noteMap of
+ Nothing -> True
+ Just s -> Set.size s <= 1
+ let prevAlone = prevAloneInGroup && prevAloneInNote
return $
(if isNote && noteNum - prevNoteNum < nearNoteDistance
then (NearNote :)
@@ -1072,7 +1095,7 @@
(groupNum == prevGroupNum + 1 &&
(((-) <$> mbNoteNum <*> mbPrevNoteNum) <= Just 1) &&
posInGroup == 1 &&
- prevAloneInGroup)
+ prevAlone)
then case (prevLoc, citationItemLocator item) of
(Nothing, Just _) -> (IbidWithLocator :) . (Ibid :)
(Nothing, Nothing) -> (Ibid :)
diff --git a/test/extra/pandoc6813.txt b/test/extra/pandoc6813.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/pandoc6813.txt
@@ -0,0 +1,1472 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+>>===== RESULT =====>>
+Doe, Title A, n.d.
+Doe, Title B, n.d.
+Doe, Title B, n.d.
+<<===== RESULT =====<<
+
+>>===== CSL =====>>
+
+
+<<===== CSL =====<<
+
+>>===== INPUT =====>>
+[
+ {
+ "author": [
+ {
+ "family": "Doe",
+ "given": "John"
+ }
+ ],
+ "id": "doeA",
+ "title": "Title A",
+ "type": "book"
+ },
+ {
+ "author": [
+ {
+ "family": "Doe",
+ "given": "John"
+ }
+ ],
+ "id": "doeB",
+ "title": "Title B",
+ "type": "book"
+ }
+]
+<<===== INPUT =====<<
+
+
+>>===== CITATIONS =====>>
+[ {"citationItems": [{"id":"doeA"}],
+ "citationNoteNumber": 1},
+ {"citationItems": [{"id":"doeB"}],
+ "citationNoteNumber": 1},
+ {"citationItems": [{"id":"doeB"}],
+ "citationNoteNumber": 2}
+]
+<<===== CITATION-ITEMS =====<<
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
+