[arabic-fallback] Disable PUA shaping under HB_NO_OT_SHAPER_ARABIC_FALLBACK

pull/3063/head
Behdad Esfahbod 3 years ago
parent 4520911429
commit 7698962911
  1. 2
      src/hb-ft.cc
  2. 2
      src/hb-ot-cmap-table.hh

@ -324,12 +324,14 @@ hb_ft_get_nominal_glyph (hb_font_t *font,
* under "Non-Standard (Symbol) Fonts". */ * under "Non-Standard (Symbol) Fonts". */
g = FT_Get_Char_Index (ft_font->ft_face, 0xF000u + unicode); g = FT_Get_Char_Index (ft_font->ft_face, 0xF000u + unicode);
break; break;
#ifndef HB_NO_OT_SHAPER_ARABIC_FALLBACK
case OT::OS2::font_page_t::FONT_PAGE_SIMP_ARABIC: case OT::OS2::font_page_t::FONT_PAGE_SIMP_ARABIC:
g = FT_Get_Char_Index (ft_font->ft_face, _hb_remap_arabic_pua1 (unicode)); g = FT_Get_Char_Index (ft_font->ft_face, _hb_remap_arabic_pua1 (unicode));
break; break;
case OT::OS2::font_page_t::FONT_PAGE_TRAD_ARABIC: case OT::OS2::font_page_t::FONT_PAGE_TRAD_ARABIC:
g = FT_Get_Char_Index (ft_font->ft_face, _hb_remap_arabic_pua2 (unicode)); g = FT_Get_Char_Index (ft_font->ft_face, _hb_remap_arabic_pua2 (unicode));
break; break;
#endif
default: default:
break; break;
} }

@ -1747,12 +1747,14 @@ struct cmap
case OS2::font_page_t::FONT_PAGE_NONE: case OS2::font_page_t::FONT_PAGE_NONE:
this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_remap_symbol_pua>; this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_remap_symbol_pua>;
break; break;
#ifndef HB_NO_OT_SHAPER_ARABIC_FALLBACK
case OS2::font_page_t::FONT_PAGE_SIMP_ARABIC: case OS2::font_page_t::FONT_PAGE_SIMP_ARABIC:
this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_remap_arabic_pua1>; this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_remap_arabic_pua1>;
break; break;
case OS2::font_page_t::FONT_PAGE_TRAD_ARABIC: case OS2::font_page_t::FONT_PAGE_TRAD_ARABIC:
this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_remap_arabic_pua2>; this->get_glyph_funcZ = get_glyph_from_symbol<CmapSubtable, _hb_remap_arabic_pua2>;
break; break;
#endif
default: default:
this->get_glyph_funcZ = get_glyph_from<CmapSubtable>; this->get_glyph_funcZ = get_glyph_from<CmapSubtable>;
break; break;

Loading…
Cancel
Save