Better robustness when backends encounter a Unicode character not

representable in the output character set.

git-svn-id: svn://svn.tartarus.org/sgt/halibut@4094 cda61777-01e9-0310-a592-d414129be87e

diff --git a/bk_info.c b/bk_info.c
index 0d7c032..f7f83fb 100644 (file)
--- a/bk_info.c
+++ b/bk_info.c
@@ -747,7 +747,7 @@ static void info_rdaddwc(rdstringc *rs, word *words, word *end, int xrefs) {
                  attraux(words->aux) == attr_Only))
            rdaddc(rs, '`');           /* FIXME: configurability */
        if (removeattr(words->type) == word_Normal) {
-           if (info_convert(words->text, &c))
+           if (info_convert(words->text, &c) || !words->alt)
                rdaddsc(rs, c);
            else
                info_rdaddwc(rs, words->alt, NULL, FALSE);
@@ -807,7 +807,7 @@ static int info_width_internal(word *words, int xrefs) {
                 ? (attraux(words->aux) == attr_Only ? 2 :
                    attraux(words->aux) == attr_Always ? 0 : 1)
                 : 0) +
-               (info_convert(words->text, NULL) ?
+               (info_convert(words->text, NULL) || !words->alt ?
                 ustrlen(words->text) :
                 info_width_internal_list(words->alt, xrefs)));
 

diff --git a/bk_man.c b/bk_man.c
index 60157fa..d03f6b7 100644 (file)
--- a/bk_man.c
+++ b/bk_man.c
@@ -372,7 +372,7 @@ static void man_rdaddwc(rdstringc *rs, word *text, word *end,
        if (removeattr(text->type) == word_Normal) {
            if (rs->pos > 0)
                quote_props &= ~QUOTE_INITCTRL;   /* not at start any more */
-           if (man_convert(text->text, 0, &c, quote_props))
+           if (man_convert(text->text, 0, &c, quote_props) || !text->alt)
                rdaddsc(rs, c);
            else
                man_rdaddwc(rs, text->alt, NULL, quote_props);

diff --git a/bk_text.c b/bk_text.c
index 359ea25..499f232 100644 (file)
--- 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)));
 

diff --git a/bk_whlp.c b/bk_whlp.c
index 9655b1f..7738c71 100644 (file)
--- a/bk_whlp.c
+++ b/bk_whlp.c
@@ -628,7 +628,7 @@ static void whlp_mkparagraph(struct bk_whlp_state *state,
            whlp_set_font(state->h, newfont);
        }
        if (removeattr(text->type) == word_Normal) {
-           if (whlp_convert(text->text, 0, &c, TRUE))
+           if (whlp_convert(text->text, 0, &c, TRUE) || !text->alt)
                whlp_text(state->h, c);
            else
                whlp_mkparagraph(state, deffont, text->alt, FALSE);

diff --git a/bk_xhtml.c b/bk_xhtml.c
index aff20a3..4b9b98c 100644 (file)
--- a/bk_xhtml.c
+++ b/bk_xhtml.c
@@ -1651,7 +1651,8 @@ static void xhtml_rdaddwc(rdstringc *rs, word *text, word *end, int indexable) {
            rdaddsc(rs, "<code>");
 
        if (removeattr(text->type) == word_Normal) {
-         if (xhtml_convert(text->text, 0, &c, TRUE)) /* spaces in the word are hard */
+         if (xhtml_convert(text->text, 0, &c, TRUE) || !text->alt)
+               /* spaces in the word are hard */
            rdaddsc(rs, c);
          else
            xhtml_rdaddwc(rs, text->alt, NULL, indexable);