version 1.270, 2017/06/14 01:31:27 |
version 1.271, 2017/06/14 17:51:15 |
Line 528 term_word(struct termp *p, const char *word) |
|
Line 528 term_word(struct termp *p, const char *word) |
|
case ESCAPE_HORIZ: |
case ESCAPE_HORIZ: |
if (a2roffsu(seq, &su, SCALE_EM) == NULL) |
if (a2roffsu(seq, &su, SCALE_EM) == NULL) |
continue; |
continue; |
uc = term_hspan(p, &su) / 24; |
uc = term_hen(p, &su); |
if (uc > 0) |
if (uc > 0) |
while (uc-- > 0) |
while (uc-- > 0) |
bufferc(p, ASCII_NBRSP); |
bufferc(p, ASCII_NBRSP); |
Line 549 term_word(struct termp *p, const char *word) |
|
Line 549 term_word(struct termp *p, const char *word) |
|
case ESCAPE_HLINE: |
case ESCAPE_HLINE: |
if ((seq = a2roffsu(seq, &su, SCALE_EM)) == NULL) |
if ((seq = a2roffsu(seq, &su, SCALE_EM)) == NULL) |
continue; |
continue; |
uc = term_hspan(p, &su) / 24; |
uc = term_hen(p, &su); |
if (uc <= 0) { |
if (uc <= 0) { |
if (p->tcol->rmargin <= p->tcol->offset) |
if (p->tcol->rmargin <= p->tcol->offset) |
continue; |
continue; |
Line 966 term_vspan(const struct termp *p, const struct roffsu |
|
Line 966 term_vspan(const struct termp *p, const struct roffsu |
|
} |
} |
|
|
/* |
/* |
* Convert a scaling width to basic units, rounding down. |
* Convert a scaling width to basic units, rounding towards 0. |
*/ |
*/ |
int |
int |
term_hspan(const struct termp *p, const struct roffsu *su) |
term_hspan(const struct termp *p, const struct roffsu *su) |
{ |
{ |
|
|
return (*p->hspan)(p, su); |
return (*p->hspan)(p, su); |
|
} |
|
|
|
/* |
|
* Convert a scaling width to basic units, rounding to closest. |
|
*/ |
|
int |
|
term_hen(const struct termp *p, const struct roffsu *su) |
|
{ |
|
int bu; |
|
|
|
if ((bu = (*p->hspan)(p, su)) >= 0) |
|
return (bu + 11) / 24; |
|
else |
|
return -((-bu + 11) / 24); |
} |
} |