luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[GB.GTK]

Browse Source 
* BUG: Correctly interpret "&#xxx;" HTML entities in rich text.

[GB.GTK3]
* BUG: Correctly interpret "&#xxx;" HTML entities in rich text.


git-svn-id: svn://localhost/gambas/trunk@6560 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2014-10-18 13:38:22 +00:00
parent d57578377c
commit 77ad93e7a6
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gb.gtk/src/gtools.cpp
View File

@ -1129,6 +1129,7 @@ char *gt_html_to_pango_string(const char *html, int len_html, bool newline_are_b
const char *entity_start = ++p;
int entity_len;
int entity_unicode;
char *endptr;
// if ((p_end - p) >= 6 && !strncasecmp(p, " ", 6))
// {
@ -1153,10 +1154,34 @@ char *gt_html_to_pango_string(const char *html, int len_html, bool newline_are_b
}
else
{
const struct entity *e = kde_findEntity(entity_start, entity_len);
if (e)
entity_unicode = -1;
endptr = NULL;
errno = 0;
if (*entity_start == '#')
{
if (entity_start[1] == 'x')
{
entity_unicode = strtol(&entity_start[2], &endptr, 16);
if (entity_unicode <= 0)
entity_unicode = -1;
}
else if (isdigit(entity_start[1]))
{
entity_unicode = strtol(&entity_start[1], &endptr, 10);
if (entity_unicode <= 0)
entity_unicode = -1;
}
}
else
{
const struct entity *e = kde_findEntity(entity_start, entity_len);
if (e)
entity_unicode = e->code;
}
if (entity_unicode >= 0)
{
entity_unicode = e->code;
g_string_append_unichar(pango, entity_unicode);
continue;
}