From f42941536c6c16ba8b89dd5f25d8a747e3d5495d Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Mon, 19 Apr 2004 17:09:12 +0000 Subject: Better robustness when backends encounter a Unicode character not representable in the output character set. [originally from svn r4094] --- bk_text.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bk_text.c') diff --git a/bk_text.c b/bk_text.c index 359ea25..499f232 100644 --- a/bk_text.c +++ b/bk_text.c @@ -450,7 +450,7 @@ static void text_rdaddwc(rdstringc *rs, word *text, word *end) { attraux(text->aux) == attr_Only)) rdaddc(rs, '`'); /* FIXME: configurability */ if (removeattr(text->type) == word_Normal) { - if (text_convert(text->text, &c)) + if (text_convert(text->text, &c) || !text->alt) rdaddsc(rs, c); else text_rdaddwc(rs, text->alt, NULL); @@ -505,7 +505,7 @@ static int text_width(void *ctx, word *text) { ? (attraux(text->aux) == attr_Only ? 2 : attraux(text->aux) == attr_Always ? 0 : 1) : 0) + - (text_convert(text->text, NULL) ? + (text_convert(text->text, NULL) || !text->alt ? ustrlen(text->text) : text_width_list(ctx, text->alt))); -- cgit v1.1