diff options
-rw-r--r-- | TODO | 4 | ||||
-rw-r--r-- | man_html.c | 7 | ||||
-rw-r--r-- | man_term.c | 11 | ||||
-rw-r--r-- | mdoc_html.c | 7 | ||||
-rw-r--r-- | mdoc_term.c | 5 |
5 files changed, 21 insertions, 13 deletions
@@ -1,6 +1,6 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.113 2011/06/18 17:58:48 kristaps Exp $ +* $Id: TODO,v 1.114 2011/06/29 15:38:09 kristaps Exp $ ************************************************************************ ************************************************************************ @@ -306,8 +306,6 @@ should produce one, not three blank lines. Reported by naddy@ Mon, 28 Mar 2011 20:45:42 +0200 -- At least sometimes, .sp is ignored right after .SH; see named.conf(5). - - trailing whitespace must be ignored even when followed by a font escape, see for example makes @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.74 2011/06/18 20:34:08 kristaps Exp $ */ +/* $Id: man_html.c,v 1.75 2011/06/29 15:38:09 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -414,8 +414,9 @@ man_br_pre(MAN_ARGS) SCALE_VS_INIT(&su, 1); if (MAN_sp == n->tok) { - if (n->child) - a2roffsu(n->child->string, &su, SCALE_VS); + if (NULL != (n = n->child)) + if ( ! a2roffsu(n->string, &su, SCALE_VS)) + SCALE_VS_INIT(&su, atoi(n->string)); } else su.scale = 0; @@ -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 <kristaps@bsd.lv> * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -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; diff --git a/mdoc_html.c b/mdoc_html.c index 1db351ce..ae79e2a6 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.170 2011/06/16 22:21:28 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.171 2011/06/29 15:38:09 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -1633,8 +1633,9 @@ mdoc_sp_pre(MDOC_ARGS) SCALE_VS_INIT(&su, 1); if (MDOC_sp == n->tok) { - if (n->child) - a2roffsu(n->child->string, &su, SCALE_VS); + if (NULL != (n = n->child)) + if ( ! a2roffsu(n->string, &su, SCALE_VS)) + SCALE_VS_INIT(&su, atoi(n->string)); } else su.scale = 0; diff --git a/mdoc_term.c b/mdoc_term.c index 1a5ce4c2..a1477546 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.230 2011/05/17 14:38:34 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.231 2011/06/29 15:38:09 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -523,9 +523,10 @@ a2height(const struct termp *p, const char *v) { struct roffsu su; + assert(v); if ( ! a2roffsu(v, &su, SCALE_VS)) - SCALE_VS_INIT(&su, term_len(p, 1)); + SCALE_VS_INIT(&su, atoi(v)); return(term_vspan(p, &su)); } |