version 1.153, 2010/06/28 22:46:21 |
version 1.161, 2010/07/16 22:33:30 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 161 term_flushln(struct termp *p) |
|
Line 162 term_flushln(struct termp *p) |
|
*/ |
*/ |
vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset; |
vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset; |
|
|
/* |
|
* FIXME: if bp is zero, we still output the first word before |
|
* breaking the line. |
|
*/ |
|
|
|
vis = vend = i = 0; |
vis = vend = i = 0; |
while (i < (int)p->col) { |
|
|
|
|
while (i < (int)p->col) { |
/* |
/* |
* Handle literal tab characters. |
* Handle literal tab characters: collapse all |
|
* subsequent tabs into a single huge set of spaces. |
*/ |
*/ |
for (j = i; j < (int)p->col; j++) { |
for (j = i; j < (int)p->col; j++) { |
if ('\t' != p->buf[j]) |
if ('\t' != p->buf[j]) |
break; |
break; |
vend = (vis/p->tabwidth+1)*p->tabwidth; |
vend = (vis / p->tabwidth + 1) * p->tabwidth; |
vbl += vend - vis; |
vbl += vend - vis; |
vis = vend; |
vis = vend; |
} |
} |
Line 191 term_flushln(struct termp *p) |
|
Line 188 term_flushln(struct termp *p) |
|
for (jhy = 0; j < (int)p->col; j++) { |
for (jhy = 0; j < (int)p->col; j++) { |
if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j]) |
if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j]) |
break; |
break; |
if (8 != p->buf[j]) { |
|
if (vend > vis && vend < bp && |
/* Back over the the last printed character. */ |
ASCII_HYPH == p->buf[j]) |
if (8 == p->buf[j]) { |
jhy = j; |
|
vend += (*p->width)(p, p->buf[j]); |
|
} else { |
|
assert(j); |
assert(j); |
vend -= (*p->width)(p, p->buf[j - 1]); |
vend -= (*p->width)(p, p->buf[j - 1]); |
|
continue; |
} |
} |
|
|
|
/* Regular word. */ |
|
/* Break at the hyphen point if we overrun. */ |
|
if (vend > vis && vend < bp && |
|
ASCII_HYPH == p->buf[j]) |
|
jhy = j; |
|
|
|
vend += (*p->width)(p, p->buf[j]); |
} |
} |
|
|
/* |
/* |
Line 308 term_flushln(struct termp *p) |
|
Line 311 term_flushln(struct termp *p) |
|
|
|
/* Right-pad. */ |
/* Right-pad. */ |
if (maxvis > vis + /* LINTED */ |
if (maxvis > vis + /* LINTED */ |
((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) { |
((TERMP_TWOSPACE & p->flags) ? |
|
(*p->width)(p, ' ') : 0)) { |
p->viscol += maxvis - vis; |
p->viscol += maxvis - vis; |
(*p->advance)(p, maxvis - vis); |
(*p->advance)(p, maxvis - vis); |
vis += (maxvis - vis); |
vis += (maxvis - vis); |
Line 361 spec(struct termp *p, const char *word, size_t len) |
|
Line 365 spec(struct termp *p, const char *word, size_t len) |
|
const char *rhs; |
const char *rhs; |
size_t sz; |
size_t sz; |
|
|
rhs = chars_a2ascii(p->symtab, word, len, &sz); |
rhs = chars_spec2str(p->symtab, word, len, &sz); |
if (rhs) |
if (rhs) |
encode(p, rhs, sz); |
encode(p, rhs, sz); |
} |
} |
Line 373 res(struct termp *p, const char *word, size_t len) |
|
Line 377 res(struct termp *p, const char *word, size_t len) |
|
const char *rhs; |
const char *rhs; |
size_t sz; |
size_t sz; |
|
|
rhs = chars_a2res(p->symtab, word, len, &sz); |
rhs = chars_res2str(p->symtab, word, len, &sz); |
if (rhs) |
if (rhs) |
encode(p, rhs, sz); |
encode(p, rhs, sz); |
} |
} |
Line 650 term_strlen(const struct termp *p, const char *cp) |
|
Line 654 term_strlen(const struct termp *p, const char *cp) |
|
} |
} |
|
|
|
|
|
/* ARGSUSED */ |
size_t |
size_t |
term_vspan(const struct termp *p, const struct roffsu *su) |
term_vspan(const struct termp *p, const struct roffsu *su) |
{ |
{ |
Line 689 term_vspan(const struct termp *p, const struct roffsu |
|
Line 694 term_vspan(const struct termp *p, const struct roffsu |
|
size_t |
size_t |
term_hspan(const struct termp *p, const struct roffsu *su) |
term_hspan(const struct termp *p, const struct roffsu *su) |
{ |
{ |
double r; |
double v; |
|
|
/* XXX: CM, IN, and PT are approximations. */ |
v = ((*p->hspan)(p, su)); |
|
if (v < 0.0) |
switch (su->unit) { |
v = 0.0; |
case (SCALE_CM): |
return((size_t) /* LINTED */ |
r = 4 * su->scale; |
v); |
break; |
|
case (SCALE_IN): |
|
/* XXX: this is an approximation. */ |
|
r = 10 * su->scale; |
|
break; |
|
case (SCALE_PC): |
|
r = (10 * su->scale) / 6; |
|
break; |
|
case (SCALE_PT): |
|
r = (10 * su->scale) / 72; |
|
break; |
|
case (SCALE_MM): |
|
r = su->scale / 1000; /* FIXME: double-check. */ |
|
break; |
|
case (SCALE_VS): |
|
r = su->scale * 2 - 1; /* FIXME: double-check. */ |
|
break; |
|
default: |
|
r = su->scale; |
|
break; |
|
} |
|
|
|
if (r < 0.0) |
|
r = 0.0; |
|
return((size_t)/* LINTED */ |
|
r); |
|
} |
} |
|
|
|
|