gnunetbib

commit 7c1e1ea1cab65599cffabb15c3048706f7ab344b
parent 2bdc5e059454d9c76d864fd8aa51fb9d98ab0f2e
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  8 Jun 2012 14:18:41 -0400

Bang on the scripts until the W3C validator is happy

Apparently our output was trying to be XHTML 1.0 transitional. Now,
it actually is.

Diffstat:
M
BibTeX.py
 | 
7
+++++--
M
anonbib.bib
 | 
2
+-
M
rank.py
 | 
2
++

3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/BibTeX.py b/BibTeX.py
@@ -34,9 +34,10 @@ WWW_FIELDS = [ 'www_section', 'www_important', 'www_remarks',
 
 def url_untranslate(s):
     """Change a BibTeX key into a string suitable for use in a URL."""
-    s = re.sub(r'([%<>, _])',
+    s = re.sub(r'([%<>`#, &_\';])',
                lambda m: "_%02x"%ord(m.group(1)),
                s)
+    s = s.replace("/",":")
     return s
 
 class ParseError(Exception):
@@ -328,6 +329,7 @@ class BibTeXEntry:
             if np:
                 d.append("%%%%% "+("ERROR: Non-ASCII characters: '%r'\n"%np))
             d.append("  ")
+            v = v.replace("&", "&amp;")
             if invStrings.has_key(v):
                 s = "%s = %s,\n" %(f, invStrings[v])
             else:
@@ -572,6 +574,7 @@ class BibTeXEntry:
                     url = self.get(key)
                     if not url: continue
                 url = unTeXescapeURL(url)
+                url = url.replace('&', '&amp;')
                 availability.append('<a href="%s">%s</a>' %(url,name))
 
             if availability:
@@ -603,7 +606,7 @@ class BibTeXEntry:
         res.append("</p>")
 
         if self.get('www_remarks'):
-            res.append("<p class='remarks'>%s</span>"%htmlize(
+            res.append("<p class='remarks'>%s</p>"%htmlize(
                 self['www_remarks']))
 
         if imp or draft:
diff --git a/anonbib.bib b/anonbib.bib
@@ -4300,7 +4300,7 @@ Omer Reingold",
 }
 
 @inproceedings{ccsw09-fingerprinting,
-  title = {Website fingerprinting: attacking popular privacy enhancing technologies with the multinomial na\"\{\i}ve-bayes classifier},
+  title = {Website fingerprinting: attacking popular privacy enhancing technologies with the multinomial na\"{\i}ve-bayes classifier},
   author = {Dominik Herrmann and Rolf Wendolsky and Hannes Federrath},
   booktitle = {Proceedings of the 2009 ACM workshop on Cloud computing security (CCSW '09)},
   year = {2009},
diff --git a/rank.py b/rank.py
@@ -116,6 +116,8 @@ def get_rank_html(title, years=None, base_url=".", update=True,
 
    html = ''
 
+   url = url.replace("&","&amp;")
+
    # Hotness
    H,h = 50,5
    if s >= H: