From 29cfc48c5e9361fa1608a315f0558311e416a0d2 Mon Sep 17 00:00:00 2001
From: Vincent St-Amour <stamourv@racket-lang.org>
Date: Sat, 10 Nov 2012 14:49:38 -0500
Subject: [PATCH] Fix citation disabiguation when authors differ.

---
 collects/scriblib/autobib.rkt                         |  3 ++-
 .../tests/scribble/docs/autobib-disambiguation.scrbl  |  7 +++++++
 .../tests/scribble/docs/autobib-disambiguation.txt    | 11 ++++++-----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/collects/scriblib/autobib.rkt b/collects/scriblib/autobib.rkt
index 548b4d0434..4d31b69890 100644
--- a/collects/scriblib/autobib.rkt
+++ b/collects/scriblib/autobib.rkt
@@ -242,7 +242,8 @@
               [(date<? b a) #f]
               [else (string-ci<? (auto-bib-key a) (auto-bib-key b))]))))
   (define (ambiguous? a b)
-    (and (string-ci=? (extract-bib-key a) (extract-bib-key b))
+    (and (string-ci=? (author-element-cite (extract-bib-author a))
+                      (author-element-cite (extract-bib-author b)))
          (auto-bib-date a)
          (auto-bib-date b)
          (date=? a b)))
diff --git a/collects/tests/scribble/docs/autobib-disambiguation.scrbl b/collects/tests/scribble/docs/autobib-disambiguation.scrbl
index c7930ff2e9..7aea6a2182 100644
--- a/collects/tests/scribble/docs/autobib-disambiguation.scrbl
+++ b/collects/tests/scribble/docs/autobib-disambiguation.scrbl
@@ -12,11 +12,18 @@
                      #:location (dissertation-location #:institution "NEU")
                      #:author (authors "Little" "Bo" "Peep")
                      #:date "2012"))
+@(define c (make-bib #:title "Diss 3"
+                     #:is-book? #t
+                     #:location (dissertation-location #:institution "NEU")
+                     #:author (authors "Little" "Bo" "Peep" "Peep2")
+                     #:date "2012"))
 According to the following people,
 @cite[a]
 @cite[b]
+@cite[c]
 @citet[a]
 @citet[b]
+@citet[c]
 @cite[a b]
 @cite[b a]
 @citet[a b]
diff --git a/collects/tests/scribble/docs/autobib-disambiguation.txt b/collects/tests/scribble/docs/autobib-disambiguation.txt
index 5b28a4ecf2..656e127ba4 100644
--- a/collects/tests/scribble/docs/autobib-disambiguation.txt
+++ b/collects/tests/scribble/docs/autobib-disambiguation.txt
@@ -1,9 +1,10 @@
 According to the following people,  (Little et al. 2012a)  (Little et
-al. 2012b) Little et al. (2012a) Little et al. (2012b)  (Little et al.
-2012a,b)  (Little et al. 2012b,a) Little et al. (2012a,b) Little et
-al. (2012b,a)
+al. 2012b)  (Little et al. 2012c) Little et al. (2012a) Little et
+al. (2012b) Little et al. (2012c)  (Little et al. 2012a,b)  (Little et
+al. 2012b,a) Little et al. (2012a,b) Little et al. (2012b,a)
 
 Bibliography
 
-Little, Bo, and Peep. Diss 1. PhD dissertation, NEU, 2012a.
-Little, Bo, and Peep. Diss 2. PhD dissertation, NEU, 2012b.
+Little, Bo, and Peep. Diss 1. PhD dissertation, NEU, 2012a.       
+Little, Bo, and Peep. Diss 2. PhD dissertation, NEU, 2012b.       
+Little, Bo, Peep, and Peep2. Diss 3. PhD dissertation, NEU, 2012c.