2 files changed, 29 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b70b37..863c639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,24 @@
 # arch-tag: automatic-ChangeLog--skribilo@sv.gnu.org--2006/skribilo--devo--1.2
 #
 
+2007-08-31 17:05:55 GMT	Ludovic Court`es <ludovic.courtes@laas.fr>	patch-162
+
+    Summary:
+      biblio: Fixed default template for `book' and `inbook'.
+    Revision:
+      skribilo--devo--1.2--patch-162
+
+    * src/guile/skribilo/biblio/template.scm
+      (make-bib-entry-template/default): For `book', use `(or author
+      editor)'.  Added an `inbook' case.
+
+    modified files:
+     ChangeLog src/guile/skribilo/biblio/template.scm
+
+    new patches:
+     lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-104
+
+
 2007-08-30 16:56:46 GMT	Ludovic Court`es <ludovic.courtes@laas.fr>	patch-161
 
     Summary:
diff --git a/src/guile/skribilo/biblio/template.scm b/src/guile/skribilo/biblio/template.scm
index 5699699..cf17a92 100644
--- a/src/guile/skribilo/biblio/template.scm
+++ b/src/guile/skribilo/biblio/template.scm
@@ -153,13 +153,13 @@
               (", " month) " " year
               (", pp. " pages) "."))
     ((article)
-     `(author ". " (or title url documenturl) ". "
+     '(author ". " (or title url documenturl) ". "
               "In " journal ", " volume
               ("(" number ") ")", "
               (address ", ") month " " year ", "
               ("pp. " pages) "."))
     ((inproceedings)
-     `(author ". " (or title url documenturl) ". "
+     '(author ". " (or title url documenturl) ". "
               "In " booktitle ", "
               (series ", ")
               ("(" number ")")
@@ -167,12 +167,20 @@
               (publisher ", ")
               (month " ") year "."))
     ((book) ;; FIXME:  Title should be in italics
-     '(author ". " (or title url documenturl) ". "
+     '((or author editor)
+              ". " (or title url documenturl) ". "
               publisher
               (", " address)
               (", " month)
               ", " year
               (", pp. " pages) "."))
+    ((inbook)
+     `(author ". " (or title url documenturl) ". "
+              "In " booktitle ", " publisher
+              (", " editor " (" ,(_ "editor") ")")
+              (", " ,(_ "Chapter ") chapter)
+              (", pp. " pages) ", "
+              (month " ") year "."))
     ((phdthesis)
      `(author ". " (or title url documenturl)
               ", " ,(_ "PhD Thesis")