From 03f06f0f08f1ad864261a5e5644862ef654506d4 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 15 Nov 2003 17:44:13 +0000 Subject: [PATCH] * src/bdf/bdfdrivr.c (bdf_interpret_style), src/pcf/pcfread.c (pcf_interpret_style): Replace spaces with dashes in properties SETWIDTH_NAME and ADD_STYLE_NAME to simplify parsing. --- ChangeLog | 6 ++++++ src/bdf/bdfdrivr.c | 13 +++++++++---- src/pcf/pcfread.c | 11 ++++++++--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index deed6a0f1..0269948e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-11-13 John A. Boyd Jr. + + * src/bdf/bdfdrivr.c (bdf_interpret_style), src/pcf/pcfread.c + (pcf_interpret_style): Replace spaces with dashes in properties + SETWIDTH_NAME and ADD_STYLE_NAME to simplify parsing. + 2003-11-11 Werner Lemberg * docs/CHANGES: Updated. diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index 03dc8d3bb..3e57c3450 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -238,7 +238,8 @@ THE SOFTWARE. face->style_name = (char *)"Regular"; else { - char *style, *s; + char *style, *s; + unsigned int i; if ( FT_ALLOC( style, len + parts ) ) @@ -248,8 +249,10 @@ THE SOFTWARE. if ( astr ) { - ft_strcpy( s, astr); - s += ft_strlen( astr ); + ft_strcpy( s, astr ); + for ( i = 0; i < ft_strlen( astr ); i++, s++ ) + if ( *s == ' ' ) + *s = '-'; /* replace spaces with dashes */ *(s++) = ' '; } if ( bstr ) @@ -267,7 +270,9 @@ THE SOFTWARE. if ( sstr ) { ft_strcpy( s, sstr ); - s += ft_strlen( sstr ); + for ( i = 0; i < ft_strlen( sstr ); i++, s++ ) + if ( *s == ' ' ) + *s = '-'; /* replace spaces with dashes */ *(s++) = ' '; } *(--s) = '\0'; /* overwrite last ' ', terminate the string */ diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index e2deab322..fcf362872 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -926,7 +926,8 @@ THE SOFTWARE. face->style_name = (char *)"Regular"; else { - char *style, *s; + char *style, *s; + unsigned int i; if ( FT_ALLOC( style, len + parts ) ) @@ -937,7 +938,9 @@ THE SOFTWARE. if ( astr ) { ft_strcpy( s, astr ); - s += ft_strlen( astr ); + for ( i = 0; i < ft_strlen( astr ); i++, s++ ) + if ( *s == ' ' ) + *s = '-'; /* replace spaces with dashes */ *(s++) = ' '; } if ( bstr ) @@ -955,7 +958,9 @@ THE SOFTWARE. if ( sstr ) { ft_strcpy( s, sstr ); - s += ft_strlen( sstr ); + for ( i = 0; i < ft_strlen( sstr ); i++, s++ ) + if ( *s == ' ' ) + *s = '-'; /* replace spaces with dashes */ *(s++) = ' '; } *(--s) = '\0'; /* overwrite last ' ', terminate the string */