=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.18 retrieving revision 1.65 diff -u -p -r1.18 -r1.65 --- mandoc/term.c 2009/02/25 12:09:20 1.18 +++ mandoc/term.c 2009/03/21 13:09:29 1.65 @@ -1,6 +1,6 @@ -/* $Id: term.c,v 1.18 2009/02/25 12:09:20 kristaps Exp $ */ +/* $Id: term.c,v 1.65 2009/03/21 13:09:29 kristaps Exp $ */ /* - * Copyright (c) 2009 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 @@ -16,21 +16,23 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include + #include +#include +#include +#include #include #include #include "term.h" -#define INDENT 4 - /* * Performs actions on nodes of the abstract syntax tree. Both pre- and * post-fix operations are defined here. */ -/* FIXME: indent/tab. */ -/* FIXME: handle nested lists. */ +/* FIXME: macro arguments can be escaped. */ #define TTYPE_PROG 0 #define TTYPE_CMD_FLAG 1 @@ -50,7 +52,11 @@ #define TTYPE_INCLUDE 15 #define TTYPE_SYMB 16 #define TTYPE_SYMBOL 17 -#define TTYPE_NMAX 18 +#define TTYPE_DIAG 18 +#define TTYPE_LINK_ANCHOR 19 +#define TTYPE_LINK_TEXT 20 +#define TTYPE_REF_JOURNAL 21 +#define TTYPE_NMAX 22 /* * These define "styles" for element types, like command arguments or @@ -58,33 +64,40 @@ * the same thing (like .Ex -std cmd and .Nm cmd). */ +/* TODO: abstract this into mdocterm.c. */ + const int ttypes[TTYPE_NMAX] = { - TERMP_BOLD, /* TTYPE_PROG */ + TERMP_BOLD, /* TTYPE_PROG */ TERMP_BOLD, /* TTYPE_CMD_FLAG */ - TERMP_UNDERLINE, /* TTYPE_CMD_ARG */ + TERMP_UNDER, /* TTYPE_CMD_ARG */ TERMP_BOLD, /* TTYPE_SECTION */ TERMP_BOLD, /* TTYPE_FUNC_DECL */ - TERMP_UNDERLINE, /* TTYPE_VAR_DECL */ - TERMP_UNDERLINE, /* TTYPE_FUNC_TYPE */ + TERMP_UNDER, /* TTYPE_VAR_DECL */ + TERMP_UNDER, /* TTYPE_FUNC_TYPE */ TERMP_BOLD, /* TTYPE_FUNC_NAME */ - TERMP_UNDERLINE, /* TTYPE_FUNC_ARG */ - TERMP_UNDERLINE, /* TTYPE_LINK */ + TERMP_UNDER, /* TTYPE_FUNC_ARG */ + TERMP_UNDER, /* TTYPE_LINK */ TERMP_BOLD, /* TTYPE_SSECTION */ - TERMP_UNDERLINE, /* TTYPE_FILE */ - TERMP_UNDERLINE, /* TTYPE_EMPH */ + TERMP_UNDER, /* TTYPE_FILE */ + TERMP_UNDER, /* TTYPE_EMPH */ TERMP_BOLD, /* TTYPE_CONFIG */ TERMP_BOLD, /* TTYPE_CMD */ TERMP_BOLD, /* TTYPE_INCLUDE */ TERMP_BOLD, /* TTYPE_SYMB */ - TERMP_BOLD /* TTYPE_SYMBOL */ + TERMP_BOLD, /* TTYPE_SYMBOL */ + TERMP_BOLD, /* TTYPE_DIAG */ + TERMP_UNDER, /* TTYPE_LINK_ANCHOR */ + TERMP_BOLD, /* TTYPE_LINK_TEXT */ + TERMP_UNDER /* TTYPE_REF_JOURNAL */ }; -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 int arg_hasattr(int, const struct mdoc_node *); +static int arg_getattrs(const int *, int *, size_t, + const struct mdoc_node *); +static int arg_getattr(int, const struct mdoc_node *); +static size_t arg_offset(const struct mdoc_argv *); +static size_t arg_width(const struct mdoc_argv *, int); +static int arg_listtype(const struct mdoc_node *); /* * What follows describes prefix and postfix operations for the abstract @@ -105,16 +118,20 @@ static void name##_post(DECL_ARGS) DECL_PRE(name); \ DECL_POST(name); +DECL_PREPOST(termp__t); DECL_PREPOST(termp_aq); DECL_PREPOST(termp_bd); DECL_PREPOST(termp_bq); +DECL_PREPOST(termp_brq); 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_in); DECL_PREPOST(termp_it); +DECL_PREPOST(termp_lb); DECL_PREPOST(termp_op); DECL_PREPOST(termp_pf); DECL_PREPOST(termp_pq); @@ -124,22 +141,25 @@ DECL_PREPOST(termp_ss); DECL_PREPOST(termp_sq); DECL_PREPOST(termp_vt); +DECL_PRE(termp__j); +DECL_PRE(termp_ap); 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_dx); 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_lk); DECL_PRE(termp_ms); +DECL_PRE(termp_mt); DECL_PRE(termp_nd); DECL_PRE(termp_nm); DECL_PRE(termp_ns); @@ -147,7 +167,9 @@ 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); @@ -156,7 +178,9 @@ 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 }, /* \" */ @@ -167,7 +191,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 */ @@ -188,7 +212,7 @@ const struct termact __termacts[MDOC_MAX] = { { termp_fn_pre, termp_fn_post }, /* Fn */ { termp_ft_pre, termp_ft_post }, /* Ft */ { termp_ic_pre, NULL }, /* Ic */ - { termp_in_pre, NULL }, /* In */ + { termp_in_pre, termp_in_post }, /* In */ { NULL, NULL }, /* Li */ { termp_nd_pre, NULL }, /* Nd */ { termp_nm_pre, NULL }, /* Nm */ @@ -200,17 +224,17 @@ const struct termact __termacts[MDOC_MAX] = { { 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 */ + { termp__j_pre, 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 */ @@ -220,7 +244,7 @@ const struct termact __termacts[MDOC_MAX] = { { 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 */ @@ -244,11 +268,11 @@ 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_sm_pre, NULL }, /* Sm */ { termp_sx_pre, NULL }, /* Sx */ { termp_sy_pre, NULL }, /* Sy */ { NULL, NULL }, /* Tn */ @@ -265,23 +289,97 @@ const struct termact __termacts[MDOC_MAX] = { { NULL, NULL }, /* Hf */ { NULL, NULL }, /* Fr */ { termp_ud_pre, NULL }, /* Ud */ + { termp_lb_pre, termp_lb_post }, /* Lb */ + { termp_ap_pre, NULL }, /* Lb */ + { termp_pp_pre, NULL }, /* Pp */ + { termp_lk_pre, NULL }, /* Lk */ + { termp_mt_pre, NULL }, /* Mt */ + { termp_brq_pre, termp_brq_post }, /* Brq */ + { termp_brq_pre, termp_brq_post }, /* Bro */ + { NULL, NULL }, /* Brc */ + { NULL, NULL }, /* %C */ + { NULL, NULL }, /* Es */ + { NULL, NULL }, /* En */ + { termp_dx_pre, NULL }, /* Dx */ + { NULL, NULL }, /* %Q */ }; const struct termact *termacts = __termacts; static size_t -arg_width(const struct mdoc_arg *arg) +arg_width(const struct mdoc_argv *arg, int pos) { + size_t v; + int i, len; - /* TODO */ - assert(*arg->value); - return(strlen(*arg->value)); + assert(pos < (int)arg->sz && pos >= 0); + assert(arg->value[pos]); + if (0 == strcmp(arg->value[pos], "indent")) + return(INDENT); + if (0 == strcmp(arg->value[pos], "indent-two")) + return(INDENT * 2); + + len = (int)strlen(arg->value[pos]); + assert(len > 0); + + for (i = 0; i < len - 1; i++) + if ( ! isdigit((u_char)arg->value[pos][i])) + break; + + if (i == len - 1) { + if ('n' == arg->value[pos][len - 1]) { + v = (size_t)atoi(arg->value[pos]); + return(v); + } + + } + return(strlen(arg->value[pos]) + 1); } +static int +arg_listtype(const struct mdoc_node *n) +{ + int i, len; + + assert(MDOC_BLOCK == n->type); + + len = (int)(n->args ? n->args->argc : 0); + + for (i = 0; i < len; i++) + switch (n->args->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_Inset): + /* FALLTHROUGH */ + case (MDOC_Diag): + /* FALLTHROUGH */ + case (MDOC_Item): + /* FALLTHROUGH */ + case (MDOC_Column): + /* FALLTHROUGH */ + case (MDOC_Ohang): + return(n->args->argv[i].arg); + default: + break; + } + + errx(1, "list type not supported"); + /* NOTREACHED */ +} + + static size_t -arg_offset(const struct mdoc_arg *arg) +arg_offset(const struct mdoc_argv *arg) { /* TODO */ @@ -290,31 +388,46 @@ arg_offset(const struct mdoc_arg *arg) return(INDENT); if (0 == strcmp(*arg->value, "indent-two")) return(INDENT * 2); - return(strlen(*arg->value)); } static int -arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv) +arg_hasattr(int arg, const struct mdoc_node *n) { - return(-1 != arg_getattr(arg, argc, argv)); + return(-1 != arg_getattr(arg, n)); } static int -arg_getattr(int arg, size_t argc, const struct mdoc_arg *argv) +arg_getattr(int v, const struct mdoc_node *n) { - int i; + int val; - for (i = 0; i < (int)argc; i++) - if (argv[i].arg == arg) - return(i); - return(-1); + return(arg_getattrs(&v, &val, 1, n) ? val : -1); } +static int +arg_getattrs(const int *keys, int *vals, + size_t sz, const struct mdoc_node *n) +{ + int i, j, k; + + if (NULL == n->args) + return(0); + + for (k = i = 0; i < (int)n->args->argc; i++) + for (j = 0; j < (int)sz; j++) + if (n->args->argv[i].arg == keys[j]) { + vals[j] = i; + k++; + } + return(k); +} + + /* ARGSUSED */ static int termp_dq_pre(DECL_ARGS) @@ -323,7 +436,7 @@ termp_dq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "``"); + term_word(p, "\\(lq"); p->flags |= TERMP_NOSPACE; return(1); } @@ -338,161 +451,259 @@ termp_dq_post(DECL_ARGS) return; p->flags |= TERMP_NOSPACE; - word(p, "''"); + term_word(p, "\\(rq"); } /* ARGSUSED */ -static void -termp_it_post(DECL_ARGS) +static int +termp_it_pre_block(DECL_ARGS) { - const struct mdoc_node *n, *it; - const struct mdoc_block *bl; - int i; - 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. - */ + term_newln(p); + if ( ! arg_hasattr(MDOC_Compact, node->parent->parent)) + term_vspace(p); - switch (node->type) { - case (MDOC_BODY): - /* FALLTHROUGH */ - case (MDOC_HEAD): - 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; - bl = &n->data.block; +/* ARGSUSED */ +static int +termp_it_pre(DECL_ARGS) +{ + const struct mdoc_node *bl, *n; + char buf[7]; + int i, type, keys[3], vals[3]; + size_t width, offset; - /* If `-tag', adjust our margins accordingly. */ + if (MDOC_BLOCK == node->type) + return(termp_it_pre_block(p, pair, meta, node)); - if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { - flushln(p); + bl = node->parent->parent->parent; - /* FIXME: this should auto-size. */ - i = arg_getattr(MDOC_Width, bl->argc, bl->argv); - width = i >= 0 ? arg_width(&bl->argv[i]) : 10; + /* Save parent attributes. */ - /* FIXME: nesting! Should happen at block. */ - i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); - offset = i >= 0 ? arg_width(&bl->argv[i]) : 0; + pair->offset = p->offset; + pair->rmargin = p->rmargin; + pair->flag = p->flags; - if (MDOC_HEAD == node->type) { - p->rmargin = p->maxrmargin; - p->offset -= offset; - p->flags &= ~TERMP_NOBREAK; - } else { - p->offset -= width; - p->flags &= ~TERMP_NOLPAD; - } - } + /* Get list width 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; + keys[0] = MDOC_Width; + keys[1] = MDOC_Offset; + keys[2] = MDOC_Column; - flushln(p); - p->offset -= offset; - return; - } -} + vals[0] = vals[1] = vals[2] = -1; + width = offset = 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; + (void)arg_getattrs(keys, vals, 3, bl); - /* - * Also see termp_it_post() for general comments. + type = arg_listtype(bl); + + /* Calculate real width and offset. */ + + switch (type) { + case (MDOC_Column): + if (MDOC_BODY == node->type) + break; + for (i = 0, n = node->prev; n; n = n->prev, i++) + offset += arg_width + (&bl->args->argv[vals[2]], i); + assert(i < (int)bl->args->argv[vals[2]].sz); + width = arg_width(&bl->args->argv[vals[2]], i); + if (vals[1] >= 0) + offset += arg_offset(&bl->args->argv[vals[1]]); + break; + default: + if (vals[0] >= 0) + width = arg_width(&bl->args->argv[vals[0]], 0); + if (vals[1] >= 0) + offset = arg_offset(&bl->args->argv[vals[1]]); + break; + } + + /* + * List-type can override the width in the case of fixed-head + * values (bullet, dash/hyphen, enum). Tags need a non-zero + * offset. */ - 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): + if (width < 4) + width = 4; break; - case (MDOC_BLOCK): - it = node; + case (MDOC_Tag): + if (0 == width) + width = 10; break; default: - return(1); + break; } - assert(MDOC_BLOCK == it->type); - assert(MDOC_It == it->tok); + /* + * Whitespace control. Inset bodies need an initial space. + */ - 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); + switch (type) { + case (MDOC_Diag): + /* FALLTHROUGH */ + case (MDOC_Inset): + if (MDOC_BODY == node->type) + p->flags &= ~TERMP_NOSPACE; else - vspace(p); - return(1); + p->flags |= TERMP_NOSPACE; + break; + default: + p->flags |= TERMP_NOSPACE; + break; } - assert(MDOC_HEAD == node->type - || MDOC_BODY == node->type); + /* + * Style flags. Diagnostic heads need TTYPE_DIAG. + */ - /* FIXME: see termp_it_post(). */ + switch (type) { + case (MDOC_Diag): + if (MDOC_HEAD == node->type) + p->flags |= ttypes[TTYPE_DIAG]; + break; + default: + break; + } - /* If `-tag', adjust our margins accordingly. */ + /* + * Pad and break control. This is the tricker part. Lists with + * set right-margins for the head get TERMP_NOBREAK because, if + * they overrun the margin, they wrap to the new margin. + * Correspondingly, the body for these types don't left-pad, as + * the head will pad out to to the right. + */ - if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { - 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; + else + p->flags |= TERMP_NOLPAD; + if (MDOC_HEAD == node->type && MDOC_Tag == type) + if (NULL == node->next || + NULL == node->next->child) + p->flags |= TERMP_NONOBREAK; + break; + case (MDOC_Column): + if (MDOC_HEAD == node->type) { + assert(node->next); + if (MDOC_BODY == node->next->type) + p->flags &= ~TERMP_NOBREAK; + else + p->flags |= TERMP_NOBREAK; + if (node->prev) + p->flags |= TERMP_NOLPAD; + } + break; + case (MDOC_Diag): + if (MDOC_HEAD == node->type) + p->flags |= TERMP_NOBREAK; + break; + default: + break; + } - i = arg_getattr(MDOC_Width, bl->argc, bl->argv); - width = i >= 0 ? arg_width(&bl->argv[i]) : 10; + /* + * Margin control. Set-head-width lists have their right + * margins shortened. The body for these lists has the offset + * necessarily lengthened. Everybody gets the offset. + */ - i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); - offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0; + p->offset += offset; - 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 p->offset += width; - } - return(1); + break; + case (MDOC_Column): + p->rmargin = p->offset + width; + break; + default: + break; } - /* If `-ohang', adjust left-margin. */ + /* + * The dash, hyphen, bullet and enum lists all have a special + * HEAD character. Print it now. + */ - 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; + if (MDOC_HEAD == node->type) + switch (type) { + case (MDOC_Bullet): + term_word(p, "\\[bu]"); + break; + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + term_word(p, "\\-"); + break; + case (MDOC_Enum): + (pair->ppair->ppair->count)++; + (void)snprintf(buf, sizeof(buf), "%d.", + pair->ppair->ppair->count); + term_word(p, buf); + break; + default: + break; + } - p->flags |= TERMP_NOSPACE; - p->offset += offset; - return(1); + /* + * If we're not going to process our children, indicate so here. + */ + + switch (type) { + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Item): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Enum): + if (MDOC_HEAD == node->type) + return(0); + break; + case (MDOC_Column): + if (MDOC_BODY == node->type) + return(0); + break; + default: + break; } return(1); @@ -500,13 +711,52 @@ termp_it_pre(DECL_ARGS) /* ARGSUSED */ +static void +termp_it_post(DECL_ARGS) +{ + int type; + + if (MDOC_BODY != node->type && MDOC_HEAD != node->type) + return; + + type = arg_listtype(node->parent->parent->parent); + + switch (type) { + case (MDOC_Diag): + /* FALLTHROUGH */ + case (MDOC_Item): + /* FALLTHROUGH */ + case (MDOC_Inset): + if (MDOC_BODY == node->type) + term_flushln(p); + break; + case (MDOC_Column): + if (MDOC_HEAD == node->type) + term_flushln(p); + break; + default: + term_flushln(p); + break; + } + + p->offset = pair->offset; + p->rmargin = pair->rmargin; + p->flags = pair->flag; +} + + +/* ARGSUSED */ static int termp_nm_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_PROG]); + if (SEC_SYNOPSIS == node->sec) + term_newln(p); + + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_PROG]); if (NULL == node->child) - word(p, meta->name); + term_word(p, meta->name); + return(1); } @@ -516,8 +766,8 @@ static int termp_fl_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]); - word(p, "\\-"); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]); + term_word(p, "\\-"); p->flags |= TERMP_NOSPACE; return(1); } @@ -528,9 +778,7 @@ static int termp_ar_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]); - if (NULL == node->child) - word(p, "..."); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]); return(1); } @@ -550,7 +798,7 @@ static int termp_pp_pre(DECL_ARGS) { - vspace(p); + term_vspace(p); return(1); } @@ -559,13 +807,21 @@ termp_pp_pre(DECL_ARGS) static int termp_st_pre(DECL_ARGS) { - const char *tp; + const char *cp; - assert(1 == node->data.elem.argc); + if (node->child && (cp = mdoc_a2st(node->child->string))) + term_word(p, cp); + return(0); +} - tp = mdoc_st2a(node->data.elem.argv[0].arg); - word(p, tp); +/* ARGSUSED */ +static int +termp_rs_pre(DECL_ARGS) +{ + + if (MDOC_BLOCK == node->type && node->prev) + term_vspace(p); return(1); } @@ -576,26 +832,28 @@ termp_rv_pre(DECL_ARGS) { int i; - i = arg_getattr(MDOC_Std, node->data.elem.argc, - node->data.elem.argv); - assert(i >= 0); + if (-1 == (i = arg_getattr(MDOC_Std, node))) + errx(1, "expected -std argument"); + if (1 != node->args->argv[i].sz) + errx(1, "expected -std argument"); - newln(p); - word(p, "The"); + term_newln(p); + term_word(p, "The"); p->flags |= ttypes[TTYPE_FUNC_NAME]; - word(p, *node->data.elem.argv[i].value); + term_word(p, *node->args->argv[i].value); p->flags &= ~ttypes[TTYPE_FUNC_NAME]; + p->flags |= TERMP_NOSPACE; - word(p, "() function returns the value 0 if successful;"); - word(p, "otherwise the value -1 is returned and the"); - word(p, "global variable"); + term_word(p, "() function returns the value 0 if successful;"); + term_word(p, "otherwise the value -1 is returned and the"); + term_word(p, "global variable"); p->flags |= ttypes[TTYPE_VAR_DECL]; - word(p, "errno"); + term_word(p, "errno"); p->flags &= ~ttypes[TTYPE_VAR_DECL]; - word(p, "is set to indicate the error."); + term_word(p, "is set to indicate the error."); return(1); } @@ -607,15 +865,16 @@ termp_ex_pre(DECL_ARGS) { int i; - i = arg_getattr(MDOC_Std, node->data.elem.argc, - node->data.elem.argv); - assert(i >= 0); + if (-1 == (i = arg_getattr(MDOC_Std, node))) + errx(1, "expected -std argument"); + if (1 != node->args->argv[i].sz) + errx(1, "expected -std argument"); - word(p, "The"); + term_word(p, "The"); p->flags |= ttypes[TTYPE_PROG]; - word(p, *node->data.elem.argv[i].value); + term_word(p, *node->args->argv[i].value); p->flags &= ~ttypes[TTYPE_PROG]; - word(p, "utility exits 0 on success, and >0 if an error occurs."); + term_word(p, "utility exits 0 on success, and >0 if an error occurs."); return(1); } @@ -626,7 +885,7 @@ static int termp_nd_pre(DECL_ARGS) { - word(p, "\\-"); + term_word(p, "\\-"); return(1); } @@ -637,7 +896,7 @@ termp_bl_post(DECL_ARGS) { if (MDOC_BLOCK == node->type) - newln(p); + term_newln(p); } @@ -649,52 +908,27 @@ termp_op_post(DECL_ARGS) if (MDOC_BODY != node->type) return; p->flags |= TERMP_NOSPACE; - word(p, "\\(rB"); + term_word(p, "\\(rB"); } /* 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_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 = node->child)) + errx(1, "expected text line argument"); + term_word(p, n->string); if (NULL == (n = n->next)) return(0); - - assert(MDOC_TEXT == n->type); p->flags |= TERMP_NOSPACE; - word(p, "("); + term_word(p, "("); p->flags |= TERMP_NOSPACE; - word(p, n->data.text.string); + term_word(p, n->string); p->flags |= TERMP_NOSPACE; - word(p, ")"); - + term_word(p, ")"); return(0); } @@ -705,7 +939,7 @@ termp_vt_pre(DECL_ARGS) { /* FIXME: this can be "type name". */ - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]); return(1); } @@ -716,7 +950,7 @@ termp_vt_post(DECL_ARGS) { if (node->sec == SEC_SYNOPSIS) - vspace(p); + term_vspace(p); } @@ -729,7 +963,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. */ - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_DECL]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_DECL]); return(1); } @@ -739,8 +973,11 @@ static void termp_fd_post(DECL_ARGS) { - if (node->sec == SEC_SYNOPSIS) - vspace(p); + if (node->sec != SEC_SYNOPSIS) + return; + term_newln(p); + if (node->next && MDOC_Fd != node->next->tok) + term_vspace(p); } @@ -751,8 +988,8 @@ termp_sh_pre(DECL_ARGS) switch (node->type) { case (MDOC_HEAD): - vspace(p); - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SECTION]); + term_vspace(p); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SECTION]); break; case (MDOC_BODY): p->offset = INDENT; @@ -765,13 +1002,32 @@ termp_sh_pre(DECL_ARGS) /* ARGSUSED */ +static void +termp_sh_post(DECL_ARGS) +{ + + switch (node->type) { + case (MDOC_HEAD): + term_newln(p); + break; + case (MDOC_BODY): + term_newln(p); + p->offset = 0; + break; + default: + break; + } +} + + +/* ARGSUSED */ static int termp_op_pre(DECL_ARGS) { switch (node->type) { case (MDOC_BODY): - word(p, "\\(lB"); + term_word(p, "\\(lB"); p->flags |= TERMP_NOSPACE; break; default: @@ -786,17 +1042,43 @@ static int termp_bt_pre(DECL_ARGS) { - word(p, "is currently in beta test."); + term_word(p, "is currently in beta test."); return(1); } /* ARGSUSED */ static int +termp_lb_pre(DECL_ARGS) +{ + const char *lb; + + if (NULL == node->child) + errx(1, "expected text line argument"); + if ((lb = mdoc_a2lib(node->child->string))) { + term_word(p, lb); + return(0); + } + term_word(p, "library"); + return(1); +} + + +/* ARGSUSED */ +static void +termp_lb_post(DECL_ARGS) +{ + + term_newln(p); +} + + +/* ARGSUSED */ +static int termp_ud_pre(DECL_ARGS) { - word(p, "currently under development."); + term_word(p, "currently under development."); return(1); } @@ -808,8 +1090,8 @@ termp_d1_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - newln(p); - p->offset += INDENT; + term_newln(p); + p->offset += (pair->offset = INDENT); return(1); } @@ -821,8 +1103,8 @@ termp_d1_post(DECL_ARGS) if (MDOC_BODY != node->type) return; - newln(p); - p->offset -= INDENT; + term_newln(p); + p->offset -= pair->offset; } @@ -833,7 +1115,7 @@ termp_aq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "<"); + term_word(p, "\\(la"); p->flags |= TERMP_NOSPACE; return(1); } @@ -847,7 +1129,7 @@ termp_aq_post(DECL_ARGS) if (MDOC_BODY != node->type) return; p->flags |= TERMP_NOSPACE; - word(p, ">"); + term_word(p, "\\(ra"); } @@ -856,7 +1138,10 @@ static int termp_ft_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_TYPE]); + if (SEC_SYNOPSIS == node->sec) + if (node->prev && MDOC_Fo == node->prev->tok) + term_vspace(p); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]); return(1); } @@ -866,8 +1151,8 @@ static void termp_ft_post(DECL_ARGS) { - if (node->sec == SEC_SYNOPSIS) - newln(p); + if (SEC_SYNOPSIS == node->sec) + term_newln(p); } @@ -877,31 +1162,30 @@ termp_fn_pre(DECL_ARGS) { const struct mdoc_node *n; - assert(node->child); - assert(MDOC_TEXT == node->child->type); + if (NULL == node->child) + errx(1, "expected text line arguments"); /* FIXME: can be "type funcname" "type varname"... */ p->flags |= ttypes[TTYPE_FUNC_NAME]; - word(p, node->child->data.text.string); + term_word(p, node->child->string); p->flags &= ~ttypes[TTYPE_FUNC_NAME]; - word(p, "("); + term_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); + term_word(p, n->string); p->flags &= ~ttypes[TTYPE_FUNC_ARG]; if (n->next) - word(p, ","); + term_word(p, ","); } - word(p, ")"); + term_word(p, ")"); if (SEC_SYNOPSIS == node->sec) - word(p, ";"); + term_word(p, ";"); return(0); } @@ -912,8 +1196,8 @@ static void termp_fn_post(DECL_ARGS) { - if (node->sec == SEC_SYNOPSIS) - vspace(p); + if (node->sec == SEC_SYNOPSIS && node->next) + term_vspace(p); } @@ -923,7 +1207,7 @@ static int termp_sx_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_LINK]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK]); return(1); } @@ -935,23 +1219,20 @@ termp_fa_pre(DECL_ARGS) struct mdoc_node *n; if (node->parent->tok != MDOC_Fo) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_ARG]); + TERMPAIR_SETFLAG(p, 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); + term_word(p, n->string); p->flags &= ~ttypes[TTYPE_FUNC_ARG]; - if (n->next) - word(p, ","); + term_word(p, ","); } if (node->next && node->next->tok == MDOC_Fa) - word(p, ","); + term_word(p, ","); return(0); } @@ -962,7 +1243,7 @@ static int termp_va_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]); return(1); } @@ -971,42 +1252,87 @@ termp_va_pre(DECL_ARGS) static int termp_bd_pre(DECL_ARGS) { - const struct mdoc_block *bl; - const struct mdoc_node *n; - int i; + int i, type, ln; + /* + * This is fairly tricky due primarily to crappy documentation. + * If -ragged or -filled are specified, the block does nothing + * but change the indentation. + * + * If, on the other hand, -unfilled or -literal are specified, + * then the game changes. Text is printed exactly as entered in + * the display: if a macro line, a newline is appended to the + * line. Blank lines are allowed. + */ + if (MDOC_BLOCK == node->type) { - vspace(p); + /* FIXME: parent prev? */ + if (node->prev) + term_vspace(p); return(1); } else if (MDOC_BODY != node->type) return(1); - assert(MDOC_BLOCK == node->parent->type); + if (NULL == node->parent->args) + errx(1, "missing display type"); - bl = &node->parent->data.block; + pair->offset = p->offset; - i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); + for (type = -1, i = 0; + i < (int)node->parent->args->argc; i++) { + switch (node->parent->args->argv[i].arg) { + case (MDOC_Ragged): + /* FALLTHROUGH */ + case (MDOC_Filled): + /* FALLTHROUGH */ + case (MDOC_Unfilled): + /* FALLTHROUGH */ + case (MDOC_Literal): + type = node->parent->args->argv[i].arg; + i = (int)node->parent->args->argc; + break; + default: + break; + } + } + + if (NULL == node->parent->args) + errx(1, "missing display type"); + + i = arg_getattr(MDOC_Offset, node->parent); if (-1 != i) { - assert(1 == bl->argv[i].sz); - p->offset += arg_offset(&bl->argv[i]); + if (1 != node->parent->args->argv[i].sz) + errx(1, "expected single value"); + p->offset += arg_offset(&node->parent->args->argv[i]); } - if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv)) + switch (type) { + case (MDOC_Literal): + /* FALLTHROUGH */ + case (MDOC_Unfilled): + break; + default: return(1); + } + /* + * Tricky. Iterate through all children. If we're on a + * different parse line, append a newline and then the contents. + * Ew. + */ + p->flags |= TERMP_LITERAL; + ln = node->child ? node->child->line : 0; - 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); - + for (node = node->child; node; node = node->next) { + if (ln < node->line) { + term_flushln(p); + p->flags |= TERMP_NOSPACE; + } + ln = node->line; + term_node(p, pair, meta, node); } - p->flags &= ~TERMP_LITERAL; return(0); } @@ -1015,20 +1341,14 @@ 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]); - } + term_flushln(p); + p->flags &= ~TERMP_LITERAL; + p->offset = pair->offset; + p->flags |= TERMP_NOSPACE; } @@ -1039,7 +1359,7 @@ termp_qq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "\""); + term_word(p, "\""); p->flags |= TERMP_NOSPACE; return(1); } @@ -1053,7 +1373,7 @@ termp_qq_post(DECL_ARGS) if (MDOC_BODY != node->type) return; p->flags |= TERMP_NOSPACE; - word(p, "\""); + term_word(p, "\""); } @@ -1062,27 +1382,38 @@ static int termp_bsx_pre(DECL_ARGS) { - word(p, "BSDI BSD/OS"); + term_word(p, "BSDI BSD/OS"); return(1); } /* ARGSUSED */ +static void +termp_bx_post(DECL_ARGS) +{ + + if (node->child) + p->flags |= TERMP_NOSPACE; + term_word(p, "BSD"); +} + + +/* ARGSUSED */ static int -termp_bx_pre(DECL_ARGS) +termp_ox_pre(DECL_ARGS) { - word(p, "BSD"); + term_word(p, "OpenBSD"); return(1); } /* ARGSUSED */ static int -termp_ox_pre(DECL_ARGS) +termp_dx_pre(DECL_ARGS) { - word(p, "OpenBSD"); + term_word(p, "DragonFly"); return(1); } @@ -1092,7 +1423,7 @@ static int termp_ux_pre(DECL_ARGS) { - word(p, "UNIX"); + term_word(p, "UNIX"); return(1); } @@ -1102,7 +1433,7 @@ static int termp_fx_pre(DECL_ARGS) { - word(p, "FreeBSD"); + term_word(p, "FreeBSD"); return(1); } @@ -1112,7 +1443,7 @@ static int termp_nx_pre(DECL_ARGS) { - word(p, "NetBSD"); + term_word(p, "NetBSD"); return(1); } @@ -1124,7 +1455,7 @@ termp_sq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "\'"); + term_word(p, "\\(oq"); p->flags |= TERMP_NOSPACE; return(1); } @@ -1138,7 +1469,7 @@ termp_sq_post(DECL_ARGS) if (MDOC_BODY != node->type) return; p->flags |= TERMP_NOSPACE; - word(p, "\'"); + term_word(p, "\\(aq"); } @@ -1168,9 +1499,13 @@ termp_ss_pre(DECL_ARGS) { switch (node->type) { + case (MDOC_BLOCK): + term_newln(p); + if (node->prev) + term_vspace(p); + break; case (MDOC_HEAD): - vspace(p); - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SSECTION]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SSECTION]); p->offset = INDENT / 2; break; default: @@ -1188,7 +1523,7 @@ termp_ss_post(DECL_ARGS) switch (node->type) { case (MDOC_HEAD): - newln(p); + term_newln(p); p->offset = INDENT; break; default: @@ -1202,7 +1537,7 @@ static int termp_pa_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FILE]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FILE]); return(1); } @@ -1212,7 +1547,7 @@ static int termp_em_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); return(1); } @@ -1222,7 +1557,8 @@ static int termp_cd_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CONFIG]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CONFIG]); + term_newln(p); return(1); } @@ -1232,7 +1568,7 @@ static int termp_cm_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]); return(1); } @@ -1242,7 +1578,7 @@ static int termp_ic_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD]); return(1); } @@ -1252,36 +1588,81 @@ static int termp_in_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_INCLUDE]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]); + term_word(p, "#include"); + term_word(p, "<"); + p->flags |= TERMP_NOSPACE; return(1); } /* ARGSUSED */ +static void +termp_in_post(DECL_ARGS) +{ + + p->flags |= TERMP_NOSPACE; + term_word(p, ">"); + + term_newln(p); + if (SEC_SYNOPSIS != node->sec) + return; + if (node->next && MDOC_In != node->next->tok) + term_vspace(p); +} + + +/* ARGSUSED */ static int termp_at_pre(DECL_ARGS) { - enum mdoc_att c; + const char *att; - c = ATT_DEFAULT; - if (node->child) { - assert(MDOC_TEXT == node->child->type); - c = mdoc_atoatt(node->child->data.text.string); - } + att = NULL; - word(p, mdoc_att2a(c)); + if (node->child) + att = mdoc_a2att(node->child->string); + if (NULL == att) + att = "AT&T UNIX"; + + term_word(p, att); return(0); } /* ARGSUSED */ static int +termp_brq_pre(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return(1); + term_word(p, "\\(lC"); + p->flags |= TERMP_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +termp_brq_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + p->flags |= TERMP_NOSPACE; + term_word(p, "\\(rC"); +} + + +/* ARGSUSED */ +static int termp_bq_pre(DECL_ARGS) { if (MDOC_BODY != node->type) return(1); - word(p, "["); + term_word(p, "\\(lB"); p->flags |= TERMP_NOSPACE; return(1); } @@ -1294,7 +1675,8 @@ termp_bq_post(DECL_ARGS) if (MDOC_BODY != node->type) return; - word(p, "]"); + p->flags |= TERMP_NOSPACE; + term_word(p, "\\(rB"); } @@ -1305,7 +1687,7 @@ termp_pq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "("); + term_word(p, "\\&("); p->flags |= TERMP_NOSPACE; return(1); } @@ -1318,7 +1700,7 @@ termp_pq_post(DECL_ARGS) if (MDOC_BODY != node->type) return; - word(p, ")"); + term_word(p, ")"); } @@ -1329,7 +1711,7 @@ termp_fo_pre(DECL_ARGS) const struct mdoc_node *n; if (MDOC_BODY == node->type) { - word(p, "("); + term_word(p, "("); p->flags |= TERMP_NOSPACE; return(1); } else if (MDOC_HEAD != node->type) @@ -1339,8 +1721,9 @@ termp_fo_pre(DECL_ARGS) 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); + if (MDOC_TEXT != n->type) + errx(1, "expected text line argument"); + term_word(p, n->string); } p->flags &= ~ttypes[TTYPE_FUNC_NAME]; @@ -1355,9 +1738,11 @@ termp_fo_post(DECL_ARGS) if (MDOC_BODY != node->type) return; - word(p, ")"); - word(p, ";"); - newln(p); + p->flags |= TERMP_NOSPACE; + term_word(p, ")"); + p->flags |= TERMP_NOSPACE; + term_word(p, ";"); + term_newln(p); } @@ -1366,32 +1751,28 @@ 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) + if (MDOC_HEAD == node->type) { return(0); - else if (MDOC_BLOCK != node->type) + } else if (MDOC_BLOCK != node->type) return(1); - b = &node->data.block; + if (NULL == (n = node->head->child)) { + if (arg_hasattr(MDOC_Emphasis, node)) + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); + else if (arg_hasattr(MDOC_Symbolic, node)) + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]); - 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 (MDOC_TEXT != n->type) + errx(1, "expected text line arguments"); - 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]); + if (0 == strcmp("Em", n->string)) + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); + else if (0 == strcmp("Sy", n->string)) + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); return(1); } @@ -1402,7 +1783,7 @@ static int termp_sy_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]); return(1); } @@ -1412,7 +1793,115 @@ static int termp_ms_pre(DECL_ARGS) { - TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMBOL]); + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMBOL]); + return(1); +} + + + +/* ARGSUSED */ +static int +termp_sm_pre(DECL_ARGS) +{ + + if (NULL == node->child || MDOC_TEXT != node->child->type) + errx(1, "expected boolean line argument"); + + if (0 == strcmp("on", node->child->string)) { + p->flags &= ~TERMP_NONOSPACE; + p->flags &= ~TERMP_NOSPACE; + } else + p->flags |= TERMP_NONOSPACE; + + return(0); +} + + +/* ARGSUSED */ +static int +termp_ap_pre(DECL_ARGS) +{ + + p->flags |= TERMP_NOSPACE; + term_word(p, "\\(aq"); + p->flags |= TERMP_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static int +termp__j_pre(DECL_ARGS) +{ + + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_REF_JOURNAL]); + return(1); +} + + +/* ARGSUSED */ +static int +termp__t_pre(DECL_ARGS) +{ + + term_word(p, "\""); + p->flags |= TERMP_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +termp__t_post(DECL_ARGS) +{ + + p->flags |= TERMP_NOSPACE; + term_word(p, "\""); + termp____post(p, pair, meta, node); +} + + +/* ARGSUSED */ +static void +termp____post(DECL_ARGS) +{ + + p->flags |= TERMP_NOSPACE; + term_word(p, node->next ? "," : "."); +} + + +/* ARGSUSED */ +static int +termp_lk_pre(DECL_ARGS) +{ + const struct mdoc_node *n; + + if (NULL == (n = node->child)) + errx(1, "expected line argument"); + + p->flags |= ttypes[TTYPE_LINK_ANCHOR]; + term_word(p, n->string); + p->flags &= ~ttypes[TTYPE_LINK_ANCHOR]; + p->flags |= TERMP_NOSPACE; + term_word(p, ":"); + + p->flags |= ttypes[TTYPE_LINK_TEXT]; + for ( ; n; n = n->next) { + term_word(p, n->string); + } + p->flags &= ~ttypes[TTYPE_LINK_TEXT]; + + return(0); +} + + +/* ARGSUSED */ +static int +termp_mt_pre(DECL_ARGS) +{ + + TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK_ANCHOR]); return(1); }