===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.204
retrieving revision 1.237
diff -u -p -r1.204 -r1.237
--- mandoc/mdoc_html.c	2014/09/27 09:20:03	1.204
+++ mandoc/mdoc_html.c	2015/10/06 18:32:19	1.237
@@ -1,15 +1,15 @@
-/*	$Id: mdoc_html.c,v 1.204 2014/09/27 09:20:03 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.237 2015/10/06 18:32:19 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -26,17 +26,17 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "mandoc.h"
 #include "mandoc_aux.h"
+#include "roff.h"
+#include "mdoc.h"
 #include "out.h"
 #include "html.h"
-#include "mdoc.h"
 #include "main.h"
 
 #define	INDENT		 5
 
-#define	MDOC_ARGS	  const struct mdoc_meta *meta, \
-			  const struct mdoc_node *n, \
+#define	MDOC_ARGS	  const struct roff_meta *meta, \
+			  struct roff_node *n, \
 			  struct html *h
 
 #ifndef MIN
@@ -48,15 +48,13 @@ struct	htmlmdoc {
 	void		(*post)(MDOC_ARGS);
 };
 
-static	void		  print_mdoc(MDOC_ARGS);
 static	void		  print_mdoc_head(MDOC_ARGS);
 static	void		  print_mdoc_node(MDOC_ARGS);
 static	void		  print_mdoc_nodelist(MDOC_ARGS);
 static	void		  synopsis_pre(struct html *,
-				const struct mdoc_node *);
+				const struct roff_node *);
 
 static	void		  a2width(const char *, struct roffsu *);
-static	void		  a2offs(const char *, struct roffsu *);
 
 static	void		  mdoc_root_post(MDOC_ARGS);
 static	int		  mdoc_root_pre(MDOC_ARGS);
@@ -83,6 +81,8 @@ static	int		  mdoc_fl_pre(MDOC_ARGS);
 static	int		  mdoc_fn_pre(MDOC_ARGS);
 static	int		  mdoc_ft_pre(MDOC_ARGS);
 static	int		  mdoc_em_pre(MDOC_ARGS);
+static	void		  mdoc_eo_post(MDOC_ARGS);
+static	int		  mdoc_eo_pre(MDOC_ARGS);
 static	int		  mdoc_er_pre(MDOC_ARGS);
 static	int		  mdoc_ev_pre(MDOC_ARGS);
 static	int		  mdoc_ex_pre(MDOC_ARGS);
@@ -99,6 +99,7 @@ static	int		  mdoc_mt_pre(MDOC_ARGS);
 static	int		  mdoc_ms_pre(MDOC_ARGS);
 static	int		  mdoc_nd_pre(MDOC_ARGS);
 static	int		  mdoc_nm_pre(MDOC_ARGS);
+static	int		  mdoc_no_pre(MDOC_ARGS);
 static	int		  mdoc_ns_pre(MDOC_ARGS);
 static	int		  mdoc_pa_pre(MDOC_ARGS);
 static	void		  mdoc_pf_post(MDOC_ARGS);
@@ -183,17 +184,17 @@ static	const struct htmlmdoc mdocs[MDOC_MAX] = {
 	{mdoc_quote_pre, mdoc_quote_post}, /* Bq */
 	{mdoc_xx_pre, NULL}, /* Bsx */
 	{mdoc_bx_pre, NULL}, /* Bx */
-	{NULL, NULL}, /* Db */
+	{mdoc_skip_pre, NULL}, /* Db */
 	{NULL, NULL}, /* Dc */
 	{mdoc_quote_pre, mdoc_quote_post}, /* Do */
 	{mdoc_quote_pre, mdoc_quote_post}, /* Dq */
 	{NULL, NULL}, /* Ec */ /* FIXME: no space */
 	{NULL, NULL}, /* Ef */
 	{mdoc_em_pre, NULL}, /* Em */
-	{mdoc_quote_pre, mdoc_quote_post}, /* Eo */
+	{mdoc_eo_pre, mdoc_eo_post}, /* Eo */
 	{mdoc_xx_pre, NULL}, /* Fx */
 	{mdoc_ms_pre, NULL}, /* Ms */
-	{mdoc_igndelim_pre, NULL}, /* No */
+	{mdoc_no_pre, NULL}, /* No */
 	{mdoc_ns_pre, NULL}, /* Ns */
 	{mdoc_xx_pre, NULL}, /* Nx */
 	{mdoc_xx_pre, NULL}, /* Ox */
@@ -262,15 +263,6 @@ static	const char * const lists[LIST_MAX] = {
 };
 
 
-void
-html_mdoc(void *arg, const struct mdoc *mdoc)
-{
-
-	print_mdoc(mdoc_meta(mdoc), mdoc_node(mdoc),
-	    (struct html *)arg);
-	putchar('\n');
-}
-
 /*
  * Calculate the scaling unit passed in a `-width' argument.  This uses
  * either a native scaling unit (e.g., 1i, 2m) or the string length of
@@ -280,17 +272,18 @@ static void
 a2width(const char *p, struct roffsu *su)
 {
 
-	if ( ! a2roffsu(p, su, SCALE_MAX)) {
-		su->unit = SCALE_BU;
+	if (a2roffsu(p, su, SCALE_MAX) < 2) {
+		su->unit = SCALE_EN;
 		su->scale = html_strlen(p);
-	}
+	} else if (su->scale < 0.0)
+		su->scale = 0.0;
 }
 
 /*
  * See the same function in mdoc_term.c for documentation.
  */
 static void
