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

* grub-core/normal/charset.c (grub_ucs4_to_utf8): Small stylistic fix.

Browse source 
(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:
Vladimir 'phcoder' Serbinenko 2011-12-25 16:07:33 +01:00
parent 5da8dbc5bc
commit f3cb4a4e57
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2011-12-25 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/unicode.h (grub_unicode_compact_range): Replace end with * include/grub/unicode.h (grub_unicode_compact_range): Replace end with

7
grub-core/normal/charset.c
View file

@ -213,8 +213,7 @@ grub_ucs4_to_utf8 (const grub_uint32_t *src, grub_size_t size,
{ {
grub_uint32_t code = *src++; grub_uint32_t code = *src++;
grub_ssize_t s; grub_ssize_t s;
s = grub_encode_utf8_character (dest, destend, s = grub_encode_utf8_character (dest, destend, code);
code);
if (s == -2) if (s == -2)
break; break;
if (s == -1) if (s == -1)
@ -906,6 +905,10 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
continue; 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, p = grub_unicode_aglomerate_comb (lptr, logical + logical_len - lptr,
&visual[visual_len]); &visual[visual_len]);

5
include/grub/unicode.h
View file

@ -206,8 +206,11 @@ enum
GRUB_UNICODE_BLACK_LEFT_TRIANGLE = 0x25c4, GRUB_UNICODE_BLACK_LEFT_TRIANGLE = 0x25c4,
GRUB_UNICODE_VARIATION_SELECTOR_1 = 0xfe00, GRUB_UNICODE_VARIATION_SELECTOR_1 = 0xfe00,
GRUB_UNICODE_VARIATION_SELECTOR_16 = 0xfe0f, 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_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[]; extern struct grub_unicode_compact_range grub_unicode_compact[];