fdo-mirrors/freetype
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/freetype/freetype.git synced 2025-12-30 05:30:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[autofit] Shorten adjustment enum names.

Browse source 
* src/autofit/afadjust.h (AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP,
  AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN, AF_VERTICAL_ADJUSTMENT_NONE):
  Renamed to...
  (AF_ADJUST_UP, AF_ADJUST_DOWN, AF_ADJUST_NONE): ...this.

* src/autofit/afadjust.c (adjustment_database,
  af_reverse_character_map_expand), src/autofit/aflatin.c
  (af_glyph_hints_apply_vertical_separation_adjustments): Updated.
This commit is contained in:
Werner Lemberg 2025-04-21 05:47:41 +02:00
parent 1da283b8ae
commit 566e30c176
3 changed files with 167 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

314
src/autofit/afadjust.c
View file

@ -45,177 +45,177 @@
FT_LOCAL_ARRAY_DEF( AF_AdjustmentDatabaseEntry )
adjustment_database[] =
{
{ 0x21, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ! */
{ 0x3F, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ? */
{ 0x69, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* i */
{ 0x6A, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* j */
{ 0x21, AF_ADJUST_UP, 0 }, /* ! */
{ 0x3F, AF_ADJUST_UP, 0 }, /* ? */
{ 0x69, AF_ADJUST_UP, 0 }, /* i */
{ 0x6A, AF_ADJUST_UP, 0 }, /* j */
#if 0
/* XXX TODO */
{ 0x7E, AF_VERTICAL_ADJUSTMENT_NONE, 1 }, /* ~ */
{ 0x7E, AF_ADJUST_NONE, 1 }, /* ~ */
#endif
{ 0xA1, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ¡ */
{ 0xA6, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ¦ */
{ 0xAA, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ª */
{ 0xBA, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* º */
{ 0xBF, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ¿ */
{ 0xA1, AF_ADJUST_UP, 0 }, /* ¡ */
{ 0xA6, AF_ADJUST_UP, 0 }, /* ¦ */
{ 0xAA, AF_ADJUST_UP, 0 }, /* ª */
{ 0xBA, AF_ADJUST_UP, 0 }, /* º */
{ 0xBF, AF_ADJUST_UP, 0 }, /* ¿ */
{ 0xC0, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* À */
{ 0xC1, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Á */
{ 0xC2, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Â */
{ 0xC3, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 1 }, /* Ã */
{ 0xC4, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ä */
{ 0xC5, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Å */
{ 0xC8, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* È */
{ 0xC9, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* É */
{ 0xCA, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ê */
{ 0xCB, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ë */
{ 0xCC, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ì */
{ 0xCD, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Í */
{ 0xCE, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Î */
{ 0xCF, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ï */
{ 0xC0, AF_ADJUST_UP, 0 }, /* À */
{ 0xC1, AF_ADJUST_UP, 0 }, /* Á */
{ 0xC2, AF_ADJUST_UP, 0 }, /* Â */
{ 0xC3, AF_ADJUST_UP, 1 }, /* Ã */
{ 0xC4, AF_ADJUST_UP, 0 }, /* Ä */
{ 0xC5, AF_ADJUST_UP, 0 }, /* Å */
{ 0xC8, AF_ADJUST_UP, 0 }, /* È */
{ 0xC9, AF_ADJUST_UP, 0 }, /* É */
{ 0xCA, AF_ADJUST_UP, 0 }, /* Ê */
{ 0xCB, AF_ADJUST_UP, 0 }, /* Ë */
{ 0xCC, AF_ADJUST_UP, 0 }, /* Ì */
{ 0xCD, AF_ADJUST_UP, 0 }, /* Í */
{ 0xCE, AF_ADJUST_UP, 0 }, /* Î */
{ 0xCF, AF_ADJUST_UP, 0 }, /* Ï */
{ 0xD1, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 1 }, /* Ñ */
{ 0xD2, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ò */
{ 0xD3, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ó */
{ 0xD4, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ô */
{ 0xD5, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 1 }, /* Õ */
{ 0xD6, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ö */
{ 0xD9, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ù */
{ 0xDA, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ú */
{ 0xDB, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Û */
{ 0xDC, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ü */
{ 0xDD, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ý */
{ 0xD1, AF_ADJUST_UP, 1 }, /* Ñ */
{ 0xD2, AF_ADJUST_UP, 0 }, /* Ò */
{ 0xD3, AF_ADJUST_UP, 0 }, /* Ó */
{ 0xD4, AF_ADJUST_UP, 0 }, /* Ô */
{ 0xD5, AF_ADJUST_UP, 1 }, /* Õ */
{ 0xD6, AF_ADJUST_UP, 0 }, /* Ö */
{ 0xD9, AF_ADJUST_UP, 0 }, /* Ù */
{ 0xDA, AF_ADJUST_UP, 0 }, /* Ú */
{ 0xDB, AF_ADJUST_UP, 0 }, /* Û */
{ 0xDC, AF_ADJUST_UP, 0 }, /* Ü */
{ 0xDD, AF_ADJUST_UP, 0 }, /* Ý */
{ 0xE0, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* à */
{ 0xE1, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* á */
{ 0xE2, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* â */
{ 0xE3, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 1 }, /* ã */
{ 0xE4, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ä */
{ 0xE5, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* å */
{ 0xE8, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* è */
{ 0xE9, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* é */
{ 0xEA, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ê */
{ 0xEB, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ë */
{ 0xEC, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ì */
{ 0xED, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* í */
{ 0xEE, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* î */
{ 0xEF, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ï */
{ 0xE0, AF_ADJUST_UP, 0 }, /* à */
{ 0xE1, AF_ADJUST_UP, 0 }, /* á */
{ 0xE2, AF_ADJUST_UP, 0 }, /* â */
{ 0xE3, AF_ADJUST_UP, 1 }, /* ã */
{ 0xE4, AF_ADJUST_UP, 0 }, /* ä */
{ 0xE5, AF_ADJUST_UP, 0 }, /* å */
{ 0xE8, AF_ADJUST_UP, 0 }, /* è */
{ 0xE9, AF_ADJUST_UP, 0 }, /* é */
{ 0xEA, AF_ADJUST_UP, 0 }, /* ê */
{ 0xEB, AF_ADJUST_UP, 0 }, /* ë */
{ 0xEC, AF_ADJUST_UP, 0 }, /* ì */
{ 0xED, AF_ADJUST_UP, 0 }, /* í */
{ 0xEE, AF_ADJUST_UP, 0 }, /* î */
{ 0xEF, AF_ADJUST_UP, 0 }, /* ï */
{ 0xF1, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 1 }, /* ñ */
{ 0xF2, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ò */
{ 0xF3, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ó */
{ 0xF4, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ô */
{ 0xF5, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 1 }, /* õ */
{ 0xF6, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ö */
{ 0xF9, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ù */
{ 0xFA, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ú */
{ 0xFB, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* û */
{ 0xFC, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ü */
{ 0xFD, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ý */
{ 0xFF, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ÿ */
{ 0xF1, AF_ADJUST_UP, 1 }, /* ñ */
{ 0xF2, AF_ADJUST_UP, 0 }, /* ò */
{ 0xF3, AF_ADJUST_UP, 0 }, /* ó */
{ 0xF4, AF_ADJUST_UP, 0 }, /* ô */
{ 0xF5, AF_ADJUST_UP, 1 }, /* õ */
{ 0xF6, AF_ADJUST_UP, 0 }, /* ö */
{ 0xF9, AF_ADJUST_UP, 0 }, /* ù */
{ 0xFA, AF_ADJUST_UP, 0 }, /* ú */
{ 0xFB, AF_ADJUST_UP, 0 }, /* û */
{ 0xFC, AF_ADJUST_UP, 0 }, /* ü */
{ 0xFD, AF_ADJUST_UP, 0 }, /* ý */
{ 0xFF, AF_ADJUST_UP, 0 }, /* ÿ */
{ 0x100, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ā */
{ 0x101, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ā */
{ 0x102, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ă */
{ 0x103, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ă */
{ 0x106, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ć */
{ 0x107, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ć */
{ 0x108, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ĉ */
{ 0x109, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ĉ */
{ 0x10A, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ċ */
{ 0x10B, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ċ */
{ 0x10C, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Č */
{ 0x10D, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* č */
{ 0x10E, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ď */
{ 0x100, AF_ADJUST_UP, 0 }, /* Ā */
{ 0x101, AF_ADJUST_UP, 0 }, /* ā */
{ 0x102, AF_ADJUST_UP, 0 }, /* Ă */
{ 0x103, AF_ADJUST_UP, 0 }, /* ă */
{ 0x106, AF_ADJUST_UP, 0 }, /* Ć */
{ 0x107, AF_ADJUST_UP, 0 }, /* ć */
{ 0x108, AF_ADJUST_UP, 0 }, /* Ĉ */
{ 0x109, AF_ADJUST_UP, 0 }, /* ĉ */
{ 0x10A, AF_ADJUST_UP, 0 }, /* Ċ */
{ 0x10B, AF_ADJUST_UP, 0 }, /* ċ */
{ 0x10C, AF_ADJUST_UP, 0 }, /* Č */
{ 0x10D, AF_ADJUST_UP, 0 }, /* č */
{ 0x10E, AF_ADJUST_UP, 0 }, /* Ď */
{ 0x112, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ē */
{ 0x113, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ē */
{ 0x114, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ĕ */
{ 0x115, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ĕ */
{ 0x116, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ė */
{ 0x117, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ė */
{ 0x11A, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ě */
{ 0x11B, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ě */
{ 0x11C, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ĝ */
{ 0x11D, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ĝ */
{ 0x11E, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ğ */
{ 0x11F, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ğ */
{ 0x112, AF_ADJUST_UP, 0 }, /* Ē */
{ 0x113, AF_ADJUST_UP, 0 }, /* ē */
{ 0x114, AF_ADJUST_UP, 0 }, /* Ĕ */
{ 0x115, AF_ADJUST_UP, 0 }, /* ĕ */
{ 0x116, AF_ADJUST_UP, 0 }, /* Ė */
{ 0x117, AF_ADJUST_UP, 0 }, /* ė */
{ 0x11A, AF_ADJUST_UP, 0 }, /* Ě */
{ 0x11B, AF_ADJUST_UP, 0 }, /* ě */
{ 0x11C, AF_ADJUST_UP, 0 }, /* Ĝ */
{ 0x11D, AF_ADJUST_UP, 0 }, /* ĝ */
{ 0x11E, AF_ADJUST_UP, 0 }, /* Ğ */
{ 0x11F, AF_ADJUST_UP, 0 }, /* ğ */
{ 0x120, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ġ */
{ 0x121, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ġ */
{ 0x122, AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN, 0 }, /* Ģ */
{ 0x123, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ģ */
{ 0x124, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ĥ */
{ 0x125, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ĥ */
{ 0x128, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 1 }, /* Ĩ */
{ 0x129, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 1 }, /* ĩ */
{ 0x12A, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ī */
{ 0x12B, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ī */
{ 0x12C, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ĭ */
{ 0x12D, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ĭ */
{ 0x12F, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* į */
{ 0x120, AF_ADJUST_UP, 0 }, /* Ġ */
{ 0x121, AF_ADJUST_UP, 0 }, /* ġ */
{ 0x122, AF_ADJUST_DOWN, 0 }, /* Ģ */
{ 0x123, AF_ADJUST_UP, 0 }, /* ģ */
{ 0x124, AF_ADJUST_UP, 0 }, /* Ĥ */
{ 0x125, AF_ADJUST_UP, 0 }, /* ĥ */
{ 0x128, AF_ADJUST_UP, 1 }, /* Ĩ */
{ 0x129, AF_ADJUST_UP, 1 }, /* ĩ */
{ 0x12A, AF_ADJUST_UP, 0 }, /* Ī */
{ 0x12B, AF_ADJUST_UP, 0 }, /* ī */
{ 0x12C, AF_ADJUST_UP, 0 }, /* Ĭ */
{ 0x12D, AF_ADJUST_UP, 0 }, /* ĭ */
{ 0x12F, AF_ADJUST_UP, 0 }, /* į */
{ 0x130, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* İ */
{ 0x133, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ij */
{ 0x134, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ĵ */
{ 0x135, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ĵ */
{ 0x136, AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN, 0 }, /* Ķ */
{ 0x137, AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN, 0 }, /* ķ */
{ 0x139, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ĺ */
{ 0x13A, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ĺ */
{ 0x13B, AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN, 0 }, /* Ļ */
{ 0x13C, AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN, 0 }, /* ļ */
{ 0x130, AF_ADJUST_UP, 0 }, /* İ */
{ 0x133, AF_ADJUST_UP, 0 }, /* ij */
{ 0x134, AF_ADJUST_UP, 0 }, /* Ĵ */
{ 0x135, AF_ADJUST_UP, 0 }, /* ĵ */
{ 0x136, AF_ADJUST_DOWN, 0 }, /* Ķ */
{ 0x137, AF_ADJUST_DOWN, 0 }, /* ķ */
{ 0x139, AF_ADJUST_UP, 0 }, /* Ĺ */
{ 0x13A, AF_ADJUST_UP, 0 }, /* ĺ */
{ 0x13B, AF_ADJUST_DOWN, 0 }, /* Ļ */
{ 0x13C, AF_ADJUST_DOWN, 0 }, /* ļ */
{ 0x143, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ń */
{ 0x144, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ń */
{ 0x145, AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN, 0 }, /* Ņ */
{ 0x146, AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN, 0 }, /* ņ */
{ 0x147, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ň */
{ 0x148, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ň */
{ 0x14C, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ō */
{ 0x14D, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ō */
{ 0x14E, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ŏ */
{ 0x14F, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ŏ */
{ 0x143, AF_ADJUST_UP, 0 }, /* Ń */
{ 0x144, AF_ADJUST_UP, 0 }, /* ń */
{ 0x145, AF_ADJUST_DOWN, 0 }, /* Ņ */
{ 0x146, AF_ADJUST_DOWN, 0 }, /* ņ */
{ 0x147, AF_ADJUST_UP, 0 }, /* Ň */
{ 0x148, AF_ADJUST_UP, 0 }, /* ň */
{ 0x14C, AF_ADJUST_UP, 0 }, /* Ō */
{ 0x14D, AF_ADJUST_UP, 0 }, /* ō */
{ 0x14E, AF_ADJUST_UP, 0 }, /* Ŏ */
{ 0x14F, AF_ADJUST_UP, 0 }, /* ŏ */
{ 0x150, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ő */
{ 0x151, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ő */
{ 0x154, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ŕ */
{ 0x155, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ŕ */
{ 0x156, AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN, 0 }, /* Ŗ */
{ 0x157, AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN, 0 }, /* ŗ */
{ 0x158, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ř */
{ 0x159, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ř */
{ 0x15A, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ś */
{ 0x15B, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ś */
{ 0x15C, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ŝ */
{ 0x15D, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ŝ */
{ 0x150, AF_ADJUST_UP, 0 }, /* Ő */
{ 0x151, AF_ADJUST_UP, 0 }, /* ő */
{ 0x154, AF_ADJUST_UP, 0 }, /* Ŕ */
{ 0x155, AF_ADJUST_UP, 0 }, /* ŕ */
{ 0x156, AF_ADJUST_DOWN, 0 }, /* Ŗ */
{ 0x157, AF_ADJUST_DOWN, 0 }, /* ŗ */
{ 0x158, AF_ADJUST_UP, 0 }, /* Ř */
{ 0x159, AF_ADJUST_UP, 0 }, /* ř */
{ 0x15A, AF_ADJUST_UP, 0 }, /* Ś */
{ 0x15B, AF_ADJUST_UP, 0 }, /* ś */
{ 0x15C, AF_ADJUST_UP, 0 }, /* Ŝ */
{ 0x15D, AF_ADJUST_UP, 0 }, /* ŝ */
{ 0x160, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Š */
{ 0x161, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* š */
{ 0x164, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ť */
{ 0x168, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 1 }, /* Ũ */
{ 0x169, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 1 }, /* ũ */
{ 0x16A, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ū */
{ 0x16B, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ū */
{ 0x16C, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ŭ */
{ 0x16D, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ŭ */
{ 0x16E, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ů */
{ 0x16F, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ů */
{ 0x160, AF_ADJUST_UP, 0 }, /* Š */
{ 0x161, AF_ADJUST_UP, 0 }, /* š */
{ 0x164, AF_ADJUST_UP, 0 }, /* Ť */
{ 0x168, AF_ADJUST_UP, 1 }, /* Ũ */
{ 0x169, AF_ADJUST_UP, 1 }, /* ũ */
{ 0x16A, AF_ADJUST_UP, 0 }, /* Ū */
{ 0x16B, AF_ADJUST_UP, 0 }, /* ū */
{ 0x16C, AF_ADJUST_UP, 0 }, /* Ŭ */
{ 0x16D, AF_ADJUST_UP, 0 }, /* ŭ */
{ 0x16E, AF_ADJUST_UP, 0 }, /* Ů */
{ 0x16F, AF_ADJUST_UP, 0 }, /* ů */
{ 0x170, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ű */
{ 0x171, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ű */
{ 0x174, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ŵ */
{ 0x175, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ŵ */
{ 0x176, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ŷ */
{ 0x177, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ŷ */
{ 0x178, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ÿ */
{ 0x179, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ź */
{ 0x17A, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ź */
{ 0x17B, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ż */
{ 0x17C, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* ż */
{ 0x17D, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 }, /* Ž */
{ 0x17E, AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP, 0 } /* ž */
{ 0x170, AF_ADJUST_UP, 0 }, /* Ű */
{ 0x171, AF_ADJUST_UP, 0 }, /* ű */
{ 0x174, AF_ADJUST_UP, 0 }, /* Ŵ */
{ 0x175, AF_ADJUST_UP, 0 }, /* ŵ */
{ 0x176, AF_ADJUST_UP, 0 }, /* Ŷ */
{ 0x177, AF_ADJUST_UP, 0 }, /* ŷ */
{ 0x178, AF_ADJUST_UP, 0 }, /* Ÿ */
{ 0x179, AF_ADJUST_UP, 0 }, /* Ź */
{ 0x17A, AF_ADJUST_UP, 0 }, /* ź */
{ 0x17B, AF_ADJUST_UP, 0 }, /* Ż */
{ 0x17C, AF_ADJUST_UP, 0 }, /* ż */
{ 0x17D, AF_ADJUST_UP, 0 }, /* Ž */
{ 0x17E, AF_ADJUST_UP, 0 } /* ž */
};
@ -686,9 +686,9 @@
FT_TRACE7(( " %5ld 0x%04X %4s %3s\n",
glyph_index,
codepoint,
adj_type == AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN
adj_type == AF_ADJUST_DOWN
? "down"
: adj_type == AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP
: adj_type == AF_ADJUST_UP
? "up"
: "",
db_entry->apply_tilde ? "yes" : "no" ));

6
src/autofit/afadjust.h
View file

@ -38,13 +38,13 @@ FT_BEGIN_HEADER
/* This means that the hinter should find the topmost contour and push */
/* it up until its lowest point is one pixel above the highest point */
/* not part of that contour. */
AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP,
AF_ADJUST_UP,
/* This is the opposite direction. The hinter should find the */
/* bottommost contour and push it down until there is a one-pixel gap. */
AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN,
AF_ADJUST_DOWN,
AF_VERTICAL_ADJUSTMENT_NONE
AF_ADJUST_NONE
} AF_VerticalSeparationAdjustmentType;

16
src/autofit/aflatin.c
View file

@ -3178,7 +3178,7 @@
const AF_AdjustmentDatabaseEntry *db_entry = NULL;
AF_VerticalSeparationAdjustmentType
adj_type = AF_VERTICAL_ADJUSTMENT_NONE;
adj_type = AF_ADJUST_NONE;
FT_TRACE4(( "Entering"
@ -3195,8 +3195,8 @@
adj_type = db_entry->vertical_separation_adjustment_type;
}
if ( adj_type == AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP &&
hints->num_contours >= 2 )
if ( adj_type == AF_ADJUST_UP &&
hints->num_contours >= 2 )
{
FT_Int highest_contour = 0;
FT_Pos highest_min_y;
@ -3228,8 +3228,7 @@
/* intersect, which can happen due to blue zone snapping. */
FT_TRACE4(( "af_glyph_hints_apply_vertical_separation_adjustments:\n"
" Applying vertical adjustment:"
" AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP\n" ));
" Applying vertical adjustment: AF_ADJUST_UP\n" ));
/* Compute vertical extrema of all contours while finding the */
/* highest contour. There is some redundancy code-wise with */
@ -3386,8 +3385,8 @@
}
}
else if ( adj_type == AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN &&
hints->num_contours >= 2 )
else if ( adj_type == AF_ADJUST_DOWN &&
hints->num_contours >= 2 )
{
FT_Int lowest_contour = 0;
FT_Pos lowest_min_y = FT_INT_MAX;
@ -3403,8 +3402,7 @@
FT_TRACE4(( "af_glyph_hints_apply_vertical_separation_adjustments:\n"
" Applying vertical adjustment:"
" AF_VERTICAL_ADJUSTMENT_BOTTOM_CONTOUR_DOWN\n" ));
" Applying vertical adjustment: AF_ADJUST_DOWN\n" ));
/* Compute vertical extrema and find lowest contour. */
for ( contour = 0; contour < hints->num_contours; contour++ )