=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.17 retrieving revision 1.32 diff -u -p -r1.17 -r1.32 --- mandoc/term.c 2009/02/25 11:37:05 1.17 +++ mandoc/term.c 2009/03/01 23:14:15 1.32 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.17 2009/02/25 11:37:05 kristaps Exp $ */ +/* $Id: term.c,v 1.32 2009/03/01 23:14:15 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -17,12 +17,15 @@ * PERFORMANCE OF THIS SOFTWARE. */ #include +#include +#include +#include #include #include #include "term.h" -#define INDENT 4 +#define INDENT 6 /* * Performs actions on nodes of the abstract syntax tree. Both pre- and @@ -30,7 +33,7 @@ */ /* FIXME: indent/tab. */ -/* FIXME: handle nested lists. */ +/* FIXME: macro arguments can be escaped. */ #define TTYPE_PROG 0 #define TTYPE_CMD_FLAG 1 @@ -93,6 +96,7 @@ static size_t arg_width(const struct mdoc_arg *); #define DECL_ARGS \ struct termp *p, \ + struct termpair *pair, \ const struct mdoc_meta *meta, \ const struct mdoc_node *node @@ -104,58 +108,62 @@ static void name##_post(DECL_ARGS) DECL_PRE(name); \ DECL_POST(name); +DECL_PREPOST(termp__t); DECL_PREPOST(termp_aq); -DECL_PREPOST(termp_ar); -DECL_PREPOST(termp_bf); DECL_PREPOST(termp_bd); DECL_PREPOST(termp_bq); -DECL_PREPOST(termp_cd); -DECL_PREPOST(termp_cm); DECL_PREPOST(termp_d1); DECL_PREPOST(termp_dq); -DECL_PREPOST(termp_em); -DECL_PREPOST(termp_fa); DECL_PREPOST(termp_fd); -DECL_PREPOST(termp_fl); DECL_PREPOST(termp_fn); DECL_PREPOST(termp_fo); DECL_PREPOST(termp_ft); -DECL_PREPOST(termp_ic); DECL_PREPOST(termp_in); DECL_PREPOST(termp_it); -DECL_PREPOST(termp_ms); -DECL_PREPOST(termp_nm); DECL_PREPOST(termp_op); -DECL_PREPOST(termp_pa); 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_sx); -DECL_PREPOST(termp_sy); -DECL_PREPOST(termp_va); DECL_PREPOST(termp_vt); +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_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_rs); DECL_PRE(termp_rv); +DECL_PRE(termp_sm); 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_POST(termp___); DECL_POST(termp_bl); +DECL_POST(termp_bx); const struct termact __termacts[MDOC_MAX] = { { NULL, NULL }, /* \" */ @@ -166,7 +174,7 @@ const struct termact __termacts[MDOC_MAX] = { { termp_ss_pre, termp_ss_post }, /* Ss */ { termp_pp_pre, NULL }, /* Pp */ { termp_d1_pre, termp_d1_post }, /* D1 */ - { NULL, NULL }, /* Dl */ + { termp_d1_pre, termp_d1_post }, /* Dl */ { termp_bd_pre, termp_bd_post }, /* Bd */ { NULL, NULL }, /* Ed */ { NULL, termp_bl_post }, /* Bl */ @@ -174,62 +182,62 @@ const struct termact __termacts[MDOC_MAX] = { { termp_it_pre, termp_it_post }, /* It */ { NULL, NULL }, /* Ad */ { NULL, NULL }, /* An */ - { termp_ar_pre, termp_ar_post }, /* Ar */ - { termp_cd_pre, termp_cd_post }, /* Cd */ - { termp_cm_pre, termp_cm_post }, /* 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 */ { termp_ex_pre, NULL }, /* Ex */ - { termp_fa_pre, termp_fa_post }, /* Fa */ + { termp_fa_pre, NULL }, /* Fa */ { termp_fd_pre, termp_fd_post }, /* Fd */ - { termp_fl_pre, termp_fl_post }, /* Fl */ + { termp_fl_pre, NULL }, /* Fl */ { termp_fn_pre, termp_fn_post }, /* Fn */ { termp_ft_pre, termp_ft_post }, /* Ft */ - { termp_ic_pre, termp_ic_post }, /* Ic */ + { termp_ic_pre, NULL }, /* Ic */ { termp_in_pre, termp_in_post }, /* In */ { NULL, NULL }, /* Li */ { termp_nd_pre, NULL }, /* Nd */ - { termp_nm_pre, termp_nm_post }, /* Nm */ + { termp_nm_pre, NULL }, /* Nm */ { termp_op_pre, termp_op_post }, /* Op */ { NULL, NULL }, /* Ot */ - { termp_pa_pre, termp_pa_post }, /* Pa */ + { termp_pa_pre, NULL }, /* Pa */ { termp_rv_pre, NULL }, /* Rv */ { termp_st_pre, NULL }, /* St */ - { termp_va_pre, termp_va_post }, /* Va */ + { 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 */ - { 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, termp____post }, /* %A */ + { NULL, termp____post }, /* %B */ + { NULL, termp____post }, /* %D */ + { NULL, termp____post }, /* %I */ + { NULL, termp____post }, /* %J */ + { NULL, termp____post }, /* %N */ + { NULL, termp____post }, /* %O */ + { NULL, termp____post }, /* %P */ + { NULL, termp____post }, /* %R */ + { termp__t_pre, termp__t_post }, /* %T */ + { NULL, termp____post }, /* %V */ { NULL, NULL }, /* Ac */ { termp_aq_pre, termp_aq_post }, /* Ao */ { termp_aq_pre, termp_aq_post }, /* Aq */ { termp_at_pre, NULL }, /* At */ { NULL, NULL }, /* Bc */ - { termp_bf_pre, termp_bf_post }, /* Bf */ + { 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, termp_bx_post }, /* Bx */ { NULL, NULL }, /* Db */ { NULL, NULL }, /* Dc */ { termp_dq_pre, termp_dq_post }, /* Do */ { termp_dq_pre, termp_dq_post }, /* Dq */ { NULL, NULL }, /* Ec */ { NULL, NULL }, /* Ef */ - { termp_em_pre, termp_em_post }, /* Em */ + { termp_em_pre, NULL }, /* Em */ { NULL, NULL }, /* Eo */ { termp_fx_pre, NULL }, /* Fx */ - { termp_ms_pre, termp_ms_post }, /* Ms */ + { termp_ms_pre, NULL }, /* Ms */ { NULL, NULL }, /* No */ { termp_ns_pre, NULL }, /* Ns */ { termp_nx_pre, NULL }, /* Nx */ @@ -243,13 +251,13 @@ const struct termact __termacts[MDOC_MAX] = { { termp_qq_pre, termp_qq_post }, /* Qo */ { termp_qq_pre, termp_qq_post }, /* Qq */ { NULL, NULL }, /* Re */ - { NULL, NULL }, /* Rs */ + { termp_rs_pre, NULL }, /* Rs */ { NULL, NULL }, /* Sc */ { termp_sq_pre, termp_sq_post }, /* So */ { termp_sq_pre, termp_sq_post }, /* Sq */ - { NULL, NULL }, /* Sm */ - { termp_sx_pre, termp_sx_post }, /* Sx */ - { termp_sy_pre, termp_sy_post }, /* Sy */ + { termp_sm_pre, NULL }, /* Sm */ + { termp_sx_pre, NULL }, /* Sx */ + { termp_sy_pre, NULL }, /* Sy */ { NULL, NULL }, /* Tn */ { termp_ux_pre, NULL }, /* Ux */ { NULL, NULL }, /* Xc */ @@ -272,10 +280,30 @@ const struct termact *termacts = __termacts; static size_t arg_width(const struct mdoc_arg *arg) { + size_t v; + int i, len; - /* TODO */ assert(*arg->value); - return(strlen(*arg->value)); + if (0 == strcmp(*arg->value, "indent")) + return(INDENT); + if (0 == strcmp(*arg->value, "indent-two")) + return(INDENT * 2); + + len = (int)strlen(*arg->value); + assert(len > 0); + + for (i = 0; i < len - 1; i++) + if ( ! isdigit((int)(*arg->value)[i])) + break; + + if (i == len - 1) { + if ('n' == (*arg->value)[len - 1]) { + v = (size_t)atoi(*arg->value); + return(v); + } + + } + return(strlen(*arg->value) + 1); } @@ -289,7 +317,6 @@ arg_offset(const struct mdoc_arg *arg) return(INDENT); if (0 == strcmp(*arg->value, "indent-two")) return(INDENT * 2); - return(strlen(*arg->value)); } @@ -342,200 +369,232 @@ termp_dq_post(DECL_ARGS) /* ARGSUSED */ -static void -termp_it_post(DECL_ARGS) +static int +termp_it_pre(DECL_ARGS) { const struct mdoc_node *n, *it; const struct mdoc_block *bl; - int i; + char buf[7], *tp; + int i, type; 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): + it = node->parent; break; + case (MDOC_BLOCK): + it = node; + break; default: - return; + 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; + n = it->parent->parent; bl = &n->data.block; - /* If `-tag', adjust our margins accordingly. */ + if (MDOC_BLOCK == node->type) { + newln(p); + if ( ! arg_hasattr(MDOC_Compact, bl->argc, bl->argv)) + if (node->prev || n->prev) + vspace(p); + return(1); + } - if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { - flushln(p); + /* Get our list type. */ - /* FIXME: this should auto-size. */ - i = arg_getattr(MDOC_Width, bl->argc, bl->argv); - width = i >= 0 ? arg_width(&bl->argv[i]) : 10; + for (type = -1, i = 0; i < (int)bl->argc; i++) + switch (bl->argv[i].arg) { + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Tag): + /* FALLTHROUGH */ + case (MDOC_Ohang): + type = bl->argv[i].arg; + i = (int)bl->argc; + break; + default: + errx(1, "list type not supported"); + /* NOTREACHED */ + } - /* FIXME: nesting! Should happen at block. */ - i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); - offset = i >= 0 ? arg_width(&bl->argv[i]) : 0; + assert(-1 != type); - if (MDOC_HEAD == node->type) { - p->rmargin = p->maxrmargin; - p->offset -= offset; - p->flags &= ~TERMP_NOBREAK; - } else { - p->offset -= width; - p->flags &= ~TERMP_NOLPAD; - } - } + /* Save our existing (inherited) margin and offset. */ - 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; + pair->offset = p->offset; + pair->rmargin = p->rmargin; - flushln(p); - p->offset -= offset; - return; - } -} + /* Get list width and offset. */ + i = arg_getattr(MDOC_Width, bl->argc, bl->argv); + width = i >= 0 ? arg_width(&bl->argv[i]) : 0; -/* ARGSUSED */ -static int -termp_it_pre(DECL_ARGS) -{ - const struct mdoc_node *n, *it; - const struct mdoc_block *bl; - int i; - size_t width, offset; + i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); + offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0; - /* - * Also see termp_it_post() for general comments. - */ + /* Override the width. */ - switch (node->type) { - case (MDOC_BODY): + switch (type) { + case (MDOC_Bullet): /* FALLTHROUGH */ - case (MDOC_HEAD): - it = node->parent; + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + width = width > 6 ? width : 6; break; - case (MDOC_BLOCK): - it = node; + case (MDOC_Tag): + /* FIXME: auto-size. */ + if (0 == width) + errx(1, "need non-zero -width"); break; default: - return(1); + break; } - assert(MDOC_BLOCK == it->type); - assert(MDOC_It == it->tok); + /* Word-wrap control. */ - n = it->parent; - assert(MDOC_BODY == n->type); - assert(MDOC_Bl == n->tok); - n = n->parent; - bl = &n->data.block; + p->flags |= TERMP_NOSPACE; - /* 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); + switch (type) { + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Tag): + if (MDOC_HEAD == node->type) + p->flags |= TERMP_NOBREAK; + else if (MDOC_BODY == node->type) + p->flags |= TERMP_NOLPAD; + break; + default: + break; } - assert(MDOC_HEAD == node->type - || MDOC_BODY == node->type); + /* + * Get a token to use as the HEAD lead-in. If NULL, we use the + * HEAD child. + */ - /* FIXME: see termp_it_post(). */ + tp = NULL; - /* If `-tag', adjust our margins accordingly. */ + if (MDOC_HEAD == node->type) { + if (arg_hasattr(MDOC_Bullet, bl->argc, bl->argv)) + tp = "\\[bu]"; + if (arg_hasattr(MDOC_Dash, bl->argc, bl->argv)) + tp = "\\-"; + if (arg_hasattr(MDOC_Enum, bl->argc, bl->argv)) { + (pair->ppair->ppair->count)++; + (void)snprintf(buf, sizeof(buf), "%d.", + pair->ppair->ppair->count); + tp = buf; + } + if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv)) + tp = "\\-"; + } - if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { - p->flags |= TERMP_NOSPACE; + /* Margin control. */ - i = arg_getattr(MDOC_Width, bl->argc, bl->argv); - width = i >= 0 ? arg_width(&bl->argv[i]) : 10; + p->offset += offset; - 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->offset += offset; + switch (type) { + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Tag): + if (MDOC_HEAD == node->type) p->rmargin = p->offset + width; - } else { - p->flags |= TERMP_NOSPACE; - p->flags |= TERMP_NOLPAD; + else if (MDOC_BODY == node->type) p->offset += width; - } - return(1); + break; + default: + break; } - /* 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; + if (NULL == tp) return(1); - } - return(1); + word(p, tp); + return(0); } /* ARGSUSED */ static void -termp_nm_post(DECL_ARGS) +termp_it_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_PROG]; + if (MDOC_BODY != node->type && MDOC_HEAD != node->type) + return; + + flushln(p); + + p->offset = pair->offset; + p->rmargin = pair->rmargin; + + if (MDOC_HEAD == node->type) + p->flags &= ~TERMP_NOBREAK; + else if (MDOC_BODY == node->type) + p->flags &= ~TERMP_NOLPAD; } /* ARGSUSED */ -static void -termp_fl_post(DECL_ARGS) +static int +termp_nm_pre(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_CMD_FLAG]; + if (SEC_SYNOPSIS == node->sec) + newln(p); + + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_PROG]); + if (NULL == node->child) + word(p, meta->name); + + return(1); } /* ARGSUSED */ static int -termp_ar_pre(DECL_ARGS) +termp_fl_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_CMD_ARG]; - if (NULL == node->child) - word(p, "..."); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]); + word(p, "\\-"); + p->flags |= TERMP_NOSPACE; return(1); } /* ARGSUSED */ static int -termp_nm_pre(DECL_ARGS) +termp_ar_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_PROG]; - if (NULL == node->child) - word(p, meta->name); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]); + if (NULL == node->child) { + word(p, "file"); + word(p, "..."); + } return(1); } @@ -561,15 +620,6 @@ termp_pp_pre(DECL_ARGS) /* ARGSUSED */ -static void -termp_ar_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_CMD_ARG]; -} - - -/* ARGSUSED */ static int termp_st_pre(DECL_ARGS) { @@ -586,6 +636,17 @@ termp_st_pre(DECL_ARGS) /* ARGSUSED */ static int +termp_rs_pre(DECL_ARGS) +{ + + if (MDOC_BLOCK == node->type && node->prev) + vspace(p); + return(1); +} + + +/* ARGSUSED */ +static int termp_rv_pre(DECL_ARGS) { int i; @@ -668,26 +729,6 @@ termp_op_post(DECL_ARGS) /* ARGSUSED */ -static void -termp_sh_post(DECL_ARGS) -{ - - switch (node->type) { - case (MDOC_HEAD): - p->flags &= ~ttypes[TTYPE_SECTION]; - newln(p); - break; - case (MDOC_BODY): - newln(p); - p->offset = 0; - break; - default: - break; - } -} - - -/* ARGSUSED */ static int termp_xr_pre(DECL_ARGS) { @@ -720,7 +761,7 @@ termp_vt_pre(DECL_ARGS) { /* FIXME: this can be "type name". */ - p->flags |= ttypes[TTYPE_VAR_DECL]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]); return(1); } @@ -730,7 +771,6 @@ static void termp_vt_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_VAR_DECL]; if (node->sec == SEC_SYNOPSIS) vspace(p); } @@ -745,7 +785,7 @@ termp_fd_pre(DECL_ARGS) * FIXME: this naming is bad. This value is used, in general, * for the #include header or other preprocessor statement. */ - p->flags |= ttypes[TTYPE_FUNC_DECL]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_DECL]); return(1); } @@ -755,10 +795,11 @@ static void termp_fd_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_FUNC_DECL]; - if (node->sec == SEC_SYNOPSIS) + if (node->sec != SEC_SYNOPSIS) + return; + newln(p); + if (node->next && MDOC_Fd != node->next->tok) vspace(p); - } @@ -770,7 +811,7 @@ termp_sh_pre(DECL_ARGS) switch (node->type) { case (MDOC_HEAD): vspace(p); - p->flags |= ttypes[TTYPE_SECTION]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SECTION]); break; case (MDOC_BODY): p->offset = INDENT; @@ -783,6 +824,25 @@ termp_sh_pre(DECL_ARGS) /* ARGSUSED */ +static void +termp_sh_post(DECL_ARGS) +{ + + switch (node->type) { + case (MDOC_HEAD): + newln(p); + break; + case (MDOC_BODY): + newln(p); + p->offset = 0; + break; + default: + break; + } +} + + +/* ARGSUSED */ static int termp_op_pre(DECL_ARGS) { @@ -821,25 +881,13 @@ termp_ud_pre(DECL_ARGS) /* ARGSUSED */ static int -termp_fl_pre(DECL_ARGS) -{ - - p->flags |= ttypes[TTYPE_CMD_FLAG]; - word(p, "\\-"); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static int termp_d1_pre(DECL_ARGS) { if (MDOC_BODY != node->type) return(1); newln(p); - p->offset += INDENT; + p->offset += (pair->offset = INDENT); return(1); } @@ -852,7 +900,7 @@ termp_d1_post(DECL_ARGS) if (MDOC_BODY != node->type) return; newln(p); - p->offset -= INDENT; + p->offset -= pair->offset; } @@ -886,7 +934,7 @@ static int termp_ft_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_FUNC_TYPE]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]); return(1); } @@ -896,10 +944,8 @@ static void termp_ft_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_FUNC_TYPE]; if (node->sec == SEC_SYNOPSIS) newln(p); - } @@ -944,7 +990,7 @@ static void termp_fn_post(DECL_ARGS) { - if (node->sec == SEC_SYNOPSIS) + if (node->sec == SEC_SYNOPSIS && node->next) vspace(p); } @@ -955,28 +1001,19 @@ static int termp_sx_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_LINK]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK]); return(1); } /* ARGSUSED */ -static void -termp_sx_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_LINK]; -} - - -/* ARGSUSED */ static int termp_fa_pre(DECL_ARGS) { struct mdoc_node *n; if (node->parent->tok != MDOC_Fo) { - p->flags |= ttypes[TTYPE_FUNC_ARG]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_ARG]); return(1); } @@ -999,34 +1036,16 @@ termp_fa_pre(DECL_ARGS) /* ARGSUSED */ -static void -termp_fa_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_FUNC_ARG]; -} - - -/* ARGSUSED */ static int termp_va_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_VAR_DECL]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]); return(1); } /* ARGSUSED */ -static void -termp_va_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_VAR_DECL]; -} - - -/* ARGSUSED */ static int termp_bd_pre(DECL_ARGS) { @@ -1035,12 +1054,14 @@ termp_bd_pre(DECL_ARGS) int i; if (MDOC_BLOCK == node->type) { - vspace(p); + if (node->prev) + vspace(p); return(1); } else if (MDOC_BODY != node->type) return(1); assert(MDOC_BLOCK == node->parent->type); + pair->offset = p->offset; bl = &node->parent->data.block; @@ -1050,13 +1071,11 @@ termp_bd_pre(DECL_ARGS) 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 (MDOC_TEXT != n->type) + errx(1, "non-text displays unsupported"); if ((*n->data.text.string)) { word(p, n->data.text.string); flushln(p); @@ -1074,20 +1093,11 @@ termp_bd_pre(DECL_ARGS) static void termp_bd_post(DECL_ARGS) { - int i; - const struct mdoc_block *bl; - if (MDOC_BODY != node->type) + if (MDOC_BODY != node->type) return; - - 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]); - } + newln(p); + p->offset = pair->offset; } @@ -1127,12 +1137,12 @@ termp_bsx_pre(DECL_ARGS) /* ARGSUSED */ -static int -termp_bx_pre(DECL_ARGS) +static void +termp_bx_post(DECL_ARGS) { + p->flags |= TERMP_NOSPACE; word(p, "BSD"); - return(1); } @@ -1183,7 +1193,7 @@ termp_sq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "\'"); + word(p, "`"); p->flags |= TERMP_NOSPACE; return(1); } @@ -1229,7 +1239,7 @@ termp_ss_pre(DECL_ARGS) switch (node->type) { case (MDOC_HEAD): vspace(p); - p->flags |= ttypes[TTYPE_SSECTION]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SSECTION]); p->offset = INDENT / 2; break; default: @@ -1247,7 +1257,6 @@ termp_ss_post(DECL_ARGS) switch (node->type) { case (MDOC_HEAD): - p->flags &= ~ttypes[TTYPE_SSECTION]; newln(p); p->offset = INDENT; break; @@ -1262,102 +1271,60 @@ static int termp_pa_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_FILE]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FILE]); return(1); } /* ARGSUSED */ -static void -termp_pa_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_FILE]; -} - - -/* ARGSUSED */ static int termp_em_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_EMPH]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); return(1); } /* ARGSUSED */ -static void -termp_em_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_EMPH]; -} - - -/* ARGSUSED */ static int termp_cd_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_CONFIG]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CONFIG]); return(1); } /* ARGSUSED */ -static void -termp_cd_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_CONFIG]; -} - - -/* ARGSUSED */ static int termp_cm_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_CMD_FLAG]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]); return(1); } /* ARGSUSED */ -static void -termp_cm_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_CMD_FLAG]; -} - - -/* ARGSUSED */ static int termp_ic_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_CMD]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD]); return(1); } /* ARGSUSED */ -static void -termp_ic_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_CMD]; -} - - -/* ARGSUSED */ static int termp_in_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_INCLUDE]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]); + word(p, "#include"); + word(p, "<"); + p->flags |= TERMP_NOSPACE; return(1); } @@ -1367,7 +1334,14 @@ static void termp_in_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_INCLUDE]; + p->flags |= TERMP_NOSPACE; + word(p, ">"); + + newln(p); + if (SEC_SYNOPSIS != node->sec) + return; + if (node->next && MDOC_In != node->next->tok) + vspace(p); } @@ -1419,7 +1393,7 @@ termp_pq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "("); + word(p, "\\&("); p->flags |= TERMP_NOSPACE; return(1); } @@ -1493,9 +1467,9 @@ termp_bf_pre(DECL_ARGS) if (NULL == (n = b->head->child)) { if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv)) - p->flags |= ttypes[TTYPE_EMPH]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv)) - p->flags |= ttypes[TTYPE_SYMB]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]); return(1); } @@ -1503,79 +1477,82 @@ termp_bf_pre(DECL_ARGS) assert(MDOC_TEXT == n->type); if (0 == strcmp("Em", n->data.text.string)) - p->flags |= ttypes[TTYPE_EMPH]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); else if (0 == strcmp("Sy", n->data.text.string)) - p->flags |= ttypes[TTYPE_SYMB]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); return(1); } /* ARGSUSED */ -static void -termp_bf_post(DECL_ARGS) +static int +termp_sy_pre(DECL_ARGS) { - const struct mdoc_node *n; - const struct mdoc_block *b; - if (MDOC_BLOCK != node->type) - return; - - b = &node->data.block; - - if (NULL == (n = b->head->child)) { - if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv)) - p->flags &= ~ttypes[TTYPE_EMPH]; - else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv)) - p->flags &= ~ttypes[TTYPE_SYMB]; - - return; - } - - assert(MDOC_TEXT == n->type); - - if (0 == strcmp("Emphasis", n->data.text.string)) - p->flags &= ~ttypes[TTYPE_EMPH]; - else if (0 == strcmp("Symbolic", n->data.text.string)) - p->flags &= ~ttypes[TTYPE_SYMB]; - - return; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]); + return(1); } /* ARGSUSED */ static int -termp_sy_pre(DECL_ARGS) +termp_ms_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_SYMB]; + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMBOL]); return(1); } + /* ARGSUSED */ -static void -termp_sy_post(DECL_ARGS) +static int +termp_sm_pre(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_SYMB]; +#if notyet + assert(node->child); + if (0 == strcmp("off", node->child->data.text.string)) { + p->flags &= ~TERMP_NONOSPACE; + p->flags &= ~TERMP_NOSPACE; + } else { + p->flags |= TERMP_NONOSPACE; + p->flags |= TERMP_NOSPACE; + } +#endif + + return(0); } /* ARGSUSED */ static int -termp_ms_pre(DECL_ARGS) +termp__t_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_SYMBOL]; + word(p, "\""); + p->flags |= TERMP_NOSPACE; return(1); } /* ARGSUSED */ static void -termp_ms_post(DECL_ARGS) +termp__t_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_SYMBOL]; + p->flags |= TERMP_NOSPACE; + word(p, "\""); + word(p, node->next ? "," : "."); +} + + +/* ARGSUSED */ +static void +termp____post(DECL_ARGS) +{ + + p->flags |= TERMP_NOSPACE; + word(p, node->next ? "," : "."); }