correct the spacing after in-line equations

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index d516021290711046e9a56b83108defdd8713fce5..66c6c3e6125c43acbd583168f1a0eb5a38b017ea 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.138 2014/08/10 23:54:41 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) :
@@ -345,6 +346,8 @@ man_addeqn(struct man *man, const struct eqn *ep)
 
        n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX);
        n->eqn = ep;
+       if (ep->ln > man->last->line)
+               n->flags |= MAN_LINE;
 
        if ( ! man_node_append(man, n))
                return(0);
@@ -471,13 +474,6 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
        int              i, ppos;
        int              bline;
 
-       if ('"' == buf[offs]) {
-               mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse,
-                   ln, offs, NULL);
-               return(1);
-       } else if ('\0' == buf[offs])
-               return(1);
-
        ppos = offs;
 
        /*