diff options
author | Werner Lemberg <wl@gnu.org> | 2023-04-26 08:17:17 +0200 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2023-04-28 10:44:14 +0200 |
commit | 545d0446b6625e8412f379304b0fc0a20741a8c1 (patch) | |
tree | bda43cfaae11f76d81009e22da09dd2bf8d6f1b9 /src/truetype/ttdriver.c | |
parent | 17a0c5dfd5d94944f091c96145a5c96bba46de0a (diff) | |
download | freetype2-545d0446b6625e8412f379304b0fc0a20741a8c1.tar.gz |
New Variation Font function `FT_Get_Default_Named_Instance`.
* include/freetype/ftmm.h, src/base/ftmm.c (FT_Get_Default_Named_Instance):
New function.
* include/freetype/internal/services/svmm.h
(FT_Get_Default_Named_Instance_Func): New typedef.
(FT_Service_MultiMasters): New field `get_default_named_instance`.
(FT_DEFINE_SERVICE_MULTIMASTERSREC): Updated.
* include/freetype/internal/tttypes.h (TT_Face): New field
`var_default_named_instance`.
* src/sfnt/sfobjc.s (sfnt_init_face): Initialize
`var_default_named_instance`.
* src/cff/cffdrivr.c (cff_get_default_named_instance): New function.
(cff_service_multi_masters): Updated.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Initialize
`var_default_named_instance`.
(TT_Get_Default_Named_Instance): New function.
* src/truetype/ttgxvar.h: Updated.
* src/truetype/ttdriver.c (tt_service_gx_multi_masters): Updated.
* src/type1/t1driver.c (t1_service_multi_masters): Updated.
* docs/CHANGES: Updated.
Diffstat (limited to 'src/truetype/ttdriver.c')
-rw-r--r-- | src/truetype/ttdriver.c | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index c2e041cd3..c128be19d 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -517,34 +517,37 @@ FT_DEFINE_SERVICE_MULTIMASTERSREC( tt_service_gx_multi_masters, - (FT_Get_MM_Func) NULL, /* get_mm */ - (FT_Set_MM_Design_Func) NULL, /* set_mm_design */ - (FT_Set_MM_Blend_Func) TT_Set_MM_Blend, /* set_mm_blend */ - (FT_Get_MM_Blend_Func) TT_Get_MM_Blend, /* get_mm_blend */ - (FT_Get_MM_Var_Func) TT_Get_MM_Var, /* get_mm_var */ - (FT_Set_Var_Design_Func)TT_Set_Var_Design, /* set_var_design */ - (FT_Get_Var_Design_Func)TT_Get_Var_Design, /* get_var_design */ - (FT_Set_Instance_Func) TT_Set_Named_Instance, /* set_instance */ + (FT_Get_MM_Func) NULL, /* get_mm */ + (FT_Set_MM_Design_Func) NULL, /* set_mm_design */ + (FT_Set_MM_Blend_Func) TT_Set_MM_Blend, /* set_mm_blend */ + (FT_Get_MM_Blend_Func) TT_Get_MM_Blend, /* get_mm_blend */ + (FT_Get_MM_Var_Func) TT_Get_MM_Var, /* get_mm_var */ + (FT_Set_Var_Design_Func)TT_Set_Var_Design, /* set_var_design */ + (FT_Get_Var_Design_Func)TT_Get_Var_Design, /* get_var_design */ + (FT_Set_Instance_Func) TT_Set_Named_Instance, /* set_instance */ + (FT_Get_Default_Named_Instance_Func) + TT_Get_Default_Named_Instance, + /* get_default_named_instance */ (FT_Set_MM_WeightVector_Func) - NULL, /* set_mm_weightvector */ + NULL, /* set_mm_weightvector */ (FT_Get_MM_WeightVector_Func) - NULL, /* get_mm_weightvector */ + NULL, /* get_mm_weightvector */ (FT_Var_Load_Delta_Set_Idx_Map_Func) tt_var_load_delta_set_index_mapping, - /* load_delta_set_idx_map */ + /* load_delta_set_idx_map */ (FT_Var_Load_Item_Var_Store_Func) tt_var_load_item_variation_store, - /* load_item_variation_store */ + /* load_item_variation_store */ (FT_Var_Get_Item_Delta_Func) - tt_var_get_item_delta, /* get_item_delta */ + tt_var_get_item_delta, /* get_item_delta */ (FT_Var_Done_Item_Var_Store_Func) tt_var_done_item_variation_store, - /* done_item_variation_store */ + /* done_item_variation_store */ (FT_Var_Done_Delta_Set_Idx_Map_Func) tt_var_done_delta_set_index_map, - /* done_delta_set_index_map */ - (FT_Get_Var_Blend_Func) tt_get_var_blend, /* get_var_blend */ - (FT_Done_Blend_Func) tt_done_blend /* done_blend */ + /* done_delta_set_index_map */ + (FT_Get_Var_Blend_Func) tt_get_var_blend, /* get_var_blend */ + (FT_Done_Blend_Func) tt_done_blend /* done_blend */ ) FT_DEFINE_SERVICE_METRICSVARIATIONSREC( |