From 769896291176936d01c79a56bce3b33eb64e2776 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 19 Jun 2022 10:41:45 -0600 Subject: [PATCH] [arabic-fallback] Disable PUA shaping under HB_NO_OT_SHAPER_ARABIC_FALLBACK --- src/hb-ft.cc | 2 ++ src/hb-ot-cmap-table.hh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/hb-ft.cc b/src/hb-ft.cc index 74ac6853b..04df8c2e9 100644 --- a/src/hb-ft.cc +++ b/src/hb-ft.cc @@ -324,12 +324,14 @@ hb_ft_get_nominal_glyph (hb_font_t *font, * under "Non-Standard (Symbol) Fonts". */ g = FT_Get_Char_Index (ft_font->ft_face, 0xF000u + unicode); break; +#ifndef HB_NO_OT_SHAPER_ARABIC_FALLBACK case OT::OS2::font_page_t::FONT_PAGE_SIMP_ARABIC: g = FT_Get_Char_Index (ft_font->ft_face, _hb_remap_arabic_pua1 (unicode)); break; case OT::OS2::font_page_t::FONT_PAGE_TRAD_ARABIC: g = FT_Get_Char_Index (ft_font->ft_face, _hb_remap_arabic_pua2 (unicode)); break; +#endif default: break; } diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index a21ae49eb..5fcc12886 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -1747,12 +1747,14 @@ struct cmap case OS2::font_page_t::FONT_PAGE_NONE: this->get_glyph_funcZ = get_glyph_from_symbol; break; +#ifndef HB_NO_OT_SHAPER_ARABIC_FALLBACK case OS2::font_page_t::FONT_PAGE_SIMP_ARABIC: this->get_glyph_funcZ = get_glyph_from_symbol; break; case OS2::font_page_t::FONT_PAGE_TRAD_ARABIC: this->get_glyph_funcZ = get_glyph_from_symbol; break; +#endif default: this->get_glyph_funcZ = get_glyph_from; break;