X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/33165a21eb5b83f96d73e616414a1ee9e7227013..780d938ad20fe8e46f828fd167afdc076c31c28c:/librarian/functions.py

diff --git a/librarian/functions.py b/librarian/functions.py
index e5023b3..4974f0d 100644
--- a/librarian/functions.py
+++ b/librarian/functions.py
@@ -5,6 +5,7 @@
 #
 from lxml import etree
 import re
+from urllib import quote
 
 from librarian.dcparser import Person
 
@@ -14,7 +15,7 @@ def _register_function(f):
     ns[f.__name__] = f
 
 
-def reg_substitute_entities(): 
+def reg_substitute_entities():
     ENTITY_SUBSTITUTIONS = [
         (u'---', u'—'),
         (u'--', u'–'),
@@ -91,8 +92,7 @@ def reg_person_name():
         """ Converts "Name, Forename" to "Forename Name" """
         if isinstance(text, list):
             text = ''.join(text)
-        p = Person.from_text(text)
-        return ' '.join(p.first_names + (p.last_name,))
+        return Person.from_text(text).readable()
     _register_function(person_name)
 
 
@@ -105,3 +105,32 @@ def reg_texcommand():
     _register_function(texcommand)
 
 
+def reg_urlquote():
+    def urlquote(content, text):
+        """ Quotes URLs """
+        if isinstance(text, list):
+            text = ''.join(text)
+        return quote(text.encode('utf-8'), safe="/:")
+    _register_function(urlquote)
+
+def reg_breakurl():
+    def breakurl(content, text):
+        """ Allows breaks in urls """
+        if isinstance(text, list):
+            text = ''.join(text)
+        chunks = text.split("/")
+        e = etree.Element("span")
+        e.text = chunks[0]
+        ret = etree.Element("span")
+        ret.append(e)
+        for chunk in chunks[1:]:
+            ret.append(etree.Element("span", text="/"))
+            ret[-1].text = "/"
+            ret.append(etree.Element("cmd", {"name": "linebreak"}))
+            ret[-1].append(etree.Element("opt"))
+            ret[-1][-1].text = "1"
+            ret[-1].tail = chunk
+        return ret
+        #return re.sub(r'(/)([^/])', r'\1\\-\2', text)
+    _register_function(breakurl)
+