* src/truetype/ttgxvar.c (ft_var_apply_tuple): Fix typo.

ChangeLog

@@ -1,3 +1,11 @@
+2004-04-25  George Williams  <gww@silcom.com>
+
+	* src/truetype/ttgxvar.c (ft_var_apply_tuple): Fix typo.
+
+2004-04-25  Werner Lemberg  <wl@gnu.org>
+
+	* src/truetype/Jamfile, docs/CHANGES: Updated.
+
 2004-04-24  Werner Lemberg  <wl@gnu.org>
 
 	* src/pcf/pcfdrivr.c: Revert change from 2004-04-17.

docs/CHANGES

@@ -9,6 +9,14 @@ LATEST CHANGES BETWEEN 2.1.9 and 2.1.8
       cmap caches.)
 
 
+  II. IMPORTANT CHANGES
+
+    - George  Williams   contributed  code  to   handle  Apple's  font
+      distortion technology found in GX fonts (`avar', `cvar', `fvar',
+      and `gvar' tables;  the Multiple Masters  API has been  slightly
+      extended to cope with the new functionality.
+
+
 ======================================================================
 
 LATEST CHANGES BETWEEN 2.1.8 and 2.1.7

src/truetype/Jamfile

@@ -1,4 +1,4 @@
-# FreeType 2 src/truetype Jamfile (c) 2001 David Turner
+# FreeType 2 src/truetype Jamfile (c) 2001, 2004 David Turner
 #
 
 SubDir  FT2_TOP $(FT2_SRC_DIR) truetype ;
@@ -8,7 +8,7 @@ SubDir  FT2_TOP $(FT2_SRC_DIR) truetype ;
 
   if $(FT2_MULTI)
   {
-    _sources = ttdriver ttobjs ttpload ttgload ttinterp ;
+    _sources = ttdriver ttobjs ttpload ttgload ttinterp ttgxvar ;
   }
   else
   {

src/truetype/ttgxvar.c

@@ -516,7 +516,7 @@
         apply = FT_MulDiv( apply,
                            blend->normalizedcoords[i] > 0
                              ? blend->normalizedcoords[i]
-                             : blend->normalizedcoords[i],
+                             : -blend->normalizedcoords[i],
                            0x10000L );
 
       else if ( blend->normalizedcoords[i] <= im_start_coords[i] ||