mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-28 17:23:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Another attempt.

Browse Source
This commit is contained in:
Michael Drake 2013-03-20 20:06:24 +00:00
parent 8e360ff040
commit 5d7b1f40a3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
amiga/font.c
View File

@ -240,7 +240,7 @@ bool nsfont_split(const plot_font_style_t *fstyle,
int x, size_t *char_offset, int *actual_x)
{
ULONG co;
char *ostr = (char *)string;
const char *str_pos = string;
uint16 *utf16 = NULL,*outf16 = NULL;
uint16 utf16next = 0;
FIXED kern = 0;
@ -262,7 +262,8 @@ bool nsfont_split(const plot_font_style_t *fstyle,
*actual_x = 0;
while(utf8clen < length) {
utf8len = utf8_char_byte_length(string + utf8clen);
str_pos += utf8clen;
utf8len = utf8_char_byte_length(str_pos);
if ((*utf16 < 0xD800) || (0xDFFF < *utf16))
utf16charlen = 1;
@ -294,13 +295,18 @@ bool nsfont_split(const plot_font_style_t *fstyle,
tx += tempx;
if((x < tx) && (coffset != 0)) {
if ((x < tx) && (coffset != 0)) {
/* We've run out of space, and a space has been found, split there. */
break;
} else if (*utf16 == 0x0020) {
} else if (*str_pos == ' ') {
*actual_x = tx;
coffset = utf8clen;
if (x < tx) {
/* Out of space, so don't look further */
break;
}
}
utf16 += utf16charlen;
utf8clen += utf8len;