aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-25 01:05:37 +00:00
Code

Display combining characters at the end of the current string in set_hline

Browse Source 
without waiting for the next non zero width character. This way combining
characters at the end of the document are displayed.

Signed-off-by: Fabienne Ducroquet <fabiduc@gmail.com>
This commit is contained in:
Fabienne Ducroquet 2016-04-12 21:58:54 +02:00 committed by Witold Filipczyk
parent c1140f54c4
commit a43ec1075c
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features.conf
View File

@ -707,8 +707,6 @@ CONFIG_UTF8=yes
# HTML forms, HTML links, HTML document titles, plain text, menus,
# dialog boxes, or keymaps.
#
# - Combining characters at the end of the document do not take effect.
#
# Default: disabled
CONFIG_COMBINE=no

51
src/document/html/renderer.c
View File

@ -425,6 +425,35 @@ move_comb_x_y(struct part *part, int xf, int yf, int xt, int yt)
# define move_comb_x_y(part, xf, yf, xt, yt) ((void) 0)
#endif
#ifdef CONFIG_COMBINE
static void
put_combined(struct part *part, int x)
{
struct document *document = part->document;
if (document->combi_length) {
if (document->comb_x != -1) {
unicode_val_T prev = get_combined(document->combi, document->combi_length + 1);
assert_comb_x_y_ok(document);
if_assert_failed prev = UCS_NO_CHAR;
/* Make sure the combined character is not considered as
* a space. */
if (x)
part->spaces[x - 1] = 0;
if (prev != UCS_NO_CHAR)
document->data[document->comb_y]
.chars[document->comb_x].data = prev;
}
document->combi_length = 0;
}
}
#else
# define put_combined(part, x) ((void) 0)
#endif
#ifdef CONFIG_UTF8
/* First possibly do the format change and then find out what coordinates
* to use since sub- or superscript might change them */
@ -564,24 +593,7 @@ good_char:
#ifdef CONFIG_COMBINE
if (wcwidth((wchar_t)data)) {
if (document->combi_length) {
if (document->comb_x != -1) {
unicode_val_T prev = get_combined(document->combi, document->combi_length + 1);
assert_comb_x_y_ok(document);
if_assert_failed prev = UCS_NO_CHAR;
/* Make sure the combined character is not considered as
* a space. */
if (x)
part->spaces[x - 1] = 0;
if (prev != UCS_NO_CHAR)
document->data[document->comb_y]
.chars[document->comb_x].data = prev;
}
document->combi_length = 0;
}
put_combined(part, x);
document->combi[0] = data;
} else {
if (document->combi_length < (UCS_MAX_LENGTH_COMBINED - 1)) {
@ -611,6 +623,9 @@ good_char:
#endif
copy_screen_chars(&POS(x++, y), schar, 1);
} /* while chars < end */
/* Display any trailing combining characters. */
put_combined(part, x);
} else { /* not UTF-8 */
for (; charslen > 0; charslen--, x++, chars++) {
part->char_width[x] = 1;