===================================================================
RCS file: /cvs/docbook2mdoc/parse.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- docbook2mdoc/parse.c	2019/04/23 15:47:23	1.50
+++ docbook2mdoc/parse.c	2019/04/24 18:38:02	1.51
@@ -1,4 +1,4 @@
-/* $Id: parse.c,v 1.50 2019/04/23 15:47:23 schwarze Exp $ */
+/* $Id: parse.c,v 1.51 2019/04/24 18:38:02 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -59,9 +59,10 @@ struct	parse {
 	int		 nofill; /* Levels of open no-fill displays. */
 	int		 flags;
 #define	PFLAG_WARN	 (1 << 0)  /* Print warning messages. */
-#define	PFLAG_SPC	 (1 << 1)  /* Whitespace before the next element. */
-#define	PFLAG_ATTR	 (1 << 2)  /* The most recent attribute is valid. */
-#define	PFLAG_EEND	 (1 << 3)  /* This element is self-closing. */
+#define	PFLAG_LINE	 (1 << 1)  /* New line before the next element. */
+#define	PFLAG_SPC	 (1 << 2)  /* Whitespace before the next element. */
+#define	PFLAG_ATTR	 (1 << 3)  /* The most recent attribute is valid. */
+#define	PFLAG_EEND	 (1 << 4)  /* This element is self-closing. */
 };
 
 struct	alias {
@@ -261,7 +262,7 @@ xml_text(struct parse *p, const char *word, int sz)
 			n->b[oldsz++] = ' ';
 		memcpy(n->b + oldsz, word, sz);
 		n->b[newsz] = '\0';
-		p->flags &= ~PFLAG_SPC;
+		p->flags &= ~(PFLAG_LINE | PFLAG_SPC);
 		return;
 	}
 
@@ -273,8 +274,9 @@ xml_text(struct parse *p, const char *word, int sz)
 	if ((n = pnode_alloc(p->cur)) == NULL)
 		fatal(p);
 	n->node = NODE_TEXT;
-	n->spc = (p->flags & PFLAG_SPC) != 0;
-	p->flags &= ~PFLAG_SPC;
+	n->flags = ((p->flags & PFLAG_LINE) ? NFLAG_LINE : 0) |
+	    ((p->flags & PFLAG_SPC) ? NFLAG_SPC : 0);
+	p->flags &= ~(PFLAG_LINE | PFLAG_SPC);
 
 	/*
 	 * If this node follows an in-line macro without intervening
@@ -282,7 +284,7 @@ xml_text(struct parse *p, const char *word, int sz)
 	 * and do not keep it open.
 	 */
 
-	np = n->spc ? NULL : TAILQ_PREV(n, pnodeq, child);
+	np = n->flags & NFLAG_SPC ? NULL : TAILQ_PREV(n, pnodeq, child);
 	while (np != NULL) {
 		switch (pnode_class(np->node)) {
 		case CLASS_VOID:
@@ -320,7 +322,7 @@ xml_text(struct parse *p, const char *word, int sz)
 		if ((n = pnode_alloc(p->cur)) == NULL)
 			fatal(p);
 		n->node = NODE_TEXT;
-		n->spc = 1;
+		n->flags |= NFLAG_SPC;
 		word += i;
 		sz -= i;
 	}
@@ -371,7 +373,7 @@ pnode_closetext(struct parse *p, int check_last_word)
 	if ((n = pnode_alloc(p->cur)) == NULL)
 		fatal(p);
 	n->node = NODE_TEXT;
-	n->spc = 1;
+	n->flags |= NFLAG_SPC;
 	if ((n->b = strdup(last_word)) == NULL)
 		fatal(p);
 }
@@ -413,7 +415,7 @@ xml_entity(struct parse *p, const char *name)
 				if ((ccp = pnode_getattr_raw(n,
 				    ATTRKEY_SYSTEM, NULL)) != NULL) {
 					parse_file(p, -1, ccp);
-					p->flags &= ~PFLAG_SPC;
+					p->flags &= ~(PFLAG_LINE | PFLAG_SPC);
 					return;
 				}
 				if ((ccp = pnode_getattr_raw(n,
@@ -423,7 +425,7 @@ xml_entity(struct parse *p, const char *name)
 					fatal(p);
 				pstate = PARSE_ELEM;
 				parse_string(p, cp, strlen(cp), &pstate, 0);
-				p->flags &= ~PFLAG_SPC;
+				p->flags &= ~(PFLAG_LINE | PFLAG_SPC);
 				free(cp);
 				return;
 			}
@@ -448,8 +450,9 @@ xml_entity(struct parse *p, const char *name)
 		fatal(p);
 done:
 	n->node = NODE_ESCAPE;
-	n->spc = (p->flags & PFLAG_SPC) != 0;
-	p->flags &= ~PFLAG_SPC;
+	n->flags = ((p->flags & PFLAG_LINE) ? NFLAG_LINE : 0) |
+	    ((p->flags & PFLAG_SPC) ? NFLAG_SPC : 0);
+	p->flags &= ~(PFLAG_LINE | PFLAG_SPC);
 }
 
 /*
@@ -541,13 +544,14 @@ xml_elem_start(struct parse *p, const char *name)
 	switch (pnode_class(p->ncur)) {
 	case CLASS_LINE:
 	case CLASS_ENCL:
-		n->spc = (p->flags & PFLAG_SPC) != 0;
+		n->flags = ((p->flags & PFLAG_LINE) ? NFLAG_LINE : 0) |
+		    ((p->flags & PFLAG_SPC) ? NFLAG_SPC : 0);
 		break;
 	case CLASS_NOFILL:
 		p->nofill++;
 		/* FALLTHROUGH */
 	default:
-		n->spc = 1;
+		n->flags |= NFLAG_SPC;
 		break;
 	}
 	p->cur = n;
@@ -659,7 +663,7 @@ xml_elem_end(struct parse *p, const char *name)
 		else
 			parse_file(p, -1, cp);
 		pnode_unlink(n);
-		p->flags &= ~PFLAG_SPC;
+		p->flags &= ~(PFLAG_LINE | PFLAG_SPC);
 		break;
 	case NODE_DOCTYPE:
 	case NODE_SBR:
@@ -687,7 +691,7 @@ xml_elem_end(struct parse *p, const char *name)
 				p->ncur = p->cur->node;
 		} else
 			p->tree->flags |= TREE_CLOSED;
-		p->flags &= ~PFLAG_SPC;
+		p->flags &= ~(PFLAG_LINE | PFLAG_SPC);
 
 		/* Include a file containing entity declarations. */
 
@@ -806,8 +810,10 @@ parse_string(struct parse *p, char *b, size_t rlen,
 			break;
 		if (isspace((unsigned char)b[pend])) {
 			p->flags |= PFLAG_SPC;
-			if (b[pend] == '\n')
+			if (b[pend] == '\n') {
+				p->flags |= PFLAG_LINE;
 				pws = pend + 1;
+			}
 			increment(p, b, &pend, refill);
 			continue;
 		}