-synopsis_pre(struct html *h, const struct mdoc_node *n)
+synopsis_pre(struct html *h, const struct roff_node *n)
 {
 
 	if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
@@ -314,11 +307,11 @@ synopsis_pre(struct html *h, const struct mdoc_node *n
 	case MDOC_In:
 		/* FALLTHROUGH */
 	case MDOC_Vt:
-		print_otag(h, TAG_P, 0, NULL);
+		print_paragraph(h);
 		break;
 	case MDOC_Ft:
 		if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
-			print_otag(h, TAG_P, 0, NULL);
+			print_paragraph(h);
 			break;
 		}
 		/* FALLTHROUGH */
@@ -328,48 +321,32 @@ synopsis_pre(struct html *h, const struct mdoc_node *n
 	}
 }
 
-/*
- * Calculate the scaling unit passed in an `-offset' argument.  This
- * uses either a native scaling unit (e.g., 1i, 2m), one of a set of
- * predefined strings (indent, etc.), or the string length of the value.
- */
-static void
-a2offs(const char *p, struct roffsu *su)
+void
+html_mdoc(void *arg, const struct roff_man *mdoc)
 {
-
-	/* FIXME: "right"? */
-
-	if (0 == strcmp(p, "left"))
-		SCALE_HS_INIT(su, 0);
-	else if (0 == strcmp(p, "indent"))
-		SCALE_HS_INIT(su, INDENT);
-	else if (0 == strcmp(p, "indent-two"))
-		SCALE_HS_INIT(su, INDENT * 2);
-	else if ( ! a2roffsu(p, su, SCALE_MAX))
-		SCALE_HS_INIT(su, html_strlen(p));
-}
-
-static void
-print_mdoc(MDOC_ARGS)
-{
-	struct tag	*t, *tt;
 	struct htmlpair	 tag;
+	struct html	*h;
+	struct tag	*t, *tt;
 
 	PAIR_CLASS_INIT(&tag, "mandoc");
+	h = (struct html *)arg;
 
 	if ( ! (HTML_FRAGMENT & h->oflags)) {
 		print_gen_decls(h);
 		t = print_otag(h, TAG_HTML, 0, NULL);
 		tt = print_otag(h, TAG_HEAD, 0, NULL);
-		print_mdoc_head(meta, n, h);
+		print_mdoc_head(&mdoc->meta, mdoc->first->child, h);
 		print_tagq(h, tt);
 		print_otag(h, TAG_BODY, 0, NULL);
 		print_otag(h, TAG_DIV, 1, &tag);
 	} else
 		t = print_otag(h, TAG_DIV, 1, &tag);
 
-	print_mdoc_nodelist(meta, n, h);
+	mdoc_root_pre(&mdoc->meta, mdoc->first->child, h);
+	print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h);
+	mdoc_root_post(&mdoc->meta, mdoc->first->child, h);
 	print_tagq(h, t);
+	putchar('\n');
 }
 
 static void
@@ -392,9 +369,10 @@ static void
 print_mdoc_nodelist(MDOC_ARGS)
 {
 
-	print_mdoc_node(meta, n, h);
-	if (n->next)
-		print_mdoc_nodelist(meta, n->next, h);
+	while (n != NULL) {
+		print_mdoc_node(meta, n, h);
+		n = n->next;
+	}
 }
 
 static void
@@ -405,12 +383,10 @@ print_mdoc_node(MDOC_ARGS)
 
 	child = 1;
 	t = h->tags.head;
+	n->flags &= ~MDOC_ENDED;
 
 	switch (n->type) {
-	case MDOC_ROOT:
-		child = mdoc_root_pre(meta, n, h);
-		break;
-	case MDOC_TEXT:
+	case ROFFT_TEXT:
 		/* No tables in this mode... */
 		assert(NULL == h->tblt);
 
@@ -427,10 +403,12 @@ print_mdoc_node(MDOC_ARGS)
 		if (MDOC_DELIMO & n->flags)
 			h->flags |= HTML_NOSPACE;
 		return;
-	case MDOC_EQN:
+	case ROFFT_EQN:
+		if (n->flags & MDOC_LINE)
+			putchar('\n');
 		print_eqn(h, n->eqn);
 		break;
-	case MDOC_TBL:
+	case ROFFT_TBL:
 		/*
 		 * This will take care of initialising all of the table
 		 * state data for the first table, then tearing it down
@@ -444,23 +422,19 @@ print_mdoc_node(MDOC_ARGS)
 		 * the "meta" table state.  This will be reopened on the
 		 * next table element.
 		 */
-		if (h->tblt) {
+		if (h->tblt != NULL) {
 			print_tblclose(h);
 			t = h->tags.head;
 		}
-
-		assert(NULL == h->tblt);
-		if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
+		assert(h->tblt == NULL);
+		if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child))
 			child = (*mdocs[n->tok].pre)(meta, n, h);
 		break;
 	}
 
-	if (HTML_KEEP & h->flags) {
-		if (n->prev ? (n->prev->lastline != n->line) :
-		    (n->parent && n->parent->line != n->line)) {
-			h->flags &= ~HTML_KEEP;
-			h->flags |= HTML_PREKEEP;
-		}
+	if (h->flags & HTML_KEEP && n->flags & MDOC_LINE) {
+		h->flags &= ~HTML_KEEP;
+		h->flags |= HTML_PREKEEP;
 	}
 
 	if (child && n->child)
@@ -469,14 +443,16 @@ print_mdoc_node(MDOC_ARGS)
 	print_stagq(h, t);
 
 	switch (n->type) {
-	case MDOC_ROOT:
-		mdoc_root_post(meta, n, h);
+	case ROFFT_EQN:
 		break;
-	case MDOC_EQN:
-		break;
 	default:
-		if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
-			(*mdocs[n->tok].post)(meta, n, h);
+		if ( ! mdocs[n->tok].post || n->flags & MDOC_ENDED)
+			break;
+		(*mdocs[n->tok].post)(meta, n, h);
+		if (n->end != ENDBODY_NOT)
+			n->body->flags |= MDOC_ENDED;
+		if (n->end == ENDBODY_NOSPACE)
+			h->flags |= HTML_NOSPACE;
 		break;
 	}
 }
