version 1.267, 2017/06/07 20:01:19 |
version 1.268, 2017/06/08 12:54:58 |
Line 479 term_word(struct termp *p, const char *word) |
|
Line 479 term_word(struct termp *p, const char *word) |
|
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
continue; |
continue; |
case ESCAPE_HORIZ: |
case ESCAPE_HORIZ: |
if (a2roffsu(seq, &su, SCALE_EM) == 0) |
if (a2roffsu(seq, &su, SCALE_EM) == NULL) |
continue; |
continue; |
uc = term_hspan(p, &su) / 24; |
uc = term_hspan(p, &su) / 24; |
if (uc > 0) |
if (uc > 0) |
Line 500 term_word(struct termp *p, const char *word) |
|
Line 500 term_word(struct termp *p, const char *word) |
|
} |
} |
continue; |
continue; |
case ESCAPE_HLINE: |
case ESCAPE_HLINE: |
if (a2roffsu(seq, &su, SCALE_EM) == 0) |
if ((seq = a2roffsu(seq, &su, SCALE_EM)) == NULL) |
continue; |
continue; |
uc = term_hspan(p, &su) / 24; |
uc = term_hspan(p, &su) / 24; |
if (uc <= 0) { |
if (uc <= 0) { |
Line 509 term_word(struct termp *p, const char *word) |
|
Line 509 term_word(struct termp *p, const char *word) |
|
lsz = p->tcol->rmargin - p->tcol->offset; |
lsz = p->tcol->rmargin - p->tcol->offset; |
} else |
} else |
lsz = uc; |
lsz = uc; |
while (sz && |
if (*seq == '\0') |
strchr(" %&()*+-./0123456789:<=>", *seq)) { |
|
seq++; |
|
sz--; |
|
} |
|
if (sz && strchr("cifMmnPpuv", *seq)) { |
|
seq++; |
|
sz--; |
|
} |
|
if (sz == 0) |
|
uc = -1; |
uc = -1; |
else if (*seq == '\\') { |
else if (*seq == '\\') { |
seq++; |
seq++; |
Line 739 term_setwidth(struct termp *p, const char *wstr) |
|
Line 730 term_setwidth(struct termp *p, const char *wstr) |
|
default: |
default: |
break; |
break; |
} |
} |
if (a2roffsu(wstr, &su, SCALE_MAX)) |
if (a2roffsu(wstr, &su, SCALE_MAX) != NULL) |
width = term_hspan(p, &su); |
width = term_hspan(p, &su); |
else |
else |
iop = 0; |
iop = 0; |