From b2c287aee4788595fa718a94fea392937215f420 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 20 Jul 2009 20:35:15 +0000
Subject: [PATCH] add 'other-authors' to generetae et al., fix no-author
 citations

svn: r15507
---
 collects/scriblib/autobib.ss                | 53 +++++++++++++++------
 collects/scriblib/scribblings/autobib.scrbl |  6 +++
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/collects/scriblib/autobib.ss b/collects/scriblib/autobib.ss
index 29e0461d47..e2faeb514a 100644
--- a/collects/scriblib/autobib.ss
+++ b/collects/scriblib/autobib.ss
@@ -9,7 +9,7 @@
          make-bib in-bib (rename-out [auto-bib? bib?])
          proceedings-location journal-location book-location 
          techrpt-location dissertation-location
-         author-name org-author-name authors editor)
+         author-name org-author-name authors other-authors editor)
 
 (define (autobib-style-extras)
   (let ([abs (lambda (s)
@@ -20,6 +20,7 @@
 (define-struct bib-group (ht))
 
 (define-struct (author-element element) (names cite))
+(define-struct (other-author-element author-element) ())
          
 (define (add-cite group bib-entry which)
   (hash-set! (bib-group-ht group) bib-entry #t)
@@ -47,10 +48,12 @@
                       (loop (cdr keys))))))
          ")")))
 
+(define (extract-bib-key b)
+  (author-element-names (auto-bib-author b)))
+
 (define (gen-bib tag group)
   (let* ([author<? (lambda (a b)
-                     (string<? (author-element-names (auto-bib-author a))
-                               (author-element-names (auto-bib-author b))))]
+                     (string<? (extract-bib-key a) (extract-bib-key b)))]
          [bibs (sort (hash-map (bib-group-ht group)
                                (lambda (k v) k))
                      author<?)])
@@ -108,24 +111,33 @@
     (define (generate-bibliography #:tag [tag "doc-bibliography"])
       (gen-bib tag group))))
 
+(define (ends-in-punc? e)
+  (regexp-match? #rx"[.!?,]$" (element->string e)))
+
 (define (make-bib #:title title	 	 	 	 
                   #:author [author #f]
                   #:is-book? [is-book? #f]
                   #:location [location #f]
                   #:date [date #f]
                   #:url [url #f])
-  (let* ([author (if (author-element? author)
-                     author
-                     (parse-author author))]
+  (let* ([author (cond
+                  [(not author) #f]
+                  [(author-element? author) author]
+                  [else (parse-author author)])]
          [elem (make-element
                 "bibentry"
                 (append
-                 (if author `(,@(decode-content (list author)) ". ") null)
+                 (if author 
+                     `(,author
+                       ,@(if (ends-in-punc? author)
+                             '(" ")
+                             '(". ")))
+                     null)
                  ;; (if is-book? null '(ldquo))
                  (if is-book?
                      (list (italic title))
                      (decode-content (list title)))
-                 (if (regexp-match? #rx"[.!?,]$" (element->string title))
+                 (if (ends-in-punc? title)
                      null
                      '("."))
                  ;; (if is-book? null '(rdquo))
@@ -135,7 +147,7 @@
                  (if date `(" " ,@(decode-content (list date)) ".") null)
                  (if url `(" " ,(link url (make-element 'url (list url)))) null)))])
     (make-auto-bib
-     author
+     (or author (org-author-name title))
      date 
      elem
      (element->string elem)
@@ -244,6 +256,13 @@
    org
    org))
 
+(define (other-authors)
+  (make-other-author-element
+   #f
+   (list "Alia")
+   "al."
+   "al."))
+
 (define (authors name . names)
   (let ([names (map parse-author (cons name names))])
     (make-author-element
@@ -252,8 +271,12 @@
        (if (null? (cdr names))
            (case prefix
              [(0) (list (car names))]
-             [(1) (list " and " (car names))]
-             [else (list ", and " (car names))])
+             [(1) (if (other-author-element? (car names))
+                      (list " et al.")
+                      (list " and " (car names)))]
+             [else (if (other-author-element? (car names))
+                       (list ", et al.")
+                       (list ", and " (car names)))])
            (case prefix
              [(0) (list* (car names)
                          (loop (cdr names) (add1 prefix)))]
@@ -263,9 +286,11 @@
      (string-join (map author-element-names names) " / ")
      (case (length names)
        [(1) (author-element-cite (car names))]
-       [(2) (format "~a and ~a" 
-                    (author-element-cite (car names))
-                    (author-element-cite (cadr names)))]
+       [(2) (if (other-author-element? (cadr names))
+                (format "~a et al." (author-element-cite (car names)))
+                (format "~a and ~a" 
+                        (author-element-cite (car names))
+                        (author-element-cite (cadr names))))]
        [else (format "~a et al." (author-element-cite (car names)))]))))
 
 (define (editor name)
diff --git a/collects/scriblib/scribblings/autobib.scrbl b/collects/scriblib/scribblings/autobib.scrbl
index f74bbdccdd..60cb963477 100644
--- a/collects/scriblib/scribblings/autobib.scrbl
+++ b/collects/scriblib/scribblings/autobib.scrbl
@@ -137,6 +137,12 @@ parsed in the same way as by @scheme[make-bib].}
 Converts an element for an organization name to one suitable for use
 as a bib-value author.}
 
+@defproc[(other-authors) element?]{
+
+Generates an element that is suitable for use as a ``others'' author.
+When combined with another author element via @scheme[authors], the
+one created by @scheme[other-authors] renders as ``et al.''}
+
 @defproc[(editor [name name/c]) element?]{
 
 Takes an author-name element and create one that represents the editor