=================================================================== RCS file: /cvs/mandoc/mdoc_term.c,v retrieving revision 1.224 retrieving revision 1.225 diff -u -p -r1.224 -r1.225 --- mandoc/mdoc_term.c 2011/04/04 16:15:58 1.224 +++ mandoc/mdoc_term.c 2011/04/04 16:21:51 1.225 @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.224 2011/04/04 16:15:58 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.225 2011/04/04 16:21:51 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -1296,32 +1296,32 @@ termp_bl_post(DECL_ARGS) term_newln(p); } - /* ARGSUSED */ static int termp_xr_pre(DECL_ARGS) { - const struct mdoc_node *nn; - if (NULL == n->child) + if (NULL == (n = n->child)) return(0); - assert(MDOC_TEXT == n->child->type); - nn = n->child; + assert(MDOC_TEXT == n->type); + term_word(p, n->string); - term_word(p, nn->string); - if (NULL == (nn = nn->next)) + if (NULL == (n = n->next)) return(0); + p->flags |= TERMP_NOSPACE; term_word(p, "("); p->flags |= TERMP_NOSPACE; - term_word(p, nn->string); + + assert(MDOC_TEXT == n->type); + term_word(p, n->string); + p->flags |= TERMP_NOSPACE; term_word(p, ")"); return(0); } - /* * This decides how to assert whitespace before any of the SYNOPSIS set