gnunetbib

commit ef4e6918004f447ea3f4d916452148b9fd0c606d
parent 82e2b3bae8252f3a769ee5776ca58c93d5ebc07f
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 23 Nov 2004 22:44:05 +0000

apply patch from goodell: fix ligatures and allow soft hyphens in URLs


svn:r122

Diffstat:
M
BibTeX.py
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/BibTeX.py b/BibTeX.py
@@ -564,6 +564,7 @@ class BibTeXEntry:
 def unTeXescapeURL(s):
     """Turn a URL as formatted in TeX into a real URL."""
     s = s.replace("\\_", "_")
+    s = s.replace("\\-", "")
     s = s.replace("\{}", "")
     s = s.replace("{}", "")
     return s
@@ -610,8 +611,8 @@ def htmlize(s):
     s = RE_LONE_AMP.sub(lambda m: "&%s" % m.group(1), s)
     s = RE_LONE_I.sub(lambda m: "i%s" % m.group(1), s)
     s = RE_ACCENT.sub(_unaccent, s)
-    s = RE_LIGATURE.sub(_unlig_html, s);
     s = unTeXescapeURL(s)
+    s = RE_LIGATURE.sub(_unlig_html, s);
     s = RE_TEX_CMD.sub("", s)
     s = s.translate(ALLCHARS, "{}")
     s = RE_PAGE_SPAN.sub(lambda m: "%s-%s"%(m.groups()), s)