margerr -> margserr (getting ready for margverr).

4 files changed, 19 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index b67d3123..04c93076 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@ CFLAGS    += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
 # in the lower-left hand corner of -mdoc manuals.
 # CFLAGS += -DOSNAME="\"OpenBSD 4.5\""
 
-# Specify this if you want to accept Xo/Xc macros extending the head of
-# block full-implicit macros.
-# CFLAGS += -DUGLY
+# Unset this if you don't want Xo/Xc allowing split `It' lines, which
+# breaks symmetry.
+CFLAGS	  += -DUGLY
 
 LINTFLAGS += $(VFLAGS)
 
diff --git a/libmdoc.h b/libmdoc.h
index 72dc53b4..2211c9fd 100644
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -111,7 +111,7 @@ struct	mdoc_macro {
 	/* Reserved words in arguments treated as text. */
 };
 
-enum	margerr {
+enum	margserr {
 	ARGS_ERROR,
 	ARGS_EOLN,
 	ARGS_WORD,
@@ -177,9 +177,9 @@ int		  mdoc_argv(struct mdoc *, int, enum mdoct,
 #define	ARGV_WORD	(2)
 void		  mdoc_argv_free(struct mdoc_arg *);
 void		  mdoc_argn_free(struct mdoc_arg *, int);
-enum margerr	  mdoc_args(struct mdoc *, int,
+enum margserr	  mdoc_args(struct mdoc *, int,
 			int *, char *, enum mdoct, char **);
-enum margerr	  mdoc_zargs(struct mdoc *, int, 
+enum margserr	  mdoc_zargs(struct mdoc *, int, 
 			int *, char *, int, char **);
 #define	ARGS_DELIM	(1 << 1)	/* See args(). */
 #define	ARGS_TABSEP	(1 << 2)	/* See args(). */
diff --git a/mdoc_argv.c b/mdoc_argv.c
index ab0f7fbf..1828ec15 100644
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -45,7 +45,7 @@
 #define	MULTI_STEP	 5
 
 static	int		 argv_a2arg(enum mdoct, const char *);
-static	enum margerr	 args(struct mdoc *, int, int *, 
+static	enum margserr	 args(struct mdoc *, int, int *, 
 				char *, int, char **);
 static	int		 argv(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
@@ -325,7 +325,7 @@ mdoc_argn_free(struct mdoc_arg *p, int iarg)
 }
 
 
-enum margerr
+enum margserr
 mdoc_zargs(struct mdoc *m, int line, int *pos, 
 		char *buf, int flags, char **v)
 {
@@ -334,7 +334,7 @@ mdoc_zargs(struct mdoc *m, int line, int *pos,
 }
 
 
-enum margerr
+enum margserr
 mdoc_args(struct mdoc *m, int line, int *pos, 
 		char *buf, enum mdoct tok, char **v)
 {
@@ -372,7 +372,7 @@ mdoc_args(struct mdoc *m, int line, int *pos,
 }
 
 
-static enum margerr
+static enum margserr
 args(struct mdoc *m, int line, int *pos, 
 		char *buf, int fl, char **v)
 {
diff --git a/mdoc_macro.c b/mdoc_macro.c
index b88143c7..390cdf32 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -623,7 +623,7 @@ static int
 append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
 {
 	int		 lastarg;
-	enum margerr	 ac;
+	enum margserr	 ac;
 	char		*p;
 
 	if (0 == buf[*pos])
@@ -654,7 +654,7 @@ static int
 blk_exp_close(MACRO_PROT_ARGS)
 {
 	int	 	 j, lastarg, maxargs, flushed;
-	enum margerr	 ac;
+	enum margserr	 ac;
 	enum mdoct	 ntok;
 	char		*p;
 
@@ -734,7 +734,7 @@ in_line(MACRO_PROT_ARGS)
 {
 	int		 la, lastpunct, c, cnt, d, nc;
 	enum mdoct	 ntok;
-	enum margerr	 ac;
+	enum margserr	 ac;
 	struct mdoc_arg	*arg;
 	char		*p;
 
@@ -891,7 +891,7 @@ blk_full(MACRO_PROT_ARGS)
 	struct mdoc_node *n;
 #endif
 	enum mdoct	  ntok;
-	enum margerr	  ac;
+	enum margserr	  ac;
 	char		 *p;
 
 	/* Close out prior implicit scope. */
@@ -1047,7 +1047,7 @@ blk_part_imp(MACRO_PROT_ARGS)
 {
 	int		  la;
 	enum mdoct	  ntok;
-	enum margerr	  ac;
+	enum margserr	  ac;
 	char		 *p;
 	struct mdoc_node *blk; /* saved block context */
 	struct mdoc_node *body; /* saved body context */
@@ -1159,7 +1159,7 @@ static int
 blk_part_exp(MACRO_PROT_ARGS)
 {
 	int		  la;
-	enum margerr	  ac;
+	enum margserr	  ac;
 	struct mdoc_node *head; /* keep track of head */
 	struct mdoc_node *body; /* keep track of body */
 	char		 *p;
@@ -1270,7 +1270,7 @@ static int
 in_line_argn(MACRO_PROT_ARGS)
 {
 	int		 la, flushed, j, c, maxargs;
-	enum margerr	 ac;
+	enum margserr	 ac;
 	struct mdoc_arg	*arg;
 	char		*p;
 	enum mdoct	 ntok;
@@ -1405,7 +1405,7 @@ static int
 in_line_eoln(MACRO_PROT_ARGS)
 {
 	int		 c, la;
-	enum margerr	 ac;
+	enum margserr	 ac;
 	struct mdoc_arg	*arg;
 	char		*p;
 	enum mdoct	 ntok;
@@ -1507,7 +1507,7 @@ static int
 phrase(struct mdoc *m, int line, int ppos, char *buf)
 {
 	int		 la, pos;
-	enum margerr	 ac;
+	enum margserr	 ac;
 	enum mdoct	 ntok;
 	char		*p;