version 1.12, 2009/02/25 15:12:26 |
version 1.15, 2009/02/26 17:11:38 |
Line 168 flushln(struct termp *p) |
|
Line 168 flushln(struct termp *p) |
|
* the line with TERMP_NOBREAK). |
* the line with TERMP_NOBREAK). |
*/ |
*/ |
|
|
if (vis && vis + vsz >= maxvis) { |
if (vis && vis + vsz > maxvis) { |
/* FIXME */ |
/* FIXME */ |
if (p->flags & TERMP_NOBREAK) |
if (p->flags & TERMP_NOBREAK) |
errx(1, "word breaks right margin"); |
errx(1, "word breaks right margin"); |
Line 176 flushln(struct termp *p) |
|
Line 176 flushln(struct termp *p) |
|
for (j = 0; j < p->offset; j++) |
for (j = 0; j < p->offset; j++) |
putchar(' '); |
putchar(' '); |
vis = 0; |
vis = 0; |
} else if (vis + vsz >= maxvis) |
} else if (vis + vsz > maxvis) |
/* FIXME */ |
/* FIXME */ |
errx(1, "word breaks right margin"); |
errx(1, "word breaks right margin"); |
|
|
Line 203 flushln(struct termp *p) |
|
Line 203 flushln(struct termp *p) |
|
*/ |
*/ |
|
|
if (p->flags & TERMP_NOBREAK) { |
if (p->flags & TERMP_NOBREAK) { |
for ( ; vis < maxvis; vis++) |
if ( ! (p->flags & TERMP_NORPAD)) |
putchar(' '); |
for ( ; vis < maxvis; vis++) |
|
putchar(' '); |
} else |
} else |
putchar('\n'); |
putchar('\n'); |
|
|
Line 345 pescape(struct termp *p, const char *word, size_t *i, |
|
Line 346 pescape(struct termp *p, const char *word, size_t *i, |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('-'): |
case ('-'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (' '): |
|
/* FALLTHROUGH */ |
case ('.'): |
case ('.'): |
chara(p, word[*i]); |
chara(p, word[*i]); |
default: |
default: |
Line 372 pword(struct termp *p, const char *word, size_t len) |
|
Line 375 pword(struct termp *p, const char *word, size_t len) |
|
! (p->flags & TERMP_LITERAL)) |
! (p->flags & TERMP_LITERAL)) |
chara(p, ' '); |
chara(p, ' '); |
|
|
p->flags &= ~TERMP_NOSPACE; |
if ( ! (p->flags & TERMP_NONOSPACE)) |
|
p->flags &= ~TERMP_NOSPACE; |
|
|
if (p->flags & TERMP_BOLD) |
if (p->flags & TERMP_BOLD) |
style(p, STYLE_BOLD); |
style(p, STYLE_BOLD); |
Line 484 footer(struct termp *p, const struct mdoc_meta *meta) |
|
Line 488 footer(struct termp *p, const struct mdoc_meta *meta) |
|
{ |
{ |
struct tm *tm; |
struct tm *tm; |
char *buf, *os; |
char *buf, *os; |
size_t sz, osz, ssz, i; |
|
|
|
if (NULL == (buf = malloc(p->rmargin))) |
if (NULL == (buf = malloc(p->rmargin))) |
err(1, "malloc"); |
err(1, "malloc"); |
Line 500 footer(struct termp *p, const struct mdoc_meta *meta) |
|
Line 503 footer(struct termp *p, const struct mdoc_meta *meta) |
|
#endif |
#endif |
err(1, "strftime"); |
err(1, "strftime"); |
|
|
osz = strlcpy(os, meta->os, p->rmargin); |
(void)strlcpy(os, meta->os, p->rmargin); |
|
|
sz = strlen(buf); |
vspace(p); |
ssz = sz + osz + 1; |
|
|
|
if (ssz > p->rmargin) { |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
ssz -= p->rmargin; |
p->rmargin = p->maxrmargin - strlen(buf); |
assert(ssz <= osz); |
p->offset = 0; |
os[osz - ssz] = 0; |
|
ssz = 1; |
|
} else |
|
ssz = p->rmargin - ssz + 1; |
|
|
|
printf("\n"); |
word(p, os); |
printf("%s", os); |
flushln(p); |
for (i = 0; i < ssz; i++) |
|
printf(" "); |
|
|
|
printf("%s\n", buf); |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
fflush(stdout); |
p->offset = p->rmargin; |
|
p->rmargin = p->maxrmargin; |
|
p->flags &= ~TERMP_NOBREAK; |
|
|
|
word(p, buf); |
|
flushln(p); |
|
|
free(buf); |
free(buf); |
free(os); |
free(os); |
} |
} |
|
|
header(struct termp *p, const struct mdoc_meta *meta) |
header(struct termp *p, const struct mdoc_meta *meta) |
{ |
{ |
char *buf, *title; |
char *buf, *title; |
const char *pp, *msec; |
const char *pp; |
size_t ssz, tsz, ttsz, i;; |
|
|
|
if (NULL == (buf = malloc(p->rmargin))) |
if (NULL == (buf = malloc(p->rmargin))) |
err(1, "malloc"); |
err(1, "malloc"); |
Line 568 header(struct termp *p, const struct mdoc_meta *meta) |
|
Line 568 header(struct termp *p, const struct mdoc_meta *meta) |
|
pp = mdoc_msec2a(MSEC_local); |
pp = mdoc_msec2a(MSEC_local); |
break; |
break; |
} |
} |
assert(pp); |
|
|
|
tsz = strlcpy(buf, pp, p->rmargin); |
if (mdoc_arch2a(meta->arch)) |
assert(tsz < p->rmargin); |
(void)snprintf(buf, p->rmargin, "%s(%s)", |
|
pp, mdoc_arch2a(meta->arch)); |
|
else |
|
(void)strlcpy(buf, pp, p->rmargin); |
|
|
if ((pp = mdoc_arch2a(meta->arch))) { |
pp = mdoc_msec2a(meta->msec); |
tsz = strlcat(buf, " (", p->rmargin); |
|
assert(tsz < p->rmargin); |
|
tsz = strlcat(buf, pp, p->rmargin); |
|
assert(tsz < p->rmargin); |
|
tsz = strlcat(buf, ")", p->rmargin); |
|
assert(tsz < p->rmargin); |
|
} |
|
|
|
ttsz = strlcpy(title, meta->title, p->rmargin); |
(void)snprintf(title, p->rmargin, "%s(%s)", |
|
meta->title, pp ? pp : ""); |
|
|
if (NULL == (msec = mdoc_msec2a(meta->msec))) |
p->offset = 0; |
msec = ""; |
p->rmargin = (p->maxrmargin - strlen(buf)) / 2; |
|
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
|
|
ssz = (2 * (ttsz + 2 + strlen(msec))) + tsz + 2; |
word(p, title); |
|
flushln(p); |
|
|
if (ssz > p->rmargin) { |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
if ((ssz -= p->rmargin) % 2) |
p->offset = p->rmargin; |
ssz++; |
p->rmargin = p->maxrmargin - strlen(title); |
ssz /= 2; |
|
|
|
assert(ssz <= ttsz); |
|
title[ttsz - ssz] = 0; |
|
ssz = 1; |
|
} else |
|
ssz = ((p->rmargin - ssz) / 2) + 1; |
|
|
|
printf("%s(%s)", title, msec); |
word(p, buf); |
|
flushln(p); |
|
|
for (i = 0; i < ssz; i++) |
p->offset = p->rmargin; |
printf(" "); |
p->rmargin = p->maxrmargin; |
|
p->flags &= ~TERMP_NOBREAK; |
|
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
|
|
printf("%s", buf); |
word(p, title); |
|
flushln(p); |
|
|
for (i = 0; i < ssz; i++) |
p->rmargin = p->maxrmargin; |
printf(" "); |
p->offset = 0; |
|
p->flags &= ~TERMP_NOSPACE; |
printf("%s(%s)\n", title, msec); |
|
fflush(stdout); |
|
|
|
free(title); |
free(title); |
free(buf); |
free(buf); |