Minor fixes.

[librarian.git] / librarian / functions.py

diff --git a/librarian/functions.py b/librarian/functions.py
index e5023b3..659bb94 100644 (file)
--- a/librarian/functions.py
+++ b/librarian/functions.py
@@ -7,6 +7,7 @@ from lxml import etree
 import re
 
 from librarian.dcparser import Person
 import re
 
 from librarian.dcparser import Person

+from librarian import get_resource

 
 def _register_function(f):
     """ Register extension function with lxml """
 
 def _register_function(f):
     """ Register extension function with lxml """


@@ -14,7 +15,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 +92,7 @@ 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)
 
 


@@ -103,5 +103,42 @@ def reg_texcommand():
             text = ''.join(text)
         return re.sub(r'[^a-zA-Z]', '', text).strip()
     _register_function(texcommand)
             text = ''.join(text)
         return re.sub(r'[^a-zA-Z]', '', text).strip()
     _register_function(texcommand)

-
+    
+def reg_lang_code_3to2():
+       def lang_code_3to2(context, text):
+               """Convert 3-letter language code to 2-letter code"""
+               result = ''
+               text = ''.join(text)
+               with open(get_resource('res/ISO-639-2_8859-1.txt'), 'rb') as f:
+                       for line in f:
+                               list = line.strip().split('|')
+                               if list[0] == text:
+                                       result=list[2]
+               if result == '':
+                       return text
+               else:
+                       return result
+       _register_function(lang_code_3to2)
+
+
+def mathml_latex(context, trees):
+    from librarian.embeds.mathml import MathML
+    text = MathML(trees[0]).to_latex().data
+    # Remove invisible multiplications, they produce unwanted spaces.
+    text = text.replace(u'\u2062', '')
+    return text
+
+def reg_mathml_latex():
+    _register_function(mathml_latex)
+
+def reg_mathml_epub(zipf):
+    from librarian.embeds.mathml import MathML
+    def mathml(context, trees):
+        data = MathML(trees[0]).to_latex().to_png().data
+        name = "math%d.png" % mathml.count
+        mathml.count += 1
+        zipf.writestr('OPS/' + name, data)
+        return name
+    mathml.count = 0
+    _register_function(mathml)