=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.4 retrieving revision 1.103 diff -u -p -r1.4 -r1.103 --- mandoc/term.c 2009/02/21 15:34:46 1.4 +++ mandoc/term.c 2009/09/23 11:02:21 1.103 @@ -1,244 +1,167 @@ -/* $Id: term.c,v 1.4 2009/02/21 15:34:46 kristaps Exp $ */ +/* $Id: term.c,v 1.103 2009/09/23 11:02:21 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include -#include -#include #include -#include #include +#include #include -#include -#include -#include "private.h" +#include "chars.h" +#include "term.h" +#include "man.h" +#include "mdoc.h" -enum termesc { - ESC_CLEAR, - ESC_BOLD, - ESC_UNDERLINE -}; +/* FIXME: accomodate non-breaking, non-collapsing white-space. */ +/* FIXME: accomodate non-breaking, collapsing white-space. */ -struct termp { - size_t rmargin; - size_t maxrmargin; - size_t maxcols; - size_t offset; - size_t col; - int flags; -#define TERMP_BOLD (1 << 0) /* Embolden words. */ -#define TERMP_UNDERLINE (1 << 1) /* Underline words. */ -#define TERMP_NOSPACE (1 << 2) /* No space before words. */ -#define TERMP_NOLPAD (1 << 3) /* No left-padding. */ -#define TERMP_NOBREAK (1 << 4) /* No break after line */ - char *buf; -}; +extern void man_run(struct termp *, + const struct man *); +extern void mdoc_run(struct termp *, + const struct mdoc *); -struct termact { - int (*pre)(struct termp *, - const struct mdoc_meta *, - const struct mdoc_node *); - int (*post)(struct termp *, - const struct mdoc_meta *, - const struct mdoc_node *); -}; +static struct termp *term_alloc(enum termenc); +static void term_free(struct termp *); -static void termprint_r(struct termp *, - const struct mdoc_meta *, - const struct mdoc_node *); -static void termprint_header(struct termp *, - const struct mdoc_meta *); -static void termprint_footer(struct termp *, - const struct mdoc_meta *); +static void do_escaped(struct termp *, const char **); +static void do_special(struct termp *, + const char *, size_t); +static void do_reserved(struct termp *, + const char *, size_t); +static void buffer(struct termp *, char); +static void encode(struct termp *, char); -static int arg_hasattr(int, size_t, - const struct mdoc_arg *); -static int arg_getattr(int, size_t, - const struct mdoc_arg *); -static void newln(struct termp *); -static void vspace(struct termp *); -static void pword(struct termp *, const char *, size_t); -static void word(struct termp *, const char *); +void * +ascii_alloc(void) +{ -#define decl_prepost(name, suffix) \ -static int name##_##suffix(struct termp *, \ - const struct mdoc_meta *, \ - const struct mdoc_node *) + return(term_alloc(TERMENC_ASCII)); +} -#define decl_pre(name) decl_prepost(name, pre) -#define decl_post(name) decl_prepost(name, post) -decl_pre(termp_fl); -decl_pre(termp_it); -decl_pre(termp_nd); -decl_pre(termp_ns); -decl_pre(termp_op); -decl_pre(termp_pp); -decl_pre(termp_sh); -decl_pre(termp_xr); +void +terminal_man(void *arg, const struct man *man) +{ + struct termp *p; -decl_post(termp_bl); -decl_post(termp_it); -decl_post(termp_op); -decl_post(termp_sh); + p = (struct termp *)arg; + if (NULL == p->symtab) + p->symtab = chars_init(CHARS_ASCII); -decl_pre(termp_bold); -decl_pre(termp_under); + man_run(p, man); +} -decl_post(termp_bold); -decl_post(termp_under); -const struct termact termacts[MDOC_MAX] = { - { NULL, NULL }, /* \" */ - { NULL, NULL }, /* Dd */ - { NULL, NULL }, /* Dt */ - { NULL, NULL }, /* Os */ - { termp_sh_pre, termp_sh_post }, /* Sh */ - { NULL, NULL }, /* Ss */ - { termp_pp_pre, NULL }, /* Pp */ - { NULL, NULL }, /* D1 */ - { NULL, NULL }, /* Dl */ - { NULL, NULL }, /* Bd */ - { NULL, NULL }, /* Ed */ - { NULL, termp_bl_post }, /* Bl */ - { NULL, NULL }, /* El */ - { termp_it_pre, termp_it_post }, /* It */ - { NULL, NULL }, /* Ad */ - { NULL, NULL }, /* An */ - { termp_under_pre, termp_under_post }, /* Ar */ - { NULL, NULL }, /* Cd */ - { NULL, NULL }, /* Cm */ - { NULL, NULL }, /* Dv */ - { NULL, NULL }, /* Er */ - { NULL, NULL }, /* Ev */ - { NULL, NULL }, /* Ex */ - { NULL, NULL }, /* Fa */ - { NULL, NULL }, /* Fd */ - { termp_fl_pre, termp_bold_post }, /* Fl */ - { NULL, NULL }, /* Fn */ - { NULL, NULL }, /* Ft */ - { NULL, NULL }, /* Ic */ - { NULL, NULL }, /* In */ - { NULL, NULL }, /* Li */ - { termp_nd_pre, NULL }, /* Nd */ - { termp_bold_pre, termp_bold_post }, /* Nm */ - { termp_op_pre, termp_op_post }, /* Op */ - { NULL, NULL }, /* Ot */ - { NULL, NULL }, /* Pa */ - { NULL, NULL }, /* Rv */ - { NULL, NULL }, /* St */ - { NULL, NULL }, /* Va */ - { NULL, NULL }, /* Vt */ - { termp_xr_pre, NULL }, /* Xr */ - { NULL, NULL }, /* %A */ - { NULL, NULL }, /* %B */ - { NULL, NULL }, /* %D */ - { NULL, NULL }, /* %I */ - { NULL, NULL }, /* %J */ - { NULL, NULL }, /* %N */ - { NULL, NULL }, /* %O */ - { NULL, NULL }, /* %P */ - { NULL, NULL }, /* %R */ - { NULL, NULL }, /* %T */ - { NULL, NULL }, /* %V */ - { NULL, NULL }, /* Ac */ - { NULL, NULL }, /* Ao */ - { NULL, NULL }, /* Aq */ - { NULL, NULL }, /* At */ - { NULL, NULL }, /* Bc */ - { NULL, NULL }, /* Bf */ - { NULL, NULL }, /* Bo */ - { NULL, NULL }, /* Bq */ - { NULL, NULL }, /* Bsx */ - { NULL, NULL }, /* Bx */ - { NULL, NULL }, /* Db */ - { NULL, NULL }, /* Dc */ - { NULL, NULL }, /* Do */ - { NULL, NULL }, /* Dq */ - { NULL, NULL }, /* Ec */ - { NULL, NULL }, /* Ef */ - { NULL, NULL }, /* Em */ - { NULL, NULL }, /* Eo */ - { NULL, NULL }, /* Fx */ - { NULL, NULL }, /* Ms */ - { NULL, NULL }, /* No */ - { termp_ns_pre, NULL }, /* Ns */ - { NULL, NULL }, /* Nx */ - { NULL, NULL }, /* Ox */ - { NULL, NULL }, /* Pc */ - { NULL, NULL }, /* Pf */ - { NULL, NULL }, /* Po */ - { NULL, NULL }, /* Pq */ - { NULL, NULL }, /* Qc */ - { NULL, NULL }, /* Ql */ - { NULL, NULL }, /* Qo */ - { NULL, NULL }, /* Qq */ - { NULL, NULL }, /* Re */ - { NULL, NULL }, /* Rs */ - { NULL, NULL }, /* Sc */ - { NULL, NULL }, /* So */ - { NULL, NULL }, /* Sq */ - { NULL, NULL }, /* Sm */ - { NULL, NULL }, /* Sx */ - { NULL, NULL }, /* Sy */ - { NULL, NULL }, /* Tn */ - { NULL, NULL }, /* Ux */ - { NULL, NULL }, /* Xc */ - { NULL, NULL }, /* Xo */ - { NULL, NULL }, /* Fo */ - { NULL, NULL }, /* Fc */ - { NULL, NULL }, /* Oo */ - { NULL, NULL }, /* Oc */ - { NULL, NULL }, /* Bk */ - { NULL, NULL }, /* Ek */ - { NULL, NULL }, /* Bt */ - { NULL, NULL }, /* Hf */ - { NULL, NULL }, /* Fr */ - { NULL, NULL }, /* Ud */ -}; +void +terminal_mdoc(void *arg, const struct mdoc *mdoc) +{ + struct termp *p; + p = (struct termp *)arg; + if (NULL == p->symtab) + p->symtab = chars_init(CHARS_ASCII); -static int -arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv) + mdoc_run(p, mdoc); +} + + +void +terminal_free(void *arg) { - return(-1 != arg_getattr(arg, argc, argv)); + term_free((struct termp *)arg); } -static int -arg_getattr(int arg, size_t argc, const struct mdoc_arg *argv) +static void +term_free(struct termp *p) { - int i; - for (i = 0; i < (int)argc; i++) - if (argv[i].arg == arg) - return(i); - return(-1); + if (p->buf) + free(p->buf); + if (p->symtab) + chars_free(p->symtab); + + free(p); } -static void -flushln(struct termp *p) +static struct termp * +term_alloc(enum termenc enc) { - size_t i, j, vsz, vis, maxvis; + struct termp *p; + if (NULL == (p = malloc(sizeof(struct termp)))) + return(NULL); + bzero(p, sizeof(struct termp)); + p->maxrmargin = 78; + p->enc = enc; + return(p); +} + + +/* + * Flush a line of text. A "line" is loosely defined as being something + * that should be followed by a newline, regardless of whether it's + * broken apart by newlines getting there. A line can also be a + * fragment of a columnar list. + * + * Specifically, a line is whatever's in p->buf of length p->col, which + * is zeroed after this function returns. + * + * The usage of termp:flags is as follows: + * + * - TERMP_NOLPAD: when beginning to write the line, don't left-pad the + * offset value. This is useful when doing columnar lists where the + * prior column has right-padded. + * + * - TERMP_NOBREAK: this is the most important and is used when making + * columns. In short: don't print a newline and instead pad to the + * right margin. Used in conjunction with TERMP_NOLPAD. + * + * - TERMP_TWOSPACE: when padding, make sure there are at least two + * space characters of padding. Otherwise, rather break the line. + * + * - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and + * the line is overrun, and don't pad-right if it's underrun. + * + * - TERMP_HANG: like TERMP_DANGLE, but doesn't newline when + * overruning, instead save the position and continue at that point + * when the next invocation. + * + * In-line line breaking: + * + * If TERMP_NOBREAK is specified and the line overruns the right + * margin, it will break and pad-right to the right margin after + * writing. If maxrmargin is violated, it will break and continue + * writing from the right-margin, which will lead to the above + * scenario upon exit. + * + * Otherwise, the line will break at the right margin. Extremely long + * lines will cause the system to emit a warning (TODO: hyphenate, if + * possible). + */ +void +term_flushln(struct termp *p) +{ + int i, j; + size_t vbl, vsz, vis, maxvis, mmax, bp; + static int overstep = 0; + /* * First, establish the maximum columns of "visible" content. * This is usually the difference between the right-margin and @@ -247,8 +170,16 @@ flushln(struct termp *p) */ assert(p->offset < p->rmargin); - maxvis = p->rmargin - p->offset; + assert((int)(p->rmargin - p->offset) - overstep > 0); + + maxvis = /* LINTED */ + p->rmargin - p->offset - overstep; + mmax = /* LINTED */ + p->maxrmargin - p->offset - overstep; + + bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; vis = 0; + overstep = 0; /* * If in the standard case (left-justified), then begin with our @@ -258,755 +189,396 @@ flushln(struct termp *p) if ( ! (p->flags & TERMP_NOLPAD)) /* LINTED */ - for (j = 0; j < p->offset; j++) + for (j = 0; j < (int)p->offset; j++) putchar(' '); - for (i = 0; i < p->col; i++) { + for (i = 0; i < (int)p->col; i++) { /* * Count up visible word characters. Control sequences - * (starting with the CSI) aren't counted. + * (starting with the CSI) aren't counted. A space + * generates a non-printing word, which is valid (the + * space is printed according to regular spacing rules). */ - assert( ! isspace(p->buf[i])); /* LINTED */ - for (j = i, vsz = 0; j < p->col; j++) { - if (isspace(p->buf[j])) + for (j = i, vsz = 0; j < (int)p->col; j++) { + if (j && ' ' == p->buf[j]) break; - else if (27 == p->buf[j]) { - assert(j + 4 <= p->col); - j += 3; - } else + else if (8 == p->buf[j]) + vsz--; + else vsz++; } - assert(vsz > 0); /* - * If a word is too long and we're within a line, put it - * on the next line. Puke if we're being asked to write - * something that will exceed the right margin (i.e., - * from a fresh line or when we're not allowed to break - * the line with TERMP_NOBREAK). + * Choose the number of blanks to prepend: no blank at the + * beginning of a line, one between words -- but do not + * actually write them yet. */ + vbl = (size_t)(0 == vis ? 0 : 1); - if (vis && vis + vsz >= maxvis) { - /* FIXME */ - if (p->flags & TERMP_NOBREAK) - errx(1, "word breaks right margin"); + /* + * Find out whether we would exceed the right margin. + * If so, break to the next line. (TODO: hyphenate) + * Otherwise, write the chosen number of blanks now. + */ + if (vis && vis + vbl + vsz > bp) { putchar('\n'); - for (j = 0; j < p->offset; j++) + if (TERMP_NOBREAK & p->flags) { + for (j = 0; j < (int)p->rmargin; j++) + putchar(' '); + vis = p->rmargin - p->offset; + } else { + for (j = 0; j < (int)p->offset; j++) + putchar(' '); + vis = 0; + } + } else { + for (j = 0; j < (int)vbl; j++) putchar(' '); - vis = 0; - } else if (vis + vsz >= maxvis) { - /* FIXME */ - errx(1, "word breaks right margin"); + vis += vbl; } - /* - * Write out the word and a trailing space. Omit the - * space if we're the last word in the line. + /* + * Finally, write out the word. */ - - for ( ; i < p->col; i++) { - if (isspace(p->buf[i])) + for ( ; i < (int)p->col; i++) { + if (' ' == p->buf[i]) break; putchar(p->buf[i]); } vis += vsz; - if (i < p->col) { - putchar(' '); - vis++; - } } + p->col = 0; - /* - * If we're not to right-marginalise it (newline), then instead - * pad to the right margin and stay off. - */ + if ( ! (TERMP_NOBREAK & p->flags)) { + putchar('\n'); + return; + } - if (p->flags & TERMP_NOBREAK) { - for ( ; vis <= maxvis; vis++) + if (TERMP_HANG & p->flags) { + /* We need one blank after the tag. */ + overstep = /* LINTED */ + vis - maxvis + 1; + + /* + * Behave exactly the same way as groff: + * If we have overstepped the margin, temporarily move + * it to the right and flag the rest of the line to be + * shorter. + * If we landed right at the margin, be happy. + * If we are one step before the margin, temporarily + * move it one step LEFT and flag the rest of the line + * to be longer. + */ + if (overstep >= -1) { + assert((int)maxvis + overstep >= 0); + /* LINTED */ + maxvis += overstep; + } else + overstep = 0; + + } else if (TERMP_DANGLE & p->flags) + return; + + /* Right-pad. */ + if (maxvis > vis + /* LINTED */ + ((TERMP_TWOSPACE & p->flags) ? 1 : 0)) + for ( ; vis < maxvis; vis++) putchar(' '); - } else + else { /* ...or newline break. */ putchar('\n'); - - p->col = 0; + for (i = 0; i < (int)p->rmargin; i++) + putchar(' '); + } } -static void -newln(struct termp *p) +/* + * A newline only breaks an existing line; it won't assert vertical + * space. All data in the output buffer is flushed prior to the newline + * assertion. + */ +void +term_newln(struct termp *p) { - /* - * A newline only breaks an existing line; it won't assert - * vertical space. - */ p->flags |= TERMP_NOSPACE; - if (0 == p->col) + if (0 == p->col) { + p->flags &= ~TERMP_NOLPAD; return; - flushln(p); + } + term_flushln(p); + p->flags &= ~TERMP_NOLPAD; } -static void -vspace(struct termp *p) +/* + * Asserts a vertical space (a full, empty line-break between lines). + * Note that if used twice, this will cause two blank spaces and so on. + * All data in the output buffer is flushed prior to the newline + * assertion. + */ +void +term_vspace(struct termp *p) { - /* - * Asserts a vertical space (a full, empty line-break between - * lines). - */ - newln(p); + term_newln(p); putchar('\n'); } static void -chara(struct termp *p, char c) +do_special(struct termp *p, const char *word, size_t len) { + const char *rhs; + size_t sz; + int i; - /* TODO: dynamically expand the buffer. */ - if (p->col + 1 >= p->maxcols) - errx(1, "line overrun"); - p->buf[(p->col)++] = c; -} + rhs = chars_a2ascii(p->symtab, word, len, &sz); - -static void -escape(struct termp *p, enum termesc esc) -{ - - if (p->col + 4 >= p->maxcols) - errx(1, "line overrun"); - - p->buf[(p->col)++] = 27; - p->buf[(p->col)++] = '['; - switch (esc) { - case (ESC_CLEAR): - p->buf[(p->col)++] = '0'; - break; - case (ESC_BOLD): - p->buf[(p->col)++] = '1'; - break; - case (ESC_UNDERLINE): - p->buf[(p->col)++] = '4'; - break; - default: - abort(); - /* NOTREACHED */ + if (NULL == rhs) { +#if 0 + fputs("Unknown special character: ", stderr); + for (i = 0; i < (int)len; i++) + fputc(word[i], stderr); + fputc('\n', stderr); +#endif + return; } - p->buf[(p->col)++] = 'm'; + for (i = 0; i < (int)sz; i++) + encode(p, rhs[i]); } static void -pword(struct termp *p, const char *word, size_t len) +do_reserved(struct termp *p, const char *word, size_t len) { - size_t i; + const char *rhs; + size_t sz; + int i; - assert(len > 0); + rhs = chars_a2res(p->symtab, word, len, &sz); - if ( ! (p->flags & TERMP_NOSPACE)) - chara(p, ' '); - - p->flags &= ~TERMP_NOSPACE; - - if (p->flags & TERMP_BOLD) - escape(p, ESC_BOLD); - if (p->flags & TERMP_UNDERLINE) - escape(p, ESC_UNDERLINE); - - /* TODO: escape patterns. */ - - for (i = 0; i < len; i++) - chara(p, word[i]); - - if (p->flags & TERMP_BOLD || - p->flags & TERMP_UNDERLINE) - escape(p, ESC_CLEAR); + if (NULL == rhs) { +#if 0 + fputs("Unknown reserved word: ", stderr); + for (i = 0; i < (int)len; i++) + fputc(word[i], stderr); + fputc('\n', stderr); +#endif + return; + } + for (i = 0; i < (int)sz; i++) + encode(p, rhs[i]); } +/* + * Handle an escape sequence: determine its length and pass it to the + * escape-symbol look table. Note that we assume mdoc(3) has validated + * the escape sequence (we assert upon badly-formed escape sequences). + */ static void -word(struct termp *p, const char *word) +do_escaped(struct termp *p, const char **word) { - size_t i, j, len; + int j, type; + const char *wp; - if (mdoc_isdelim(word)) - p->flags |= TERMP_NOSPACE; + wp = *word; + type = 1; - len = strlen(word); - assert(len > 0); + if (0 == *(++wp)) { + *word = wp; + return; + } - /* LINTED */ - for (j = i = 0; i < len; i++) { - if ( ! isspace(word[i])) { - j++; - continue; + if ('(' == *wp) { + wp++; + if (0 == *wp || 0 == *(wp + 1)) { + *word = 0 == *wp ? wp : wp + 1; + return; } - if (0 == j) - continue; - assert(i >= j); - pword(p, &word[i - j], j); - j = 0; - } - if (j > 0) { - assert(i >= j); - pword(p, &word[i - j], j); - } -} + do_special(p, wp, 2); + *word = ++wp; + return; -/* ARGSUSED */ -static int -termp_it_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - const struct mdoc_node *n, *it; - const struct mdoc_block *bl; - int i; - size_t width; - - switch (node->type) { - case (MDOC_BODY): - /* FALLTHROUGH */ - case (MDOC_HEAD): - break; - default: - return(1); - } - - it = node->parent; - assert(MDOC_BLOCK == it->type); - assert(MDOC_It == it->tok); - - n = it->parent; - assert(MDOC_BODY == n->type); - assert(MDOC_Bl == n->tok); - n = n->parent; - bl = &n->data.block; - - /* If `-tag', adjust our margins accordingly. */ - - if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { - i = arg_getattr(MDOC_Width, bl->argc, bl->argv); - assert(i >= 0); - assert(1 == bl->argv[i].sz); - width = strlen(*bl->argv[i].value); /* XXX */ - - if (MDOC_HEAD == node->type) { - flushln(p); - /* FIXME: nested lists. */ - p->rmargin = p->maxrmargin; - p->flags &= ~TERMP_NOBREAK; - } else { - flushln(p); - p->offset -= width + 1; - p->flags &= ~TERMP_NOLPAD; + } else if ('*' == *wp) { + if (0 == *(++wp)) { + *word = wp; + return; } - } - return(1); -} + switch (*wp) { + case ('('): + wp++; + if (0 == *wp || 0 == *(wp + 1)) { + *word = 0 == *wp ? wp : wp + 1; + return; + } - -/* ARGSUSED */ -static int -termp_it_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - const struct mdoc_node *n, *it; - const struct mdoc_block *bl; - int i; - size_t width; - - switch (node->type) { - case (MDOC_BODY): - /* FALLTHROUGH */ - case (MDOC_HEAD): - it = node->parent; - break; - case (MDOC_BLOCK): - it = node; - break; - default: - return(1); - } - - assert(MDOC_BLOCK == it->type); - assert(MDOC_It == it->tok); - - n = it->parent; - assert(MDOC_BODY == n->type); - assert(MDOC_Bl == n->tok); - n = n->parent; - bl = &n->data.block; - - /* If `-compact', don't assert vertical space. */ - - if (MDOC_BLOCK == node->type) { - if (arg_hasattr(MDOC_Compact, bl->argc, bl->argv)) - newln(p); - else - vspace(p); - return(1); - } - - assert(MDOC_HEAD == node->type - || MDOC_BODY == node->type); - - /* If `-tag', adjust our margins accordingly. */ - - if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { - i = arg_getattr(MDOC_Width, bl->argc, bl->argv); - assert(i >= 0); /* XXX */ - assert(1 == bl->argv[i].sz); - width = strlen(*bl->argv[i].value); /* XXX */ - - /* FIXME: nested lists. */ - - if (MDOC_HEAD == node->type) { - p->flags |= TERMP_NOBREAK; - p->flags |= TERMP_NOSPACE; - p->rmargin = p->offset + width; - } else { - p->flags |= TERMP_NOSPACE; - p->flags |= TERMP_NOLPAD; - p->offset += width + 1; + do_reserved(p, wp, 2); + *word = ++wp; + return; + case ('['): + type = 0; + break; + default: + do_reserved(p, wp, 1); + *word = wp; + return; } - } + + } else if ('f' == *wp) { + if (0 == *(++wp)) { + *word = wp; + return; + } - return(1); -} - - -/* ARGSUSED */ -static int -termp_bold_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - p->flags &= ~TERMP_BOLD; - return(1); -} - - -/* ARGSUSED */ -static int -termp_under_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - p->flags |= TERMP_UNDERLINE; - return(1); -} - - -/* ARGSUSED */ -static int -termp_bold_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - p->flags |= TERMP_BOLD; - return(1); -} - - -/* ARGSUSED */ -static int -termp_ns_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static int -termp_pp_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - vspace(p); - return(1); -} - - -/* ARGSUSED */ -static int -termp_under_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - p->flags &= ~TERMP_UNDERLINE; - return(1); -} - - -/* ARGSUSED */ -static int -termp_nd_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - word(p, "-"); - return(1); -} - - -/* ARGSUSED */ -static int -termp_bl_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - switch (node->type) { - case (MDOC_BLOCK): - newln(p); - break; - default: - break; - } - return(1); -} - - -/* ARGSUSED */ -static int -termp_op_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - switch (node->type) { - case (MDOC_BODY): - p->flags |= TERMP_NOSPACE; - word(p, "\\]"); - break; - default: - break; - } - return(1); -} - - -/* ARGSUSED */ -static int -termp_sh_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - switch (node->type) { - case (MDOC_HEAD): - p->flags &= ~TERMP_BOLD; - newln(p); - break; - case (MDOC_BODY): - newln(p); - p->offset -= 4; - break; - default: - break; - } - return(1); -} - - -/* ARGSUSED */ -static int -termp_xr_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - const struct mdoc_node *n; - - n = node->child; - assert(n); - - assert(MDOC_TEXT == n->type); - word(p, n->data.text.string); - - if (NULL == (n = n->next)) - return(0); - - assert(MDOC_TEXT == n->type); - p->flags |= TERMP_NOSPACE; - word(p, "\\("); - p->flags |= TERMP_NOSPACE; - word(p, n->data.text.string); - p->flags |= TERMP_NOSPACE; - word(p, "\\)"); - - return(0); -} - - -/* ARGSUSED */ -static int -termp_sh_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - switch (node->type) { - case (MDOC_HEAD): - vspace(p); - p->flags |= TERMP_BOLD; - break; - case (MDOC_BODY): - p->offset += 4; - break; - default: - break; - } - return(1); -} - - -/* ARGSUSED */ -static int -termp_op_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - switch (node->type) { - case (MDOC_BODY): - word(p, "\\["); - p->flags |= TERMP_NOSPACE; - break; - default: - break; - } - return(1); -} - - -/* ARGSUSED */ -static int -termp_fl_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - - p->flags |= TERMP_BOLD; - word(p, "-"); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -static void -termprint_r(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) -{ - int dochild; - - /* Pre-processing ----------------- */ - - dochild = 1; - - if (MDOC_TEXT != node->type) { - if (termacts[node->tok].pre) - if ( ! (*termacts[node->tok].pre)(p, meta, node)) - dochild = 0; - } else /* MDOC_TEXT == node->type */ - word(p, node->data.text.string); - - /* Children ---------------------- */ - - if (dochild && NULL == node->child) { - /* No-child processing. */ - switch (node->type) { - case (MDOC_ELEM): - switch (node->tok) { - case (MDOC_Nm): - word(p, "progname"); /* TODO */ - break; - case (MDOC_Ar): - word(p, "..."); - break; - default: - break; - } + switch (*wp) { + case ('B'): + p->bold++; break; + case ('I'): + p->under++; + break; + case ('P'): + /* FALLTHROUGH */ + case ('R'): + p->bold = p->under = 0; + break; default: break; } - } else if (dochild) - termprint_r(p, meta, node->child); - /* Post-processing --------------- */ + *word = wp; + return; - if (MDOC_TEXT != node->type) { - if (termacts[node->tok].post) - if ( ! (*termacts[node->tok].post)(p, meta, node)) - return; - } + } else if ('[' != *wp) { + do_special(p, wp, 1); + *word = wp; + return; + } - /* Siblings ---------------------- */ + wp++; + for (j = 0; *wp && ']' != *wp; wp++, j++) + /* Loop... */ ; - if (node->next) - termprint_r(p, meta, node->next); -} + if (0 == *wp) { + *word = wp; + return; + } - -static void -termprint_footer(struct termp *p, const struct mdoc_meta *meta) -{ - struct tm *tm; - char *buf, *os; - size_t sz, osz, ssz, i; - - if (NULL == (buf = malloc(p->rmargin))) - err(1, "malloc"); - if (NULL == (os = malloc(p->rmargin))) - err(1, "malloc"); - - tm = localtime(&meta->date); - if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm)) - err(1, "strftime"); - - osz = strlcpy(os, meta->os, p->rmargin); - - sz = strlen(buf); - ssz = sz + osz + 1; - - if (ssz > p->rmargin) { - ssz -= p->rmargin; - assert(ssz <= osz); - os[osz - ssz] = 0; - ssz = 1; - } else - ssz = p->rmargin - ssz + 1; - - printf("\n"); - printf("%s", os); - for (i = 0; i < ssz; i++) - printf(" "); - - printf("%s\n", buf); - fflush(stdout); - - free(buf); - free(os); + if (type) + do_special(p, wp - j, (size_t)j); + else + do_reserved(p, wp - j, (size_t)j); + *word = wp; } -static void -termprint_header(struct termp *p, const struct mdoc_meta *meta) +/* + * Handle pwords, partial words, which may be either a single word or a + * phrase that cannot be broken down (such as a literal string). This + * handles word styling. + */ +void +term_word(struct termp *p, const char *word) { - char *msec, *buf, *title, *pp; - size_t ssz, tsz, ttsz, i;; + const char *sv; - if (NULL == (buf = malloc(p->rmargin))) - err(1, "malloc"); - if (NULL == (title = malloc(p->rmargin))) - err(1, "malloc"); + sv = word; - if (NULL == (pp = mdoc_vol2a(meta->vol))) - switch (meta->msec) { - case (MSEC_1): + if (word[0] && 0 == word[1]) + switch (word[0]) { + case('.'): /* FALLTHROUGH */ - case (MSEC_6): + case(','): /* FALLTHROUGH */ - case (MSEC_7): - pp = mdoc_vol2a(VOL_URM); - break; - case (MSEC_8): - pp = mdoc_vol2a(VOL_SMM); - break; - case (MSEC_2): + case(';'): /* FALLTHROUGH */ - case (MSEC_3): + case(':'): /* FALLTHROUGH */ - case (MSEC_4): + case('?'): /* FALLTHROUGH */ - case (MSEC_5): - pp = mdoc_vol2a(VOL_PRM); + case('!'): + /* FALLTHROUGH */ + case(')'): + /* FALLTHROUGH */ + case(']'): + /* FALLTHROUGH */ + case('}'): + if ( ! (TERMP_IGNDELIM & p->flags)) + p->flags |= TERMP_NOSPACE; break; - case (MSEC_9): - pp = mdoc_vol2a(VOL_KM); - break; default: - /* FIXME: capitalise. */ - if (NULL == (pp = mdoc_msec2a(meta->msec))) - pp = mdoc_msec2a(MSEC_local); break; } - assert(pp); - tsz = strlcpy(buf, pp, p->rmargin); - assert(tsz < p->rmargin); + if ( ! (TERMP_NOSPACE & p->flags)) + buffer(p, ' '); - if ((pp = mdoc_arch2a(meta->arch))) { - 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); - } + if ( ! (p->flags & TERMP_NONOSPACE)) + p->flags &= ~TERMP_NOSPACE; - ttsz = strlcpy(title, meta->title, p->rmargin); + for ( ; *word; word++) + if ('\\' != *word) + encode(p, *word); + else + do_escaped(p, &word); - if (NULL == (msec = mdoc_msec2a(meta->msec))) - msec = ""; - - ssz = (2 * (ttsz + 2 + strlen(msec))) + tsz + 2; - - if (ssz > p->rmargin) { - if ((ssz -= p->rmargin) % 2) - ssz++; - ssz /= 2; - - assert(ssz <= ttsz); - title[ttsz - ssz] = 0; - ssz = 1; - } else - ssz = ((p->rmargin - ssz) / 2) + 1; - - printf("%s(%s)", title, msec); - - for (i = 0; i < ssz; i++) - printf(" "); - - printf("%s", buf); - - for (i = 0; i < ssz; i++) - printf(" "); - - printf("%s(%s)\n", title, msec); - fflush(stdout); - - free(title); - free(buf); + if (sv[0] && 0 == sv[1]) + switch (sv[0]) { + case('('): + /* FALLTHROUGH */ + case('['): + /* FALLTHROUGH */ + case('{'): + p->flags |= TERMP_NOSPACE; + break; + default: + break; + } } -int -termprint(const struct mdoc_node *node, - const struct mdoc_meta *meta) +/* + * Insert a single character into the line-buffer. If the buffer's + * space is exceeded, then allocate more space by doubling the buffer + * size. + */ +static void +buffer(struct termp *p, char c) { - struct termp p; + size_t s; - if (ERR == setupterm(NULL, STDOUT_FILENO, NULL)) - return(0); - - p.maxrmargin = columns < 60 ? 60 : (size_t)columns; - p.rmargin = p.maxrmargin; - p.maxcols = 1024; - p.offset = p.col = 0; - p.flags = TERMP_NOSPACE; - - if (NULL == (p.buf = malloc(p.maxcols))) - err(1, "malloc"); - - termprint_header(&p, meta); - termprint_r(&p, meta, node); - termprint_footer(&p, meta); - - free(p.buf); - - return(1); + if (p->col + 1 >= p->maxcols) { + if (0 == p->maxcols) + p->maxcols = 256; + s = p->maxcols * 2; + p->buf = realloc(p->buf, s); + if (NULL == p->buf) + err(1, "realloc"); /* FIXME: shouldn't be here! */ + p->maxcols = s; + } + p->buf[(int)(p->col)++] = c; } +static void +encode(struct termp *p, char c) +{ + + if (' ' != c) { + if (p->bold) { + buffer(p, c); + buffer(p, 8); + } + if (p->under) { + buffer(p, '_'); + buffer(p, 8); + } + } + buffer(p, c); +}