Merge branch 'master' of github.com:fnp/librarian into pretty

[librarian.git] / librarian / functions.py

diff --git a/librarian/functions.py b/librarian/functions.py
index 5ad723d..523b3d5 100644 (file)
--- a/librarian/functions.py
+++ b/librarian/functions.py
@@ -14,7 +14,7 @@ def _register_function(f):
     ns[f.__name__] = f
 
 
     ns[f.__name__] = f
 
 

-def reg_substitute_entities(): 
+def reg_substitute_entities():

     ENTITY_SUBSTITUTIONS = [
         (u'---', u'—'),
         (u'--', u'–'),
     ENTITY_SUBSTITUTIONS = [
         (u'---', u'—'),
         (u'--', u'–'),


@@ -91,8 +91,16 @@ def reg_person_name():
         """ Converts "Name, Forename" to "Forename Name" """
         if isinstance(text, list):
             text = ''.join(text)
         """ 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)
 
 
     _register_function(person_name)
 
 

+def reg_texcommand():
+    def texcommand(context, text):
+        """Remove non-letters"""
+        if isinstance(text, list):
+            text = ''.join(text)
+        return re.sub(r'[^a-zA-Z]', '', text).strip()
+    _register_function(texcommand)
+
+