Commit 6dd303db0d38b7d02759f8ce701d35c20af56c36
2000-11-26T21:25:53
* builds/ansi/ansi.mk: Fix inclusion order of files. * src/type1/t1objs.c (T1_Init_Face): Compute style flags.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/ChangeLog b/ChangeLog
index 3f23f5a..7d19ff7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2000-11-26 Werner Lemberg <wl@gnu.org>
+ * builds/ansi/ansi.mk: Fix inclusion order of files.
+
+2000-11-26 Keith Packard <keithp@keithp.com>
+
+ * src/type1/t1objs.c (T1_Init_Face): Compute style flags.
+
+2000-11-26 Werner Lemberg <wl@gnu.org>
+
* builds/compiler/ansi-cc.mk (CLEAN_LIBRARY): Fix rule and
conditional.
diff --git a/builds/ansi/ansi.mk b/builds/ansi/ansi.mk
index 92cbadf..04d90ca 100644
--- a/builds/ansi/ansi.mk
+++ b/builds/ansi/ansi.mk
@@ -13,7 +13,7 @@
# fully.
-include $(TOP)/builds/ansi/ansi-def.mk
include $(TOP)/builds/compiler/ansi-cc.mk
+include $(TOP)/builds/ansi/ansi-def.mk
# EOF
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index fa990c2..65c3344 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -19,6 +19,8 @@
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftstream.h>
+#include <string.h> /* strcmp() */
+
#ifdef FT_FLAT_COMPILE
@@ -258,6 +260,17 @@
}
}
+ /* compute style flags */
+ root->style_flags = 0;
+ if ( face->type1.font_info.italic_angle )
+ root->style_flags |= FT_STYLE_FLAG_ITALIC;
+ if ( face->type1.font_info.weight )
+ {
+ if ( !strcmp( face->type1.font_info.weight, "Bold" ) ||
+ !strcmp( face->type1.font_info.weight, "Black" ) )
+ root->style_flags |= FT_STYLE_FLAG_BOLD;
+ }
+
/* no embedded bitmap support */
root->num_fixed_sizes = 0;
root->available_sizes = 0;