added some more font examples

jdh2358 · jdh2358 · commit 45064c7d939f · 2005-03-30T17:57:12.000Z
svn path=/trunk/matplotlib/; revision=1111
diff --git a/examples/backend_driver.py b/examples/backend_driver.py
@@ -62,6 +62,7 @@
     'text_rotation.py',
     'text_themes.py',
     'two_scales.py',
+    'unicode_demo.py',
     'vline_demo.py',
     'zorder_demo.py',
     )
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -49,8 +49,6 @@ def _nums_to_str(*args):
 
 def quote_ps_string(s):
     "Quote dangerous characters of S for use in a PostScript string constant."
-    if isinstance(s, unicode):
-        s = s.encode('ascii', 'replace') # unicode not supported yet
     s=s.replace("\\", "\\\\")
     s=s.replace("(", "\\(")
     s=s.replace(")", "\\)")
@@ -408,9 +406,6 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
         """
         # local to avoid repeated attribute lookups
 
-        if isinstance(s, unicode):
-            self.draw_unicode(gc, x, y, s, prop, angle)
-            return
         
         write = self._pswriter.write
         if debugPS:
@@ -451,10 +446,12 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
     """ % locals()
             self._draw_ps(ps, gc, None)
 
-        else:
-            if ismath:
-                return self.draw_mathtext(gc, x, y, s, prop, angle)
+        elif ismath:
+            return self.draw_mathtext(gc, x, y, s, prop, angle)
 
+        elif isinstance(s, unicode):
+            return self.draw_unicode(gc, x, y, s, prop, angle)
+        else:
             font = self._get_font_ttf(prop)
             font.set_text(s,0)
 

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@`
`62`	`62`	`'text_rotation.py',`
`63`	`63`	`'text_themes.py',`
`64`	`64`	`'two_scales.py',`
	`65`	`+ 'unicode_demo.py',`
`65`	`66`	`'vline_demo.py',`
`66`	`67`	`'zorder_demo.py',`
`67`	`68`	`)`