@@ -489,9 +465,6 @@ mdoc_root_post(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "foot");
 	t = print_otag(h, TAG_TABLE, 1, &tag);
-	PAIR_INIT(&tag, ATTR_WIDTH, "50%");
-	print_otag(h, TAG_COL, 1, &tag);
-	print_otag(h, TAG_COL, 1, &tag);
 
 	print_otag(h, TAG_TBODY, 0, NULL);
 
@@ -529,10 +502,6 @@ mdoc_root_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "head");
 	t = print_otag(h, TAG_TABLE, 1, &tag);
-	PAIR_INIT(&tag, ATTR_WIDTH, "30%");
-	print_otag(h, TAG_COL, 1, &tag);
-	print_otag(h, TAG_COL, 1, &tag);
-	print_otag(h, TAG_COL, 1, &tag);
 
 	print_otag(h, TAG_TBODY, 0, NULL);
 
@@ -555,7 +524,7 @@ mdoc_root_pre(MDOC_ARGS)
 
 	free(title);
 	free(volume);
-	return(1);
+	return 1;
 }
 
 static int
@@ -564,14 +533,14 @@ mdoc_sh_pre(MDOC_ARGS)
 	struct htmlpair	 tag;
 
 	switch (n->type) {
-	case MDOC_BLOCK:
+	case ROFFT_BLOCK:
 		PAIR_CLASS_INIT(&tag, "section");
 		print_otag(h, TAG_DIV, 1, &tag);
-		return(1);
-	case MDOC_BODY:
+		return 1;
+	case ROFFT_BODY:
 		if (n->sec == SEC_AUTHORS)
 			h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);
-		return(1);
+		return 1;
 	default:
 		break;
 	}
@@ -579,7 +548,7 @@ mdoc_sh_pre(MDOC_ARGS)
 	bufinit(h);
 	bufcat(h, "x");
 
-	for (n = n->child; n && MDOC_TEXT == n->type; ) {
+	for (n = n->child; n != NULL && n->type == ROFFT_TEXT; ) {
 		bufcat_id(h, n->string);
 		if (NULL != (n = n->next))
 			bufcat_id(h, " ");
@@ -591,7 +560,7 @@ mdoc_sh_pre(MDOC_ARGS)
 	} else
 		print_otag(h, TAG_H1, 0, NULL);
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -599,17 +568,17 @@ mdoc_ss_pre(MDOC_ARGS)
 {
 	struct htmlpair	 tag;
 
-	if (MDOC_BLOCK == n->type) {
+	if (n->type == ROFFT_BLOCK) {
 		PAIR_CLASS_INIT(&tag, "subsection");
 		print_otag(h, TAG_DIV, 1, &tag);
-		return(1);
-	} else if (MDOC_BODY == n->type)
-		return(1);
+		return 1;
+	} else if (n->type == ROFFT_BODY)
+		return 1;
 
 	bufinit(h);
 	bufcat(h, "x");
 
-	for (n = n->child; n && MDOC_TEXT == n->type; ) {
+	for (n = n->child; n != NULL && n->type == ROFFT_TEXT; ) {
 		bufcat_id(h, n->string);
 		if (NULL != (n = n->next))
 			bufcat_id(h, " ");
@@ -621,7 +590,7 @@ mdoc_ss_pre(MDOC_ARGS)
 	} else
 		print_otag(h, TAG_H2, 0, NULL);
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -635,17 +604,17 @@ mdoc_fl_pre(MDOC_ARGS)
 	/* `Cm' has no leading hyphen. */
 
 	if (MDOC_Cm == n->tok)
-		return(1);
+		return 1;
 
 	print_text(h, "\\-");
 
 	if ( ! (n->nchild == 0 &&
 	    (n->next == NULL ||
-	     n->next->type == MDOC_TEXT ||
+	     n->next->type == ROFFT_TEXT ||
 	     n->next->flags & MDOC_LINE)))
 		h->flags |= HTML_NOSPACE;
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -653,15 +622,15 @@ mdoc_nd_pre(MDOC_ARGS)
 {
 	struct htmlpair	 tag;
 
-	if (MDOC_BODY != n->type)
-		return(1);
+	if (n->type != ROFFT_BODY)
+		return 1;
 
 	/* XXX: this tag in theory can contain block elements. */
 
 	print_text(h, "\\(em");
 	PAIR_CLASS_INIT(&tag, "desc");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -672,21 +641,18 @@ mdoc_nm_pre(MDOC_ARGS)
 	int		 len;
 
 	switch (n->type) {
-	case MDOC_ELEM:
-		synopsis_pre(h, n);
+	case ROFFT_HEAD:
+		print_otag(h, TAG_TD, 0, NULL);
+		/* FALLTHROUGH */
+	case ROFFT_ELEM:
 		PAIR_CLASS_INIT(&tag, "name");
 		print_otag(h, TAG_B, 1, &tag);
-		if (NULL == n->child && meta->name)
+		if (n->child == NULL && meta->name != NULL)
 			print_text(h, meta->name);
-		return(1);
-	case MDOC_HEAD:
+		return 1;
+	case ROFFT_BODY:
 		print_otag(h, TAG_TD, 0, NULL);
-		if (NULL == n->child && meta->name)
-			print_text(h, meta->name);
-		return(1);
-	case MDOC_BODY:
-		print_otag(h, TAG_TD, 0, NULL);
-		return(1);
+		return 1;
 	default:
 		break;
 	}
@@ -695,11 +661,11 @@ mdoc_nm_pre(MDOC_ARGS)
 	PAIR_CLASS_INIT(&tag, "synopsis");
 	print_otag(h, TAG_TABLE, 1, &tag);
 
-	for (len = 0, n = n->child; n; n = n->next)
-		if (MDOC_TEXT == n->type)
+	for (len = 0, n = n->head->child; n; n = n->next)
+		if (n->type == ROFFT_TEXT)
 			len += html_strlen(n->string);
 
-	if (0 == len && meta->name)
+	if (len == 0 && meta->name != NULL)
 		len = html_strlen(meta->name);
 
 	SCALE_HS_INIT(&su, len);
@@ -710,7 +676,7 @@ mdoc_nm_pre(MDOC_ARGS)
 	print_otag(h, TAG_COL, 0, NULL);
 	print_otag(h, TAG_TBODY, 0, NULL);
 	print_otag(h, TAG_TR, 0, NULL);
-	return(1);
+	return 1;
 }
 
 static int
@@ -719,7 +685,7 @@ mdoc_xr_pre(MDOC_ARGS)
 	struct htmlpair	 tag[2];
 
 	if (NULL == n->child)
-		return(0);
+		return 0;
 
 	PAIR_CLASS_INIT(&tag[0], "link-man");
 
@@ -736,7 +702,7 @@ mdoc_xr_pre(MDOC_ARGS)
 	print_text(h, n->string);
 
 	if (NULL == (n = n->next))
-		return(0);
+		return 0;
 
 	h->flags |= HTML_NOSPACE;
 	print_text(h, "(");
@@ -744,7 +710,7 @@ mdoc_xr_pre(MDOC_ARGS)
 	print_text(h, n->string);
 	h->flags |= HTML_NOSPACE;
 	print_text(h, ")");
-	return(0);
+	return 0;
 }
 
 static int
@@ -753,7 +719,7 @@ mdoc_ns_pre(MDOC_ARGS)
 
 	if ( ! (MDOC_LINE & n->flags))
 		h->flags |= HTML_NOSPACE;
-	return(1);
+	return 1;
 }
 
 static int
@@ -763,7 +729,7 @@ mdoc_ar_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "arg");
 	print_otag(h, TAG_I, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -793,7 +759,7 @@ mdoc_xx_pre(MDOC_ARGS)
 		pp = "UNIX";
 		break;
 	default:
-		return(1);
+		return 1;
 	}
 
 	PAIR_CLASS_INIT(&tag, "unix");
