version 1.228, 2014/08/18 21:07:53 |
version 1.230, 2014/10/27 13:31:04 |
Line 444 term_word(struct termp *p, const char *word) |
|
Line 444 term_word(struct termp *p, const char *word) |
|
if (ESCAPE_ERROR == esc) |
if (ESCAPE_ERROR == esc) |
continue; |
continue; |
|
|
if (TERMENC_ASCII != p->enc) |
|
switch (esc) { |
|
case ESCAPE_UNICODE: |
|
uc = mchars_num2uc(seq + 1, sz - 1); |
|
if ('\0' == uc) |
|
break; |
|
encode1(p, uc); |
|
continue; |
|
case ESCAPE_SPECIAL: |
|
uc = mchars_spec2cp(p->symtab, seq, sz); |
|
if (uc <= 0) |
|
break; |
|
encode1(p, uc); |
|
continue; |
|
default: |
|
break; |
|
} |
|
|
|
switch (esc) { |
switch (esc) { |
case ESCAPE_UNICODE: |
case ESCAPE_UNICODE: |
encode1(p, '?'); |
uc = mchars_num2uc(seq + 1, sz - 1); |
|
if (p->enc == TERMENC_ASCII) { |
|
cp = ascii_uc2str(uc); |
|
encode(p, cp, strlen(cp)); |
|
} else |
|
encode1(p, uc); |
break; |
break; |
case ESCAPE_NUMBERED: |
case ESCAPE_NUMBERED: |
c = mchars_num2char(seq, sz); |
c = mchars_num2char(seq, sz); |
Line 472 term_word(struct termp *p, const char *word) |
|
Line 459 term_word(struct termp *p, const char *word) |
|
encode(p, &c, 1); |
encode(p, &c, 1); |
break; |
break; |
case ESCAPE_SPECIAL: |
case ESCAPE_SPECIAL: |
cp = mchars_spec2str(p->symtab, seq, sz, &ssz); |
if (p->enc == TERMENC_ASCII) { |
if (NULL != cp) |
cp = mchars_spec2str(p->symtab, |
encode(p, cp, ssz); |
seq, sz, &ssz); |
else if (1 == ssz) |
if (cp == NULL) |
encode(p, seq, sz); |
encode(p, "<?>", 3); |
|
else |
|
encode(p, cp, ssz); |
|
} else { |
|
uc = mchars_spec2cp(p->symtab, seq, sz); |
|
if (uc > 0) |
|
encode1(p, uc); |
|
} |
break; |
break; |
case ESCAPE_FONTBOLD: |
case ESCAPE_FONTBOLD: |
term_fontrepl(p, TERMFONT_BOLD); |
term_fontrepl(p, TERMFONT_BOLD); |
Line 683 term_strlen(const struct termp *p, const char *cp) |
|
Line 677 term_strlen(const struct termp *p, const char *cp) |
|
if (ESCAPE_ERROR == esc) |
if (ESCAPE_ERROR == esc) |
continue; |
continue; |
|
|
if (TERMENC_ASCII != p->enc) |
|
switch (esc) { |
|
case ESCAPE_UNICODE: |
|
c = mchars_num2uc(seq + 1, |
|
ssz - 1); |
|
if ('\0' == c) |
|
break; |
|
sz += cond_width(p, c, &skip); |
|
continue; |
|
case ESCAPE_SPECIAL: |
|
c = mchars_spec2cp(p->symtab, |
|
seq, ssz); |
|
if (c <= 0) |
|
break; |
|
sz += cond_width(p, c, &skip); |
|
continue; |
|
default: |
|
break; |
|
} |
|
|
|
rhs = NULL; |
rhs = NULL; |
|
|
switch (esc) { |
switch (esc) { |
case ESCAPE_UNICODE: |
case ESCAPE_UNICODE: |
sz += cond_width(p, '?', &skip); |
c = mchars_num2uc(seq + 1, sz - 1); |
|
if (p->enc == TERMENC_ASCII) { |
|
rhs = ascii_uc2str(c); |
|
rsz = strlen(rhs); |
|
} else |
|
sz += cond_width(p, c, &skip); |
break; |
break; |
case ESCAPE_NUMBERED: |
case ESCAPE_NUMBERED: |
c = mchars_num2char(seq, ssz); |
c = mchars_num2char(seq, ssz); |
Line 715 term_strlen(const struct termp *p, const char *cp) |
|
Line 694 term_strlen(const struct termp *p, const char *cp) |
|
sz += cond_width(p, c, &skip); |
sz += cond_width(p, c, &skip); |
break; |
break; |
case ESCAPE_SPECIAL: |
case ESCAPE_SPECIAL: |
rhs = mchars_spec2str(p->symtab, |
if (p->enc == TERMENC_ASCII) { |
seq, ssz, &rsz); |
rhs = mchars_spec2str(p->symtab, |
|
seq, ssz, &rsz); |
if (ssz != 1 || rhs) |
if (rhs == NULL) { |
break; |
rhs = "<?>"; |
|
rsz = 3; |
rhs = seq; |
} |
rsz = ssz; |
} else { |
|
c = mchars_spec2cp(p->symtab, |
|
seq, ssz); |
|
if (c > 0) |
|
sz += cond_width(p, c, &skip); |
|
} |
break; |
break; |
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
skip = 1; |
skip = 1; |