=================================================================== RCS file: /cvs/mandoc/mdoc_term.c,v retrieving revision 1.54 retrieving revision 1.63 diff -u -p -r1.54 -r1.63 --- mandoc/mdoc_term.c 2009/07/21 15:03:37 1.54 +++ mandoc/mdoc_term.c 2009/07/25 16:03:03 1.63 @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.54 2009/07/21 15:03:37 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.63 2009/07/25 16:03:03 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -50,8 +50,9 @@ #define TTYPE_LINK_ANCHOR 19 #define TTYPE_LINK_TEXT 20 #define TTYPE_REF_JOURNAL 21 -#define TTYPE_LIST 22 -#define TTYPE_NMAX 23 +#define TTYPE_REF_TITLE 22 +#define TTYPE_LIST 23 +#define TTYPE_NMAX 24 const int ttypes[TTYPE_NMAX] = { TERMP_BOLD, /* TTYPE_PROG */ @@ -65,7 +66,7 @@ const int ttypes[TTYPE_NMAX] = { TERMP_UNDER, /* TTYPE_FUNC_ARG */ TERMP_UNDER, /* TTYPE_LINK */ TERMP_BOLD, /* TTYPE_SSECTION */ - 0, /* TTYPE_FILE */ + TERMP_UNDER, /* TTYPE_FILE */ TERMP_UNDER, /* TTYPE_EMPH */ TERMP_BOLD, /* TTYPE_CONFIG */ TERMP_BOLD, /* TTYPE_CMD */ @@ -76,6 +77,7 @@ const int ttypes[TTYPE_NMAX] = { TERMP_UNDER, /* TTYPE_LINK_ANCHOR */ TERMP_BOLD, /* TTYPE_LINK_TEXT */ TERMP_UNDER, /* TTYPE_REF_JOURNAL */ + TERMP_UNDER, /* TTYPE_REF_TITLE */ TERMP_BOLD /* TTYPE_LIST */ }; @@ -96,7 +98,7 @@ struct termact { }; static void termp____post(DECL_ARGS); -static void termp__t_post(DECL_ARGS); +static void termp_an_post(DECL_ARGS); static void termp_aq_post(DECL_ARGS); static void termp_bd_post(DECL_ARGS); static void termp_bl_post(DECL_ARGS); @@ -123,6 +125,7 @@ static void termp_vt_post(DECL_ARGS); static int termp__j_pre(DECL_ARGS); static int termp__t_pre(DECL_ARGS); +static int termp_an_pre(DECL_ARGS); static int termp_ap_pre(DECL_ARGS); static int termp_aq_pre(DECL_ARGS); static int termp_ar_pre(DECL_ARGS); @@ -154,6 +157,7 @@ static int termp_nd_pre(DECL_ARGS); static int termp_nm_pre(DECL_ARGS); static int termp_ns_pre(DECL_ARGS); static int termp_op_pre(DECL_ARGS); +static int termp_pa_pre(DECL_ARGS); static int termp_pf_pre(DECL_ARGS); static int termp_pp_pre(DECL_ARGS); static int termp_pq_pre(DECL_ARGS); @@ -189,7 +193,7 @@ static const struct termact termacts[MDOC_MAX] = { { NULL, NULL }, /* El */ { termp_it_pre, termp_it_post }, /* It */ { NULL, NULL }, /* Ad */ - { NULL, NULL }, /* An */ + { termp_an_pre, termp_an_post }, /* An */ { termp_ar_pre, NULL }, /* Ar */ { termp_cd_pre, NULL }, /* Cd */ { termp_cm_pre, NULL }, /* Cm */ @@ -209,7 +213,7 @@ static const struct termact termacts[MDOC_MAX] = { { termp_nm_pre, NULL }, /* Nm */ { termp_op_pre, termp_op_post }, /* Op */ { NULL, NULL }, /* Ot */ - { NULL, NULL }, /* Pa */ + { termp_pa_pre, NULL }, /* Pa */ { termp_rv_pre, NULL }, /* Rv */ { NULL, NULL }, /* St */ { termp_va_pre, NULL }, /* Va */ @@ -224,7 +228,7 @@ static const struct termact termacts[MDOC_MAX] = { { NULL, termp____post }, /* %O */ { NULL, termp____post }, /* %P */ { NULL, termp____post }, /* %R */ - { termp__t_pre, termp__t_post }, /* %T */ + { termp__t_pre, termp____post }, /* %T */ { NULL, termp____post }, /* %V */ { NULL, NULL }, /* Ac */ { termp_aq_pre, termp_aq_post }, /* Ao */ @@ -668,8 +672,9 @@ fmt_block_vspace(struct termp *p, term_newln(p); - if (arg_hasattr(MDOC_Compact, bl)) + if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Compact, bl)) return; + assert(node); /* * Search through our prior nodes. If we follow a `Ss' or `Sh', @@ -689,14 +694,25 @@ fmt_block_vspace(struct termp *p, } /* - * XXX - not documented: a `-column' does not ever assert - * vertical space within the list. + * XXX - not documented: a `-column' does not ever assert vspace + * within the list. */ - if (arg_hasattr(MDOC_Column, bl)) + if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Column, bl)) if (node->prev && MDOC_It == node->prev->tok) return; + /* + * XXX - not documented: a `-diag' without a body does not + * assert a vspace prior to the next element. + */ + if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Diag, bl)) + if (node->prev && MDOC_It == node->prev->tok) { + assert(node->prev->body); + if (NULL == node->prev->body->child) + return; + } + term_vspace(p); } @@ -769,11 +785,27 @@ termp_it_pre(DECL_ARGS) case (MDOC_Column): if (MDOC_BODY == node->type) break; - for (i = 0, n = node->prev; n; n = n->prev, i++) + /* + * Work around groff's column handling. The offset is + * equal to the sum of all widths leading to the current + * column (plus the -offset value). If this column + * exceeds the stated number of columns, the width is + * set as 0, else it's the stated column width (later + * the 0 will be adjusted to default 10 or, if in the + * last column case, set to stretch to the margin). + */ + for (i = 0, n = node->prev; n && n && + i < (int)bl->args[vals[2]].argv->sz; + 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); + + /* Whether exceeds maximum column. */ + if (i < (int)bl->args[vals[2]].argv->sz) + width = arg_width(&bl->args->argv[vals[2]], i); + else + width = 0; + if (vals[1] >= 0) offset += arg_offset(&bl->args->argv[vals[1]]); break; @@ -827,7 +859,8 @@ termp_it_pre(DECL_ARGS) switch (type) { case (MDOC_Diag): - term_word(p, "\\ \\ "); + if (MDOC_BODY == node->type) + term_word(p, "\\ \\ "); break; case (MDOC_Inset): if (MDOC_BODY == node->type) @@ -879,7 +912,21 @@ termp_it_pre(DECL_ARGS) else p->flags |= TERMP_NOLPAD; - if (MDOC_HEAD == node->type) + if (MDOC_HEAD != node->type) + break; + + /* + * This is ugly. If `-hang' is specified and the body + * is a `Bl' or `Bd', then we want basically to nullify + * the "overstep" effect in term_flushln() and treat + * this as a `-ohang' list instead. + */ + if (node->next->child && + (MDOC_Bl == node->next->child->tok || + MDOC_Bd == node->next->child->tok)) { + p->flags &= ~TERMP_NOBREAK; + p->flags &= ~TERMP_NOLPAD; + } else p->flags |= TERMP_HANG; break; case (MDOC_Tag): @@ -921,6 +968,17 @@ termp_it_pre(DECL_ARGS) p->offset += offset; switch (type) { + case (MDOC_Hang): + /* + * Same stipulation as above, regarding `-hang'. We + * don't want to recalculate rmargin and offsets when + * using `Bd' or `Bl' within `-hang' overstep lists. + */ + if (MDOC_HEAD == node->type && node->next->child && + (MDOC_Bl == node->next->child->tok || + MDOC_Bd == node->next->child->tok)) + break; + /* FALLTHROUGH */ case (MDOC_Bullet): /* FALLTHROUGH */ case (MDOC_Dash): @@ -929,8 +987,6 @@ termp_it_pre(DECL_ARGS) /* FALLTHROUGH */ case (MDOC_Hyphen): /* FALLTHROUGH */ - case (MDOC_Hang): - /* FALLTHROUGH */ case (MDOC_Tag): assert(width); if (MDOC_HEAD == node->type) @@ -1078,6 +1134,65 @@ termp_fl_pre(DECL_ARGS) /* ARGSUSED */ static int +termp_an_pre(DECL_ARGS) +{ + + if (NULL == node->child) + return(1); + + /* + * XXX: this is poorly documented. If not in the AUTHORS + * section, `An -split' will cause newlines to occur before the + * author name. If in the AUTHORS section, by default, the + * first `An' invocation is nosplit, then all subsequent ones, + * regardless of whether interspersed with other macros/text, + * are split. -split, in this case, will override the condition + * of the implied first -nosplit. + */ + + if (node->sec == SEC_AUTHORS) { + if ( ! (TERMP_ANPREC & p->flags)) { + if (TERMP_SPLIT & p->flags) + term_newln(p); + return(1); + } + if (TERMP_NOSPLIT & p->flags) + return(1); + term_newln(p); + return(1); + } + + if (TERMP_SPLIT & p->flags) + term_newln(p); + + return(1); +} + + +/* ARGSUSED */ +static void +termp_an_post(DECL_ARGS) +{ + + if (node->child) { + if (SEC_AUTHORS == node->sec) + p->flags |= TERMP_ANPREC; + return; + } + + if (arg_getattr(MDOC_Split, node) > -1) { + p->flags &= ~TERMP_NOSPLIT; + p->flags |= TERMP_SPLIT; + } else { + p->flags &= ~TERMP_SPLIT; + p->flags |= TERMP_NOSPLIT; + } + +} + + +/* ARGSUSED */ +static int termp_ar_pre(DECL_ARGS) { @@ -1530,7 +1645,7 @@ termp_va_pre(DECL_ARGS) static int termp_bd_pre(DECL_ARGS) { - int i, type, ln; + int i, type; /* * This is fairly tricky due primarily to crappy documentation. @@ -1549,12 +1664,9 @@ termp_bd_pre(DECL_ARGS) } else if (MDOC_BODY != node->type) return(1); - /* FIXME: display type should be mandated by parser. */ + assert(node->parent->args); - if (NULL == node->parent->args) - errx(1, "missing display type"); - - for (type = -1, i = 0; + for (type = -1, i = 0; -1 == type && i < (int)node->parent->args->argc; i++) { switch (node->parent->args->argv[i].arg) { case (MDOC_Ragged): @@ -1565,22 +1677,17 @@ termp_bd_pre(DECL_ARGS) /* FALLTHROUGH */ case (MDOC_Literal): type = node->parent->args->argv[i].arg; - i = (int)node->parent->args->argc; break; default: break; } } + + assert(type > -1); - if (NULL == node->parent->args) - errx(1, "missing display type"); - i = arg_getattr(MDOC_Offset, node->parent); - if (-1 != i) { - if (1 != node->parent->args->argv[i].sz) - errx(1, "expected single value"); + if (-1 != i) p->offset += arg_offset(&node->parent->args->argv[i]); - } switch (type) { case (MDOC_Literal): @@ -1591,21 +1698,11 @@ termp_bd_pre(DECL_ARGS) return(1); } - /* - * Tricky. Iterate through all children. If we're on a - * different parse line, append a newline and then the contents. - * Ew. - */ - - ln = node->child ? node->child->line : 0; - for (node = node->child; node; node = node->next) { - if (ln < node->line) { - term_flushln(p); - p->flags |= TERMP_NOSPACE; - } - ln = node->line; + p->flags |= TERMP_NOSPACE; print_node(p, pair, meta, node); + if (node->next) + term_flushln(p); } return(0); @@ -1619,6 +1716,7 @@ termp_bd_post(DECL_ARGS) if (MDOC_BODY != node->type) return; + p->flags |= TERMP_NOSPACE; term_flushln(p); } @@ -1722,6 +1820,16 @@ termp_sq_post(DECL_ARGS) /* ARGSUSED */ static int +termp_pa_pre(DECL_ARGS) +{ + + pair->flag |= ttypes[TTYPE_FILE]; + return(1); +} + + +/* ARGSUSED */ +static int termp_pf_pre(DECL_ARGS) { @@ -2094,20 +2202,8 @@ static int termp__t_pre(DECL_ARGS) { - term_word(p, "\""); - p->flags |= TERMP_NOSPACE; + pair->flag |= ttypes[TTYPE_REF_TITLE]; return(1); -} - - -/* ARGSUSED */ -static void -termp__t_post(DECL_ARGS) -{ - - p->flags |= TERMP_NOSPACE; - term_word(p, "\""); - termp____post(p, pair, meta, node); }