gnunetbib

commit 00ef12e8350f96ce6fe70a2d782b2e0ec5f9c950
parent 73a964b55938a5c18ee2b1416e9b5b9a8f7fe7c5
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 20 May 2003 19:25:36 +0000

Recognize bad proceedings; get dashes right; get pages right.


svn:r20

Diffstat:
M
BibTeX.py
 | 
23
++++++++++++++++-------

1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/BibTeX.py b/BibTeX.py
@@ -255,6 +255,13 @@ class BibTeXEntry:
                    self.get(field).startswith("<span class='bad'>"):
                 errs.append("ERROR: %s has no %s field" % (self.key, field))
                 self.entries[field] = "<span class='bad'>%s:??</span>"%field
+
+        if self.type == 'inproceedings':
+            if self.get("booktitle"):
+                if not self['booktitle'].startswith("Proceedings of"):
+                    errs.append("ERROR: %s's booktitle doesn't start with 'Proceedings'" % self.key)
+
+                
         for field in self.entries.keys():
             if field.startswith("www_") and field not in WWW_FIELDS:
                 errs.append("ERROR: unknown www field %s"% field)
@@ -284,9 +291,9 @@ class BibTeXEntry:
             if not self.get('pages'):
                 pass
             elif "-" in self['pages']:
-                res.append(", pages&nbsp; %s"%self['pages'])
+                res.append(", pages&nbsp;%s"%self['pages'])
             else:
-                res.append(", page&nbsp; %s"%self['pages'])
+                res.append(", page&nbsp;%s"%self['pages'])
         elif self.type == 'article':
             res = ["In "]
             if self.get('journalurl'):
@@ -302,9 +309,9 @@ class BibTeXEntry:
             if not self.get('pages'):
                 pass
             elif "-" in self['pages']:
-                res.append(", pages&nbsp; %s"%self['pages'])
+                res.append(", pages&nbsp;%s"%self['pages'])
             else:
-                res.append(", page&nbsp; %s"%self['pages'])
+                res.append(", page&nbsp;%s"%self['pages'])
         elif self.type == 'techreport':
             res = [ "%s %s %s" % (self['institution'],
                                   self.get('type', 'technical report'),
@@ -332,14 +339,14 @@ class BibTeXEntry:
             if not self.get('pages'):
                 pass
             elif "-" in self['pages']:
-                res.append(", pages&nbsp; %s"%self['pages'])
+                res.append(", pages&nbsp;%s"%self['pages'])
             else:
-                res.append(", page&nbsp; %s"%self['pages'])
+                res.append(", page&nbsp;%s"%self['pages'])
         else:
             res = ["&lt;Odd type %s&gt;"%self.type]
 
         res[0:0] = ["<span class='biblio'>"]
-        res.append("</span>")
+        res.append(".</span>")
 
         bibtexurl = "./bibtex.html#%s"%url_untranslate(self.key)
         res.append((" <span class='availability'>"
@@ -426,6 +433,8 @@ def htmlize(s):
     s = RE_TEX_CMD.sub("", s)
     s = s.translate(ALLCHARS, "{}")
     s = RE_PAGE_SPAN.sub(lambda m: "%s-%s"%(m.groups()), s)
+    s = s.replace("---", "&mdash;");
+    s = s.replace("--", "&ndash;");
     return s
 
 def htmlize_author(author):