From 16d73130efad35a1c6494cf969a08ca3ae6f45ff Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 28 Aug 2003 10:57:05 +0000 Subject: * src/bdf/bdfdrivr.c (BDF_Face_Init): Accept lowercase characters for spacing. * src/pcf/pcfread.c (pcf_load_font), src/bdf/bdfdrivr.c (BDF_Face_Init): Accept lowercase characters for slant and weight. --- ChangeLog | 10 ++++++++++ src/bdf/bdfdrivr.c | 11 ++++++++--- src/pcf/pcfread.c | 7 +++++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d21203a53..44daf295e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-08-27 Werner Lemberg + + * src/bdf/bdfdrivr.c (BDF_Face_Init): Accept lowercase characters + for spacing. + +2003-08-27 Mike FABIAN + + * src/pcf/pcfread.c (pcf_load_font), src/bdf/bdfdrivr.c + (BDF_Face_Init): Accept lowercase characters for slant and weight. + 2003-08-18 David Turner * include/freetype/config/ftoption.h: Disabling TrueType bytecode diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index 3582a0fb1..79576c530 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -253,7 +253,9 @@ THE SOFTWARE. if ( prop->format == BDF_ATOM ) if ( prop->value.atom != NULL ) if ( ( *(prop->value.atom) == 'M' ) || - ( *(prop->value.atom) == 'C' ) ) + ( *(prop->value.atom) == 'm' ) || + ( *(prop->value.atom) == 'C' ) || + ( *(prop->value.atom) == 'c' ) ) root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH; /* FZ XXX: TO DO: FT_FACE_FLAGS_VERTICAL */ @@ -265,14 +267,17 @@ THE SOFTWARE. if ( prop->format == BDF_ATOM ) if ( prop->value.atom != NULL ) if ( ( *(prop->value.atom) == 'O' ) || - ( *(prop->value.atom) == 'I' ) ) + ( *(prop->value.atom) == 'o' ) || + ( *(prop->value.atom) == 'I' ) || + ( *(prop->value.atom) == 'i' ) ) root->style_flags |= FT_STYLE_FLAG_ITALIC; prop = bdf_get_font_property( font, "WEIGHT_NAME" ); if ( prop != NULL ) if ( prop->format == BDF_ATOM ) if ( prop->value.atom != NULL ) - if ( *(prop->value.atom) == 'B' ) + if ( ( *(prop->value.atom) == 'B' ) || + ( *(prop->value.atom) == 'b' ) ) root->style_flags |= FT_STYLE_FLAG_BOLD; prop = bdf_get_font_property( font, "FAMILY_NAME" ); diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index ee65ae5d6..1b377b5b1 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -935,13 +935,16 @@ THE SOFTWARE. if ( prop != NULL ) if ( prop->isString ) if ( ( *(prop->value.atom) == 'O' ) || - ( *(prop->value.atom) == 'I' ) ) + ( *(prop->value.atom) == 'o' ) || + ( *(prop->value.atom) == 'I' ) || + ( *(prop->value.atom) == 'i' ) ) root->style_flags |= FT_STYLE_FLAG_ITALIC; prop = pcf_find_property( face, "WEIGHT_NAME" ); if ( prop != NULL ) if ( prop->isString ) - if ( *(prop->value.atom) == 'B' ) + if ( ( *(prop->value.atom) == 'B' ) || + ( *(prop->value.atom) == 'b' ) ) root->style_flags |= FT_STYLE_FLAG_BOLD; root->style_name = (char *)"Regular"; -- cgit v1.2.1