started reworking the FONTUSAGE code.

[swftools.git] / lib / rfxswf.h

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 85b0c98..d9a5848 100644 (file)
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -491,6 +491,11 @@ typedef struct
   SHAPE *     shape;
 } SWFGLYPH;
 
+typedef struct _FONTUSAGE
+{ int* chars;
+  char is_reduced;
+} FONTUSAGE, * LPFONTUSAGE;
+
 #define FONT_STYLE_BOLD 1
 #define FONT_STYLE_ITALIC 2
 #define FONT_ENCODING_UNICODE 1
@@ -513,12 +518,11 @@ typedef struct _SWFFONT
   SWFGLYPH *   glyph;
   U8           language;
   char **      glyphnames;
+
+  FONTUSAGE *   use;
+
 } SWFFONT, * LPSWFFONT;
 
-// does not support wide characters !
-typedef struct _FONTUSAGE
-{ U8* code;
-} FONTUSAGE, * LPFONTUSAGE;
 
 #define ET_HASTEXT 32768
 #define ET_WORDWRAP 16384
@@ -557,10 +561,11 @@ int swf_FontIsItalic(SWFFONT * f);
 int swf_FontIsBold(SWFFONT * f);
 
 int swf_FontSetID(SWFFONT * f,U16 id);
-int swf_FontReduce(SWFFONT * f,FONTUSAGE * use);
+int swf_FontReduce(SWFFONT * f);
 
-int swf_FontInitUsage(SWFFONT * f,FONTUSAGE * use);
-int swf_FontUse(SWFFONT* f,FONTUSAGE * use,U8 * s);
+int swf_FontInitUsage(SWFFONT * f);
+int swf_FontUseGlyph(SWFFONT * f, int glyph);
+int swf_FontUse(SWFFONT* f,U8 * s);
 
 int swf_FontSetDefine(TAG * t,SWFFONT * f);
 int swf_FontSetDefine2(TAG * t,SWFFONT * f);
@@ -602,7 +607,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename);
 SWFFONT* swf_LoadT1Font(char*filename);
 SWFFONT* swf_LoadFont(char*filename);
 
-void swf_SetLoadFontParameters(int scale, int skip_unused);
+void swf_SetLoadFontParameters(int scale, int skip_unused, int full_unicode);
 
 // swfdump.c