Menu
▾
▴
[Silgraphite-cvs] silgraphite/contrib/pangomod fontconfig-cvs.diff,NONE,1.1 README,1.1,1.2 fontconfig.diff,1.1,1.2
|
From: <sil...@li...> - 2004-10-22 10:24:37
|
Update of /cvsroot/silgraphite/silgraphite/contrib/pangomod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2155 Modified Files: README fontconfig.diff Added Files: fontconfig-cvs.diff Log Message: The fontconfig release and CVS patches need to be different --- NEW FILE: fontconfig-cvs.diff --- Index: fontconfig/fontconfig.h =================================================================== RCS file: /cvs/fontconfig/fontconfig/fontconfig/fontconfig.h,v retrieving revision 1.56 diff -u -w -u -w -r1.56 fontconfig.h --- fontconfig/fontconfig.h 30 Jun 2004 20:06:41 -0000 1.56 +++ fontconfig/fontconfig.h 21 Oct 2004 16:22:04 -0000 @@ -89,6 +89,7 @@ #define FC_CHARSET "charset" /* CharSet */ #define FC_LANG "lang" /* String RFC 3066 langs */ #define FC_FONTVERSION "fontversion" /* Int from 'head' table */ +#define FC_CAPABILITY "capability" /* String */ #define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION #define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION Index: src/fcfreetype.c =================================================================== RCS file: /cvs/fontconfig/fontconfig/src/fcfreetype.c,v retrieving revision 1.50 diff -u -w -u -w -r1.50 fcfreetype.c --- src/fcfreetype.c 29 May 2004 19:32:41 -0000 1.50 +++ src/fcfreetype.c 21 Oct 2004 16:22:05 -0000 @@ -55,6 +55,9 @@ #include FT_SFNT_NAMES_H #include FT_TRUETYPE_IDS_H #include FT_TYPE1_TABLES_H +#include FT_INTERNAL_STREAM_H +#include FT_INTERNAL_SFNT_H +#include FT_INTERNAL_TRUETYPE_TYPES_H #if HAVE_FT_GET_BDF_PROPERTY #include FT_BDF_H @@ -385,6 +388,7 @@ FT_Library ftLibrary; FcChar8 *family = 0; FcChar8 *style = 0; + FcChar8 *complex = 0; const FcChar8 *foundry = 0; int spacing; TT_OS2 *os2; @@ -400,6 +404,7 @@ FT_UInt snamei, snamec; FcBool family_allocated = FcFalse; FcBool style_allocated = FcFalse; + FcBool complex_allocated = FcFalse; int family_prio = 0; int style_prio = 0; @@ -820,6 +825,12 @@ case 9: width = FC_WIDTH_ULTRAEXPANDED; break; } } + if (os2 && FcFontCapabilities(face, &complex)) + { + complex_allocated = FcTrue; + if (!FcPatternAddString (pat, FC_CAPABILITY, complex)) + goto bail1; + } /* * Type 1: Check for FontInfo dictionary information @@ -1066,6 +1077,9 @@ free (family); if (style_allocated) free (style); + if (complex_allocated) + free (complex); + FT_Done_Face (face); FT_Done_FreeType (ftLibrary); @@ -2067,3 +2081,178 @@ return FcFreeTypeCharSetAndSpacing (face, blanks, &spacing); } + + +#define TTAG_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' ) +#define TTAG_GSUB FT_MAKE_TAG( 'G', 'S', 'U', 'B' ) +#define TTAG_SILF FT_MAKE_TAG( 'S', 'i', 'l', 'f') +#define TT_Err_Ok FT_Err_Ok +#define TT_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle +#define TTO_Err_Empty_Script 0x1005 +#define TTO_Err_Invalid_SubTable 0x1001 + + +void addtag(FcChar8 *complex, FT_ULong tag) +{ + FcChar8 tagstring[15]; + sprintf (tagstring, "otlayout:%c%c%c%c ", + (unsigned char)(tag >> 24), + (unsigned char)((tag & 0xff0000) >> 16), + (unsigned char)((tag & 0xff00) >> 8), + (unsigned char)(tag & 0xff)); + strncat(complex, tagstring, 14); +} + +static int compareulong (const void *a, const void *b) +{ + const FT_ULong *ua = (const FT_ULong *) a; + const FT_ULong *ub = (const FT_ULong *) b; + return *ua - *ub; +} + + +FT_Error GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *script_count) +{ + FT_ULong cur_offset, new_offset, base_offset; + FT_UShort i, num_lookups; + TT_Face tt_face = (TT_Face)face; + FT_Stream stream = face->stream; + FT_Error error; + FT_UShort n, p; + FT_Memory memory = stream->memory; + + if ( !stream ) + return TT_Err_Invalid_Face_Handle; + + if (( error = tt_face->goto_table( tt_face, tabletag, stream, 0 ) )) + return error; + + base_offset = FT_STREAM_POS(); + + /* skip version */ + + if ( FT_STREAM_SEEK( base_offset + 4L ) || + FT_FRAME_ENTER( 2L ) ) + return error; + + new_offset = FT_GET_USHORT() + base_offset; + + FT_FRAME_EXIT(); + + cur_offset = FT_STREAM_POS(); + + if ( FT_STREAM_SEEK( new_offset ) != TT_Err_Ok ) + return error; + + base_offset = FT_STREAM_POS(); + + if ( FT_FRAME_ENTER( 2L ) ) + return error; + + *script_count = FT_GET_USHORT(); + + FT_FRAME_EXIT(); + + if ( FT_SET_ERROR (FT_MEM_ALLOC_ARRAY( *stags, *script_count, FT_ULong )) ) + return error; + + p = 0; + for ( n = 0; n < *script_count; n++ ) + { + if ( FT_FRAME_ENTER( 6L ) ) + goto Fail; + + (*stags)[p] = FT_GET_ULONG(); + new_offset = FT_GET_USHORT() + base_offset; + + FT_FRAME_EXIT(); + + cur_offset = FT_STREAM_POS(); + + if ( FT_STREAM_SEEK( new_offset ) ) + goto Fail; + + if ( error == TT_Err_Ok ) + p++; + else if ( error != TTO_Err_Empty_Script ) + goto Fail; + + (void)FT_STREAM_SEEK( cur_offset ); + } + + if (!p) + { + error = TTO_Err_Invalid_SubTable; + goto Fail; + } + + // sort the tag list before returning it + qsort(*stags, *script_count, sizeof(FT_ULong), compareulong); + + return TT_Err_Ok; + + Fail: + FT_FREE( *stags ); + return error; +} + + +FcBool FcFontCapabilities(FT_Face face, FcChar8 **complex) +{ + FcBool issilgraphitefont = 0; + FT_Error err; + FT_ULong len = 0; + FT_ULong *gsubtags=NULL, *gpostags=NULL; + FT_UShort gsub_count=0, gpos_count=0, maxsize; + FT_Memory memory = face->stream->memory; + + if (*complex) + { + free(*complex); + *complex = 0; + } + err = FT_Load_Sfnt_Table(face, TTAG_SILF, 0, 0, &len); + issilgraphitefont = ( err == FT_Err_Ok); + + err = GetScriptTags(face, TTAG_GPOS, &gpostags, &gpos_count); + err = GetScriptTags(face, TTAG_GSUB, &gsubtags, &gsub_count); + if (!issilgraphitefont && !gsub_count && !gpos_count) + { + goto bail; + } + + maxsize = ((gpos_count + gsub_count) * 15) + (issilgraphitefont ? 13 : 0); + *complex = (FcChar8 *) malloc (sizeof (FcChar8) * maxsize); + if (issilgraphitefont) + { + strcpy(*complex, "ttable:Silf "); + } + else + { + strcpy(*complex, ""); + } + + int indx1 = 0, indx2 = 0; + while ((indx1 < gsub_count) || (indx2 < gpos_count)) { + if (indx1 == gsub_count) { + addtag(*complex, gpostags[indx2]); + indx2++; + } else if ((indx2 == gpos_count) || (gsubtags[indx1] < gpostags[indx2])) { + addtag(*complex, gsubtags[indx1]); + indx1++; + } else if (gsubtags[indx1] == gpostags[indx2]) { + addtag(*complex, gsubtags[indx1]); + indx1++; + indx2++; + } else { + addtag(*complex, gpostags[indx2]); + indx2++; + } + } + if (FcDebug () & FC_DBG_PARSE) + printf("complex features in this font: %s\n", *complex); +bail: + FT_FREE(gsubtags); + FT_FREE(gpostags); + return (*complex)!=NULL; +} Index: src/fcmatch.c =================================================================== RCS file: /cvs/fontconfig/fontconfig/src/fcmatch.c,v retrieving revision 1.25 diff -u -w -u -w -r1.25 fcmatch.c --- src/fcmatch.c 29 May 2004 19:32:41 -0000 1.25 +++ src/fcmatch.c 21 Oct 2004 16:22:06 -0000 @@ -220,6 +220,9 @@ { FC_FONTVERSION, FcCompareNumber, 14, 14 }, #define MATCH_FONTVERSION 13 + + { FC_CAPABILITY, FcCompareString, 15, 15 }, +#define MATCH_CAPABILITY 14 }; #define NUM_MATCH_VALUES 15 @@ -258,7 +261,13 @@ } break; case 'c': + switch (FcToLower (object[1])) { + case 'a': + i = MATCH_CAPABILITY; break; + case 'h': i = MATCH_CHARSET; break; + } + break; case 'a': i = MATCH_ANTIALIAS; break; case 'l': Index: src/fcname.c =================================================================== RCS file: /cvs/fontconfig/fontconfig/src/fcname.c,v retrieving revision 1.21 diff -u -w -u -w -r1.21 fcname.c --- src/fcname.c 23 Sep 2003 20:12:20 -0000 1.21 +++ src/fcname.c 21 Oct 2004 16:22:06 -0000 @@ -63,6 +63,7 @@ { FC_CHARSET, FcTypeCharSet }, { FC_LANG, FcTypeLangSet }, { FC_FONTVERSION, FcTypeInteger }, + { FC_CAPABILITY, FcTypeString } }; #define NUM_OBJECT_TYPES (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0]) Index: README =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- README 12 Apr 2004 10:24:24 -0000 1.1 +++ README 22 Oct 2004 10:24:25 -0000 1.2 @@ -14,3 +14,6 @@ with the Silf table and cache that information. It has been submitted as fontconfig bug 105 http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=105 +it works for fontconfig 2.2.3 + +fontconfig-cvs.diff is the same change but for fontconfig CVS HEAD. Index: fontconfig.diff =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/fontconfig.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- fontconfig.diff 12 Apr 2004 10:24:24 -0000 1.1 +++ fontconfig.diff 22 Oct 2004 10:24:25 -0000 1.2 @@ -1,11 +1,11 @@ Index: fontconfig/fontconfig.h =================================================================== RCS file: /cvs/fontconfig/fontconfig/fontconfig/fontconfig.h,v -retrieving revision 1.50 -diff -u -w -r1.50 fontconfig.h ---- fontconfig/fontconfig.h 27 Oct 2003 10:47:53 -0000 1.50 -+++ fontconfig/fontconfig.h 28 Feb 2004 16:17:45 -0000 -@@ -89,6 +89,7 @@ +retrieving revision 1.42.2.3 +diff -u -w -u -w -r1.42.2.3 fontconfig.h +--- fontconfig/fontconfig.h 30 Jun 2004 18:53:39 -0000 1.42.2.3 ++++ fontconfig/fontconfig.h 22 Oct 2004 10:19:14 -0000 +@@ -88,6 +88,7 @@ #define FC_CHARSET "charset" /* CharSet */ #define FC_LANG "lang" /* String RFC 3066 langs */ #define FC_FONTVERSION "fontversion" /* Int from 'head' table */ @@ -16,10 +16,10 @@ Index: src/fcfreetype.c =================================================================== RCS file: /cvs/fontconfig/fontconfig/src/fcfreetype.c,v -retrieving revision 1.45 -diff -u -w -r1.45 fcfreetype.c ---- src/fcfreetype.c 11 Feb 2004 18:53:05 -0000 1.45 -+++ src/fcfreetype.c 28 Feb 2004 16:17:49 -0000 +retrieving revision 1.26.2.4 +diff -u -w -u -w -r1.26.2.4 fcfreetype.c +--- src/fcfreetype.c 30 Mar 2004 17:17:20 -0000 1.26.2.4 ++++ src/fcfreetype.c 22 Oct 2004 10:19:15 -0000 @@ -55,6 +55,9 @@ #include FT_SFNT_NAMES_H #include FT_TRUETYPE_IDS_H @@ -28,9 +28,9 @@ +#include FT_INTERNAL_SFNT_H +#include FT_INTERNAL_TRUETYPE_TYPES_H - #if HAVE_FT_GET_BDF_PROPERTY + #if (FREETYPE_MINOR > 1 || (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 4)) #include FT_BDF_H -@@ -382,6 +385,7 @@ +@@ -294,6 +297,7 @@ FT_Library ftLibrary; FcChar8 *family = 0; FcChar8 *style = 0; @@ -38,7 +38,7 @@ const FcChar8 *foundry = 0; int spacing; TT_OS2 *os2; -@@ -397,6 +401,7 @@ +@@ -304,6 +308,7 @@ FT_UInt snamei, snamec; FcBool family_allocated = FcFalse; FcBool style_allocated = FcFalse; @@ -46,30 +46,27 @@ int family_prio = 0; int style_prio = 0; -@@ -817,6 +822,12 @@ +@@ -750,6 +755,19 @@ case 9: width = FC_WIDTH_ULTRAEXPANDED; break; } } -+ if (os2 && FcFontCapabilities(face, &complex)) -+ { -+ complex_allocated = FcTrue; -+ if (!FcPatternAddString (pat, FC_CAPABILITY, complex)) -+ goto bail1; ++ if (os2 && FcFontCapabilities(face, &complex)) ++ { ++ complex_allocated = FcTrue; ++ if (!FcPatternAddString (pat, FC_CAPABILITY, complex)) ++ { ++ if (complex_allocated) ++ free (complex); ++ goto bail1; ++ } + } ++ ++ if (complex_allocated) ++ free (complex); /* * Type 1: Check for FontInfo dictionary information -@@ -1061,6 +1072,9 @@ - free (family); - if (style_allocated) - free (style); -+ if (complex_allocated) -+ free (complex); -+ - - FT_Done_Face (face); - FT_Done_FreeType (ftLibrary); -@@ -2059,3 +2073,178 @@ +@@ -1747,3 +1765,178 @@ return FcFreeTypeCharSetAndSpacing (face, blanks, &spacing); } @@ -248,18 +245,49 @@ + FT_FREE(gpostags); + return (*complex)!=NULL; +} +Index: src/fcmatch.c +=================================================================== +RCS file: /cvs/fontconfig/fontconfig/src/fcmatch.c,v +retrieving revision 1.24 +diff -u -w -u -w -r1.24 fcmatch.c +--- src/fcmatch.c 12 Mar 2003 22:16:25 -0000 1.24 ++++ src/fcmatch.c 22 Oct 2004 10:19:16 -0000 +@@ -220,6 +220,9 @@ + + { FC_FONTVERSION, FcCompareNumber, 14, 14 }, + #define MATCH_FONTVERSION 13 ++ ++ { FC_CAPABILITY, FcCompareString, 15, 15 }, ++#define MATCH_CAPABILITY 14 + }; + + #define NUM_MATCH_VALUES 15 +@@ -258,7 +261,13 @@ + } + break; + case 'c': ++ switch (FcToLower (object[1])) { ++ case 'a': ++ i = MATCH_CAPABILITY; break; ++ case 'h': + i = MATCH_CHARSET; break; ++ } ++ break; + case 'a': + i = MATCH_ANTIALIAS; break; + case 'l': Index: src/fcname.c =================================================================== RCS file: /cvs/fontconfig/fontconfig/src/fcname.c,v -retrieving revision 1.21 -diff -u -w -r1.21 fcname.c ---- src/fcname.c 23 Sep 2003 20:12:20 -0000 1.21 -+++ src/fcname.c 28 Feb 2004 16:17:50 -0000 -@@ -63,6 +63,7 @@ +retrieving revision 1.18 +diff -u -w -u -w -r1.18 fcname.c +--- src/fcname.c 12 Mar 2003 22:16:25 -0000 1.18 ++++ src/fcname.c 22 Oct 2004 10:19:16 -0000 +@@ -62,6 +62,7 @@ { FC_CHARSET, FcTypeCharSet }, { FC_LANG, FcTypeLangSet }, { FC_FONTVERSION, FcTypeInteger }, -+ { FC_CAPABILITY, FcTypeString }, ++ { FC_CAPABILITY, FcTypeString } }; #define NUM_OBJECT_TYPES (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0]) |