Fixed STRUCTURE repeat (schwarze@openbsd.org).

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 91490bf0c17d921a3f55bfecad15fe8d3670d85b..e63657e1293106df22731e64885df1a38edc1f5b 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,20 +1,18 @@
-/* $Id: man_macro.c,v 1.12 2009/04/02 06:51:44 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.17 2009/06/18 10:53:58 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * 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.
+ * 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 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR 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 OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
 #include <ctype.h>
@@ -30,7 +28,7 @@ static        int              man_args(struct man *, int,
                                int *, char *, char **);
 
 static int man_flags[MAN_MAX] = {
-       0, /* __ */
+       0, /* br */
        0, /* TH */
        0, /* SH */
        0, /* SS */
@@ -51,8 +49,8 @@ static        int man_flags[MAN_MAX] = {
        FL_NLINE, /* I */
        FL_NLINE, /* IR */
        FL_NLINE, /* RI */
-       0, /* br */
        0, /* na */
+       FL_NLINE, /* i */
 };
 
 int
@@ -84,16 +82,14 @@ man_macro(struct man *man, int tok, int line,
 
        if (n == man->last && (FL_NLINE & man_flags[tok])) {
                if (MAN_NLINE & man->flags) 
-                       return(man_verr(man, line, ppos, 
-                               "next-line scope already open"));
+                       return(man_perr(man, line, ppos, WLNSCOPE));
                man->flags |= MAN_NLINE;
                return(1);
        }
 
        if (FL_TLINE & man_flags[tok]) {
                if (MAN_NLINE & man->flags) 
-                       return(man_verr(man, line, ppos, 
-                               "next-line scope already open"));
+                       return(man_perr(man, line, ppos, WLNSCOPE));
                man->flags |= MAN_NLINE;
                return(1);
        }
@@ -188,7 +184,7 @@ man_args(struct man *m, int line,
                if (buf[*pos])
                        return(1);
 
-               if ( ! man_vwarn(m, line, *pos, "trailing spaces"))
+               if ( ! man_pwarn(m, line, *pos, WTSPACE))
                        return(-1);
 
                return(1);
@@ -206,7 +202,7 @@ man_args(struct man *m, int line,
                (*pos)++;
 
        if (0 == buf[*pos]) {
-               if ( ! man_vwarn(m, line, *pos, "unterminated quote"))
+               if ( ! man_pwarn(m, line, *pos, WTQUOTE))
                        return(-1);
                return(1);
        }
@@ -221,7 +217,7 @@ man_args(struct man *m, int line,
        if (buf[*pos])
                return(1);
 
-       if ( ! man_vwarn(m, line, *pos, "trailing spaces"))
+       if ( ! man_pwarn(m, line, *pos, WTSPACE))
                return(-1);
        return(1);
 }