diff options
| -rw-r--r-- | man.c | 5 | ||||
| -rw-r--r-- | man_term.c | 4 | ||||
| -rw-r--r-- | mdoc.c | 5 | ||||
| -rw-r--r-- | mdoc_term.c | 4 |
4 files changed, 10 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.140 2014/10/20 02:33:06 schwarze Exp $ */ +/* $Id: man.c,v 1.141 2014/10/20 15:50:24 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -119,7 +119,8 @@ int man_parseln(struct man *man, int ln, char *buf, int offs) { - man->flags |= MAN_NEWLINE; + if (man->last->type != MAN_EQN || ln > man->last->line) + man->flags |= MAN_NEWLINE; return (roff_getcontrol(man->roff, buf, &offs) ? man_pmacro(man, ln, buf, offs) : @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.153 2014/10/20 02:47:09 schwarze Exp $ */ +/* $Id: man_term.c,v 1.154 2014/10/20 15:50:24 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -990,7 +990,7 @@ print_man_node(DECL_ARGS) if ( ! (n->flags & MAN_LINE)) p->flags |= TERMP_NOSPACE; term_eqn(p, n->eqn); - if ( ! (n->flags & MAN_LINE)) + if (n->next != NULL && ! (n->next->flags & MAN_LINE)) p->flags |= TERMP_NOSPACE; return; case MAN_TBL: @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.227 2014/10/20 02:33:06 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.228 2014/10/20 15:50:24 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -238,7 +238,8 @@ int mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs) { - mdoc->flags |= MDOC_NEWLINE; + if (mdoc->last->type != MDOC_EQN || ln > mdoc->last->line) + mdoc->flags |= MDOC_NEWLINE; /* * Let the roff nS register switch SYNOPSIS mode early, diff --git a/mdoc_term.c b/mdoc_term.c index 6c900e55..58aac510 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.285 2014/10/20 02:47:09 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.286 2014/10/20 15:50:24 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -347,7 +347,7 @@ print_mdoc_node(DECL_ARGS) if ( ! (n->flags & MDOC_LINE)) p->flags |= TERMP_NOSPACE; term_eqn(p, n->eqn); - if ( ! (n->flags & MDOC_LINE)) + if (n->next != NULL && ! (n->next->flags & MDOC_LINE)) p->flags |= TERMP_NOSPACE; break; case MDOC_TBL: |