diff options
Diffstat (limited to 'src/otvalid/otvgpos.c')
| -rw-r--r-- | src/otvalid/otvgpos.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/otvalid/otvgpos.c b/src/otvalid/otvgpos.c index ceffd2f8e..a93a00786 100644 --- a/src/otvalid/otvgpos.c +++ b/src/otvalid/otvgpos.c @@ -48,9 +48,9 @@ /*************************************************************************/ /*************************************************************************/ -#define BaseArray otv_x_sxy, "BaseArray" -#define LigatureAttach otv_x_sxy, "LigatureAttach" -#define Mark2Array otv_x_sxy, "Mark2Array" +#define BaseArrayFunc otv_x_sxy +#define LigatureAttachFunc otv_x_sxy +#define Mark2ArrayFunc otv_x_sxy /* uses valid->extra1 (counter) */ /* uses valid->extra2 (boolean to handle NULL anchor field) */ @@ -88,8 +88,8 @@ OTV_SIZE_CHECK( anchor_offset ); if ( anchor_offset ) otv_Anchor_validate( table + anchor_offset, valid ); - } - else + } + else otv_Anchor_validate( table + anchor_offset, valid ); } @@ -97,9 +97,9 @@ } -#define MarkBasePosFormat1 otv_u_O_O_u_O_O, "MarkBasePosFormat1" -#define MarkLigPosFormat1 otv_u_O_O_u_O_O, "MarkLigPosFormat1" -#define MarkMarkPosFormat1 otv_u_O_O_u_O_O, "MarkMarkPosFormat1" +#define MarkBasePosFormat1Func otv_u_O_O_u_O_O +#define MarkLigPosFormat1Func otv_u_O_O_u_O_O +#define MarkMarkPosFormat1Func otv_u_O_O_u_O_O /* sets valid->extra1 (class count) */ @@ -130,7 +130,7 @@ otv_MarkArray_validate( table + Array1, valid ); valid->nesting_level++; - func = valid->func[valid->nesting_level]; + func = valid->func[valid->nesting_level]; valid->extra1 = ClassCount; func( table + Array2, valid ); @@ -861,8 +861,7 @@ /* context rules since even invalid glyph indices/classes return */ /* meaningful results */ - OTV_NEST3( ChainContextPosFormat2, - ChainPosClassSet, ChainPosClassRule ); + OTV_NEST3( ChainContextPosFormat2,ChainPosClassSet, ChainPosClassRule ); OTV_RUN( table, valid ); break; |