shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

added a new demonstration program called "ftmulti" to
demonstrate the multiple masters support

fixed a few bugs

git/fs: mount .git/fs: mount/attach disallowed

--- a/demos/Makefile

+++ b/demos/Makefile

@@ -160,7 +160,7 @@

   #

   # 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 @@

   $(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$@ $<

@@ -266,6 +269,9 @@

   $(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)

--- 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 */