src/reportlab/lib/rl_accel.py
branchpy33
changeset 3727 67e69a84138b
parent 3725 ca840494f9dd
child 3731 b233dd0577ff
--- a/src/reportlab/lib/rl_accel.py	Tue Apr 30 14:39:22 2013 +0100
+++ b/src/reportlab/lib/rl_accel.py	Sat Feb 23 19:12:41 2013 +0000
@@ -30,11 +30,10 @@
     def fp_str(*a):
         return _FP_STR(*a).replace(',','.')
 
-def unicode2T1(utext,fonts,font0=None):
+def unicode2T1(utext,fonts):
     '''return a list of (font,string) pairs representing the unicode text'''
     R = []
     font, fonts = fonts[0], fonts[1:]
-    if font0 is None: font0 = font
     enc = font.encName
     if 'UCS-2' in enc:
         enc = 'UTF16'
@@ -51,9 +50,9 @@
             if i0:
                 R.append((font,utext[:i0].encode(enc)))
             if fonts:
-                R.extend(unicode2T1(utext[i0:il],fonts,font0))
+                R.extend(unicode2T1(utext[i0:il],fonts))
             else:
-                R.append((font0._notdefFont,font0._notdefChar*(il-i0)))
+                R.append((font._notdefFont,font._notdefChar*(il-i0)))
             utext = utext[il:]
     return R