From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (schwarze@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id s9KFoQQb007810
	for <source@mdocml.bsd.lv>; Mon, 20 Oct 2014 11:50:26 -0400 (EDT)
Received: (from schwarze@localhost)
	by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s9KFoOC3013978;
	Mon, 20 Oct 2014 11:50:24 -0400 (EDT)
Date: Mon, 20 Oct 2014 11:50:24 -0400 (EDT)
Message-Id: <201410201550.s9KFoOC3013978@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: correct the spacing after in-line equations that start at the 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
correct the spacing after in-line equations
that start at the beginning of an input line
but end before the end of an input line

Modified Files:
--------------
    mdocml:
        man.c
        man_term.c
        mdoc.c
        mdoc_term.c

Revision Data
-------------
Index: man_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -Lman_term.c -Lman_term.c -u -p -r1.153 -r1.154
--- man_term.c
+++ man_term.c
@@ -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:
Index: mdoc_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_term.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -Lmdoc_term.c -Lmdoc_term.c -u -p -r1.285 -r1.286
--- mdoc_term.c
+++ mdoc_term.c
@@ -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:
Index: man.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -Lman.c -Lman.c -u -p -r1.140 -r1.141
--- man.c
+++ man.c
@@ -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) :
Index: mdoc.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -Lmdoc.c -Lmdoc.c -u -p -r1.227 -r1.228
--- mdoc.c
+++ mdoc.c
@@ -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,
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv