X-Git-Url: https://git.sthu.org/?p=shutils.git;a=blobdiff_plain;f=bib2html.py;h=64286f25ed25a3c513164c6481194e67f8280be2;hp=b1ba7613da248acabb9b84d5ca51cae378f143ab;hb=HEAD;hpb=9b52797ddadf989219c0f1677ee4f403a1e31030

diff --git a/bib2html.py b/bib2html.py
index b1ba761..ae64a1c 100755
--- a/bib2html.py
+++ b/bib2html.py
@@ -44,7 +44,7 @@ def format_latex(text):
         '\\"a': 'ä',
         '\\"o': 'ö',
         '\\"u': 'u',
-        '\mathcal': '',
+        '\\mathcal': '',
         '{': '',
         '}': '',
         '\\': '',
@@ -76,7 +76,9 @@ def format_authors(entry):
 
 def format_details_article(entry):
 
-    where = format_field(entry, 'journal')
+    where = format_field(entry, 'journaltitle')
+    if where == "":
+        where = format_field(entry, 'journal')
 
     line = []
     line.append(format_field(entry, 'pages', pre='pp. '))
@@ -103,6 +105,21 @@ def format_details_inproceedings(entry):
     line = filter(lambda l: l != "", line)
     return [where, ", ".join(line)]
 
+def format_details_incollection(entry):
+    where = format_field(entry, 'booktitle')
+
+    line = []
+    line.append(format_field(entry, 'publisher'))
+    line.append(format_field(entry, 'pages', pre='pp. '))
+    line.append(format_field(entry, 'address'))
+    line.append(format_field(entry, 'month', post=' ') + \
+            format_field(entry, 'year'))
+    line.append(format_field(entry, 'isbn', pre='ISBN '))
+    line.append(format_field(entry, 'note'))
+
+    line = filter(lambda l: l != "", line)
+    return [where, ", ".join(line)]
+
 def format_details_thesis(entry):
     line = []
     line.append(format_field(entry, 'school'))
@@ -153,6 +170,8 @@ def format_entry(entry):
         lines.extend(format_details_article(entry))
     elif entry.type=='inproceedings':
         lines.extend(format_details_inproceedings(entry))
+    elif entry.type=='incollection':
+        lines.extend(format_details_incollection(entry))
     elif entry.type=='book':
         lines.extend(format_details_book(entry))
     elif entry.type=='patent':