GCJ

diff --git a/font/font.c b/font/font.c
index 5cda443e7f05ab0a0398bd6884d5a2d79c743811..fa619c4cd02ba3c86e5c6b4f5263b34693bc1032 100644 (file)
--- a/font/font.c
+++ b/font/font.c
@@ -1175,6 +1175,9 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
       
       if (!combining_glyphs[i])
        continue;
+      /* CGJ is to avoid diacritics reordering. */
+      if (glyph_id->combining[i] == GRUB_UNICODE_COMBINING_GRAPHEME_JOINER)
+       continue;
       combtype = get_comb_type (glyph_id->combining[i]);
       switch (combtype)
        {

diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 93f9f147d4a24a73ceee2ce6683b17daa48c7531..59649c3b53cf02f696495c800c4dc37a9f84945b 100644 (file)
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -57,11 +57,9 @@ enum grub_comb_type
   {
     GRUB_UNICODE_COMB_OVERLAY = 1,
     GRUB_UNICODE_STACK_ATTACHED_BELOW = 202,
-    GRUB_UNICODE_COMB_ATTACHED_BELOW_RIGHT = 204,
     GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214,
     GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT = 216,
     GRUB_UNICODE_STACK_BELOW = 220,
-    GRUB_UNICODE_COMB_BELOW_RIGHT = 222,
     GRUB_UNICODE_STACK_ABOVE = 230,
     GRUB_UNICODE_COMB_ABOVE_RIGHT = 232,
     GRUB_UNICODE_COMB_YPOGEGRAMMENI = 240,
@@ -83,6 +81,7 @@ struct grub_unicode_glyph
 };
 
 #define GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR 0x1
+#define GRUB_UNICODE_COMBINING_GRAPHEME_JOINER 0x34f
 #define GRUB_UNICODE_VARIATION_SELECTOR_1 0xfe00
 #define GRUB_UNICODE_VARIATION_SELECTOR_16 0xfe0f
 #define GRUB_UNICODE_VARIATION_SELECTOR_17 0xe0100