@@ -806,7 +772,7 @@ mdoc_xx_pre(MDOC_ARGS)
 		print_text(h, n->child->string);
 		h->flags = flags;
 	}
-	return(0);
+	return 0;
 }
 
 static int
@@ -823,7 +789,7 @@ mdoc_bx_pre(MDOC_ARGS)
 		print_text(h, "BSD");
 	} else {
 		print_text(h, "BSD");
-		return(0);
+		return 0;
 	}
 
 	if (NULL != (n = n->next)) {
@@ -833,7 +799,7 @@ mdoc_bx_pre(MDOC_ARGS)
 		print_text(h, n->string);
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -842,7 +808,7 @@ mdoc_it_pre(MDOC_ARGS)
 	struct roffsu	 su;
 	enum mdoc_list	 type;
 	struct htmlpair	 tag[2];
-	const struct mdoc_node *bl;
+	const struct roff_node *bl;
 
 	bl = n->parent;
 	while (bl && MDOC_Bl != bl->tok)
@@ -857,7 +823,7 @@ mdoc_it_pre(MDOC_ARGS)
 
 	bufinit(h);
 
-	if (MDOC_HEAD == n->type) {
+	if (n->type == ROFFT_HEAD) {
 		switch (type) {
 		case LIST_bullet:
 			/* FALLTHROUGH */
@@ -868,7 +834,7 @@ mdoc_it_pre(MDOC_ARGS)
 		case LIST_hyphen:
 			/* FALLTHROUGH */
 		case LIST_enum:
-			return(0);
+			return 0;
 		case LIST_diag:
 			/* FALLTHROUGH */
 		case LIST_hang:
@@ -892,7 +858,7 @@ mdoc_it_pre(MDOC_ARGS)
 		default:
 			break;
 		}
-	} else if (MDOC_BODY == n->type) {
+	} else if (n->type == ROFFT_BODY) {
 		switch (type) {
 		case LIST_bullet:
 			/* FALLTHROUGH */
@@ -945,7 +911,7 @@ mdoc_it_pre(MDOC_ARGS)
 		}
 	}
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -956,15 +922,15 @@ mdoc_bl_pre(MDOC_ARGS)
 	struct roffsu	 su;
 	char		 buf[BUFSIZ];
 
-	if (MDOC_BODY == n->type) {
+	if (n->type == ROFFT_BODY) {
 		if (LIST_column == n->norm->Bl.type)
 			print_otag(h, TAG_TBODY, 0, NULL);
-		return(1);
+		return 1;
 	}
 
-	if (MDOC_HEAD == n->type) {
+	if (n->type == ROFFT_HEAD) {
 		if (LIST_column != n->norm->Bl.type)
-			return(0);
+			return 0;
 
 		/*
 		 * For each column, print out the <COL> tag with our
@@ -984,7 +950,7 @@ mdoc_bl_pre(MDOC_ARGS)
 			print_otag(h, TAG_COL, 1, tag);
 		}
 
-		return(0);
+		return 0;
 	}
 
 	SCALE_VS_INIT(&su, 0);
@@ -1001,7 +967,7 @@ mdoc_bl_pre(MDOC_ARGS)
 	/* Set the block's left-hand margin. */
 
 	if (n->norm->Bl.offs) {
-		a2offs(n->norm->Bl.offs, &su);
+		a2width(n->norm->Bl.offs, &su);
 		bufcat_su(h, "margin-left", &su);
 	}
 
@@ -1034,10 +1000,9 @@ mdoc_bl_pre(MDOC_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -1056,7 +1021,7 @@ mdoc_ex_pre(MDOC_ARGS)
 
 	nchild = n->nchild;
 	for (n = n->child; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
+		assert(n->type == ROFFT_TEXT);
 
 		t = print_otag(h, TAG_B, 1, &tag);
 		print_text(h, n->string);
@@ -1077,7 +1042,7 @@ mdoc_ex_pre(MDOC_ARGS)
 		print_text(h, "utility exits\\~0");
 
 	print_text(h, "on success, and\\~>0 if an error occurs.");
-	return(0);
+	return 0;
 }
 
 static int
@@ -1087,7 +1052,7 @@ mdoc_em_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "emph");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1096,8 +1061,8 @@ mdoc_d1_pre(MDOC_ARGS)
 	struct htmlpair	 tag[2];
 	struct roffsu	 su;
 
-	if (MDOC_BLOCK != n->type)
-		return(1);
+	if (n->type != ROFFT_BLOCK)
+		return 1;
 
 	SCALE_VS_INIT(&su, 0);
 	bufinit(h);
@@ -1116,7 +1081,7 @@ mdoc_d1_pre(MDOC_ARGS)
 		print_otag(h, TAG_CODE, 1, tag);
 	}
 
-	return(1);
+	return 1;
 }
 
 static int
@@ -1138,7 +1103,7 @@ mdoc_sx_pre(MDOC_ARGS)
 
 	print_otag(h, TAG_I, 1, tag);
 	print_otag(h, TAG_A, 2, tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1146,16 +1111,16 @@ mdoc_bd_pre(MDOC_ARGS)
 {
 	struct htmlpair		 tag[2];
 	int			 comp, sv;
-	const struct mdoc_node	*nn;
+	struct roff_node	*nn;
 	struct roffsu		 su;
 
-	if (MDOC_HEAD == n->type)
-		return(0);
+	if (n->type == ROFFT_HEAD)
+		return 0;
 
-	if (MDOC_BLOCK == n->type) {
+	if (n->type == ROFFT_BLOCK) {
 		comp = n->norm->Bd.comp;
 		for (nn = n; nn && ! comp; nn = nn->parent) {
-			if (MDOC_BLOCK != nn->type)
+			if (nn->type != ROFFT_BLOCK)
 				continue;
 			if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
 				comp = 1;
@@ -1163,14 +1128,22 @@ mdoc_bd_pre(MDOC_ARGS)
 				break;
 		}
 		if ( ! comp)
-			print_otag(h, TAG_P, 0, NULL);
-		return(1);
+			print_paragraph(h);
+		return 1;
 	}
 
-	SCALE_HS_INIT(&su, 0);
-	if (n->norm->Bd.offs)
-		a2offs(n->norm->Bd.offs, &su);
+	/* Handle the -offset argument. */
 
+	if (n->norm->Bd.offs == NULL ||
+	    ! strcmp(n->norm->Bd.offs, "left"))
+		SCALE_HS_INIT(&su, 0);
+	else if ( ! strcmp(n->norm->Bd.offs, "indent"))
+		SCALE_HS_INIT(&su, INDENT);
+	else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
+		SCALE_HS_INIT(&su, INDENT * 2);
+	else
+		a2width(n->norm->Bd.offs, &su);
+
 	bufinit(h);
 	bufcat_su(h, "margin-left", &su);
 	PAIR_STYLE_INIT(&tag[0], h);
@@ -1179,7 +1152,7 @@ mdoc_bd_pre(MDOC_ARGS)
 	    DISP_literal != n->norm->Bd.type) {
 		PAIR_CLASS_INIT(&tag[1], "display");
 		print_otag(h, TAG_DIV, 2, tag);
-		return(1);
+		return 1;
 	}
 
 	PAIR_CLASS_INIT(&tag[1], "lit display");
@@ -1218,7 +1191,8 @@ mdoc_bd_pre(MDOC_ARGS)
 		default:
 			break;
 		}
-		if (nn->next && nn->next->line == nn->line)
+		if (h->flags & HTML_NONEWLINE ||
+		    (nn->next && ! (nn->next->flags & MDOC_LINE)))
 			continue;
 		else if (nn->next)
 			print_text(h, "\n");
@@ -1229,7 +1203,7 @@ mdoc_bd_pre(MDOC_ARGS)
 	if (0 == sv)
 		h->flags &= ~HTML_LITERAL;
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1239,7 +1213,7 @@ mdoc_pa_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "file");
 	print_otag(h, TAG_I, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1249,7 +1223,7 @@ mdoc_ad_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "addr");
 	print_otag(h, TAG_I, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1260,17 +1234,14 @@ mdoc_an_pre(MDOC_ARGS)
 	if (n->norm->An.auth == AUTH_split) {
 		h->flags &= ~HTML_NOSPLIT;
 		h->flags |= HTML_SPLIT;
-		return(0);
+		return 0;
 	}
 	if (n->norm->An.auth == AUTH_nosplit) {
 		h->flags &= ~HTML_SPLIT;
 		h->flags |= HTML_NOSPLIT;
-		return(0);
+		return 0;
 	}
 
-	if (n->child == NULL)
-		return(0);
-
 	if (h->flags & HTML_SPLIT)
 		print_otag(h, TAG_BR, 0, NULL);
 
@@ -1279,7 +1250,7 @@ mdoc_an_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "author");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1290,7 +1261,7 @@ mdoc_cd_pre(MDOC_ARGS)
 	synopsis_pre(h, n);
 	PAIR_CLASS_INIT(&tag, "config");
 	print_otag(h, TAG_B, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1300,7 +1271,7 @@ mdoc_dv_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "define");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1310,7 +1281,7 @@ mdoc_ev_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "env");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1320,20 +1291,20 @@ mdoc_er_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "errno");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
 mdoc_fa_pre(MDOC_ARGS)
 {
-	const struct mdoc_node	*nn;
+	const struct roff_node	*nn;
 	struct htmlpair		 tag;
 	struct tag		*t;
 
 	PAIR_CLASS_INIT(&tag, "farg");
 	if (n->parent->tok != MDOC_Fo) {
 		print_otag(h, TAG_I, 1, &tag);
-		return(1);
+		return 1;
 	}
 
 	for (nn = n->child; nn; nn = nn->next) {
@@ -1351,7 +1322,7 @@ mdoc_fa_pre(MDOC_ARGS)
 		print_text(h, ",");
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1366,14 +1337,14 @@ mdoc_fd_pre(MDOC_ARGS)
 	synopsis_pre(h, n);
 
 	if (NULL == (n = n->child))
-		return(0);
+		return 0;
 
-	assert(MDOC_TEXT == n->type);
+	assert(n->type == ROFFT_TEXT);
 
 	if (strcmp(n->string, "#include")) {
 		PAIR_CLASS_INIT(&tag[0], "macro");
 		print_otag(h, TAG_B, 1, tag);
-		return(1);
+		return 1;
 	}
 
 	PAIR_CLASS_INIT(&tag[0], "includes");
@@ -1381,7 +1352,7 @@ mdoc_fd_pre(MDOC_ARGS)
 	print_text(h, n->string);
 
 	if (NULL != (n = n->next)) {
-		assert(MDOC_TEXT == n->type);
+		assert(n->type == ROFFT_TEXT);
 
 		/*
 		 * XXX This is broken and not easy to fix.
@@ -1415,11 +1386,11 @@ mdoc_fd_pre(MDOC_ARGS)
 	}
 
 	for ( ; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
+		assert(n->type == ROFFT_TEXT);
 		print_text(h, n->string);
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1427,17 +1398,17 @@ mdoc_vt_pre(MDOC_ARGS)
 {
 	struct htmlpair	 tag;
 
-	if (MDOC_BLOCK == n->type) {
+	if (n->type == ROFFT_BLOCK) {
 		synopsis_pre(h, n);
-		return(1);
-	} else if (MDOC_ELEM == n->type) {
+		return 1;
+	} else if (n->type == ROFFT_ELEM) {
 		synopsis_pre(h, n);
-	} else if (MDOC_HEAD == n->type)
-		return(0);
+	} else if (n->type == ROFFT_HEAD)
+		return 0;
 
 	PAIR_CLASS_INIT(&tag, "type");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1448,7 +1419,7 @@ mdoc_ft_pre(MDOC_ARGS)
 	synopsis_pre(h, n);
 	PAIR_CLASS_INIT(&tag, "ftype");
 	print_otag(h, TAG_I, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1538,7 +1509,7 @@ mdoc_fn_pre(MDOC_ARGS)
 		print_text(h, ";");
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1555,22 +1526,22 @@ mdoc_sm_pre(MDOC_ARGS)
 	if ( ! (HTML_NONOSPACE & h->flags))
 		h->flags &= ~HTML_NOSPACE;
 
-	return(0);
+	return 0;
 }
 
 static int
 mdoc_skip_pre(MDOC_ARGS)
 {
 
-	return(0);
+	return 0;
 }
 
 static int
 mdoc_pp_pre(MDOC_ARGS)
 {
 
-	print_otag(h, TAG_P, 0, NULL);
-	return(0);
+	print_paragraph(h);
+	return 0;
 }
 
 static int
@@ -1582,9 +1553,12 @@ mdoc_sp_pre(MDOC_ARGS)
 	SCALE_VS_INIT(&su, 1);
 
 	if (MDOC_sp == n->tok) {
-		if (NULL != (n = n->child))
+		if (NULL != (n = n->child)) {
 			if ( ! a2roffsu(n->string, &su, SCALE_VS))
-				SCALE_VS_INIT(&su, atoi(n->string));
+				su.scale = 1.0;
+			else if (su.scale < 0.0)
+				su.scale = 0.0;
+		}
 	} else
 		su.scale = 0.0;
 
@@ -1596,7 +1570,7 @@ mdoc_sp_pre(MDOC_ARGS)
 	/* So the div isn't empty: */
 	print_text(h, "\\~");
 
-	return(0);
+	return 0;
 
 }
 
@@ -1606,9 +1580,9 @@ mdoc_lk_pre(MDOC_ARGS)
 	struct htmlpair	 tag[2];
 
 	if (NULL == (n = n->child))
-		return(0);
+		return 0;
 
-	assert(MDOC_TEXT == n->type);
+	assert(n->type == ROFFT_TEXT);
 
 	PAIR_CLASS_INIT(&tag[0], "link-ext");
 	PAIR_HREF_INIT(&tag[1], n->string);
@@ -1621,7 +1595,7 @@ mdoc_lk_pre(MDOC_ARGS)
 	for (n = n->next; n; n = n->next)
 		print_text(h, n->string);
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1633,7 +1607,7 @@ mdoc_mt_pre(MDOC_ARGS)
 	PAIR_CLASS_INIT(&tag[0], "link-mail");
 
 	for (n = n->child; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
+		assert(n->type == ROFFT_TEXT);
 
 		bufinit(h);
 		bufcat(h, "mailto:");
@@ -1645,7 +1619,7 @@ mdoc_mt_pre(MDOC_ARGS)
 		print_tagq(h, t);
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1654,33 +1628,32 @@ mdoc_fo_pre(MDOC_ARGS)
 	struct htmlpair	 tag;
 	struct tag	*t;
 
-	if (MDOC_BODY == n->type) {
+	if (n->type == ROFFT_BODY) {
 		h->flags |= HTML_NOSPACE;
 		print_text(h, "(");
 		h->flags |= HTML_NOSPACE;
-		return(1);
-	} else if (MDOC_BLOCK == n->type) {
+		return 1;
+	} else if (n->type == ROFFT_BLOCK) {
 		synopsis_pre(h, n);
-		return(1);
+		return 1;
 	}
 
-	/* XXX: we drop non-initial arguments as per groff. */
+	if (n->child == NULL)
+		return 0;
 
-	assert(n->child);
 	assert(n->child->string);
-
 	PAIR_CLASS_INIT(&tag, "fname");
 	t = print_otag(h, TAG_B, 1, &tag);
 	print_text(h, n->child->string);
 	print_tagq(h, t);
-	return(0);
+	return 0;
 }
 
 static void
 mdoc_fo_post(MDOC_ARGS)
 {
 
-	if (MDOC_BODY != n->type)
+	if (n->type != ROFFT_BODY)
 		return;
 	h->flags |= HTML_NOSPACE;
 	print_text(h, ")");
@@ -1714,7 +1687,7 @@ mdoc_in_pre(MDOC_ARGS)
 	h->flags |= HTML_NOSPACE;
 
 	if (NULL != (n = n->child)) {
-		assert(MDOC_TEXT == n->type);
+		assert(n->type == ROFFT_TEXT);
 
 		PAIR_CLASS_INIT(&tag[0], "link-includes");
 
@@ -1736,11 +1709,11 @@ mdoc_in_pre(MDOC_ARGS)
 	print_text(h, ">");
 
 	for ( ; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
+		assert(n->type == ROFFT_TEXT);
 		print_text(h, n->string);
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -1750,7 +1723,7 @@ mdoc_ic_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "cmd");
 	print_otag(h, TAG_B, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1806,7 +1779,7 @@ mdoc_rv_pre(MDOC_ARGS)
 	print_text(h, "errno");
 	print_tagq(h, t);
 	print_text(h, "is set to indicate the error.");
-	return(0);
+	return 0;
 }
 
 static int
@@ -1816,7 +1789,7 @@ mdoc_va_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "var");
 	print_otag(h, TAG_B, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1826,7 +1799,7 @@ mdoc_ap_pre(MDOC_ARGS)
 	h->flags |= HTML_NOSPACE;
 	print_text(h, "\\(aq");
 	h->flags |= HTML_NOSPACE;
-	return(1);
+	return 1;
 }
 
 static int
@@ -1835,10 +1808,10 @@ mdoc_bf_pre(MDOC_ARGS)
 	struct htmlpair	 tag[2];
 	struct roffsu	 su;
 
-	if (MDOC_HEAD == n->type)
-		return(0);
-	else if (MDOC_BODY != n->type)
-		return(1);
+	if (n->type == ROFFT_HEAD)
+		return 0;
+	else if (n->type != ROFFT_BODY)
+		return 1;
 
 	if (FONT_Em == n->norm->Bf.font)
 		PAIR_CLASS_INIT(&tag[0], "emph");
@@ -1860,7 +1833,7 @@ mdoc_bf_pre(MDOC_ARGS)
 	bufcat_su(h, "margin-left", &su);
 	PAIR_STYLE_INIT(&tag[1], h);
 	print_otag(h, TAG_DIV, 2, tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1870,7 +1843,7 @@ mdoc_ms_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "symb");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1878,14 +1851,15 @@ mdoc_igndelim_pre(MDOC_ARGS)
 {
 
 	h->flags |= HTML_IGNDELIM;
-	return(1);
+	return 1;
 }
 
 static void
 mdoc_pf_post(MDOC_ARGS)
 {
 
-	h->flags |= HTML_NOSPACE;
+	if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+		h->flags |= HTML_NOSPACE;
 }
 
 static int
@@ -1893,25 +1867,35 @@ mdoc_rs_pre(MDOC_ARGS)
 {
 	struct htmlpair	 tag;
 
-	if (MDOC_BLOCK != n->type)
-		return(1);
+	if (n->type != ROFFT_BLOCK)
+		return 1;
 
 	if (n->prev && SEC_SEE_ALSO == n->sec)
-		print_otag(h, TAG_P, 0, NULL);
+		print_paragraph(h);
 
 	PAIR_CLASS_INIT(&tag, "ref");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
+mdoc_no_pre(MDOC_ARGS)
+{
+	struct htmlpair	tag;
+
+	PAIR_CLASS_INIT(&tag, "none");
+	print_otag(h, TAG_CODE, 1, &tag);
+	return 1;
+}
+
+static int
 mdoc_li_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
 	PAIR_CLASS_INIT(&tag, "lit");
 	print_otag(h, TAG_CODE, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1921,7 +1905,7 @@ mdoc_sy_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "symb");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -1929,7 +1913,7 @@ mdoc_bt_pre(MDOC_ARGS)
 {
 
 	print_text(h, "is currently in beta test.");
-	return(0);
+	return 0;
 }
 
 static int
@@ -1937,7 +1921,7 @@ mdoc_ud_pre(MDOC_ARGS)
 {
 
 	print_text(h, "currently under development.");
-	return(0);
+	return 0;
 }
 
 static int
@@ -1950,7 +1934,7 @@ mdoc_lb_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "lib");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	return(1);
+	return 1;
 }
 
 static int
@@ -2012,18 +1996,17 @@ mdoc__x_pre(MDOC_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	if (MDOC__U != n->tok) {
 		print_otag(h, t, 1, tag);
-		return(1);
+		return 1;
 	}
 
 	PAIR_HREF_INIT(&tag[1], n->child->string);
 	print_otag(h, TAG_A, 2, tag);
 
-	return(1);
+	return 1;
 }
 
 static void
@@ -2049,27 +2032,26 @@ mdoc_bk_pre(MDOC_ARGS)
 {
 
 	switch (n->type) {
-	case MDOC_BLOCK:
+	case ROFFT_BLOCK:
 		break;
-	case MDOC_HEAD:
-		return(0);
-	case MDOC_BODY:
+	case ROFFT_HEAD:
+		return 0;
+	case ROFFT_BODY:
 		if (n->parent->args || 0 == n->prev->nchild)
 			h->flags |= HTML_PREKEEP;
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
-	return(1);
+	return 1;
 }
 
 static void
 mdoc_bk_post(MDOC_ARGS)
 {
 
-	if (MDOC_BODY == n->type)
+	if (n->type == ROFFT_BODY)
 		h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
 }
 
@@ -2078,14 +2060,15 @@ mdoc_quote_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
-	if (MDOC_BODY != n->type)
-		return(1);
+	if (n->type != ROFFT_BODY)
+		return 1;
 
 	switch (n->tok) {
 	case MDOC_Ao:
 		/* FALLTHROUGH */
 	case MDOC_Aq:
-		print_text(h, "\\(la");
+		print_text(h, n->nchild == 1 &&
+		    n->child->tok == MDOC_Mt ?  "<" : "\\(la");
 		break;
 	case MDOC_Bro:
 		/* FALLTHROUGH */
@@ -2108,11 +2091,9 @@ mdoc_quote_pre(MDOC_ARGS)
 	case MDOC_En:
 		if (NULL == n->norm->Es ||
 		    NULL == n->norm->Es->child)
-			return(1);
+			return 1;
 		print_text(h, n->norm->Es->child->string);
 		break;
-	case MDOC_Eo:
-		break;
 	case MDOC_Do:
 		/* FALLTHROUGH */
 	case MDOC_Dq:
@@ -2140,28 +2121,27 @@ mdoc_quote_pre(MDOC_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	h->flags |= HTML_NOSPACE;
-	return(1);
+	return 1;
 }
 
 static void
 mdoc_quote_post(MDOC_ARGS)
 {
 
-	if (MDOC_BODY != n->type)
+	if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)
 		return;
 
-	if (MDOC_En != n->tok)
-		h->flags |= HTML_NOSPACE;
+	h->flags |= HTML_NOSPACE;
 
 	switch (n->tok) {
 	case MDOC_Ao:
 		/* FALLTHROUGH */
 	case MDOC_Aq:
-		print_text(h, "\\(ra");
+		print_text(h, n->nchild == 1 &&
+		    n->child->tok == MDOC_Mt ?  ">" : "\\(ra");
 		break;
 	case MDOC_Bro:
 		/* FALLTHROUGH */
@@ -2178,15 +2158,13 @@ mdoc_quote_post(MDOC_ARGS)
 		print_text(h, "\\(rB");
 		break;
 	case MDOC_En:
-		if (NULL != n->norm->Es &&
-		    NULL != n->norm->Es->child &&
-		    NULL != n->norm->Es->child->next) {
-			h->flags |= HTML_NOSPACE;
+		if (n->norm->Es == NULL ||
+		    n->norm->Es->child == NULL ||
+		    n->norm->Es->child->next == NULL)
+			h->flags &= ~HTML_NOSPACE;
+		else
 			print_text(h, n->norm->Es->child->next->string);
-		}
 		break;
-	case MDOC_Eo:
-		break;
 	case MDOC_Qo:
 		/* FALLTHROUGH */
 	case MDOC_Qq:
@@ -2210,6 +2188,46 @@ mdoc_quote_post(MDOC_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
+}
+
+static int
+mdoc_eo_pre(MDOC_ARGS)
+{
+
+	if (n->type != ROFFT_BODY)
+		return 1;
+
+	if (n->end == ENDBODY_NOT &&
+	    n->parent->head->child == NULL &&
+	    n->child != NULL &&
+	    n->child->end != ENDBODY_NOT)
+		print_text(h, "\\&");
+	else if (n->end != ENDBODY_NOT ? n->child != NULL :
+	    n->parent->head->child != NULL && (n->child != NULL ||
+	    (n->parent->tail != NULL && n->parent->tail->child != NULL)))
+		h->flags |= HTML_NOSPACE;
+	return 1;
+}
+
+static void
+mdoc_eo_post(MDOC_ARGS)
+{
+	int	 body, tail;
+
+	if (n->type != ROFFT_BODY)
+		return;
+
+	if (n->end != ENDBODY_NOT) {
+		h->flags &= ~HTML_NOSPACE;
+		return;
+	}
+
+	body = n->child != NULL || n->parent->head->child != NULL;
+	tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+	if (body && tail)
+		h->flags |= HTML_NOSPACE;
+	else if ( ! tail)
+		h->flags &= ~HTML_NOSPACE;
 }