===================================================================
RCS file: /cvs/mandoc/mdoc_argv.c,v
retrieving revision 1.102
retrieving revision 1.105
diff -u -p -r1.102 -r1.105
--- mandoc/mdoc_argv.c	2015/04/02 22:48:17	1.102
+++ mandoc/mdoc_argv.c	2015/10/06 18:32:19	1.105
@@ -1,7 +1,7 @@
-/*	$Id: mdoc_argv.c,v 1.102 2015/04/02 22:48:17 schwarze Exp $ */
+/*	$Id: mdoc_argv.c,v 1.105 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012, 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
@@ -52,12 +52,12 @@ struct	mdocarg {
 };
 
 static	void		 argn_free(struct mdoc_arg *, int);
-static	enum margserr	 args(struct mdoc *, int, int *,
+static	enum margserr	 args(struct roff_man *, int, int *,
 				char *, enum argsflag, char **);
 static	int		 args_checkpunct(const char *, int);
-static	void		 argv_multi(struct mdoc *, int,
+static	void		 argv_multi(struct roff_man *, int,
 				struct mdoc_argv *, int *, char *);
-static	void		 argv_single(struct mdoc *, int,
+static	void		 argv_single(struct roff_man *, int,
 				struct mdoc_argv *, int *, char *);
 
 static	const enum argvflag argvflags[MDOC_ARG_MAX] = {
@@ -276,7 +276,7 @@ static	const struct mdocarg mdocargs[MDOC_MAX] = {
  * Some flags take no argument, some one, some multiple.
  */
 void
-mdoc_argv(struct mdoc *mdoc, int line, int tok,
+mdoc_argv(struct roff_man *mdoc, int line, int tok,
 	struct mdoc_arg **reta, int *pos, char *buf)
 {
 	struct mdoc_argv	  tmpv;
@@ -413,7 +413,7 @@ argn_free(struct mdoc_arg *p, int iarg)
 }
 
 enum margserr
-mdoc_args(struct mdoc *mdoc, int line, int *pos,
+mdoc_args(struct roff_man *mdoc, int line, int *pos,
 	char *buf, int tok, char **v)
 {
 	struct roff_node *n;
@@ -422,9 +422,9 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos,
 
 	if (v == NULL)
 		v = &v_local;
-	fl = tok == MDOC_MAX ? ARGSFL_NONE : mdocargs[tok].flags;
+	fl = tok == TOKEN_NONE ? ARGSFL_NONE : mdocargs[tok].flags;
 	if (tok != MDOC_It)
-		return(args(mdoc, line, pos, buf, fl, v));
+		return args(mdoc, line, pos, buf, fl, v);
 
 	/*
 	 * We know that we're in an `It', so it's reasonable to expect
@@ -440,11 +440,11 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos,
 				break;
 			}
 
-	return(args(mdoc, line, pos, buf, fl, v));
+	return args(mdoc, line, pos, buf, fl, v);
 }
 
 static enum margserr
-args(struct mdoc *mdoc, int line, int *pos,
+args(struct roff_man *mdoc, int line, int *pos,
 		char *buf, enum argsflag fl, char **v)
 {
 	char		*p, *pp;
@@ -453,7 +453,7 @@ args(struct mdoc *mdoc, int line, int *pos,
 
 	if ('\0' == buf[*pos]) {
 		if (MDOC_PPHRASE & mdoc->flags)
-			return(ARGS_EOLN);
+			return ARGS_EOLN;
 		/*
 		 * If we're not in a partial phrase and the flag for
 		 * being a phrase literal is still set, the punctuation
@@ -464,14 +464,14 @@ args(struct mdoc *mdoc, int line, int *pos,
 			    mdoc->parse, line, *pos, NULL);
 
 		mdoc->flags &= ~MDOC_PHRASELIT;
-		return(ARGS_EOLN);
+		return ARGS_EOLN;
 	}
 
 	*v = &buf[*pos];
 
 	if (ARGSFL_DELIM == fl)
 		if (args_checkpunct(buf, *pos))
-			return(ARGS_PUNCT);
+			return ARGS_PUNCT;
 
 	/*
 	 * First handle TABSEP items, restricted to `Bl -column'.  This
@@ -538,7 +538,7 @@ args(struct mdoc *mdoc, int line, int *pos,
 		for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++)
 			/* Skip ahead. */ ;
 
-		return(rc);
+		return rc;
 	}
 
 	/*
@@ -575,17 +575,17 @@ args(struct mdoc *mdoc, int line, int *pos,
 
 		if ('\0' == buf[*pos]) {
 			if (MDOC_PPHRASE & mdoc->flags)
-				return(ARGS_QWORD);
+				return ARGS_QWORD;
 			mandoc_msg(MANDOCERR_ARG_QUOTE,
 			    mdoc->parse, line, *pos, NULL);
-			return(ARGS_QWORD);
+			return ARGS_QWORD;
 		}
 
 		mdoc->flags &= ~MDOC_PHRASELIT;
 		buf[(*pos)++] = '\0';
 
 		if ('\0' == buf[*pos])
-			return(ARGS_QWORD);
+			return ARGS_QWORD;
 
 		while (' ' == buf[*pos])
 			(*pos)++;
@@ -594,13 +594,13 @@ args(struct mdoc *mdoc, int line, int *pos,
 			mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
 			    line, *pos, NULL);
 
-		return(ARGS_QWORD);
+		return ARGS_QWORD;
 	}
 
 	p = &buf[*pos];
 	*v = mandoc_getarg(mdoc->parse, &p, line, pos);
 
-	return(ARGS_WORD);
+	return ARGS_WORD;
 }
 
 /*
@@ -622,11 +622,11 @@ args_checkpunct(const char *buf, int i)
 		dbuf[j] = buf[i];
 
 	if (DELIMSZ == j)
-		return(0);
+		return 0;
 
 	dbuf[j] = '\0';
 	if (DELIM_CLOSE != mdoc_isdelim(dbuf))
-		return(0);
+		return 0;
 
 	while (' ' == buf[i])
 		i++;
@@ -639,22 +639,22 @@ args_checkpunct(const char *buf, int i)
 			dbuf[j++] = buf[i++];
 
 		if (DELIMSZ == j)
-			return(0);
+			return 0;
 
 		dbuf[j] = '\0';
 		d = mdoc_isdelim(dbuf);
 		if (DELIM_NONE == d || DELIM_OPEN == d)
-			return(0);
+			return 0;
 
 		while (' ' == buf[i])
 			i++;
 	}
 
-	return('\0' == buf[i]);
+	return '\0' == buf[i];
 }
 
 static void
-argv_multi(struct mdoc *mdoc, int line,
+argv_multi(struct roff_man *mdoc, int line,
 		struct mdoc_argv *v, int *pos, char *buf)
 {
 	enum margserr	 ac;
@@ -676,7 +676,7 @@ argv_multi(struct mdoc *mdoc, int line,
 }
 
 static void
-argv_single(struct mdoc *mdoc, int line,
+argv_single(struct roff_man *mdoc, int line,
 		struct mdoc_argv *v, int *pos, char *buf)
 {
 	enum margserr	 ac;