=================================================================== RCS file: /cvs/mandoc/man_term.c,v retrieving revision 1.20 retrieving revision 1.28 diff -u -p -r1.20 -r1.28 --- mandoc/man_term.c 2009/08/13 12:15:58 1.20 +++ mandoc/man_term.c 2009/08/21 08:41:05 1.28 @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.20 2009/08/13 12:15:58 kristaps Exp $ */ +/* $Id: man_term.c,v 1.28 2009/08/21 08:41:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -14,6 +14,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include #include @@ -27,15 +29,28 @@ #define INDENT 7 #define HALFINDENT 3 -#ifdef __linux__ -extern size_t strlcpy(char *, const char *, size_t); -extern size_t strlcat(char *, const char *, size_t); -#endif - +struct mtermp { + int fl; #define MANT_LITERAL (1 << 0) + /* + * Default amount to indent the left margin after leading text + * has been printed (e.g., `HP' left-indent, `TP' and `IP' body + * indent). This needs to be saved because `HP' and so on, if + * not having a specified value, must default. + * + * Note that this is the indentation AFTER the left offset, so + * the total offset is usually offset + lmargin. + */ + size_t lmargin; + /* + * The default offset, i.e., the amount between any text and the + * page boundary. + */ + size_t offset; +}; #define DECL_ARGS struct termp *p, \ - int *fl, \ + struct mtermp *mt, \ const struct man_node *n, \ const struct man_meta *m @@ -55,6 +70,7 @@ static int pre_IR(DECL_ARGS); static int pre_PP(DECL_ARGS); static int pre_RB(DECL_ARGS); static int pre_RI(DECL_ARGS); +static int pre_RS(DECL_ARGS); static int pre_SH(DECL_ARGS); static int pre_SS(DECL_ARGS); static int pre_TP(DECL_ARGS); @@ -66,9 +82,12 @@ static int pre_sp(DECL_ARGS); static void post_B(DECL_ARGS); static void post_I(DECL_ARGS); +static void post_IP(DECL_ARGS); static void post_HP(DECL_ARGS); +static void post_RS(DECL_ARGS); static void post_SH(DECL_ARGS); static void post_SS(DECL_ARGS); +static void post_TP(DECL_ARGS); static void post_i(DECL_ARGS); static const struct termact termacts[MAN_MAX] = { @@ -76,11 +95,11 @@ static const struct termact termacts[MAN_MAX] = { { NULL, NULL }, /* TH */ { pre_SH, post_SH }, /* SH */ { pre_SS, post_SS }, /* SS */ - { pre_TP, NULL }, /* TP */ + { pre_TP, post_TP }, /* TP */ { pre_PP, NULL }, /* LP */ { pre_PP, NULL }, /* PP */ { pre_PP, NULL }, /* P */ - { pre_IP, NULL }, /* IP */ + { pre_IP, post_IP }, /* IP */ { pre_HP, post_HP }, /* HP */ { NULL, NULL }, /* SM */ { pre_B, post_B }, /* SB */ @@ -93,14 +112,22 @@ static const struct termact termacts[MAN_MAX] = { { pre_I, post_I }, /* I */ { pre_IR, NULL }, /* IR */ { pre_RI, NULL }, /* RI */ - { NULL, NULL }, /* na */ /* TODO: document that has no effect */ + { NULL, NULL }, /* na */ { pre_I, post_i }, /* i */ { pre_sp, NULL }, /* sp */ { pre_nf, NULL }, /* nf */ { pre_fi, NULL }, /* fi */ { pre_r, NULL }, /* r */ + { NULL, NULL }, /* RE */ + { pre_RS, post_RS }, /* RS */ + { NULL, NULL }, /* DT */ }; +#ifdef __linux__ +extern size_t strlcpy(char *, const char *, size_t); +extern size_t strlcat(char *, const char *, size_t); +#endif + static void print_head(struct termp *, const struct man_meta *); static void print_body(DECL_ARGS); @@ -115,16 +142,19 @@ static int arg_width(const struct man_node *); int man_run(struct termp *p, const struct man *m) { - int fl; + struct mtermp mt; print_head(p, man_meta(m)); p->flags |= TERMP_NOSPACE; assert(man_node(m)); assert(MAN_ROOT == man_node(m)->type); - fl = 0; + mt.fl = 0; + mt.lmargin = INDENT; + mt.offset = INDENT; + if (man_node(m)->child) - print_body(p, &fl, man_node(m)->child, man_meta(m)); + print_body(p, &mt, man_node(m)->child, man_meta(m)); print_foot(p, man_meta(m)); return(1); @@ -221,7 +251,7 @@ static int pre_fi(DECL_ARGS) { - *fl &= ~MANT_LITERAL; + mt->fl &= ~MANT_LITERAL; return(1); } @@ -232,7 +262,7 @@ pre_nf(DECL_ARGS) { term_newln(p); - *fl |= MANT_LITERAL; + mt->fl |= MANT_LITERAL; return(1); } @@ -249,7 +279,7 @@ pre_IR(DECL_ARGS) p->flags |= TERMP_UNDER; if (i > 0) p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); + print_node(p, mt, nn, m); if ( ! (i % 2)) p->flags &= ~TERMP_UNDER; } @@ -268,7 +298,7 @@ pre_IB(DECL_ARGS) p->flags |= i % 2 ? TERMP_BOLD : TERMP_UNDER; if (i > 0) p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); + print_node(p, mt, nn, m); p->flags &= i % 2 ? ~TERMP_BOLD : ~TERMP_UNDER; } return(0); @@ -287,7 +317,7 @@ pre_RB(DECL_ARGS) p->flags |= TERMP_BOLD; if (i > 0) p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); + print_node(p, mt, nn, m); if (i % 2) p->flags &= ~TERMP_BOLD; } @@ -307,7 +337,7 @@ pre_RI(DECL_ARGS) p->flags |= TERMP_UNDER; if (i > 0) p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); + print_node(p, mt, nn, m); if ( ! (i % 2)) p->flags &= ~TERMP_UNDER; } @@ -327,7 +357,7 @@ pre_BR(DECL_ARGS) p->flags |= TERMP_BOLD; if (i > 0) p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); + print_node(p, mt, nn, m); if ( ! (i % 2)) p->flags &= ~TERMP_BOLD; } @@ -346,7 +376,7 @@ pre_BI(DECL_ARGS) p->flags |= i % 2 ? TERMP_UNDER : TERMP_BOLD; if (i > 0) p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); + print_node(p, mt, nn, m); p->flags &= i % 2 ? ~TERMP_UNDER : ~TERMP_BOLD; } return(0); @@ -407,21 +437,40 @@ pre_br(DECL_ARGS) static int pre_HP(DECL_ARGS) { + size_t len; + int ival; + const struct man_node *nn; switch (n->type) { case (MAN_BLOCK): fmt_block_vspace(p, n); - break; + return(1); case (MAN_BODY): p->flags |= TERMP_NOBREAK; p->flags |= TERMP_TWOSPACE; - p->offset = INDENT; - p->rmargin = INDENT * 2; break; default: return(0); } + len = mt->lmargin; + ival = -1; + + /* Calculate offset. */ + + if (NULL != (nn = n->parent->head->child)) + if ((ival = arg_width(nn)) >= 0) + len = (size_t)ival; + + if (0 == len) + len = 1; + + p->offset = mt->offset; + p->rmargin = mt->offset + len; + + if (ival >= 0) + mt->lmargin = (size_t)ival; + return(1); } @@ -432,11 +481,14 @@ post_HP(DECL_ARGS) { switch (n->type) { + case (MAN_BLOCK): + term_flushln(p); + break; case (MAN_BODY): term_flushln(p); p->flags &= ~TERMP_NOBREAK; p->flags &= ~TERMP_TWOSPACE; - p->offset = INDENT; + p->offset = mt->offset; p->rmargin = p->maxrmargin; break; default: @@ -452,10 +504,11 @@ pre_PP(DECL_ARGS) switch (n->type) { case (MAN_BLOCK): + mt->lmargin = INDENT; fmt_block_vspace(p, n); break; default: - p->offset = INDENT; + p->offset = mt->offset; break; } @@ -467,110 +520,202 @@ pre_PP(DECL_ARGS) static int pre_IP(DECL_ARGS) { - /* TODO */ -#if 0 - const struct man_node *nn; - size_t offs, sv; - int ival; + const struct man_node *nn; + size_t len; + int ival; - fmt_block_vspace(p, n); - - p->flags |= TERMP_NOSPACE; - - sv = p->offset; - p->offset = INDENT; - - if (NULL == n->child) + switch (n->type) { + case (MAN_BODY): + p->flags |= TERMP_NOLPAD; + p->flags |= TERMP_NOSPACE; + break; + case (MAN_HEAD): + p->flags |= TERMP_NOBREAK; + p->flags |= TERMP_TWOSPACE; + break; + case (MAN_BLOCK): + fmt_block_vspace(p, n); + /* FALLTHROUGH */ + default: return(1); + } - p->flags |= TERMP_NOBREAK; + len = mt->lmargin; + ival = -1; - offs = sv; + /* Calculate offset. */ - /* - * If the last token is number-looking (3m, 3n, 3) then - * interpret it as the width specifier, else we stick with the - * prior saved offset. XXX - obviously not documented. - */ - for (nn = n->child; nn; nn = nn->next) { - if (NULL == nn->next) { - ival = arg_width(nn); - if (ival >= 0) { - offs = (size_t)ival; - break; - } + if (NULL != (nn = n->parent->head->child)) + if (NULL != (nn = nn->next)) { + for ( ; nn->next; nn = nn->next) + /* Do nothing. */ ; + if ((ival = arg_width(nn)) >= 0) + len = (size_t)ival; } - print_node(p, fl, nn, m); - } - p->rmargin = p->offset + offs; + switch (n->type) { + case (MAN_HEAD): + /* Handle zero-width lengths. */ + if (0 == len) + len = 1; - term_flushln(p); + p->offset = mt->offset; + p->rmargin = mt->offset + len; + if (ival < 0) + break; - p->offset = offs; - p->rmargin = p->maxrmargin; + /* Set the saved left-margin. */ + mt->lmargin = (size_t)ival; - p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; + /* Don't print the length value. */ + for (nn = n->child; nn->next; nn = nn->next) + print_node(p, mt, nn, m); + return(0); + case (MAN_BODY): + p->offset = mt->offset + len; + p->rmargin = p->maxrmargin; + break; + default: + break; + } - return(0); -#endif return(1); } /* ARGSUSED */ +static void +post_IP(DECL_ARGS) +{ + + switch (n->type) { + case (MAN_HEAD): + term_flushln(p); + p->flags &= ~TERMP_NOBREAK; + p->flags &= ~TERMP_TWOSPACE; + p->rmargin = p->maxrmargin; + break; + case (MAN_BODY): + term_flushln(p); + p->flags &= ~TERMP_NOLPAD; + break; + default: + break; + } +} + + +/* ARGSUSED */ static int pre_TP(DECL_ARGS) { - /* TODO */ -#if 0 - const struct man_node *nn; - size_t offs; + const struct man_node *nn; + size_t len; + int ival; - term_vspace(p); + switch (n->type) { + case (MAN_HEAD): + p->flags |= TERMP_NOBREAK; + p->flags |= TERMP_TWOSPACE; + break; + case (MAN_BODY): + p->flags |= TERMP_NOLPAD; + p->flags |= TERMP_NOSPACE; + break; + case (MAN_BLOCK): + fmt_block_vspace(p, n); + /* FALLTHROUGH */ + default: + return(1); + } - p->offset = INDENT; + len = (size_t)mt->lmargin; + ival = -1; - if (NULL == (nn = n->child)) - return(1); + /* Calculate offset. */ - if (nn->line == n->line) { - if (MAN_TEXT != nn->type) - errx(1, "expected text line argument"); - offs = (size_t)atoi(nn->string); - nn = nn->next; - } else - offs = INDENT; + if (NULL != (nn = n->parent->head->child)) + if (NULL != nn->next) + if ((ival = arg_width(nn)) >= 0) + len = (size_t)ival; - for ( ; nn; nn = nn->next) - print_node(p, fl, nn, m); + switch (n->type) { + case (MAN_HEAD): + /* Handle zero-length properly. */ + if (0 == len) + len = 1; - term_flushln(p); - p->flags |= TERMP_NOSPACE; - p->offset += offs; - return(0); -#endif + p->offset = mt->offset; + p->rmargin = mt->offset + len; + + /* Don't print same-line elements. */ + for (nn = n->child; nn; nn = nn->next) + if (nn->line > n->line) + print_node(p, mt, nn, m); + + if (ival >= 0) + mt->lmargin = (size_t)ival; + + return(0); + case (MAN_BODY): + p->offset = mt->offset + len; + p->rmargin = p->maxrmargin; + break; + default: + break; + } + return(1); } /* ARGSUSED */ +static void +post_TP(DECL_ARGS) +{ + + switch (n->type) { + case (MAN_HEAD): + term_flushln(p); + p->flags &= ~TERMP_NOBREAK; + p->flags &= ~TERMP_TWOSPACE; + p->rmargin = p->maxrmargin; + break; + case (MAN_BODY): + term_flushln(p); + p->flags &= ~TERMP_NOLPAD; + break; + default: + break; + } +} + + +/* ARGSUSED */ static int pre_SS(DECL_ARGS) { switch (n->type) { case (MAN_BLOCK): - term_newln(p); - if (n->prev) - term_vspace(p); + mt->lmargin = INDENT; + mt->offset = INDENT; + /* If following a prior empty `SS', no vspace. */ + if (n->prev && MAN_SS == n->prev->tok) + if (NULL == n->prev->body->child) + break; + if (NULL == n->prev) + break; + term_vspace(p); break; case (MAN_HEAD): p->flags |= TERMP_BOLD; p->offset = HALFINDENT; break; + case (MAN_BODY): + p->offset = mt->offset; + break; default: - p->offset = INDENT; break; } @@ -588,6 +733,9 @@ post_SS(DECL_ARGS) term_newln(p); p->flags &= ~TERMP_BOLD; break; + case (MAN_BODY): + term_newln(p); + break; default: break; } @@ -598,12 +746,12 @@ post_SS(DECL_ARGS) static int pre_SH(DECL_ARGS) { - /* - * XXX: undocumented: using two `SH' macros in sequence has no - * vspace between calls, only a newline. - */ + switch (n->type) { case (MAN_BLOCK): + mt->lmargin = INDENT; + mt->offset = INDENT; + /* If following a prior empty `SH', no vspace. */ if (n->prev && MAN_SH == n->prev->tok) if (NULL == n->prev->body->child) break; @@ -614,7 +762,7 @@ pre_SH(DECL_ARGS) p->offset = 0; break; case (MAN_BODY): - p->offset = INDENT; + p->offset = mt->offset; break; default: break; @@ -643,7 +791,57 @@ post_SH(DECL_ARGS) } +/* ARGSUSED */ +static int +pre_RS(DECL_ARGS) +{ + const struct man_node *nn; + int ival; + + switch (n->type) { + case (MAN_BLOCK): + term_newln(p); + return(1); + case (MAN_HEAD): + return(0); + default: + break; + } + + if (NULL == (nn = n->parent->head->child)) { + mt->offset = mt->lmargin + INDENT; + p->offset = mt->offset; + return(1); + } + + if ((ival = arg_width(nn)) < 0) + return(1); + + mt->offset = INDENT + (size_t)ival; + p->offset = mt->offset; + + return(1); +} + + +/* ARGSUSED */ static void +post_RS(DECL_ARGS) +{ + + switch (n->type) { + case (MAN_BLOCK): + mt->offset = mt->lmargin = INDENT; + break; + default: + term_newln(p); + p->offset = INDENT; + break; + } +} + + +static void print_node(DECL_ARGS) { int c, sz; @@ -668,23 +866,23 @@ print_node(DECL_ARGS) n->string[sz - 2] == '\\') p->flags |= TERMP_NOSPACE; /* FIXME: this means that macro lines are munged! */ - if (MANT_LITERAL & *fl) { + if (MANT_LITERAL & mt->fl) { p->flags |= TERMP_NOSPACE; term_flushln(p); } break; default: if (termacts[n->tok].pre) - c = (*termacts[n->tok].pre)(p, fl, n, m); + c = (*termacts[n->tok].pre)(p, mt, n, m); break; } if (c && n->child) - print_body(p, fl, n->child, m); + print_body(p, mt, n->child, m); if (MAN_TEXT != n->type) if (termacts[n->tok].post) - (*termacts[n->tok].post)(p, fl, n, m); + (*termacts[n->tok].post)(p, mt, n, m); } @@ -692,10 +890,10 @@ static void print_body(DECL_ARGS) { - print_node(p, fl, n, m); + print_node(p, mt, n, m); if ( ! n->next) return; - print_body(p, fl, n->next, m); + print_body(p, mt, n->next, m); }