* 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:
Vladimir 'phcoder' Serbinenko 2011-12-25 16:07:33 +01:00
parent 5da8dbc5bc
commit f3cb4a4e57
3 changed files with 17 additions and 3 deletions

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_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]);