1 files changed, 6 insertions, 2 deletions

diff --git a/BibTeX.py b/BibTeX.py
index 55609d0..091e1d8 100644
--- a/BibTeX.py
+++ b/BibTeX.py
@@ -21,6 +21,7 @@ WWW_FIELDS = [ 'www_section', 'www_important', 'www_remarks',
 
 def url_untranslate(s):
     s = s.replace(" ", "+")
+    s = s.replace(" ", "+")
     s = re.sub(r'([%<>])',
                lambda m: "%%%02x"%ord(m.group(1)),
                s)
@@ -106,9 +107,12 @@ def splitEntriesByAuthor(entries):
     for ent in entries:
         for a in ent.parsedAuthor:
             sortkey = txtize(" ".join(a.von+a.last+a.first+a.jr))
-            secname = " ".join(a.first+a.von+a.last)
+            secname = "&nbsp;".join(a.last)
+            more = a.first+a.von
+            if more:
+                secname += ",&nbsp;"+"&nbsp;".join(more)
             if a.jr:
-                secname += ", "+a.jr
+                secname += ",&nbsp;"+"&nbsp;".join(a.jr)
             secname = htmlize(secname)
             url = author_url(secname)
             if url: