From 6dd303db0d38b7d02759f8ce701d35c20af56c36 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Sun, 26 Nov 2000 21:25:53 +0000
Subject: [PATCH] * builds/ansi/ansi.mk: Fix inclusion order of files.

* src/type1/t1objs.c (T1_Init_Face): Compute style flags.
---
 ChangeLog           |  8 ++++++++
 builds/ansi/ansi.mk |  2 +-
 src/type1/t1objs.c  | 13 +++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3f23f5a5f..7d19ff799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
diff --git a/builds/ansi/ansi.mk b/builds/ansi/ansi.mk
index 92cbadfe3..04d90cafd 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 fa990c2a6..65c3344fb 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;