From 8575117c5077e6aeb64a59870a6bbe3aef6e68ab Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 21 Mar 2008 07:16:00 +0000 Subject: [PATCH] * src/type1/t1objs.c (T1_Face_Init): Use `/Weight'. Patch from Savannah bug #22675. --- ChangeLog | 5 +++++ docs/CHANGES | 2 +- src/type1/t1objs.c | 8 +++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a34d0d32b..3e6fe3cbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-21 Laurence Darby + + * src/type1/t1objs.c (T1_Face_Init): Use `/Weight'. Patch from + Savannah bug #22675. + 2008-03-13 Derek Clegg * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix named style loop. diff --git a/docs/CHANGES b/docs/CHANGES index 8f43fad06..2158cf492 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -27,7 +27,7 @@ CHANGES BETWEEN 2.3.6 and 2.3.5 has been contributed by George Williams. - III. MISCELANEOUS + III. MISCELLANEOUS - Build support for symbian has been contributed. diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index 3d08336c6..40b258fce 100644 --- 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;