aboutsummaryrefslogtreecommitdiff
path: root/src/guile
diff options
context:
space:
mode:
authorLudovic Court`es2007-02-05 13:40:03 +0000
committerLudovic Court`es2007-02-05 13:40:03 +0000
commit2efe70aec1e1146abdae6a007af27b3662f89338 (patch)
tree36653760ab7f6c86dbb612d292df2bdb065715c5 /src/guile
parentb4ea21167b30affccc43d5e398f369c319c6f9a5 (diff)
downloadskribilo-2efe70aec1e1146abdae6a007af27b3662f89338.tar.gz
skribilo-2efe70aec1e1146abdae6a007af27b3662f89338.tar.lz
skribilo-2efe70aec1e1146abdae6a007af27b3662f89338.zip
Cleaned up the default bibliography template.
* src/guile/skribilo/biblio/template.scm (make-bib-entry-template/default): Cleaned up. Produces better output. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-14
Diffstat (limited to 'src/guile')
-rw-r--r--src/guile/skribilo/biblio/template.scm45
1 files changed, 26 insertions, 19 deletions
diff --git a/src/guile/skribilo/biblio/template.scm b/src/guile/skribilo/biblio/template.scm
index 0917a93..02b4e76 100644
--- a/src/guile/skribilo/biblio/template.scm
+++ b/src/guile/skribilo/biblio/template.scm
@@ -141,14 +141,16 @@
(case kind
((techreport)
`(author ". " (or title url documenturl) ". "
- ,(_ "Technical Report") " " number ", " institution ", "
- address ", " month " " year ", "
- ("pp. " pages) "."))
+ ,(_ "Technical Report") " " number
+ (", " institution)
+ (", " address)
+ (", " month) " " year
+ (", pp. " pages) "."))
((article)
`(author ". " (or title url documenturl) ". "
"In " journal ", " volume
- ("(" number ")") ", "
- address ", " month " " year ", "
+ ("(" number ") ")", "
+ (address ", ") month " " year ", "
("pp. " pages) "."))
((inproceedings)
`(author ". " (or title url documenturl) ". "
@@ -156,28 +158,33 @@
(series ", ")
("(" number ")")
("pp. " pages ", ")
- ("" publisher ", ")
- ;; FIXME: Addr., month.
- year "."))
+ (publisher ", ")
+ (month " ") year "."))
((book) ;; FIXME: Title should be in italics
'(author ". " (or title url documenturl) ". "
- publisher ", " address
- ", " month " " year ", "
+ publisher
+ (", " address)
+ (", " month)
+ (if month " " ", ") year ", "
("pp. " pages) "."))
((phdthesis)
- '(author ". " (or title url documenturl)
- ". " type ", "
- school ", " address
- ", " month " " year"."))
+ `(author ". " (or title url documenturl)
+ ", " ,(_ "PhD Thesis")
+ (", " (or school institution))
+ (", " address)
+ (", " month)
+ (if month " " ", ") year "."))
((misc)
'(author ". " (or title url documenturl) ". "
- publisher ", " address
- ", " month " " year
- (", " url) "."))
+ (publisher ", ")
+ (address ", ")
+ (month " ") year ". "
+ (url ".")))
(else
'(author ". " (or title url documenturl) ". "
- publisher ", " address
- ", " month " " year ", "
+ (publisher ", ")
+ (address ", ")
+ (month " ") year ", "
("pp. " pages) "."))))
(define (make-bib-entry-template/skribe kind)