Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
4c3916e9
by Alexei Podtelezhnikov at 2023-02-08T14:58:46+00:00
[truetype, type1] Additional variation tags.
Sync with
https://learn.microsoft.com/en-us/typography/opentype/spec/dvaraxisreg#registered-axis-tags
* src/truetype/ttgxvar.h (TTAG_ital): New tag.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Use it.
* src/type1/t1load.c (T1_Get_MM_Var): Handle 'slnt' and 'ital'.
3 changed files:
Changes:
src/truetype/ttgxvar.c
| ... |
... |
@@ -2713,6 +2713,8 @@ |
|
2713
|
2713
|
a->name = (char*)"OpticalSize";
|
|
2714
|
2714
|
else if ( a->tag == TTAG_slnt )
|
|
2715
|
2715
|
a->name = (char*)"Slant";
|
|
|
2716
|
+ else if ( a->tag == TTAG_ital )
|
|
|
2717
|
+ a->name = (char*)"Italic";
|
|
2716
|
2718
|
|
|
2717
|
2719
|
next_name += 5;
|
|
2718
|
2720
|
a++;
|
src/truetype/ttgxvar.h
| ... |
... |
@@ -343,6 +343,7 @@ FT_BEGIN_HEADER |
|
343
|
343
|
#define TTAG_wdth FT_MAKE_TAG( 'w', 'd', 't', 'h' )
|
|
344
|
344
|
#define TTAG_opsz FT_MAKE_TAG( 'o', 'p', 's', 'z' )
|
|
345
|
345
|
#define TTAG_slnt FT_MAKE_TAG( 's', 'l', 'n', 't' )
|
|
|
346
|
+#define TTAG_ital FT_MAKE_TAG( 'i', 't', 'a', 'l' )
|
|
346
|
347
|
|
|
347
|
348
|
|
|
348
|
349
|
FT_LOCAL( FT_Error )
|
src/type1/t1load.c
| ... |
... |
@@ -355,6 +355,10 @@ |
|
355
|
355
|
mmvar->axis[i].tag = FT_MAKE_TAG( 'w', 'd', 't', 'h' );
|
|
356
|
356
|
else if ( ft_strcmp( mmvar->axis[i].name, "OpticalSize" ) == 0 )
|
|
357
|
357
|
mmvar->axis[i].tag = FT_MAKE_TAG( 'o', 'p', 's', 'z' );
|
|
|
358
|
+ else if ( ft_strcmp( mmvar->axis[i].name, "Slant" ) == 0 )
|
|
|
359
|
+ mmvar->axis[i].tag = FT_MAKE_TAG( 's', 'l', 'n', 't' );
|
|
|
360
|
+ else if ( ft_strcmp( mmvar->axis[i].name, "Italic" ) == 0 )
|
|
|
361
|
+ mmvar->axis[i].tag = FT_MAKE_TAG( 'i', 't', 'a', 'l' );
|
|
358
|
362
|
}
|
|
359
|
363
|
|
|
360
|
364
|
mm_weights_unmap( blend->default_weight_vector,
|
|