=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.3 retrieving revision 1.18 diff -u -p -r1.3 -r1.18 --- mandoc/term.c 2009/02/21 14:56:58 1.3 +++ mandoc/term.c 2009/02/25 12:09:20 1.18 @@ -1,6 +1,6 @@ -/* $Id: term.c,v 1.3 2009/02/21 14:56:58 kristaps Exp $ */ +/* $Id: term.c,v 1.18 2009/02/25 12:09:20 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 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 @@ -17,134 +17,189 @@ * PERFORMANCE OF THIS SOFTWARE. */ #include -#include -#include -#include #include -#include #include -#include -#include -#include "private.h" +#include "term.h" -enum termesc { - ESC_CLEAR, - ESC_BOLD, - ESC_UNDERLINE -}; +#define INDENT 4 -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; -}; +/* + * Performs actions on nodes of the abstract syntax tree. Both pre- and + * post-fix operations are defined here. + */ -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 *); -}; +/* FIXME: indent/tab. */ +/* FIXME: handle nested lists. */ -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 *); +#define TTYPE_PROG 0 +#define TTYPE_CMD_FLAG 1 +#define TTYPE_CMD_ARG 2 +#define TTYPE_SECTION 3 +#define TTYPE_FUNC_DECL 4 +#define TTYPE_VAR_DECL 5 +#define TTYPE_FUNC_TYPE 6 +#define TTYPE_FUNC_NAME 7 +#define TTYPE_FUNC_ARG 8 +#define TTYPE_LINK 9 +#define TTYPE_SSECTION 10 +#define TTYPE_FILE 11 +#define TTYPE_EMPH 12 +#define TTYPE_CONFIG 13 +#define TTYPE_CMD 14 +#define TTYPE_INCLUDE 15 +#define TTYPE_SYMB 16 +#define TTYPE_SYMBOL 17 +#define TTYPE_NMAX 18 +/* + * These define "styles" for element types, like command arguments or + * executable names. This is useful when multiple macros must decorate + * the same thing (like .Ex -std cmd and .Nm cmd). + */ + +const int ttypes[TTYPE_NMAX] = { + TERMP_BOLD, /* TTYPE_PROG */ + TERMP_BOLD, /* TTYPE_CMD_FLAG */ + TERMP_UNDERLINE, /* TTYPE_CMD_ARG */ + TERMP_BOLD, /* TTYPE_SECTION */ + TERMP_BOLD, /* TTYPE_FUNC_DECL */ + TERMP_UNDERLINE, /* TTYPE_VAR_DECL */ + TERMP_UNDERLINE, /* TTYPE_FUNC_TYPE */ + TERMP_BOLD, /* TTYPE_FUNC_NAME */ + TERMP_UNDERLINE, /* TTYPE_FUNC_ARG */ + TERMP_UNDERLINE, /* TTYPE_LINK */ + TERMP_BOLD, /* TTYPE_SSECTION */ + TERMP_UNDERLINE, /* TTYPE_FILE */ + TERMP_UNDERLINE, /* TTYPE_EMPH */ + TERMP_BOLD, /* TTYPE_CONFIG */ + TERMP_BOLD, /* TTYPE_CMD */ + TERMP_BOLD, /* TTYPE_INCLUDE */ + TERMP_BOLD, /* TTYPE_SYMB */ + TERMP_BOLD /* TTYPE_SYMBOL */ +}; + static int arg_hasattr(int, size_t, const struct mdoc_arg *); static int arg_getattr(int, size_t, const struct mdoc_arg *); +static size_t arg_offset(const struct mdoc_arg *); +static size_t arg_width(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 *); +/* + * What follows describes prefix and postfix operations for the abstract + * syntax tree descent. + */ -#define decl_prepost(name, suffix) \ -static int name##_##suffix(struct termp *, \ - const struct mdoc_meta *, \ - const struct mdoc_node *) +#define DECL_ARGS \ + struct termp *p, \ + struct termpair *pair, \ + const struct mdoc_meta *meta, \ + const struct mdoc_node *node -#define decl_pre(name) decl_prepost(name, pre) -#define decl_post(name) decl_prepost(name, post) +#define DECL_PRE(name) \ +static int name##_pre(DECL_ARGS) +#define DECL_POST(name) \ +static void name##_post(DECL_ARGS) +#define DECL_PREPOST(name) \ +DECL_PRE(name); \ +DECL_POST(name); -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_PREPOST(termp_aq); +DECL_PREPOST(termp_bd); +DECL_PREPOST(termp_bq); +DECL_PREPOST(termp_d1); +DECL_PREPOST(termp_dq); +DECL_PREPOST(termp_fd); +DECL_PREPOST(termp_fn); +DECL_PREPOST(termp_fo); +DECL_PREPOST(termp_ft); +DECL_PREPOST(termp_it); +DECL_PREPOST(termp_op); +DECL_PREPOST(termp_pf); +DECL_PREPOST(termp_pq); +DECL_PREPOST(termp_qq); +DECL_PREPOST(termp_sh); +DECL_PREPOST(termp_ss); +DECL_PREPOST(termp_sq); +DECL_PREPOST(termp_vt); -decl_post(termp_bl); -decl_post(termp_it); -decl_post(termp_op); -decl_post(termp_sh); +DECL_PRE(termp_ar); +DECL_PRE(termp_at); +DECL_PRE(termp_bf); +DECL_PRE(termp_bsx); +DECL_PRE(termp_bt); +DECL_PRE(termp_bx); +DECL_PRE(termp_cd); +DECL_PRE(termp_cm); +DECL_PRE(termp_em); +DECL_PRE(termp_ex); +DECL_PRE(termp_fa); +DECL_PRE(termp_fl); +DECL_PRE(termp_fx); +DECL_PRE(termp_ic); +DECL_PRE(termp_in); +DECL_PRE(termp_ms); +DECL_PRE(termp_nd); +DECL_PRE(termp_nm); +DECL_PRE(termp_ns); +DECL_PRE(termp_nx); +DECL_PRE(termp_ox); +DECL_PRE(termp_pa); +DECL_PRE(termp_pp); +DECL_PRE(termp_rv); +DECL_PRE(termp_st); +DECL_PRE(termp_sx); +DECL_PRE(termp_sy); +DECL_PRE(termp_ud); +DECL_PRE(termp_ux); +DECL_PRE(termp_va); +DECL_PRE(termp_xr); -decl_pre(termp_bold); -decl_pre(termp_under); +DECL_POST(termp_bl); -decl_post(termp_bold); -decl_post(termp_under); - -const struct termact termacts[MDOC_MAX] = { +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_ss_pre, termp_ss_post }, /* Ss */ { termp_pp_pre, NULL }, /* Pp */ - { NULL, NULL }, /* D1 */ + { termp_d1_pre, termp_d1_post }, /* D1 */ { NULL, NULL }, /* Dl */ - { NULL, NULL }, /* Bd */ + { termp_bd_pre, termp_bd_post }, /* 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 */ + { termp_ar_pre, NULL }, /* Ar */ + { termp_cd_pre, NULL }, /* Cd */ + { termp_cm_pre, 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 */ + { termp_ex_pre, NULL }, /* Ex */ + { termp_fa_pre, NULL }, /* Fa */ + { termp_fd_pre, termp_fd_post }, /* Fd */ + { termp_fl_pre, NULL }, /* Fl */ + { termp_fn_pre, termp_fn_post }, /* Fn */ + { termp_ft_pre, termp_ft_post }, /* Ft */ + { termp_ic_pre, NULL }, /* Ic */ + { termp_in_pre, NULL }, /* In */ { NULL, NULL }, /* Li */ { termp_nd_pre, NULL }, /* Nd */ - { termp_bold_pre, termp_bold_post }, /* Nm */ + { termp_nm_pre, NULL }, /* 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 */ - { NULL, NULL }, /* Xr */ + { termp_pa_pre, NULL }, /* Pa */ + { termp_rv_pre, NULL }, /* Rv */ + { termp_st_pre, NULL }, /* St */ + { termp_va_pre, NULL }, /* Va */ + { termp_vt_pre, termp_vt_post }, /* Vt */ + { termp_xr_pre, NULL }, /* Xr */ { NULL, NULL }, /* %A */ { NULL, NULL }, /* %B */ { NULL, NULL }, /* %D */ @@ -157,322 +212,159 @@ const struct termact termacts[MDOC_MAX] = { { NULL, NULL }, /* %T */ { NULL, NULL }, /* %V */ { NULL, NULL }, /* Ac */ - { NULL, NULL }, /* Ao */ - { NULL, NULL }, /* Aq */ - { NULL, NULL }, /* At */ + { termp_aq_pre, termp_aq_post }, /* Ao */ + { termp_aq_pre, termp_aq_post }, /* Aq */ + { termp_at_pre, NULL }, /* At */ { NULL, NULL }, /* Bc */ - { NULL, NULL }, /* Bf */ - { NULL, NULL }, /* Bo */ - { NULL, NULL }, /* Bq */ - { NULL, NULL }, /* Bsx */ - { NULL, NULL }, /* Bx */ + { termp_bf_pre, NULL }, /* Bf */ + { termp_bq_pre, termp_bq_post }, /* Bo */ + { termp_bq_pre, termp_bq_post }, /* Bq */ + { termp_bsx_pre, NULL }, /* Bsx */ + { termp_bx_pre, NULL }, /* Bx */ { NULL, NULL }, /* Db */ { NULL, NULL }, /* Dc */ - { NULL, NULL }, /* Do */ - { NULL, NULL }, /* Dq */ + { termp_dq_pre, termp_dq_post }, /* Do */ + { termp_dq_pre, termp_dq_post }, /* Dq */ { NULL, NULL }, /* Ec */ { NULL, NULL }, /* Ef */ - { NULL, NULL }, /* Em */ + { termp_em_pre, NULL }, /* Em */ { NULL, NULL }, /* Eo */ - { NULL, NULL }, /* Fx */ - { NULL, NULL }, /* Ms */ + { termp_fx_pre, NULL }, /* Fx */ + { termp_ms_pre, NULL }, /* Ms */ { NULL, NULL }, /* No */ { termp_ns_pre, NULL }, /* Ns */ - { NULL, NULL }, /* Nx */ - { NULL, NULL }, /* Ox */ + { termp_nx_pre, NULL }, /* Nx */ + { termp_ox_pre, NULL }, /* Ox */ { NULL, NULL }, /* Pc */ - { NULL, NULL }, /* Pf */ - { NULL, NULL }, /* Po */ - { NULL, NULL }, /* Pq */ + { termp_pf_pre, termp_pf_post }, /* Pf */ + { termp_pq_pre, termp_pq_post }, /* Po */ + { termp_pq_pre, termp_pq_post }, /* Pq */ { NULL, NULL }, /* Qc */ - { NULL, NULL }, /* Ql */ - { NULL, NULL }, /* Qo */ - { NULL, NULL }, /* Qq */ + { termp_sq_pre, termp_sq_post }, /* Ql */ + { termp_qq_pre, termp_qq_post }, /* Qo */ + { termp_qq_pre, termp_qq_post }, /* Qq */ { NULL, NULL }, /* Re */ { NULL, NULL }, /* Rs */ { NULL, NULL }, /* Sc */ - { NULL, NULL }, /* So */ - { NULL, NULL }, /* Sq */ + { termp_sq_pre, termp_sq_post }, /* So */ + { termp_sq_pre, termp_sq_post }, /* Sq */ { NULL, NULL }, /* Sm */ - { NULL, NULL }, /* Sx */ - { NULL, NULL }, /* Sy */ + { termp_sx_pre, NULL }, /* Sx */ + { termp_sy_pre, NULL }, /* Sy */ { NULL, NULL }, /* Tn */ - { NULL, NULL }, /* Ux */ + { termp_ux_pre, NULL }, /* Ux */ { NULL, NULL }, /* Xc */ { NULL, NULL }, /* Xo */ - { NULL, NULL }, /* Fo */ + { termp_fo_pre, termp_fo_post }, /* Fo */ { NULL, NULL }, /* Fc */ - { NULL, NULL }, /* Oo */ + { termp_op_pre, termp_op_post }, /* Oo */ { NULL, NULL }, /* Oc */ { NULL, NULL }, /* Bk */ { NULL, NULL }, /* Ek */ - { NULL, NULL }, /* Bt */ + { termp_bt_pre, NULL }, /* Bt */ { NULL, NULL }, /* Hf */ { NULL, NULL }, /* Fr */ - { NULL, NULL }, /* Ud */ + { termp_ud_pre, NULL }, /* Ud */ }; +const struct termact *termacts = __termacts; -static int -arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv) -{ - return(-1 != arg_getattr(arg, argc, argv)); -} - - -static int -arg_getattr(int arg, size_t argc, const struct mdoc_arg *argv) +static size_t +arg_width(const struct mdoc_arg *arg) { - int i; - for (i = 0; i < (int)argc; i++) - if (argv[i].arg == arg) - return(i); - return(-1); + /* TODO */ + assert(*arg->value); + return(strlen(*arg->value)); } -static void -flushln(struct termp *p) +static size_t +arg_offset(const struct mdoc_arg *arg) { - size_t i, j, vsz, vis, maxvis; - /* - * First, establish the maximum columns of "visible" content. - * This is usually the difference between the right-margin and - * an indentation, but can be, for tagged lists or columns, a - * small set of values. - */ + /* TODO */ + assert(*arg->value); + if (0 == strcmp(*arg->value, "indent")) + return(INDENT); + if (0 == strcmp(*arg->value, "indent-two")) + return(INDENT * 2); - assert(p->offset < p->rmargin); - maxvis = p->rmargin - p->offset; - vis = 0; - - /* - * If in the standard case (left-justified), then begin with our - * indentation, otherwise (columns, etc.) just start spitting - * out text. - */ - - if ( ! (p->flags & TERMP_NOLPAD)) - /* LINTED */ - for (j = 0; j < p->offset; j++) - putchar(' '); - - for (i = 0; i < p->col; i++) { - /* - * Count up visible word characters. Control sequences - * (starting with the CSI) aren't counted. - */ - assert( ! isspace(p->buf[i])); - - /* LINTED */ - for (j = i, vsz = 0; j < p->col; j++) { - if (isspace(p->buf[j])) - break; - else if (27 == p->buf[j]) { - assert(j + 4 <= p->col); - j += 3; - } 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). - */ - - if (vis && vis + vsz >= maxvis) { - /* FIXME */ - if (p->flags & TERMP_NOBREAK) - errx(1, "word breaks right margin"); - putchar('\n'); - for (j = 0; j < p->offset; j++) - putchar(' '); - vis = 0; - } else if (vis + vsz >= maxvis) { - /* FIXME */ - errx(1, "word breaks right margin"); - } - - /* - * Write out the word and a trailing space. Omit the - * space if we're the last word in the line. - */ - - for ( ; i < p->col; i++) { - if (isspace(p->buf[i])) - break; - putchar(p->buf[i]); - } - vis += vsz; - if (i < p->col) { - putchar(' '); - vis++; - } - } - - /* - * If we're not to right-marginalise it (newline), then instead - * pad to the right margin and stay off. - */ - - if (p->flags & TERMP_NOBREAK) { - for ( ; vis <= maxvis; vis++) - putchar(' '); - } else - putchar('\n'); - - p->col = 0; + return(strlen(*arg->value)); } -static void -newln(struct termp *p) +static int +arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv) { - /* - * A newline only breaks an existing line; it won't assert - * vertical space. - */ - p->flags |= TERMP_NOSPACE; - if (0 == p->col) - return; - flushln(p); + return(-1 != arg_getattr(arg, argc, argv)); } -static void -vspace(struct termp *p) +static int +arg_getattr(int arg, size_t argc, const struct mdoc_arg *argv) { + int i; - /* - * Asserts a vertical space (a full, empty line-break between - * lines). - */ - newln(p); - putchar('\n'); + for (i = 0; i < (int)argc; i++) + if (argv[i].arg == arg) + return(i); + return(-1); } -static void -chara(struct termp *p, char c) +/* ARGSUSED */ +static int +termp_dq_pre(DECL_ARGS) { - /* TODO: dynamically expand the buffer. */ - if (p->col + 1 >= p->maxcols) - errx(1, "line overrun"); - p->buf[(p->col)++] = c; -} + if (MDOC_BODY != node->type) + return(1); - -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 */ - } - p->buf[(p->col)++] = 'm'; + word(p, "``"); + p->flags |= TERMP_NOSPACE; + return(1); } +/* ARGSUSED */ static void -pword(struct termp *p, const char *word, size_t len) +termp_dq_post(DECL_ARGS) { - size_t i; - assert(len > 0); + if (MDOC_BODY != node->type) + return; - 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); + p->flags |= TERMP_NOSPACE; + word(p, "''"); } +/* ARGSUSED */ static void -word(struct termp *p, const char *word) +termp_it_post(DECL_ARGS) { - size_t i, j, len; - - if (mdoc_isdelim(word)) - p->flags |= TERMP_NOSPACE; - - len = strlen(word); - assert(len > 0); - - /* LINTED */ - for (j = i = 0; i < len; i++) { - if ( ! isspace(word[i])) { - j++; - continue; - } - 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); - } -} - - -/* 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; + size_t width, offset; + /* + * This (and termp_it_pre()) are the most complicated functions + * here. They must account for a considerable number of + * switches that completely change the output behaviour, like + * -tag versus -column. Yech. + */ + switch (node->type) { case (MDOC_BODY): /* FALLTHROUGH */ case (MDOC_HEAD): break; default: - return(1); + return; } it = node->parent; @@ -488,37 +380,50 @@ termp_it_post(struct termp *p, const struct mdoc_meta /* If `-tag', adjust our margins accordingly. */ if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { + flushln(p); + + /* FIXME: this should auto-size. */ 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 */ + width = i >= 0 ? arg_width(&bl->argv[i]) : 10; + /* FIXME: nesting! Should happen at block. */ + i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); + offset = i >= 0 ? arg_width(&bl->argv[i]) : 0; + if (MDOC_HEAD == node->type) { - flushln(p); - /* FIXME: nested lists. */ p->rmargin = p->maxrmargin; + p->offset -= offset; p->flags &= ~TERMP_NOBREAK; } else { - flushln(p); - p->offset -= width + 1; + p->offset -= width; p->flags &= ~TERMP_NOLPAD; } } - return(1); + if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) { + i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); + offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0; + + flushln(p); + p->offset -= offset; + return; + } } /* ARGSUSED */ static int -termp_it_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_it_pre(DECL_ARGS) { const struct mdoc_node *n, *it; const struct mdoc_block *bl; int i; - size_t width; + size_t width, offset; + /* + * Also see termp_it_post() for general comments. + */ + switch (node->type) { case (MDOC_BODY): /* FALLTHROUGH */ @@ -554,68 +459,85 @@ termp_it_pre(struct termp *p, const struct mdoc_meta * assert(MDOC_HEAD == node->type || MDOC_BODY == node->type); + /* FIXME: see termp_it_post(). */ + /* If `-tag', adjust our margins accordingly. */ if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { + p->flags |= TERMP_NOSPACE; + 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 */ + width = i >= 0 ? arg_width(&bl->argv[i]) : 10; - /* FIXME: nested lists. */ + i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); + offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0; if (MDOC_HEAD == node->type) { p->flags |= TERMP_NOBREAK; - p->flags |= TERMP_NOSPACE; + p->offset += offset; p->rmargin = p->offset + width; } else { p->flags |= TERMP_NOSPACE; p->flags |= TERMP_NOLPAD; - p->offset += width + 1; + p->offset += width; } + return(1); } + /* If `-ohang', adjust left-margin. */ + + if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) { + i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); + offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0; + + p->flags |= TERMP_NOSPACE; + p->offset += offset; + return(1); + } + return(1); } /* ARGSUSED */ static int -termp_bold_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_nm_pre(DECL_ARGS) { - p->flags &= ~TERMP_BOLD; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_PROG]); + if (NULL == node->child) + word(p, meta->name); return(1); } /* ARGSUSED */ static int -termp_under_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_fl_pre(DECL_ARGS) { - p->flags |= TERMP_UNDERLINE; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]); + word(p, "\\-"); + p->flags |= TERMP_NOSPACE; return(1); } /* ARGSUSED */ static int -termp_bold_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_ar_pre(DECL_ARGS) { - p->flags |= TERMP_BOLD; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]); + if (NULL == node->child) + word(p, "..."); return(1); } /* ARGSUSED */ static int -termp_ns_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_ns_pre(DECL_ARGS) { p->flags |= TERMP_NOSPACE; @@ -625,8 +547,7 @@ termp_ns_pre(struct termp *p, const struct mdoc_meta * /* ARGSUSED */ static int -termp_pp_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_pp_pre(DECL_ARGS) { vspace(p); @@ -636,96 +557,205 @@ termp_pp_pre(struct termp *p, const struct mdoc_meta * /* ARGSUSED */ static int -termp_under_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_st_pre(DECL_ARGS) { + const char *tp; - p->flags &= ~TERMP_UNDERLINE; + assert(1 == node->data.elem.argc); + + tp = mdoc_st2a(node->data.elem.argv[0].arg); + word(p, tp); + return(1); } /* ARGSUSED */ static int -termp_nd_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_rv_pre(DECL_ARGS) { + int i; - word(p, "-"); + i = arg_getattr(MDOC_Std, node->data.elem.argc, + node->data.elem.argv); + assert(i >= 0); + + newln(p); + word(p, "The"); + + p->flags |= ttypes[TTYPE_FUNC_NAME]; + word(p, *node->data.elem.argv[i].value); + p->flags &= ~ttypes[TTYPE_FUNC_NAME]; + + word(p, "() function returns the value 0 if successful;"); + word(p, "otherwise the value -1 is returned and the"); + word(p, "global variable"); + + p->flags |= ttypes[TTYPE_VAR_DECL]; + word(p, "errno"); + p->flags &= ~ttypes[TTYPE_VAR_DECL]; + + word(p, "is set to indicate the error."); + return(1); } /* ARGSUSED */ static int -termp_bl_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_ex_pre(DECL_ARGS) { + int i; - switch (node->type) { - case (MDOC_BLOCK): - newln(p); - break; - default: - break; - } + i = arg_getattr(MDOC_Std, node->data.elem.argc, + node->data.elem.argv); + assert(i >= 0); + + word(p, "The"); + p->flags |= ttypes[TTYPE_PROG]; + word(p, *node->data.elem.argv[i].value); + p->flags &= ~ttypes[TTYPE_PROG]; + word(p, "utility exits 0 on success, and >0 if an error occurs."); + return(1); } /* ARGSUSED */ static int -termp_op_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_nd_pre(DECL_ARGS) { - switch (node->type) { - case (MDOC_BODY): - p->flags |= TERMP_NOSPACE; - word(p, "\\(rB"); - break; - default: - break; - } + word(p, "\\-"); return(1); } /* ARGSUSED */ -static int -termp_sh_post(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +static void +termp_bl_post(DECL_ARGS) { + if (MDOC_BLOCK == node->type) + newln(p); +} + + +/* ARGSUSED */ +static void +termp_op_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + p->flags |= TERMP_NOSPACE; + word(p, "\\(rB"); +} + + +/* ARGSUSED */ +static void +termp_sh_post(DECL_ARGS) +{ + switch (node->type) { case (MDOC_HEAD): - p->flags &= ~TERMP_BOLD; newln(p); break; case (MDOC_BODY): newln(p); - p->offset -= 4; + p->offset = 0; break; default: break; } +} + + +/* ARGSUSED */ +static int +termp_xr_pre(DECL_ARGS) +{ + 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_vt_pre(DECL_ARGS) +{ + + /* FIXME: this can be "type name". */ + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]); return(1); } /* ARGSUSED */ +static void +termp_vt_post(DECL_ARGS) +{ + + if (node->sec == SEC_SYNOPSIS) + vspace(p); +} + + +/* ARGSUSED */ static int -termp_sh_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_fd_pre(DECL_ARGS) { + /* + * FIXME: this naming is bad. This value is used, in general, + * for the #include header or other preprocessor statement. + */ + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_DECL]); + return(1); +} + + +/* ARGSUSED */ +static void +termp_fd_post(DECL_ARGS) +{ + + if (node->sec == SEC_SYNOPSIS) + vspace(p); +} + + +/* ARGSUSED */ +static int +termp_sh_pre(DECL_ARGS) +{ + switch (node->type) { case (MDOC_HEAD): vspace(p); - p->flags |= TERMP_BOLD; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SECTION]); break; case (MDOC_BODY): - p->offset += 4; + p->offset = INDENT; break; default: break; @@ -736,8 +766,7 @@ termp_sh_pre(struct termp *p, const struct mdoc_meta * /* ARGSUSED */ static int -termp_op_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_op_pre(DECL_ARGS) { switch (node->type) { @@ -754,227 +783,636 @@ termp_op_pre(struct termp *p, const struct mdoc_meta * /* ARGSUSED */ static int -termp_fl_pre(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_bt_pre(DECL_ARGS) { - p->flags |= TERMP_BOLD; - word(p, "-"); + word(p, "is currently in beta test."); + return(1); +} + + +/* ARGSUSED */ +static int +termp_ud_pre(DECL_ARGS) +{ + + word(p, "currently under development."); + return(1); +} + + +/* ARGSUSED */ +static int +termp_d1_pre(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return(1); + newln(p); + p->offset += INDENT; + return(1); +} + + +/* ARGSUSED */ +static void +termp_d1_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + newln(p); + p->offset -= INDENT; +} + + +/* ARGSUSED */ +static int +termp_aq_pre(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return(1); + word(p, "<"); p->flags |= TERMP_NOSPACE; return(1); } +/* ARGSUSED */ static void -termprint_r(struct termp *p, const struct mdoc_meta *meta, - const struct mdoc_node *node) +termp_aq_post(DECL_ARGS) { - /* Pre-processing ----------------- */ + if (MDOC_BODY != node->type) + return; + p->flags |= TERMP_NOSPACE; + word(p, ">"); +} - if (MDOC_TEXT != node->type) { - if (termacts[node->tok].pre) - if ( ! (*termacts[node->tok].pre)(p, meta, node)) - return; - } else /* MDOC_TEXT == node->type */ - word(p, node->data.text.string); - /* Children ---------------------- */ +/* ARGSUSED */ +static int +termp_ft_pre(DECL_ARGS) +{ - if (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; - } - break; - default: - break; - } - } else - termprint_r(p, meta, node->child); + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_TYPE]); + return(1); +} - /* Post-processing --------------- */ - if (MDOC_TEXT != node->type) { - if (termacts[node->tok].post) - if ( ! (*termacts[node->tok].post)(p, meta, node)) - return; - } +/* ARGSUSED */ +static void +termp_ft_post(DECL_ARGS) +{ - /* Siblings ---------------------- */ + if (node->sec == SEC_SYNOPSIS) + newln(p); +} - if (node->next) - termprint_r(p, meta, node->next); + +/* ARGSUSED */ +static int +termp_fn_pre(DECL_ARGS) +{ + const struct mdoc_node *n; + + assert(node->child); + assert(MDOC_TEXT == node->child->type); + + /* FIXME: can be "type funcname" "type varname"... */ + + p->flags |= ttypes[TTYPE_FUNC_NAME]; + word(p, node->child->data.text.string); + p->flags &= ~ttypes[TTYPE_FUNC_NAME]; + + word(p, "("); + + p->flags |= TERMP_NOSPACE; + for (n = node->child->next; n; n = n->next) { + assert(MDOC_TEXT == n->type); + p->flags |= ttypes[TTYPE_FUNC_ARG]; + word(p, n->data.text.string); + p->flags &= ~ttypes[TTYPE_FUNC_ARG]; + if (n->next) + word(p, ","); + } + + word(p, ")"); + + if (SEC_SYNOPSIS == node->sec) + word(p, ";"); + + return(0); } +/* ARGSUSED */ static void -termprint_footer(struct termp *p, const struct mdoc_meta *meta) +termp_fn_post(DECL_ARGS) { - 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"); + if (node->sec == SEC_SYNOPSIS) + vspace(p); - 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; +/* ARGSUSED */ +static int +termp_sx_pre(DECL_ARGS) +{ - if (ssz > p->rmargin) { - ssz -= p->rmargin; - assert(ssz <= osz); - os[osz - ssz] = 0; - ssz = 1; - } else - ssz = p->rmargin - ssz + 1; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_LINK]); + return(1); +} - printf("\n"); - printf("%s", os); - for (i = 0; i < ssz; i++) - printf(" "); - printf("%s\n", buf); - fflush(stdout); +/* ARGSUSED */ +static int +termp_fa_pre(DECL_ARGS) +{ + struct mdoc_node *n; - free(buf); - free(os); + if (node->parent->tok != MDOC_Fo) { + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_ARG]); + return(1); + } + + for (n = node->child; n; n = n->next) { + assert(MDOC_TEXT == n->type); + + p->flags |= ttypes[TTYPE_FUNC_ARG]; + word(p, n->data.text.string); + p->flags &= ~ttypes[TTYPE_FUNC_ARG]; + + if (n->next) + word(p, ","); + } + + if (node->next && node->next->tok == MDOC_Fa) + word(p, ","); + + return(0); } +/* ARGSUSED */ +static int +termp_va_pre(DECL_ARGS) +{ + + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]); + return(1); +} + + +/* ARGSUSED */ +static int +termp_bd_pre(DECL_ARGS) +{ + const struct mdoc_block *bl; + const struct mdoc_node *n; + int i; + + if (MDOC_BLOCK == node->type) { + vspace(p); + return(1); + } else if (MDOC_BODY != node->type) + return(1); + + assert(MDOC_BLOCK == node->parent->type); + + bl = &node->parent->data.block; + + i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); + if (-1 != i) { + assert(1 == bl->argv[i].sz); + p->offset += arg_offset(&bl->argv[i]); + } + + if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv)) + return(1); + + p->flags |= TERMP_LITERAL; + + for (n = node->child; n; n = n->next) { + assert(MDOC_TEXT == n->type); /* FIXME */ + if ((*n->data.text.string)) { + word(p, n->data.text.string); + flushln(p); + } else + vspace(p); + + } + + p->flags &= ~TERMP_LITERAL; + return(0); +} + + +/* ARGSUSED */ static void -termprint_header(struct termp *p, const struct mdoc_meta *meta) +termp_bd_post(DECL_ARGS) { - char *msec, *buf, *title, *pp; - size_t ssz, tsz, ttsz, i;; + int i; + const struct mdoc_block *bl; - if (NULL == (buf = malloc(p->rmargin))) - err(1, "malloc"); - if (NULL == (title = malloc(p->rmargin))) - err(1, "malloc"); + if (MDOC_BODY != node->type) + return; - if (NULL == (pp = mdoc_vol2a(meta->vol))) - switch (meta->msec) { - case (MSEC_1): - /* FALLTHROUGH */ - case (MSEC_6): - /* FALLTHROUGH */ - case (MSEC_7): - pp = mdoc_vol2a(VOL_URM); - break; - case (MSEC_8): - pp = mdoc_vol2a(VOL_SMM); - break; - case (MSEC_2): - /* FALLTHROUGH */ - case (MSEC_3): - /* FALLTHROUGH */ - case (MSEC_4): - /* FALLTHROUGH */ - case (MSEC_5): - pp = mdoc_vol2a(VOL_PRM); - 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); + assert(MDOC_BLOCK == node->parent->type); + bl = &node->parent->data.block; - tsz = strlcpy(buf, pp, p->rmargin); - assert(tsz < p->rmargin); + i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); + if (-1 != i) { + assert(1 == bl->argv[i].sz); + p->offset -= arg_offset(&bl->argv[i]); + } +} - 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); + +/* ARGSUSED */ +static int +termp_qq_pre(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return(1); + word(p, "\""); + p->flags |= TERMP_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +termp_qq_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + p->flags |= TERMP_NOSPACE; + word(p, "\""); +} + + +/* ARGSUSED */ +static int +termp_bsx_pre(DECL_ARGS) +{ + + word(p, "BSDI BSD/OS"); + return(1); +} + + +/* ARGSUSED */ +static int +termp_bx_pre(DECL_ARGS) +{ + + word(p, "BSD"); + return(1); +} + + +/* ARGSUSED */ +static int +termp_ox_pre(DECL_ARGS) +{ + + word(p, "OpenBSD"); + return(1); +} + + +/* ARGSUSED */ +static int +termp_ux_pre(DECL_ARGS) +{ + + word(p, "UNIX"); + return(1); +} + + +/* ARGSUSED */ +static int +termp_fx_pre(DECL_ARGS) +{ + + word(p, "FreeBSD"); + return(1); +} + + +/* ARGSUSED */ +static int +termp_nx_pre(DECL_ARGS) +{ + + word(p, "NetBSD"); + return(1); +} + + +/* ARGSUSED */ +static int +termp_sq_pre(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return(1); + word(p, "\'"); + p->flags |= TERMP_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +termp_sq_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + p->flags |= TERMP_NOSPACE; + word(p, "\'"); +} + + +/* ARGSUSED */ +static int +termp_pf_pre(DECL_ARGS) +{ + + p->flags |= TERMP_IGNDELIM; + return(1); +} + + +/* ARGSUSED */ +static void +termp_pf_post(DECL_ARGS) +{ + + p->flags &= ~TERMP_IGNDELIM; + p->flags |= TERMP_NOSPACE; +} + + +/* ARGSUSED */ +static int +termp_ss_pre(DECL_ARGS) +{ + + switch (node->type) { + case (MDOC_HEAD): + vspace(p); + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SSECTION]); + p->offset = INDENT / 2; + break; + default: + break; } - ttsz = strlcpy(title, meta->title, p->rmargin); + return(1); +} - if (NULL == (msec = mdoc_msec2a(meta->msec))) - msec = ""; - ssz = (2 * (ttsz + 2 + strlen(msec))) + tsz + 2; +/* ARGSUSED */ +static void +termp_ss_post(DECL_ARGS) +{ - 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; + switch (node->type) { + case (MDOC_HEAD): + newln(p); + p->offset = INDENT; + break; + default: + break; + } +} - printf("%s(%s)", title, msec); - for (i = 0; i < ssz; i++) - printf(" "); +/* ARGSUSED */ +static int +termp_pa_pre(DECL_ARGS) +{ - printf("%s", buf); + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FILE]); + return(1); +} - for (i = 0; i < ssz; i++) - printf(" "); - printf("%s(%s)\n", title, msec); - fflush(stdout); +/* ARGSUSED */ +static int +termp_em_pre(DECL_ARGS) +{ - free(title); - free(buf); + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); + return(1); } -int -termprint(const struct mdoc_node *node, - const struct mdoc_meta *meta) +/* ARGSUSED */ +static int +termp_cd_pre(DECL_ARGS) { - struct termp p; - if (ERR == setupterm(NULL, STDOUT_FILENO, NULL)) + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CONFIG]); + return(1); +} + + +/* ARGSUSED */ +static int +termp_cm_pre(DECL_ARGS) +{ + + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]); + return(1); +} + + +/* ARGSUSED */ +static int +termp_ic_pre(DECL_ARGS) +{ + + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD]); + return(1); +} + + +/* ARGSUSED */ +static int +termp_in_pre(DECL_ARGS) +{ + + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_INCLUDE]); + return(1); +} + + +/* ARGSUSED */ +static int +termp_at_pre(DECL_ARGS) +{ + enum mdoc_att c; + + c = ATT_DEFAULT; + if (node->child) { + assert(MDOC_TEXT == node->child->type); + c = mdoc_atoatt(node->child->data.text.string); + } + + word(p, mdoc_att2a(c)); + return(0); +} + + +/* ARGSUSED */ +static int +termp_bq_pre(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return(1); + word(p, "["); + p->flags |= TERMP_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +termp_bq_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + word(p, "]"); +} + + +/* ARGSUSED */ +static int +termp_pq_pre(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return(1); + word(p, "("); + p->flags |= TERMP_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +termp_pq_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + word(p, ")"); +} + + +/* ARGSUSED */ +static int +termp_fo_pre(DECL_ARGS) +{ + const struct mdoc_node *n; + + if (MDOC_BODY == node->type) { + word(p, "("); + p->flags |= TERMP_NOSPACE; + return(1); + } else if (MDOC_HEAD != node->type) + return(1); + + /* XXX - groff shows only first parameter */ + + p->flags |= ttypes[TTYPE_FUNC_NAME]; + for (n = node->child; n; n = n->next) { + assert(MDOC_TEXT == n->type); + word(p, n->data.text.string); + } + p->flags &= ~ttypes[TTYPE_FUNC_NAME]; + + return(0); +} + + +/* ARGSUSED */ +static void +termp_fo_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + word(p, ")"); + word(p, ";"); + newln(p); +} + + +/* ARGSUSED */ +static int +termp_bf_pre(DECL_ARGS) +{ + const struct mdoc_node *n; + const struct mdoc_block *b; + + /* XXX - we skip over possible trailing HEAD tokens. */ + + if (MDOC_HEAD == node->type) return(0); + else if (MDOC_BLOCK != node->type) + return(1); - p.maxrmargin = columns < 60 ? 60 : (size_t)columns; - p.rmargin = p.maxrmargin; - p.maxcols = 1024; - p.offset = p.col = 0; - p.flags = TERMP_NOSPACE; + b = &node->data.block; - if (NULL == (p.buf = malloc(p.maxcols))) - err(1, "malloc"); + if (NULL == (n = b->head->child)) { + if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv)) + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); + else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv)) + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]); - termprint_header(&p, meta); - termprint_r(&p, meta, node); - termprint_footer(&p, meta); + return(1); + } - free(p.buf); + assert(MDOC_TEXT == n->type); + if (0 == strcmp("Em", n->data.text.string)) + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); + else if (0 == strcmp("Sy", n->data.text.string)) + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); + return(1); } + +/* ARGSUSED */ +static int +termp_sy_pre(DECL_ARGS) +{ + + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]); + return(1); +} + + +/* ARGSUSED */ +static int +termp_ms_pre(DECL_ARGS) +{ + + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMBOL]); + return(1); +}