vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

GCJ

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-02-08 02:01:10 +01:00
parent 9d9dca02d9
commit 1876cfdb56
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
font/font.c
View file

@ -1175,6 +1175,9 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
if (!combining_glyphs[i]) if (!combining_glyphs[i])
continue; 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]); combtype = get_comb_type (glyph_id->combining[i]);
switch (combtype) switch (combtype)
{ {

3
include/grub/unicode.h
View file

@ -57,11 +57,9 @@ enum grub_comb_type
{ {
GRUB_UNICODE_COMB_OVERLAY = 1, GRUB_UNICODE_COMB_OVERLAY = 1,
GRUB_UNICODE_STACK_ATTACHED_BELOW = 202, GRUB_UNICODE_STACK_ATTACHED_BELOW = 202,
GRUB_UNICODE_COMB_ATTACHED_BELOW_RIGHT = 204,
GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214, GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214,
GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT = 216, GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT = 216,
GRUB_UNICODE_STACK_BELOW = 220, GRUB_UNICODE_STACK_BELOW = 220,
GRUB_UNICODE_COMB_BELOW_RIGHT = 222,
GRUB_UNICODE_STACK_ABOVE = 230, GRUB_UNICODE_STACK_ABOVE = 230,
GRUB_UNICODE_COMB_ABOVE_RIGHT = 232, GRUB_UNICODE_COMB_ABOVE_RIGHT = 232,
GRUB_UNICODE_COMB_YPOGEGRAMMENI = 240, GRUB_UNICODE_COMB_YPOGEGRAMMENI = 240,
@ -83,6 +81,7 @@ struct grub_unicode_glyph
}; };
#define GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR 0x1 #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_1 0xfe00
#define GRUB_UNICODE_VARIATION_SELECTOR_16 0xfe0f #define GRUB_UNICODE_VARIATION_SELECTOR_16 0xfe0f
#define GRUB_UNICODE_VARIATION_SELECTOR_17 0xe0100 #define GRUB_UNICODE_VARIATION_SELECTOR_17 0xe0100