=================================================================== RCS file: /cvs/mandoc/mdoc_term.c,v retrieving revision 1.76 retrieving revision 1.80 diff -u -p -r1.76 -r1.80 --- mandoc/mdoc_term.c 2009/09/21 14:07:07 1.76 +++ mandoc/mdoc_term.c 2009/09/24 09:50:31 1.80 @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.76 2009/09/21 14:07:07 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.80 2009/09/24 09:50:31 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -218,7 +218,7 @@ static const struct termact termacts[MDOC_MAX] = { { termp_under_pre, NULL }, /* Em */ { NULL, NULL }, /* Eo */ { termp_xx_pre, NULL }, /* Fx */ - { termp_bold_pre, NULL }, /* Ms */ + { termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */ { NULL, NULL }, /* No */ { termp_ns_pre, NULL }, /* Ns */ { termp_xx_pre, NULL }, /* Nx */ @@ -762,13 +762,13 @@ termp_it_pre(DECL_ARGS) * last column case, set to stretch to the margin). */ for (i = 0, n = node->prev; n && - i < (int)bl->args[vals[2]].argv->sz; + i < (int)bl->args->argv[vals[2]].sz; n = n->prev, i++) offset += arg_width (&bl->args->argv[vals[2]], i); /* Whether exceeds maximum column. */ - if (i < (int)bl->args[vals[2]].argv->sz) + if (i < (int)bl->args->argv[vals[2]].sz) width = arg_width(&bl->args->argv[vals[2]], i); else width = 0; @@ -1164,6 +1164,8 @@ static int termp_rs_pre(DECL_ARGS) { + if (SEC_SEE_ALSO != node->sec) + return(1); if (MDOC_BLOCK == node->type && node->prev) term_vspace(p); return(1); @@ -1842,6 +1844,7 @@ termp_in_post(DECL_ARGS) { p->bold++; + p->flags |= TERMP_NOSPACE; term_word(p, ">"); p->bold--; @@ -1866,7 +1869,7 @@ termp_sp_pre(DECL_ARGS) { int i, len; - switch (node->type) { + switch (node->tok) { case (MDOC_sp): len = node->child ? atoi(node->child->string) : 1; break;