if font encoding is not unicode, try glyph[ascii2glyph[c]] before glyph[c]

in getCharID().

diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc
index 5d1c10f..25fa510 100644 (file)
--- a/pdf2swf/swfoutput.cc
+++ b/pdf2swf/swfoutput.cc
@@ -1167,11 +1167,6 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u)
        }
     }
 
-    if(charnr>=0 && charnr<font->numchars) {
-       msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr);
-       return charnr;
-    }
-
     if(font->encoding != FONT_ENCODING_UNICODE) {
        /* the following only works if the font encoding
           is US-ASCII based. It's needed for fonts which return broken unicode
@@ -1180,8 +1175,13 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u)
            msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, font->ascii2glyph[charnr]);
            return font->ascii2glyph[charnr];
        }
+    } 
+    
+    if(charnr>=0 && charnr<font->numchars) {
+       msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr);
+       return charnr;
     }
-
+    
     return -1;
 }