From bb4474bbaffec06fe1a59767f2694790025f016f Mon Sep 17 00:00:00 2001 From: nhmall Date: Fri, 26 Aug 2022 14:08:03 -0400 Subject: [PATCH] fix some (not all) glyph_to_cmap odd returns I think some of these discrepencies between glyph_is_cmap and glyph_to_cmap started after b14b830b because the additional ranges added by that didn't have a corresponding return in glyph_to_cmap. --- include/display.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/display.h b/include/display.h index ab69aaece..fd117134f 100644 --- a/include/display.h +++ b/include/display.h @@ -729,9 +729,11 @@ enum glyph_offsets { ? (S_altar) \ : glyph_is_cmap_b(glyph) \ ? (((glyph) - GLYPH_CMAP_B_OFF) + S_grave) \ - : glyph_is_cmap_c(glyph) \ - ? (((glyph) - GLYPH_CMAP_C_OFF) + S_digbeam) \ - : NO_GLYPH) + : glyph_is_cmap_zap(glyph) \ + ? (((glyph) - GLYPH_ZAP_OFF) + S_vbeam) \ + : glyph_is_cmap_c(glyph) \ + ? (((glyph) - GLYPH_CMAP_C_OFF) + S_digbeam) \ + : NO_GLYPH) #define glyph_to_swallow(glyph) \ (glyph_is_swallow(glyph) ? (((glyph) - GLYPH_SWALLOW_OFF) & 0x7) : 0)