===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.175
retrieving revision 1.178
diff -u -p -r1.175 -r1.178
--- mandoc/mdoc_macro.c	2015/02/05 00:14:13	1.175
+++ mandoc/mdoc_macro.c	2015/02/06 03:38:45	1.178
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.175 2015/02/05 00:14:13 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.178 2015/02/06 03:38:45 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -772,7 +772,7 @@ in_line(MACRO_PROT_ARGS)
 		 */
 
 		if (ac == ARGS_PUNCT) {
-			if (cnt == 0 && nc == 0)
+			if (cnt == 0 && (nc == 0 || tok == MDOC_An))
 				mdoc->flags |= MDOC_NODELIMC;
 			break;
 		}
@@ -904,6 +904,12 @@ blk_full(MACRO_PROT_ARGS)
 
 	nl = MDOC_NEWLINE & mdoc->flags;
 
+	if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
+		mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+		    line, ppos, mdoc_macronames[tok]);
+		return;
+	}
+
 	if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) {
 
 		/* Here, tok is one of Sh Ss Nm Nd It. */
@@ -1367,6 +1373,11 @@ in_line_argn(MACRO_PROT_ARGS)
 	}
 
 	if (j == 0) {
+		if (tok == MDOC_In || tok == MDOC_St || tok == MDOC_Xr) {
+			mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+			    line, ppos, mdoc_macronames[tok]);
+			return;
+		}
 		mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
 		if (ac == ARGS_PUNCT && tok == MDOC_Pf)
 			append_delims(mdoc, line, pos, buf);
@@ -1390,6 +1401,12 @@ in_line_eoln(MACRO_PROT_ARGS)
 			n = n->parent;
 		if (n->tok == MDOC_Nm)
 			rew_last(mdoc, mdoc->last->parent);
+	}
+
+	if (buf[*pos] == '\0' && tok == MDOC_Fd) {
+		mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+		    line, ppos, "Fd");
+		return;
 	}
 
 	mdoc_argv(mdoc, line, tok, &arg, pos, buf);