From cd6dcca658f20f37fb224f7b727516d60c442142 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 19 Jun 2008 06:20:21 +0000 Subject: [PATCH] * src/type/t1objs.c (T1_Face_Init): Slightly improve algorithm. --- ChangeLog | 4 ++++ src/type1/t1objs.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 016f4ded5..3ee4de610 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-06-19 Werner Lemberg + + * src/type/t1objs.c (T1_Face_Init): Slightly improve algorithm. + 2008-06-18 Werner Lemberg * src/type/t1objs.c (T1_Face_Init): Fix change from 2008-03-21. diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index bc3e2d4ce..9d00cf396 100644 --- a/src/type1/t1objs.c +++ b/src/type1/t1objs.c @@ -375,6 +375,9 @@ if ( full ) { + FT_Bool the_same = TRUE; + + while ( *full ) { if ( *full == *family ) @@ -390,12 +393,17 @@ family++; else { + the_same = FALSE; + if ( !*family ) root->style_name = full; break; } } } + + if ( the_same ) + root->style_name = (char *)"Regular"; } } else @@ -410,7 +418,7 @@ if ( info->weight ) root->style_name = info->weight; else - /* assume "Regular" style because we don't know better */ + /* assume `Regular' style because we don't know better */ root->style_name = (char *)"Regular"; }