Commit 5413644b5e296b705377eebdf3cda12f95718912
2000-05-26T17:52:06
added a new demonstration program called "ftmulti" to demonstrate the multiple masters support fixed a few bugs
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
diff --git a/demos/Makefile b/demos/Makefile
index 8d3ce7f..b06623b 100644
--- a/demos/Makefile
+++ b/demos/Makefile
@@ -160,7 +160,7 @@ else
#
# The list of demonstration programs to build.
#
- EXES := ftlint ftview fttimer compos ftstring memtest
+ EXES := ftlint ftview fttimer compos ftstring memtest ftmulti
ifneq ($(findstring $(PLATFORM),os2 unix win32),)
EXES += ttdebug
@@ -200,6 +200,9 @@ else
$(OBJ_)ftview.$O: $(SRC_DIR_)ftview.c $(GRAPH_LIB)
$(COMPILE) $(GRAPH_INCLUDES:%=$I%) $T$@ $<
+ $(OBJ_)ftmulti.$O: $(SRC_DIR_)ftmulti.c $(GRAPH_LIB)
+ $(COMPILE) $(GRAPH_INCLUDES:%=$I%) $T$@ $<
+
$(OBJ_)ftstring.$O: $(SRC_DIR_)ftstring.c $(GRAPH_LIB)
$(COMPILE) $(GRAPH_INCLUDES:%=$I%) $T$@ $<
@@ -268,6 +271,9 @@ else
$(BIN_)ftview$E: $(OBJ_)ftview.$O $(FTLIB) $(GRAPH_LIB) $(COMMON_OBJ)
$(GRAPH_LINK)
+ $(BIN_)ftmulti$E: $(OBJ_)ftmulti.$O $(FTLIB) $(GRAPH_LIB) $(COMMON_OBJ)
+ $(GRAPH_LINK)
+
$(BIN_)ftstring$E: $(OBJ_)ftstring.$O $(FTLIB) $(GRAPH_LIB) $(COMMON_OBJ)
$(GRAPH_LINK)
diff --git a/src/type1z/t1objs.c b/src/type1z/t1objs.c
index 4632751..48ac8cf 100644
--- a/src/type1z/t1objs.c
+++ b/src/type1z/t1objs.c
@@ -264,6 +264,9 @@
if ( face->type1.font_info.is_fixed_pitch )
root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
+ if ( face->blend )
+ root->face_flags |= FT_FACE_FLAG_MULTIPLE_MASTERS;
+
/* XXX : TO DO - add kerning with .afm support */
/* get style name - be careful, some broken fonts only */