=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.10 retrieving revision 1.23 diff -u -p -r1.10 -r1.23 --- mandoc/term.c 2009/02/23 09:33:34 1.10 +++ mandoc/term.c 2009/02/25 23:18:50 1.23 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.10 2009/02/23 09:33:34 kristaps Exp $ */ +/* $Id: term.c,v 1.23 2009/02/25 23:18:50 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -17,6 +17,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ #include +#include +#include #include #include @@ -30,6 +32,7 @@ */ /* FIXME: indent/tab. */ +/* FIXME: macro arguments can be escaped. */ #define TTYPE_PROG 0 #define TTYPE_CMD_FLAG 1 @@ -43,7 +46,13 @@ #define TTYPE_LINK 9 #define TTYPE_SSECTION 10 #define TTYPE_FILE 11 -#define TTYPE_NMAX 12 +#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 @@ -63,14 +72,21 @@ const int ttypes[TTYPE_NMAX] = { TERMP_UNDERLINE, /* TTYPE_FUNC_ARG */ TERMP_UNDERLINE, /* TTYPE_LINK */ TERMP_BOLD, /* TTYPE_SSECTION */ - TERMP_UNDERLINE /* TTYPE_FILE */ + 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 char *); +static size_t arg_offset(const struct mdoc_arg *); +static size_t arg_width(const struct mdoc_arg *); /* * What follows describes prefix and postfix operations for the abstract @@ -79,6 +95,7 @@ static size_t arg_offset(const char *); #define DECL_ARGS \ struct termp *p, \ + struct termpair *pair, \ const struct mdoc_meta *meta, \ const struct mdoc_node *node @@ -91,36 +108,55 @@ DECL_PRE(name); \ DECL_POST(name); DECL_PREPOST(termp_aq); -DECL_PREPOST(termp_ar); +DECL_PREPOST(termp_bd); +DECL_PREPOST(termp_bq); DECL_PREPOST(termp_d1); DECL_PREPOST(termp_dq); -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_it); -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_va); DECL_PREPOST(termp_vt); -DECL_PRE(termp_bd); +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_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_bl); @@ -135,36 +171,36 @@ const struct termact __termacts[MDOC_MAX] = { { termp_pp_pre, NULL }, /* Pp */ { termp_d1_pre, termp_d1_post }, /* D1 */ { NULL, NULL }, /* Dl */ - { termp_bd_pre, 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_ar_pre, termp_ar_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 */ { 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 */ - { NULL, NULL }, /* Ic */ - { NULL, NULL }, /* In */ + { termp_ic_pre, NULL }, /* Ic */ + { termp_in_pre, NULL }, /* 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 */ - { NULL, NULL }, /* Rv */ - { NULL, NULL }, /* St */ - { termp_va_pre, termp_va_post }, /* Va */ + { 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 */ @@ -179,56 +215,56 @@ const struct termact __termacts[MDOC_MAX] = { { NULL, NULL }, /* %T */ { NULL, NULL }, /* %V */ { NULL, NULL }, /* Ac */ - { NULL, NULL }, /* Ao */ + { termp_aq_pre, termp_aq_post }, /* Ao */ { termp_aq_pre, termp_aq_post }, /* Aq */ - { NULL, NULL }, /* At */ + { termp_at_pre, NULL }, /* At */ { NULL, NULL }, /* Bc */ - { NULL, NULL }, /* Bf */ - { NULL, NULL }, /* Bo */ - { NULL, NULL }, /* Bq */ - { NULL, NULL }, /* Bsx */ + { 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 */ + { 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 */ { termp_nx_pre, NULL }, /* Nx */ { termp_ox_pre, NULL }, /* Ox */ { NULL, NULL }, /* Pc */ { termp_pf_pre, termp_pf_post }, /* Pf */ - { NULL, NULL }, /* Po */ - { NULL, NULL }, /* Pq */ + { termp_pq_pre, termp_pq_post }, /* Po */ + { termp_pq_pre, termp_pq_post }, /* Pq */ { NULL, NULL }, /* Qc */ - { NULL, NULL }, /* Ql */ - { NULL, NULL }, /* Qo */ + { 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 */ + { termp_sq_pre, termp_sq_post }, /* So */ { termp_sq_pre, termp_sq_post }, /* Sq */ - { NULL, NULL }, /* Sm */ - { termp_sx_pre, termp_sx_post }, /* Sx */ - { NULL, NULL }, /* Sy */ + { termp_sm_pre, NULL }, /* Sm */ + { 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 */ { termp_ud_pre, NULL }, /* Ud */ @@ -238,15 +274,27 @@ const struct termact *termacts = __termacts; static size_t -arg_offset(const char *v) +arg_width(const struct mdoc_arg *arg) { - if (0 == strcmp(v, "indent")) + + /* TODO */ + assert(*arg->value); + return(strlen(*arg->value)); +} + + +static size_t +arg_offset(const struct mdoc_arg *arg) +{ + + /* TODO */ + assert(*arg->value); + if (0 == strcmp(*arg->value, "indent")) return(INDENT); - if (0 == strcmp(v, "indent-two")) + if (0 == strcmp(*arg->value, "indent-two")) return(INDENT * 2); - /* TODO */ - return(0); + return(strlen(*arg->value)); } @@ -298,89 +346,15 @@ termp_dq_post(DECL_ARGS) /* ARGSUSED */ -static void -termp_it_post(DECL_ARGS) -{ - const struct mdoc_node *n, *it; - const struct mdoc_block *bl; - int i; - size_t width; - - /* - * 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; - } - - 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; - } - return; - } - - if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) { - i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); - width = 0; - if (i >= 0) { - assert(1 == bl->argv[i].sz); - width = arg_offset(*bl->argv[i].value); - } - - flushln(p); - p->offset -= width; - return; - } -} - - -/* ARGSUSED */ static int termp_it_pre(DECL_ARGS) { const struct mdoc_node *n, *it; const struct mdoc_block *bl; - int i; - size_t width; + char buf[7], *tp; + int i, type; + size_t width, offset; - /* - * Also see termp_it_post() for general comments. - */ - switch (node->type) { case (MDOC_BODY): /* FALLTHROUGH */ @@ -394,17 +368,9 @@ termp_it_pre(DECL_ARGS) 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; + n = it->parent->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); @@ -413,88 +379,207 @@ termp_it_pre(DECL_ARGS) return(1); } - assert(MDOC_HEAD == node->type - || MDOC_BODY == node->type); + /* Get our list type. */ - /* If `-tag', adjust our margins accordingly. */ + for (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_Item): + /* FALLTHROUGH */ + case (MDOC_Tag): + /* FALLTHROUGH */ + case (MDOC_Ohang): + type = bl->argv[i].arg; + i = (int)bl->argc; + break; + case (MDOC_Inset): + /* FALLTHROUGH */ + case (MDOC_Hang): + /* FALLTHROUGH */ + case (MDOC_Diag): + /* FALLTHROUGH */ + case (MDOC_Column): + errx(1, "list type not supported"); + /* NOTREACHED */ + default: + break; + } - 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 */ + /* Save our existing (inherited) margin and offset. */ - /* FIXME: nested lists. */ + pair->offset = p->offset; + pair->rmargin = p->rmargin; - if (MDOC_HEAD == node->type) { + /* Get list width and offset. */ + + /* FIXME: auto-size. */ + i = arg_getattr(MDOC_Width, bl->argc, bl->argv); + width = i >= 0 ? arg_width(&bl->argv[i]) : 0; + + i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); + offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0; + + /* Override the width. */ + + switch (type) { + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + width = width > 6 ? width : 6; + break; + case (MDOC_Tag): + if (0 == width) + errx(1, "need non-zero -width"); + break; + default: + break; + } + + /* Word-wrap control. */ + + p->flags |= TERMP_NOSPACE; + + 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; - p->flags |= TERMP_NOSPACE; - p->rmargin = p->offset + width; - } else { - p->flags |= TERMP_NOSPACE; + else if (MDOC_BODY == node->type) p->flags |= TERMP_NOLPAD; - p->offset += width + 1; + break; + case (MDOC_Ohang): + break; + } + + /* + * Get a token to use as the HEAD lead-in. If NULL, we use the + * HEAD child. + */ + + tp = NULL; + 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; } - return(1); + if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv)) + tp = "\\-"; + if (arg_hasattr(MDOC_Item, bl->argc, bl->argv)) + tp = ""; } - /* If `-ohang', adjust left-margin. */ + /* Margin control. */ - if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) { - width = 0; - i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); - if (i >= 0) { - assert(1 == bl->argv[i].sz); - width = arg_offset(*bl->argv[i].value); - } + p->offset += offset; - p->flags |= TERMP_NOSPACE; - p->offset += width; - return(1); + switch (type) { + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Item): + /* FALLTHROUGH */ + case (MDOC_Tag): + if (MDOC_HEAD == node->type) + p->rmargin = p->offset + width; + else if (MDOC_BODY == node->type) + p->offset += width; + break; + case (MDOC_Ohang): + break; } - return(1); + if (NULL == tp) + return(1); + + /* XXX - ignoring children. */ + + 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; + p->flags &= ~TERMP_NORPAD; + } 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]; + TERMPAIR_SETFLAG(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(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]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]); if (NULL == node->child) - word(p, meta->name); + word(p, "..."); return(1); } @@ -520,16 +605,53 @@ termp_pp_pre(DECL_ARGS) /* ARGSUSED */ -static void -termp_ar_post(DECL_ARGS) +static int +termp_st_pre(DECL_ARGS) { + const char *tp; - p->flags &= ~ttypes[TTYPE_CMD_ARG]; + assert(1 == node->data.elem.argc); + + tp = mdoc_st2a(node->data.elem.argv[0].arg); + word(p, tp); + + return(1); } /* ARGSUSED */ static int +termp_rv_pre(DECL_ARGS) +{ + int i; + + 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_ex_pre(DECL_ARGS) { int i; @@ -581,26 +703,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) { @@ -633,7 +735,7 @@ termp_vt_pre(DECL_ARGS) { /* FIXME: this can be "type name". */ - p->flags |= ttypes[TTYPE_VAR_DECL]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]); return(1); } @@ -643,7 +745,6 @@ static void termp_vt_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_VAR_DECL]; if (node->sec == SEC_SYNOPSIS) vspace(p); } @@ -658,7 +759,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(pair, ttypes[TTYPE_FUNC_DECL]); return(1); } @@ -668,10 +769,8 @@ static void termp_fd_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_FUNC_DECL]; if (node->sec == SEC_SYNOPSIS) vspace(p); - } @@ -683,7 +782,7 @@ termp_sh_pre(DECL_ARGS) switch (node->type) { case (MDOC_HEAD): vspace(p); - p->flags |= ttypes[TTYPE_SECTION]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SECTION]); break; case (MDOC_BODY): p->offset = INDENT; @@ -696,6 +795,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) { @@ -714,22 +832,20 @@ termp_op_pre(DECL_ARGS) /* ARGSUSED */ static int -termp_ud_pre(DECL_ARGS) +termp_bt_pre(DECL_ARGS) { - word(p, "currently under development."); + word(p, "is currently in beta test."); return(1); } /* ARGSUSED */ static int -termp_fl_pre(DECL_ARGS) +termp_ud_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_CMD_FLAG]; - word(p, "\\-"); - p->flags |= TERMP_NOSPACE; + word(p, "currently under development."); return(1); } @@ -742,7 +858,7 @@ termp_d1_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); newln(p); - p->offset += INDENT; + p->offset += (pair->offset = INDENT); return(1); } @@ -755,7 +871,7 @@ termp_d1_post(DECL_ARGS) if (MDOC_BODY != node->type) return; newln(p); - p->offset -= INDENT; + p->offset -= pair->offset; } @@ -789,7 +905,7 @@ static int termp_ft_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_FUNC_TYPE]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_TYPE]); return(1); } @@ -799,10 +915,8 @@ static void termp_ft_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_FUNC_TYPE]; if (node->sec == SEC_SYNOPSIS) newln(p); - } @@ -821,7 +935,6 @@ termp_fn_pre(DECL_ARGS) word(p, node->child->data.text.string); p->flags &= ~ttypes[TTYPE_FUNC_NAME]; - p->flags |= TERMP_NOSPACE; word(p, "("); p->flags |= TERMP_NOSPACE; @@ -830,11 +943,10 @@ termp_fn_pre(DECL_ARGS) p->flags |= ttypes[TTYPE_FUNC_ARG]; word(p, n->data.text.string); p->flags &= ~ttypes[TTYPE_FUNC_ARG]; - if ((n->next)) + if (n->next) word(p, ","); } - p->flags |= TERMP_NOSPACE; word(p, ")"); if (SEC_SYNOPSIS == node->sec) @@ -860,36 +972,37 @@ static int termp_sx_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_LINK]; + TERMPAIR_SETFLAG(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; - p->flags |= ttypes[TTYPE_FUNC_ARG]; - return(1); -} + 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); -/* ARGSUSED */ -static void -termp_fa_post(DECL_ARGS) -{ + p->flags |= ttypes[TTYPE_FUNC_ARG]; + word(p, n->data.text.string); + p->flags &= ~ttypes[TTYPE_FUNC_ARG]; - p->flags &= ~ttypes[TTYPE_FUNC_ARG]; + if (n->next) + word(p, ","); + } + + if (node->next && node->next->tok == MDOC_Fa) + word(p, ","); + + return(0); } @@ -898,26 +1011,18 @@ static int termp_va_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_VAR_DECL]; + TERMPAIR_SETFLAG(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) { const struct mdoc_block *bl; const struct mdoc_node *n; + int i; if (MDOC_BLOCK == node->type) { vspace(p); @@ -926,8 +1031,17 @@ termp_bd_pre(DECL_ARGS) return(1); assert(MDOC_BLOCK == node->parent->type); + pair->offset = p->offset; 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); @@ -949,6 +1063,18 @@ termp_bd_pre(DECL_ARGS) /* ARGSUSED */ +static void +termp_bd_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + newln(p); + p->offset = pair->offset; +} + + +/* ARGSUSED */ static int termp_qq_pre(DECL_ARGS) { @@ -975,6 +1101,16 @@ termp_qq_post(DECL_ARGS) /* ARGSUSED */ static int +termp_bsx_pre(DECL_ARGS) +{ + + word(p, "BSDI BSD/OS"); + return(1); +} + + +/* ARGSUSED */ +static int termp_bx_pre(DECL_ARGS) { @@ -995,6 +1131,26 @@ termp_ox_pre(DECL_ARGS) /* 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) { @@ -1010,7 +1166,7 @@ termp_sq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "`"); + word(p, "\'"); p->flags |= TERMP_NOSPACE; return(1); } @@ -1056,7 +1212,7 @@ termp_ss_pre(DECL_ARGS) switch (node->type) { case (MDOC_HEAD): vspace(p); - p->flags |= ttypes[TTYPE_SSECTION]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SSECTION]); p->offset = INDENT / 2; break; default: @@ -1074,7 +1230,6 @@ termp_ss_post(DECL_ARGS) switch (node->type) { case (MDOC_HEAD): - p->flags &= ~ttypes[TTYPE_SSECTION]; newln(p); p->offset = INDENT; break; @@ -1089,15 +1244,237 @@ static int termp_pa_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_FILE]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FILE]); return(1); } /* ARGSUSED */ +static int +termp_em_pre(DECL_ARGS) +{ + + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); + return(1); +} + + +/* ARGSUSED */ +static int +termp_cd_pre(DECL_ARGS) +{ + + 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_pa_post(DECL_ARGS) +termp_bq_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_FILE]; + 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); + + b = &node->data.block; + + 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]); + + return(1); + } + + 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); +} + + + +/* ARGSUSED */ +static int +termp_sm_pre(DECL_ARGS) +{ + +#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); }