* grub-core/normal/charset.c (grub_ucs4_to_utf8): Small stylistic fix.
(grub_bidi_line_logical_to_visual): Skip tags. They are deprecated. * include/grub/unicode.h (GRUB_UNICODE_TAG_START): New enum value. (GRUB_UNICODE_TAG_END): Likewise. (GRUB_UNICODE_LAST_VALID): Likewise.
This commit is contained in:
parent
5da8dbc5bc
commit
f3cb4a4e57
3 changed files with 17 additions and 3 deletions
|
@ -1,3 +1,11 @@
|
|||
2011-12-25 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/normal/charset.c (grub_ucs4_to_utf8): Small stylistic fix.
|
||||
(grub_bidi_line_logical_to_visual): Skip tags. They are deprecated.
|
||||
* include/grub/unicode.h (GRUB_UNICODE_TAG_START): New enum value.
|
||||
(GRUB_UNICODE_TAG_END): Likewise.
|
||||
(GRUB_UNICODE_LAST_VALID): Likewise.
|
||||
|
||||
2011-12-25 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* include/grub/unicode.h (grub_unicode_compact_range): Replace end with
|
||||
|
|
|
@ -213,8 +213,7 @@ grub_ucs4_to_utf8 (const grub_uint32_t *src, grub_size_t size,
|
|||
{
|
||||
grub_uint32_t code = *src++;
|
||||
grub_ssize_t s;
|
||||
s = grub_encode_utf8_character (dest, destend,
|
||||
code);
|
||||
s = grub_encode_utf8_character (dest, destend, code);
|
||||
if (s == -2)
|
||||
break;
|
||||
if (s == -1)
|
||||
|
@ -906,6 +905,10 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
|
|||
continue;
|
||||
}
|
||||
|
||||
/* The tags: deprecated, never used. */
|
||||
if (*lptr >= GRUB_UNICODE_TAG_START && *lptr <= GRUB_UNICODE_TAG_END)
|
||||
continue;
|
||||
|
||||
p = grub_unicode_aglomerate_comb (lptr, logical + logical_len - lptr,
|
||||
&visual[visual_len]);
|
||||
|
||||
|
|
|
@ -206,8 +206,11 @@ enum
|
|||
GRUB_UNICODE_BLACK_LEFT_TRIANGLE = 0x25c4,
|
||||
GRUB_UNICODE_VARIATION_SELECTOR_1 = 0xfe00,
|
||||
GRUB_UNICODE_VARIATION_SELECTOR_16 = 0xfe0f,
|
||||
GRUB_UNICODE_TAG_START = 0xe0000,
|
||||
GRUB_UNICODE_TAG_END = 0xe007f,
|
||||
GRUB_UNICODE_VARIATION_SELECTOR_17 = 0xe0100,
|
||||
GRUB_UNICODE_VARIATION_SELECTOR_256 = 0xe01ef
|
||||
GRUB_UNICODE_VARIATION_SELECTOR_256 = 0xe01ef,
|
||||
GRUB_UNICODE_LAST_VALID = 0x10ffff
|
||||
};
|
||||
|
||||
extern struct grub_unicode_compact_range grub_unicode_compact[];
|
||||
|
|
Loading…
Reference in a new issue