Merge lp:~kifcaliph/openobject-server/openobject-server into lp:openobject-server

[kifcaliph]

this is some modification to enable RTL languages to work with Openerp in PDF reports, without this modifications RTL languages may appear something like this "prenepO" for word Openerp.

Unmerged revisions

4129. By kifcaliph <kifcaliph@kifcaliph> on 2012-04-07

Enabling RTL languages to work

4128. By kifcaliph on 2012-04-05

These modification to make Openerp to expor pdf documents for RTL languages like Arabic

=== modified file 'openerp/report/render/rml2pdf/__init__.py'
--- openerp/report/render/rml2pdf/__init__.py	2011-11-22 08:58:48 +0000
+++ openerp/report/render/rml2pdf/__init__.py	2012-04-08 03:03:21 +0000
@@ -19,9 +19,43 @@
 #
 ##############################################################################
 
+
+# file location /openerp/report/render/rml2pdf
+
+
+import os, stat
+from reportlab import rl_config
+from reportlab.pdfbase import pdfmetrics
+from reportlab.pdfbase import ttfonts
+from reportlab.lib.fonts import addMapping
+
+def rl_isreg(filename, dirname):
+    try:
+        st = os.stat(os.path.join(dirname, filename))
+    except OSError, reason:
+        if reason.errno == 2:
+            return False
+        raise
+    return stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)
+
+for dirname in rl_config.TTFSearchPath:
+    for root, dirs, files in os.walk(dirname): #@UnusedVariable
+        for file in [x for x in files
+                     if x.lower().endswith('.ttf') and rl_isreg(x, root)
+                     ]:
+            filename = os.path.join(root, file)
+            try:
+                face = ttfonts.TTFontFace(filename)
+                face.extractInfo(1)
+                pdfmetrics.registerFont(ttfonts.TTFont(face.name, filename, asciiReadable=0))
+                addMapping(face.familyName, face.bold, face.italic, face.name)
+            except:
+                pass
+
+
 from trml2pdf import parseString, parseNode
 
 #.apidoc title: RML to PDF engine
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
--- openerp/report/render/rml2pdf/trml2pdf.py	2012-02-08 01:36:17 +0000
+++ openerp/report/render/rml2pdf/trml2pdf.py	2012-04-08 03:03:21 +0000
@@ -624,7 +624,7 @@
             if not n.tag == 'bullet':
                 txt_n.text = utils.xml2str(self._textual(n))
             txt_n.tail = n.tail and utils.xml2str(utils._process_text(self, n.tail.replace('\n',''))) or ''
-            rc1 += etree.tostring(txt_n)
+            rc1 += etree.tostring(txt_n, encoding = unicode)
         return rc1
 
     def _table(self, node):
@@ -968,7 +968,41 @@
             fis.append(PageCount())
             self.doc_tmpl.build(fis)
 
+def changeFonts(data):
+    fontmap = {
+        'Times-Roman':                   'DejaVuSerif',
+        'Times-BoldItalic':              'DejaVuSerif-BoldItalic',
+        'Times-Bold':                    'DejaVuSerif-Bold',
+        'Times-Italic':                  'DejaVuSerif-Italic',
+
+        'Helvetica':                     'DejaVuSans',
+        'Helvetica-BoldItalic':          'DejaVuSans-BoldOblique',
+        'Helvetica-Bold':                'DejaVuSans-Bold',
+        'Helvetica-Italic':              'DejaVuSans-Oblique',
+
+        'Courier':                       'DejaVuSansMono',
+        'Courier-Bold':                  'DejaVuSansMono-Bold',
+        'Courier-BoldItalic':            'DejaVuSansMono-BoldOblique',
+        'Courier-Italic':                'DejaVuSansMono-Oblique',
+
+        'Helvetica-ExtraLight':          'DejaVuSans-ExtraLight',
+
+        'TimesCondensed-Roman':          'DejaVuSerifCondensed',
+        'TimesCondensed-BoldItalic':     'DejaVuSerifCondensed-BoldItalic',
+        'TimesCondensed-Bold':           'DejaVuSerifCondensed-Bold',
+        'TimesCondensed-Italic':         'DejaVuSerifCondensed-Italic',
+
+        'HelveticaCondensed':            'DejaVuSansCondensed',
+        'HelveticaCondensed-BoldItalic': 'DejaVuSansCondensed-BoldOblique',
+        'HelveticaCondensed-Bold':       'DejaVuSansCondensed-Bold',
+        'HelveticaCondensed-Italic':     'DejaVuSansCondensed-Oblique',
+    }
+    for old, new in fontmap.iteritems():
+        data = data.replace('"'+old+'"', '"'+new+'"')
+    return data
+
 def parseNode(rml, localcontext=None, fout=None, images=None, path='.', title=None):
+    rml = changeFonts(rml)
     node = etree.XML(rml)
     r = _rml_doc(node, localcontext, images, path, title=title)
     #try to override some font mappings
@@ -986,6 +1020,7 @@
     return fp.getvalue()
 
 def parseString(rml, localcontext=None, fout=None, images=None, path='.', title=None):
+    rml = changeFonts(rml)
     node = etree.XML(rml)
     r = _rml_doc(node, localcontext, images, path, title=title)