X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=47365137d87d6cfbf21b41d17e85d99c618ac384;hb=47959de33e640212bf416d46c4069d1d25cb4643;hp=d52192af9d7700ce43cccdfbb1d5f1d954c08cc4;hpb=ece0945146eafffb2113fc58a8898c0d49ebd2c1;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index d52192a..4736513 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -230,13 +230,6 @@ int   swf_SetRGBA(TAG * t,RGBA * col);
 
 // Advanced Funtions
 
-// swfdump.c
-
-void swf_DumpHeader(FILE * f,SWF * swf);
-void swf_DumpMatrix(FILE * f,MATRIX * m);
-void swf_DumpTag(FILE * f,TAG * t); 
-char* swf_TagGetName(TAG*tag);
-
 // swfshape.c
 
 typedef struct _LINESTYLE
@@ -306,33 +299,40 @@ int   swf_ShapeSetEnd(TAG * t);
 
 // does not support wide characters !
 
-#define MAX_CHAR_PER_FONT 256
+#define MAX_CHAR_PER_FONT 512
+
+typedef struct _KERNING
+{
+  U16	      char1;
+  U16	      char2;
+  U16	      adjustment;
+} SWFKERNING;
 
 typedef struct _SWFLAYOUT
-{ S16         ascent;
-  S16         descent;
-  S16         leading;
-  SRECT       bounds[MAX_CHAR_PER_FONT];
-  struct
-  { U16       count;
-    U8 *      data;  // size = count*4 bytes
-  } kerning;
+{ S16          ascent;
+  S16          descent;
+  S16          leading;
+  SRECT      * bounds;
+  U16	       kerningcount;
+  SWFKERNING * kerning;
 } SWFLAYOUT, * LPSWFLAYOUT;
 
+typedef struct
+{ S16         advance;
+  SHAPE *     shape;
+} SWFGLYPH;
+
 typedef struct _SWFFONT
-{ U16           id;
+{ int		id; // -1 = not set
+  U8		version; // 0 = not set, 1 = definefont, 2 = definefont2
   U8 *          name;
   SWFLAYOUT *   layout;
-
+  U16		numchars;
+  U16		maxascii; // highest mapped ascii value
   U8            flags; // bold/italic/unicode/ansi ...
-
-  U16           codes[MAX_CHAR_PER_FONT];
-  
-  struct
-  { U16         advance;
-    U16         gid;            // Glyph-ID after DefineFont
-    SHAPE *     shape;
-  }             glyph[MAX_CHAR_PER_FONT];
+  U16	*	glyph2ascii;
+  int	*	ascii2glyph;
+  SWFGLYPH *	glyph;
 } SWFFONT, * LPSWFFONT;
 
 typedef struct _FONTUSAGE
@@ -358,10 +358,11 @@ int swf_FontUse(FONTUSAGE * use,U8 * s);
 int swf_FontSetDefine(TAG * t,SWFFONT * f);
 int swf_FontSetInfo(TAG * t,SWFFONT * f);
 
+// the following two functions are obsolete and will be removed soon
 int swf_FontExport(int handle,SWFFONT * f);
 int swf_FontImport(int handle,SWFFONT * * f);
 
-void swf_WriteFont(SWFFONT* font, char* filename, int useDefineFont2);
+void swf_WriteFont(SWFFONT* font, char* filename);
 SWFFONT* swf_ReadFont(char* filename);
 
 void swf_FontFree(SWFFONT * f);
@@ -375,6 +376,13 @@ int swf_TextSetCharRecord(TAG * t,SWFFONT * font,U8 * s,int scale,U8 gbits,U8 ab
 int swf_TextPrintDefineText(TAG * t,SWFFONT * f);
 // Prints text defined in tag t with font f to stdout
 
+// swfdump.c
+
+void swf_DumpHeader(FILE * f,SWF * swf);
+void swf_DumpMatrix(FILE * f,MATRIX * m);
+void swf_DumpTag(FILE * f,TAG * t); 
+char* swf_TagGetName(TAG*tag);
+void swf_DumpFont(SWFFONT * font);
 
 // swfobject.c
 
@@ -479,8 +487,9 @@ void swf_uncgi();  // same behaviour as Steven Grimm's uncgi-library
 
 // swfaction.c
 
-ActionTAG* swf_GetActions(TAG*tag);
-void swf_SetActions(TAG*tag, ActionTAG*actions);
+ActionTAG* swf_ActionGet(TAG*tag);
+void swf_ActionFree(ActionTAG*tag);
+void swf_ActionSet(TAG*tag, ActionTAG*actions);
 void swf_DumpActions(ActionTAG*atag, char*prefix);
 void swf_ActionEnumerateURLs(ActionTAG*atag, char*(*callback)(char*));
 void swf_ActionEnumerateTargets(ActionTAG*atag, char*(*callback)(char*));