version 1.156, 2010/06/30 12:30:36 |
version 1.172, 2010/09/23 20:26:00 |
|
|
/* $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 |
|
|
#include "term.h" |
#include "term.h" |
#include "main.h" |
#include "main.h" |
|
|
static void spec(struct termp *, const char *, size_t); |
static void spec(struct termp *, enum roffdeco, |
|
const char *, size_t); |
static void res(struct termp *, const char *, size_t); |
static void res(struct termp *, const char *, size_t); |
static void buffera(struct termp *, const char *, size_t); |
|
static void bufferc(struct termp *, char); |
static void bufferc(struct termp *, char); |
static void adjbuf(struct termp *p, size_t); |
static void adjbuf(struct termp *p, size_t); |
static void encode(struct termp *, const char *, size_t); |
static void encode(struct termp *, const char *, size_t); |
Line 82 term_alloc(enum termenc enc) |
|
Line 83 term_alloc(enum termenc enc) |
|
p = calloc(1, sizeof(struct termp)); |
p = calloc(1, sizeof(struct termp)); |
if (NULL == p) { |
if (NULL == p) { |
perror(NULL); |
perror(NULL); |
exit(EXIT_FAILURE); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
|
|
p->enc = enc; |
p->enc = enc; |
Line 133 term_flushln(struct termp *p) |
|
Line 134 term_flushln(struct termp *p) |
|
size_t vbl; /* number of blanks to prepend to output */ |
size_t vbl; /* number of blanks to prepend to output */ |
size_t vend; /* end of word visual position on output */ |
size_t vend; /* end of word visual position on output */ |
size_t bp; /* visual right border position */ |
size_t bp; /* visual right border position */ |
|
size_t dv; /* temporary for visual pos calculations */ |
int j; /* temporary loop index for p->buf */ |
int j; /* temporary loop index for p->buf */ |
int jhy; /* last hyph before overflow w/r/t j */ |
int jhy; /* last hyph before overflow w/r/t j */ |
size_t maxvis; /* output position of visible boundary */ |
size_t maxvis; /* output position of visible boundary */ |
Line 168 term_flushln(struct termp *p) |
|
Line 170 term_flushln(struct termp *p) |
|
* Handle literal tab characters: collapse all |
* Handle literal tab characters: collapse all |
* subsequent tabs into a single huge set of spaces. |
* subsequent tabs into a single huge set of spaces. |
*/ |
*/ |
for (j = i; j < (int)p->col; j++) { |
while (i < (int)p->col && '\t' == p->buf[i]) { |
if ('\t' != p->buf[j]) |
|
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; |
|
i++; |
} |
} |
|
|
/* |
/* |
Line 184 term_flushln(struct termp *p) |
|
Line 185 term_flushln(struct termp *p) |
|
*/ |
*/ |
|
|
/* LINTED */ |
/* LINTED */ |
for (jhy = 0; j < (int)p->col; j++) { |
for (j = i, 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; |
|
|
Line 227 term_flushln(struct termp *p) |
|
Line 228 term_flushln(struct termp *p) |
|
p->overstep = 0; |
p->overstep = 0; |
} |
} |
|
|
/* |
|
* Skip leading tabs, they were handled above. |
|
*/ |
|
while (i < (int)p->col && '\t' == p->buf[i]) |
|
i++; |
|
|
|
/* Write out the [remaining] word. */ |
/* Write out the [remaining] word. */ |
for ( ; i < (int)p->col; i++) { |
for ( ; i < (int)p->col; i++) { |
if (vend > bp && jhy > 0 && i > jhy) |
if (vend > bp && jhy > 0 && i > jhy) |
Line 240 term_flushln(struct termp *p) |
|
Line 235 term_flushln(struct termp *p) |
|
if ('\t' == p->buf[i]) |
if ('\t' == p->buf[i]) |
break; |
break; |
if (' ' == p->buf[i]) { |
if (' ' == p->buf[i]) { |
while (' ' == p->buf[i]) { |
j = i; |
vbl += (*p->width)(p, p->buf[i]); |
while (' ' == p->buf[i]) |
i++; |
i++; |
} |
dv = (i - j) * (*p->width)(p, ' '); |
|
vbl += dv; |
|
vend += dv; |
break; |
break; |
} |
} |
if (ASCII_NBRSP == p->buf[i]) { |
if (ASCII_NBRSP == p->buf[i]) { |
Line 270 term_flushln(struct termp *p) |
|
Line 267 term_flushln(struct termp *p) |
|
p->viscol += (*p->width)(p, p->buf[i]); |
p->viscol += (*p->width)(p, p->buf[i]); |
} |
} |
} |
} |
vend += vbl; |
|
vis = vend; |
vis = vend; |
} |
} |
|
|
|
/* |
|
* If there was trailing white space, it was not printed; |
|
* so reset the cursor position accordingly. |
|
*/ |
|
vis -= vbl; |
|
|
p->col = 0; |
p->col = 0; |
p->overstep = 0; |
p->overstep = 0; |
|
|
Line 359 term_vspace(struct termp *p) |
|
Line 361 term_vspace(struct termp *p) |
|
|
|
|
|
static void |
static void |
spec(struct termp *p, const char *word, size_t len) |
spec(struct termp *p, enum roffdeco d, 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); |
|
else if (DECO_SSPECIAL == d) |
|
encode(p, word, len); |
} |
} |
|
|
|
|
Line 376 res(struct termp *p, const char *word, size_t len) |
|
Line 380 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); |
} |
} |
|
|
term_word(struct termp *p, const char *word) |
term_word(struct termp *p, const char *word) |
{ |
{ |
const char *sv, *seq; |
const char *sv, *seq; |
int sz; |
|
size_t ssz; |
size_t ssz; |
enum roffdeco deco; |
enum roffdeco deco; |
|
|
Line 499 term_word(struct termp *p, const char *word) |
|
Line 502 term_word(struct termp *p, const char *word) |
|
|
|
if ( ! (p->flags & TERMP_NONOSPACE)) |
if ( ! (p->flags & TERMP_NONOSPACE)) |
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
|
else |
|
p->flags |= TERMP_NOSPACE; |
|
|
p->flags &= ~TERMP_SENTENCE; |
p->flags &= ~TERMP_SENTENCE; |
|
|
/* FIXME: use strcspn. */ |
|
|
|
while (*word) { |
while (*word) { |
if ('\\' != *word) { |
if ((ssz = strcspn(word, "\\")) > 0) |
encode(p, word, 1); |
encode(p, word, ssz); |
word++; |
|
|
word += ssz; |
|
if ('\\' != *word) |
continue; |
continue; |
} |
|
|
|
seq = ++word; |
seq = ++word; |
sz = a2roffdeco(&deco, &seq, &ssz); |
word += a2roffdeco(&deco, &seq, &ssz); |
|
|
switch (deco) { |
switch (deco) { |
case (DECO_RESERVED): |
case (DECO_RESERVED): |
res(p, seq, ssz); |
res(p, seq, ssz); |
break; |
break; |
case (DECO_SPECIAL): |
case (DECO_SPECIAL): |
spec(p, seq, ssz); |
/* FALLTHROUGH */ |
|
case (DECO_SSPECIAL): |
|
spec(p, deco, seq, ssz); |
break; |
break; |
case (DECO_BOLD): |
case (DECO_BOLD): |
term_fontrepl(p, TERMFONT_BOLD); |
term_fontrepl(p, TERMFONT_BOLD); |
Line 537 term_word(struct termp *p, const char *word) |
|
Line 543 term_word(struct termp *p, const char *word) |
|
break; |
break; |
} |
} |
|
|
word += sz; |
|
if (DECO_NOSPACE == deco && '\0' == *word) |
if (DECO_NOSPACE == deco && '\0' == *word) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
Line 546 term_word(struct termp *p, const char *word) |
|
Line 551 term_word(struct termp *p, const char *word) |
|
* Note that we don't process the pipe: the parser sees it as |
* Note that we don't process the pipe: the parser sees it as |
* punctuation, but we don't in terms of typography. |
* punctuation, but we don't in terms of typography. |
*/ |
*/ |
if (sv[0] && 0 == sv[1]) |
if (sv[0] && '\0' == sv[1]) |
switch (sv[0]) { |
switch (sv[0]) { |
case('('): |
case('('): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 571 adjbuf(struct termp *p, size_t sz) |
|
Line 576 adjbuf(struct termp *p, size_t sz) |
|
p->buf = realloc(p->buf, p->maxcols); |
p->buf = realloc(p->buf, p->maxcols); |
if (NULL == p->buf) { |
if (NULL == p->buf) { |
perror(NULL); |
perror(NULL); |
exit(EXIT_FAILURE); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
} |
} |
|
|
|
|
static void |
static void |
buffera(struct termp *p, const char *word, size_t sz) |
|
{ |
|
|
|
if (p->col + sz >= p->maxcols) |
|
adjbuf(p, p->col + sz); |
|
|
|
memcpy(&p->buf[(int)p->col], word, sz); |
|
p->col += sz; |
|
} |
|
|
|
|
|
static void |
|
bufferc(struct termp *p, char c) |
bufferc(struct termp *p, char c) |
{ |
{ |
|
|
Line 612 encode(struct termp *p, const char *word, size_t sz) |
|
Line 605 encode(struct termp *p, const char *word, size_t sz) |
|
*/ |
*/ |
|
|
if (TERMFONT_NONE == (f = term_fonttop(p))) { |
if (TERMFONT_NONE == (f = term_fonttop(p))) { |
buffera(p, word, sz); |
if (p->col + sz >= p->maxcols) |
|
adjbuf(p, p->col + sz); |
|
memcpy(&p->buf[(int)p->col], word, sz); |
|
p->col += sz; |
return; |
return; |
} |
} |
|
|
|
/* Pre-buffer, assuming worst-case. */ |
|
|
|
if (p->col + 1 + (sz * 3) >= p->maxcols) |
|
adjbuf(p, p->col + 1 + (sz * 3)); |
|
|
for (i = 0; i < (int)sz; i++) { |
for (i = 0; i < (int)sz; i++) { |
if ( ! isgraph((u_char)word[i])) { |
if ( ! isgraph((u_char)word[i])) { |
bufferc(p, word[i]); |
p->buf[(int)p->col++] = word[i]; |
continue; |
continue; |
} |
} |
|
|
if (TERMFONT_UNDER == f) |
if (TERMFONT_UNDER == f) |
bufferc(p, '_'); |
p->buf[(int)p->col++] = '_'; |
else |
else |
bufferc(p, word[i]); |
p->buf[(int)p->col++] = word[i]; |
|
|
bufferc(p, 8); |
p->buf[(int)p->col++] = 8; |
bufferc(p, word[i]); |
p->buf[(int)p->col++] = word[i]; |
} |
} |
} |
} |
|
|
Line 644 term_len(const struct termp *p, size_t sz) |
|
Line 645 term_len(const struct termp *p, size_t sz) |
|
size_t |
size_t |
term_strlen(const struct termp *p, const char *cp) |
term_strlen(const struct termp *p, const char *cp) |
{ |
{ |
size_t sz; |
size_t sz, ssz, rsz, i; |
|
enum roffdeco d; |
|
const char *seq, *rhs; |
|
|
for (sz = 0; *cp; cp++) |
for (sz = 0; '\0' != *cp; ) |
sz += (*p->width)(p, *cp); |
/* |
|
* Account for escaped sequences within string length |
|
* calculations. This follows the logic in term_word() |
|
* as we must calculate the width of produced strings. |
|
*/ |
|
if ('\\' == *cp) { |
|
seq = ++cp; |
|
cp += a2roffdeco(&d, &seq, &ssz); |
|
|
|
switch (d) { |
|
case (DECO_RESERVED): |
|
rhs = chars_res2str |
|
(p->symtab, seq, ssz, &rsz); |
|
break; |
|
case (DECO_SPECIAL): |
|
/* FALLTHROUGH */ |
|
case (DECO_SSPECIAL): |
|
rhs = chars_spec2str |
|
(p->symtab, seq, ssz, &rsz); |
|
|
|
/* Allow for one-char escapes. */ |
|
if (DECO_SSPECIAL != d || rhs) |
|
break; |
|
|
|
rhs = seq; |
|
rsz = ssz; |
|
break; |
|
default: |
|
rhs = NULL; |
|
break; |
|
} |
|
|
|
if (rhs) |
|
for (i = 0; i < rsz; i++) |
|
sz += (*p->width)(p, *rhs++); |
|
} else |
|
sz += (*p->width)(p, *cp++); |
|
|
return(sz); |
return(sz); |
} |
} |
|
|
|
|
|
/* 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) |
{ |
{ |