If the first character of free-form text is whitespace, then a newline

shall precede outputted text (surprise!).

9 files changed, 42 insertions, 10 deletions

diff --git a/libman.h b/libman.h
index d9e56d49..4b72ce0e 100644
--- a/libman.h
+++ b/libman.h
@@ -34,6 +34,7 @@ struct	man {
 #define	MAN_ILINE	(1 << 3) /* Ignored in next-line scope. */
 #define	MAN_LITERAL	(1 << 4) /* Literal input. */
 #define	MAN_BPLINE	(1 << 5)
+#define	MAN_NEWLINE	(1 << 6) /* first macro/text in a line */
 	enum man_next	 next; /* where to put the next node */
 	struct man_node	*last; /* the last parsed node */
 	struct man_node	*first; /* the first parsed node */
diff --git a/man.7 b/man.7
index be88f6bb..195761c5 100644
--- a/man.7
+++ b/man.7
@@ -59,6 +59,9 @@ line termination.
 .Pp
 Blank lines are acceptable; where found, the output will assert a
 vertical space.
+.Pp
+If the first character of a line is a space, that line is printed
+with a leading newline.
 .Ss Comments
 Text following a
 .Sq \e\*q ,
diff --git a/man.c b/man.c
index b5daeb6b..41865f09 100644
--- a/man.c
+++ b/man.c
@@ -44,7 +44,7 @@ const	char *const __man_macronames[MAN_MAX] = {
 
 const	char * const *man_macronames = __man_macronames;
 
-static	struct man_node	*man_node_alloc(int, int, 
+static	struct man_node	*man_node_alloc(struct man *, int, int, 
 				enum man_type, enum mant);
 static	int		 man_node_append(struct man *, 
 				struct man_node *);
@@ -129,6 +129,8 @@ int
 man_parseln(struct man *m, int ln, char *buf, int offs)
 {
 
+	m->flags |= MAN_NEWLINE;
+
 	assert( ! (MAN_HALT & m->flags));
 	return(('.' == buf[offs] || '\'' == buf[offs]) ? 
 			man_pmacro(m, ln, buf, offs) : 
@@ -229,7 +231,8 @@ man_node_append(struct man *man, struct man_node *p)
 
 
 static struct man_node *
-man_node_alloc(int line, int pos, enum man_type type, enum mant tok)
+man_node_alloc(struct man *m, int line, int pos, 
+		enum man_type type, enum mant tok)
 {
 	struct man_node *p;
 
@@ -238,6 +241,10 @@ man_node_alloc(int line, int pos, enum man_type type, enum mant tok)
 	p->pos = pos;
 	p->type = type;
 	p->tok = tok;
+
+	if (MAN_NEWLINE & m->flags)
+		p->flags |= MAN_LINE;
+	m->flags &= ~MAN_NEWLINE;
 	return(p);
 }
 
@@ -247,7 +254,7 @@ man_elem_alloc(struct man *m, int line, int pos, enum mant tok)
 {
 	struct man_node *p;
 
-	p = man_node_alloc(line, pos, MAN_ELEM, tok);
+	p = man_node_alloc(m, line, pos, MAN_ELEM, tok);
 	if ( ! man_node_append(m, p))
 		return(0);
 	m->next = MAN_NEXT_CHILD;
@@ -260,7 +267,7 @@ man_head_alloc(struct man *m, int line, int pos, enum mant tok)
 {
 	struct man_node *p;
 
-	p = man_node_alloc(line, pos, MAN_HEAD, tok);
+	p = man_node_alloc(m, line, pos, MAN_HEAD, tok);
 	if ( ! man_node_append(m, p))
 		return(0);
 	m->next = MAN_NEXT_CHILD;
@@ -273,7 +280,7 @@ man_body_alloc(struct man *m, int line, int pos, enum mant tok)
 {
 	struct man_node *p;
 
-	p = man_node_alloc(line, pos, MAN_BODY, tok);
+	p = man_node_alloc(m, line, pos, MAN_BODY, tok);
 	if ( ! man_node_append(m, p))
 		return(0);
 	m->next = MAN_NEXT_CHILD;
@@ -286,7 +293,7 @@ man_block_alloc(struct man *m, int line, int pos, enum mant tok)
 {
 	struct man_node *p;
 
-	p = man_node_alloc(line, pos, MAN_BLOCK, tok);
+	p = man_node_alloc(m, line, pos, MAN_BLOCK, tok);
 	if ( ! man_node_append(m, p))
 		return(0);
 	m->next = MAN_NEXT_CHILD;
@@ -299,7 +306,7 @@ man_span_alloc(struct man *m, const struct tbl_span *span)
 	struct man_node	*n;
 
 	/* FIXME: grab from span */
-	n = man_node_alloc(0, 0, MAN_TBL, MAN_MAX);
+	n = man_node_alloc(m, 0, 0, MAN_TBL, MAN_MAX);
 	n->span = span;
 
 	if ( ! man_node_append(m, n))
@@ -317,7 +324,7 @@ man_word_alloc(struct man *m, int line, int pos, const char *word)
 
 	len = strlen(word);
 
-	n = man_node_alloc(line, pos, MAN_TEXT, MAN_MAX);
+	n = man_node_alloc(m, line, pos, MAN_TEXT, MAN_MAX);
 	n->string = mandoc_malloc(len + 1);
 	sv = strlcpy(n->string, word, len + 1);
 
diff --git a/man.h b/man.h
index ffd4cf33..0533bcf5 100644
--- a/man.h
+++ b/man.h
@@ -97,6 +97,7 @@ struct	man_node {
 	int		 flags;
 #define	MAN_VALID	(1 << 0) /* has been validated */
 #define	MAN_EOS		(1 << 2) /* at sentence boundary */
+#define	MAN_LINE	(1 << 3) /* first macro/text on line */
 	enum man_type	 type; /* AST node type */
 	char		*string; /* TEXT node argument */
 	struct man_node	*head; /* BLOCK node HEAD ptr */
diff --git a/man_html.c b/man_html.c
index 2495c8cd..4217e87e 100644
--- a/man_html.c
+++ b/man_html.c
@@ -197,7 +197,16 @@ print_man_node(MAN_ARGS)
 		child = man_root_pre(m, n, mh, h);
 		break;
 	case (MAN_TEXT):
+		if ('\0' == *n->string) {
+			print_otag(h, TAG_P, 0, NULL);
+			return;
+		}
+
+		if (' ' == *n->string && MAN_LINE & n->flags)
+			print_otag(h, TAG_BR, 0, NULL);
+
 		print_text(h, n->string);
+
 		if (MANH_LITERAL & mh->fl)
 			print_otag(h, TAG_BR, 0, NULL);
 		return;
diff --git a/man_term.c b/man_term.c
index 29148d65..2aab8277 100644
--- a/man_term.c
+++ b/man_term.c
@@ -859,10 +859,13 @@ print_man_node(DECL_ARGS)
 
 	switch (n->type) {
 	case(MAN_TEXT):
-		if (0 == *n->string) {
+		if ('\0' == *n->string) {
 			term_vspace(p);
 			break;
-		}
+		} 
+
+		if (' ' == *n->string && MAN_LINE & n->flags)
+			term_newln(p);
 
 		term_word(p, n->string);
 
@@ -878,6 +881,7 @@ print_man_node(DECL_ARGS)
 			p->rmargin = rm;
 			p->maxrmargin = rmax;
 		}
+
 		break;
 	case (MAN_TBL):
 		if (TBL_SPAN_FIRST & n->span->flags) 
diff --git a/mdoc.7 b/mdoc.7
index e927c18e..ee53d228 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -55,6 +55,9 @@ character, and, in certain circumstances, the tab character.
 All manuals must have
 .Ux
 line terminators.
+.Pp
+If the first character of a line is a space, that line is printed
+with a leading newline.
 .Ss Comments
 Text following a
 .Sq \e\*q ,
diff --git a/mdoc_html.c b/mdoc_html.c
index 4de1115d..a3708728 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -420,6 +420,8 @@ print_mdoc_node(MDOC_ARGS)
 		child = mdoc_root_pre(m, n, h);
 		break;
 	case (MDOC_TEXT):
+		if (' ' == *n->string && MDOC_LINE & n->flags)
+			print_otag(h, TAG_BR, 0, NULL);
 		print_text(h, n->string);
 		return;
 	case (MDOC_TBL):
diff --git a/mdoc_term.c b/mdoc_term.c
index aa8b00f4..1d01baca 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -315,6 +315,8 @@ print_mdoc_node(DECL_ARGS)
 	
 	switch (n->type) {
 	case (MDOC_TEXT):
+		if (' ' == *n->string && MDOC_LINE & n->flags)
+			term_newln(p);
 		term_word(p, n->string);
 		break;
 	case (MDOC_TBL):