Commit 723aafb5e35f4cd2410064285cdc591bd62b7b04
2017-01-11T14:21:26
[truetype] Actually use metrics variation service. * src/base/ftmm.c: Include FT_SERVICE_METRICS_VARIATIONS_H. (ft_face_get_mvar_service): New auxiliary function to look up metrics variation service. (FT_Set_Var_Design_Coordinates, FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): Call metrics variation service. * src/truetype/ttobjs.c (tt_face_init): Use metrics variations for named instances.
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 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188
diff --git a/ChangeLog b/ChangeLog
index b196b5a..1a96831 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2017-01-11 Werner Lemberg <wl@gnu.org>
+ [truetype] Actually use metrics variation service.
+
+ * src/base/ftmm.c: Include FT_SERVICE_METRICS_VARIATIONS_H.
+ (ft_face_get_mvar_service): New auxiliary function to look up
+ metrics variation service.
+ (FT_Set_Var_Design_Coordinates, FT_Set_MM_Blend_Coordinates,
+ FT_Set_Var_Blend_Coordinates): Call metrics variation service.
+
+ * src/truetype/ttobjs.c (tt_face_init): Use metrics variations for
+ named instances.
+
+2017-01-11 Werner Lemberg <wl@gnu.org>
+
[truetype] Provide metrics variation service.
* include/freetype/internal/services/svmetric.h
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index 6eda8ed..b8db3c5 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -22,6 +22,7 @@
#include FT_MULTIPLE_MASTERS_H
#include FT_INTERNAL_OBJECTS_H
#include FT_SERVICE_MULTIPLE_MASTERS_H
+#include FT_SERVICE_METRICS_VARIATIONS_H
/*************************************************************************/
@@ -62,6 +63,34 @@
}
+ static FT_Error
+ ft_face_get_mvar_service( FT_Face face,
+ FT_Service_MetricsVariations *aservice )
+ {
+ FT_Error error;
+
+
+ *aservice = NULL;
+
+ if ( !face )
+ return FT_THROW( Invalid_Face_Handle );
+
+ error = FT_ERR( Invalid_Argument );
+
+ if ( FT_HAS_MULTIPLE_MASTERS( face ) )
+ {
+ FT_FACE_LOOKUP_SERVICE( face,
+ *aservice,
+ METRICS_VARIATIONS );
+
+ if ( *aservice )
+ error = FT_Err_Ok;
+ }
+
+ return error;
+ }
+
+
/* documentation is in ftmm.h */
FT_EXPORT_DEF( FT_Error )
@@ -158,8 +187,9 @@
FT_UInt num_coords,
FT_Fixed* coords )
{
- FT_Error error;
- FT_Service_MultiMasters service;
+ FT_Error error;
+ FT_Service_MultiMasters service_mm;
+ FT_Service_MetricsVariations service_mvar;
/* check of `face' delayed to `ft_face_get_mm_service' */
@@ -167,12 +197,19 @@
if ( !coords )
return FT_THROW( Invalid_Argument );
- error = ft_face_get_mm_service( face, &service );
+ error = ft_face_get_mm_service( face, &service_mm );
if ( !error )
{
error = FT_ERR( Invalid_Argument );
- if ( service->set_var_design )
- error = service->set_var_design( face, num_coords, coords );
+ if ( service_mm->set_var_design )
+ error = service_mm->set_var_design( face, num_coords, coords );
+ }
+
+ error = ft_face_get_mvar_service( face, &service_mvar );
+ if ( !error )
+ {
+ if ( service_mvar->metrics_adjust )
+ service_mvar->metrics_adjust( face );
}
/* enforce recomputation of auto-hinting data */
@@ -221,8 +258,9 @@
FT_UInt num_coords,
FT_Fixed* coords )
{
- FT_Error error;
- FT_Service_MultiMasters service;
+ FT_Error error;
+ FT_Service_MultiMasters service_mm;
+ FT_Service_MetricsVariations service_mvar;
/* check of `face' delayed to `ft_face_get_mm_service' */
@@ -230,12 +268,19 @@
if ( !coords )
return FT_THROW( Invalid_Argument );
- error = ft_face_get_mm_service( face, &service );
+ error = ft_face_get_mm_service( face, &service_mm );
if ( !error )
{
error = FT_ERR( Invalid_Argument );
- if ( service->set_mm_blend )
- error = service->set_mm_blend( face, num_coords, coords );
+ if ( service_mm->set_mm_blend )
+ error = service_mm->set_mm_blend( face, num_coords, coords );
+ }
+
+ error = ft_face_get_mvar_service( face, &service_mvar );
+ if ( !error )
+ {
+ if ( service_mvar->metrics_adjust )
+ service_mvar->metrics_adjust( face );
}
/* enforce recomputation of auto-hinting data */
@@ -259,8 +304,9 @@
FT_UInt num_coords,
FT_Fixed* coords )
{
- FT_Error error;
- FT_Service_MultiMasters service;
+ FT_Error error;
+ FT_Service_MultiMasters service_mm;
+ FT_Service_MetricsVariations service_mvar;
/* check of `face' delayed to `ft_face_get_mm_service' */
@@ -268,12 +314,19 @@
if ( !coords )
return FT_THROW( Invalid_Argument );
- error = ft_face_get_mm_service( face, &service );
+ error = ft_face_get_mm_service( face, &service_mm );
if ( !error )
{
error = FT_ERR( Invalid_Argument );
- if ( service->set_mm_blend )
- error = service->set_mm_blend( face, num_coords, coords );
+ if ( service_mm->set_mm_blend )
+ error = service_mm->set_mm_blend( face, num_coords, coords );
+ }
+
+ error = ft_face_get_mvar_service( face, &service_mvar );
+ if ( !error )
+ {
+ if ( service_mvar->metrics_adjust )
+ service_mvar->metrics_adjust( face );
}
/* enforce recomputation of auto-hinting data */
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index c907ecd..18aa48a 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -664,6 +664,8 @@
named_style->coords );
if ( error )
goto Exit;
+
+ tt_apply_mvar( face );
}
}
}