From 2f53f5a989471121a5bf1f4a5c4d4a335b0f7fdb Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Wed, 29 Jun 2011 15:38:09 +0000 Subject: First fix how `sp 1' doesn't imply `1v' (it now does) and that 1 followed by non-digits, e.g. `1g', really means `1'. Next, fix some spacing issues where `sp' was invoked in -man after sections or subsections. Make sure this behaviour is mirrored in -Thtml. --- man_term.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'man_term.c') diff --git a/man_term.c b/man_term.c index 8bf9d0c6..7bff3542 100644 --- a/man_term.c +++ b/man_term.c @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.111 2011/06/18 17:58:48 kristaps Exp $ */ +/* $Id: man_term.c,v 1.112 2011/06/29 15:38:09 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2011 Ingo Schwarze @@ -181,7 +181,7 @@ a2height(const struct termp *p, const char *cp) struct roffsu su; if ( ! a2roffsu(cp, &su, SCALE_VS)) - SCALE_VS_INIT(&su, term_strlen(p, cp)); + SCALE_VS_INIT(&su, atoi(cp)); return(term_vspan(p, &su)); } @@ -411,6 +411,13 @@ pre_sp(DECL_ARGS) { size_t i, len; + if ((NULL == n->prev && n->parent)) { + if (MAN_SS == n->parent->tok) + return(0); + if (MAN_SH == n->parent->tok) + return(0); + } + switch (n->tok) { case (MAN_br): len = 0; -- cgit v1.2.3