minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

* src/cff/cffobjs.c (cff_face_init): Improve computation of 

FT_STYLE_BOLD_FLAG.
This commit is contained in:
Werner Lemberg 2004-12-28 08:00:09 +00:00
parent b897e4c9c1
commit 213b9d01b2
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-27 Dirck Blaskey <listtarget@danbala.com>
* src/cff/cffobjs.c (cff_face_init): Improve computation of
FT_STYLE_BOLD_FLAG.
2004-12-27 Werner Lemberg <wl@gnu.org>
* src/cff/cffobjs.c (cff_face_init): A CFF within an SFNT can have

22
src/cff/cffobjs.c
View File

@ -537,10 +537,21 @@
psnames );
char* fullp = full;
char* family = cffface->family_name;
char* family_name = 0;
if ( dict->family_name )
{
family_name = cff_index_get_sid_string( &cff->string_index,
dict->family_name,
psnames);
if ( family_name )
family = family_name;
}
/* We try to extract the style name from the full name. */
/* We need to ignore spaces and dashes during the search. */
if ( full )
if ( full && family )
{
while ( *fullp )
{
@ -576,6 +587,9 @@
}
break;
}
if ( family_name )
FT_FREE( family_name );
FT_FREE( full );
}
}
@ -643,6 +657,12 @@
FT_FREE( weight );
}
/* double check */
if ( !(flags & FT_STYLE_FLAG_BOLD) && cffface->style_name )
if ( !strncmp( cffface->style_name, "Bold", 4 ) ||
!strncmp( cffface->style_name, "Black", 5 ) )
flags |= FT_STYLE_FLAG_BOLD;
cffface->style_flags = flags;
}