SF.net SVN: matplotlib:[8186] trunk/matplotlib/ttconv/pprdrv_tt.cpp

[<md...@us...>]

Revision: 8186
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8186&view=rev
Author:   mdboom
Date:     2010-03-09 21:09:51 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
Fix PS Type 3 font output -- the custom encoding seems to cause more trouble than it's worth.

Modified Paths:
--------------
    trunk/matplotlib/ttconv/pprdrv_tt.cpp

Modified: trunk/matplotlib/ttconv/pprdrv_tt.cpp
===================================================================
--- trunk/matplotlib/ttconv/pprdrv_tt.cpp	2010-03-09 15:44:16 UTC (rev 8185)
+++ trunk/matplotlib/ttconv/pprdrv_tt.cpp	2010-03-09 21:09:51 UTC (rev 8186)
@@ -420,19 +420,21 @@
 -------------------------------------------------------------*/
 void ttfont_encoding(TTStreamWriter& stream, struct TTFONT *font, std::vector<int>& glyph_ids, font_type_enum target_type)
     {
-        if (target_type == PS_TYPE_3) {
-            stream.printf("/Encoding [ ");
+        stream.putline("/Encoding ISOLatin1Encoding def");
 
-            for (std::vector<int>::const_iterator i = glyph_ids.begin();
-                 i != glyph_ids.end(); ++i) {
-                const char* name = ttfont_CharStrings_getname(font, *i);
-                stream.printf("/%s ", name);
-            }
+        // if (target_type == PS_TYPE_3) {
+        //     stream.printf("/Encoding [ ");
 
-            stream.printf("] def\n");
-        } else {
-            stream.putline("/Encoding StandardEncoding def");
-        }
+        //     for (std::vector<int>::const_iterator i = glyph_ids.begin();
+        //          i != glyph_ids.end(); ++i) {
+        //         const char* name = ttfont_CharStrings_getname(font, *i);
+        //         stream.printf("/%s ", name);
+        //     }
+
+        //     stream.printf("] def\n");
+        // } else {
+        //     stream.putline("/Encoding StandardEncoding def");
+        // }
     } /* end of ttfont_encoding() */
 
 /*-----------------------------------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.