Cleaned up the `biblio' modules.

git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-105

4 files changed, 13 insertions, 14 deletions

diff --git a/src/guile/skribilo/biblio/abbrev.scm b/src/guile/skribilo/biblio/abbrev.scm
index 9c88b6a..867fd53 100644
--- a/src/guile/skribilo/biblio/abbrev.scm
+++ b/src/guile/skribilo/biblio/abbrev.scm
@@ -96,7 +96,7 @@
           ((list? markup)
            (map loop markup))
           ((markup? markup)
-           (markup-body-set! markup (loop (markup-body title)))
+           (markup-body-set! markup (loop (markup-body markup)))
            markup)
           (else markup))))
 
diff --git a/src/guile/skribilo/biblio/author.scm b/src/guile/skribilo/biblio/author.scm
index c1883ee..e842780 100644
--- a/src/guile/skribilo/biblio/author.scm
+++ b/src/guile/skribilo/biblio/author.scm
@@ -20,7 +20,6 @@
 
 (define-module (skribilo biblio author)
   :use-module (srfi srfi-13)
-  :use-module (srfi srfi-14)
   :use-module (skribilo biblio abbrev)
   :autoload   (skribilo ast)     (markup-option markup-body markup-ident)
   :autoload   (skribilo lib)     (skribe-error)
@@ -58,7 +57,7 @@
   ;; return a string where author names are separated by " and " (suitable
   ;; for BibTeX).
   (string-join (comma-separated->author-list authors)
-	       " and " 'infix))
+	       " and "))
 
 
 (define (extract-first-author-name names)
@@ -72,7 +71,7 @@
    ;; Abbreviate author first names
    (let* ((components (string-split name #\space))
 	  (component-number (length components)))
-      (apply string-append
+      (string-concatenate
 	     (append
 	      (map (lambda (c)
 		      (string-append (abbreviate-word c) " "))
@@ -139,13 +138,13 @@
 			      #t))))
       (sort entries
 	    (lambda (e1 e2)
-	    (let* ((x1 (check-author e1))
-		   (x2 (check-author e2))
-		   (a1 (first-author-last-name
-			(markup-body (markup-option e1 'author))))
-		   (a2 (first-author-last-name
-			(markup-body (markup-option e2 'author)))))
-	       (string-ci<=? a1 a2))))))
+              (and (check-author e1)
+                   (check-author e2)
+                   (let* ((a1 (first-author-last-name
+                               (markup-body (markup-option e1 'author))))
+                          (a2 (first-author-last-name
+                               (markup-body (markup-option e2 'author)))))
+                     (string-ci<=? a1 a2)))))))
 
 
 ;;; arch-tag: c9a1ef10-a2cd-4a06-bd35-fbdee1abf09a
diff --git a/src/guile/skribilo/biblio/bibtex.scm b/src/guile/skribilo/biblio/bibtex.scm
index 319df1d..1008c09 100644
--- a/src/guile/skribilo/biblio/bibtex.scm
+++ b/src/guile/skribilo/biblio/bibtex.scm
@@ -1,6 +1,6 @@
 ;;; bibtex.scm  --  Handling BibTeX references.
 ;;;
-;;; Copyright 2006  Ludovic Courtès <ludovic.courtes@laas.fr>
+;;; Copyright 2006, 2007  Ludovic Courtès <ludovic.courtes@laas.fr>
 ;;;
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@
   :autoload   (skribilo engine)        (engine-filter find-engine)
   :use-module (skribilo biblio author)
   :use-module (srfi srfi-39)
+  :use-module (srfi srfi-13)
   :export     (print-as-bibtex-entry))
 
 ;;; Author:  Ludovic Courtès
@@ -67,7 +68,7 @@
 		       (id (lambda (a) a)))
 		  (if o
 		      (display
-		       (apply string-append
+		       (string-concatenate
 			      `(,@(map (if (eq? 'url opt)
 					   id filter)
 				       (cons "  " o))
diff --git a/src/guile/skribilo/biblio/template.scm b/src/guile/skribilo/biblio/template.scm
index 37eb803..5699699 100644
--- a/src/guile/skribilo/biblio/template.scm
+++ b/src/guile/skribilo/biblio/template.scm
@@ -25,7 +25,6 @@
   :use-module (srfi srfi-35)
 
   :use-module (skribilo ast)
-  :autoload   (skribilo lib)    (skribe-error)
   :autoload   (skribilo output) (output)
   :use-module (skribilo biblio)