=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.64 retrieving revision 1.69 diff -u -p -r1.64 -r1.69 --- mandoc/term.c 2009/03/21 09:42:07 1.64 +++ mandoc/term.c 2009/03/23 09:42:43 1.69 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.64 2009/03/21 09:42:07 kristaps Exp $ */ +/* $Id: term.c,v 1.69 2009/03/23 09:42:43 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -55,8 +55,9 @@ #define TTYPE_DIAG 18 #define TTYPE_LINK_ANCHOR 19 #define TTYPE_LINK_TEXT 20 -#define TTYPE_REF_TITLE 21 -#define TTYPE_NMAX 22 +#define TTYPE_REF_JOURNAL 21 +#define TTYPE_LIST 22 +#define TTYPE_NMAX 23 /* * These define "styles" for element types, like command arguments or @@ -88,7 +89,8 @@ const int ttypes[TTYPE_NMAX] = { TERMP_BOLD, /* TTYPE_DIAG */ TERMP_UNDER, /* TTYPE_LINK_ANCHOR */ TERMP_BOLD, /* TTYPE_LINK_TEXT */ - TERMP_UNDER /* TTYPE_REF_TITLE */ + TERMP_UNDER, /* TTYPE_REF_JOURNAL */ + TERMP_BOLD /* TTYPE_LIST */ }; static int arg_hasattr(int, const struct mdoc_node *); @@ -98,6 +100,9 @@ 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 *); +static int fmt_block_vspace(struct termp *, + const struct mdoc_node *, + const struct mdoc_node *); /* * What follows describes prefix and postfix operations for the abstract @@ -118,6 +123,7 @@ 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); @@ -140,7 +146,7 @@ DECL_PREPOST(termp_ss); DECL_PREPOST(termp_sq); DECL_PREPOST(termp_vt); -DECL_PRE(termp__t); +DECL_PRE(termp__j); DECL_PRE(termp_ap); DECL_PRE(termp_ar); DECL_PRE(termp_at); @@ -227,12 +233,12 @@ const struct termact __termacts[MDOC_MAX] = { { NULL, termp____post }, /* %B */ { NULL, termp____post }, /* %D */ { NULL, termp____post }, /* %I */ - { NULL, termp____post }, /* %J */ + { 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____post }, /* %T */ + { termp__t_pre, termp__t_post }, /* %T */ { NULL, termp____post }, /* %V */ { NULL, NULL }, /* Ac */ { termp_aq_pre, termp_aq_post }, /* Ao */ @@ -319,8 +325,8 @@ arg_width(const struct mdoc_argv *arg, int pos) if (0 == strcmp(arg->value[pos], "indent-two")) return(INDENT * 2); - len = (int)strlen(arg->value[pos]); - assert(len > 0); + if (0 == (len = (int)strlen(arg->value[pos]))) + return(0); for (i = 0; i < len - 1; i++) if ( ! isdigit((u_char)arg->value[pos][i])) @@ -429,6 +435,36 @@ arg_getattrs(const int *keys, int *vals, /* ARGSUSED */ static int +fmt_block_vspace(struct termp *p, + const struct mdoc_node *bl, + const struct mdoc_node *node) +{ + const struct mdoc_node *n; + + term_newln(p); + + if (arg_hasattr(MDOC_Compact, bl)) + return(1); + + for (n = node; n; n = n->parent) { + if (MDOC_BLOCK != n->type) + continue; + if (MDOC_Ss == n->tok) + break; + if (MDOC_Sh == n->tok) + break; + if (NULL == n->prev) + continue; + term_vspace(p); + break; + } + + return(1); +} + + +/* ARGSUSED */ +static int termp_dq_pre(DECL_ARGS) { @@ -456,19 +492,6 @@ termp_dq_post(DECL_ARGS) /* ARGSUSED */ static int -termp_it_pre_block(DECL_ARGS) -{ - - term_newln(p); - if ( ! arg_hasattr(MDOC_Compact, node->parent->parent)) - term_vspace(p); - - return(1); -} - - -/* ARGSUSED */ -static int termp_it_pre(DECL_ARGS) { const struct mdoc_node *bl, *n; @@ -477,7 +500,7 @@ termp_it_pre(DECL_ARGS) size_t width, offset; if (MDOC_BLOCK == node->type) - return(termp_it_pre_block(p, pair, meta, node)); + return(fmt_block_vspace(p, node->parent->parent, node)); bl = node->parent->parent->parent; @@ -1170,9 +1193,9 @@ termp_fn_pre(DECL_ARGS) term_word(p, node->child->string); p->flags &= ~ttypes[TTYPE_FUNC_NAME]; + p->flags |= TERMP_NOSPACE; term_word(p, "("); - p->flags |= TERMP_NOSPACE; for (n = node->child->next; n; n = n->next) { p->flags |= ttypes[TTYPE_FUNC_ARG]; term_word(p, n->string); @@ -1230,7 +1253,7 @@ termp_fa_pre(DECL_ARGS) term_word(p, ","); } - if (node->next && node->next->tok == MDOC_Fa) + if (node->child && node->next && node->next->tok == MDOC_Fa) term_word(p, ","); return(0); @@ -1264,13 +1287,10 @@ termp_bd_pre(DECL_ARGS) * line. Blank lines are allowed. */ - if (MDOC_BLOCK == node->type) { - /* FIXME: parent prev? */ - if (node->prev) - term_vspace(p); + if (MDOC_BLOCK == node->type) + return(fmt_block_vspace(p, node, node)); + else if (MDOC_BODY != node->type) return(1); - } else if (MDOC_BODY != node->type) - return(1); if (NULL == node->parent->args) errx(1, "missing display type"); @@ -1803,16 +1823,14 @@ static int termp_sm_pre(DECL_ARGS) { -#if notyet - assert(node->child); - if (0 == strcmp("off", node->child->data.text.string)) { + 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 { + } else p->flags |= TERMP_NONOSPACE; - p->flags |= TERMP_NOSPACE; - } -#endif return(0); } @@ -1832,11 +1850,33 @@ termp_ap_pre(DECL_ARGS) /* 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) { - TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_REF_TITLE]); + 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); }