Fix verse numbering.

[librarian.git] / librarian / embeds / mathml.py

diff --git a/librarian/embeds/mathml.py b/librarian/embeds/mathml.py
index dd78f05..564a9f4 100644 (file)
--- a/librarian/embeds/mathml.py
+++ b/librarian/embeds/mathml.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+from __future__ import unicode_literals
+

 from lxml import etree
 from lxml import etree

+import six

 from librarian import get_resource
 from . import TreeEmbed, create_embed, downgrades_to
 
 from librarian import get_resource
 from . import TreeEmbed, create_embed, downgrades_to
 


@@ -7,6 +10,17 @@ from . import TreeEmbed, create_embed, downgrades_to
 class MathML(TreeEmbed):
     @downgrades_to('application/x-latex')
     def to_latex(self):
 class MathML(TreeEmbed):
     @downgrades_to('application/x-latex')
     def to_latex(self):

+        """
+        >>> print(MathML(etree.fromstring('<mat>a &lt; b</mat>')).to_latex().data.strip())
+        a < b
+
+        >>> print(MathML(etree.fromstring('<mat>&lt; &amp; &amp;lt; &#65;</mat>')).to_latex().data.strip())
+        < & &lt; A
+
+        """

         xslt = etree.parse(get_resource('res/embeds/mathml/mathml2latex.xslt'))
         output = self.tree.xslt(xslt)
         xslt = etree.parse(get_resource('res/embeds/mathml/mathml2latex.xslt'))
         output = self.tree.xslt(xslt)

-        return create_embed('application/x-latex', data=unicode(output))
+        text = six.text_type(output)
+        # Workaround for entities being preserved in output. But there should be a better way.
+        text = text.replace('&lt;', '<').replace('&amp;', '&')
+        return create_embed('application/x-latex', data=text)