ref: 8575117c5077e6aeb64a59870a6bbe3aef6e68ab
parent: 3863c951463ddd089298472d75f6c7be5cedefe9
author: Werner Lemberg <[email protected]>
date: Fri Mar 21 03:16:00 EDT 2008
* src/type1/t1objs.c (T1_Face_Init): Use `/Weight'. Patch from Savannah bug #22675.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-21 Laurence Darby <ldarby>
+
+ * src/type1/t1objs.c (T1_Face_Init): Use `/Weight'. Patch from
+ Savannah bug #22675.
+
2008-03-13 Derek Clegg <[email protected]>
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix named style loop.
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -27,7 +27,7 @@
has been contributed by George Williams.
- III. MISCELANEOUS
+ III. MISCELLANEOUS
- Build support for symbian has been contributed.
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -4,7 +4,7 @@
/* */
/* Type 1 objects manager (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -298,7 +298,6 @@
FT_UNUSED( num_params );
FT_UNUSED( params );
- FT_UNUSED( face_index );
FT_UNUSED( stream );
@@ -361,7 +360,10 @@
root->family_name = info->family_name;
/* assume "Regular" style if we don't know better */
root->style_name = (char *)"Regular";
- if ( root->family_name )
+
+ if ( info->weight )
+ root->style_name = info->weight;
+ else if ( root->family_name )
{char* full = info->full_name;
char* family = root->family_name;