Adding revamped webpage.

[mandoc.git] / argv.c

diff --git a/argv.c b/argv.c
index 5564d8678b8fe9a3ae7f0690f180e987407f2df5..aed85c42c3d6a8c328bc3c4ea5cfd1df91c64fa3 100644 (file)
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.26 2009/01/22 14:56:21 kristaps Exp $ */
+/* $Id: argv.c,v 1.28 2009/02/23 15:19:47 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -26,10 +26,9 @@
 #include "private.h"
 
 /*
- * Parse arguments and parameters of macros.  Arguments follow the
- * syntax of `-arg [val [valN...]]', while parameters are free-form text
- * following arguments (if any).  This file must correctly handle the
- * strange punctuation rules dictated by groff.
+ * Routines to parse arguments of macros.  Arguments follow the syntax
+ * of `-arg [val [valN...]]'.  Arguments come in all types:  quoted
+ * arguments, multiple arguments per value, no-value arguments, etc.
  */
 
 #define        ARGS_QUOTED     (1 << 0)
@@ -45,8 +44,6 @@ static        int              argv_single(struct mdoc *, int,
                                struct mdoc_arg *, int *, char *);
 static int              argv_multi(struct mdoc *, int, 
                                struct mdoc_arg *, int *, char *);
-static int              postargv(struct mdoc *, int, 
-                               const struct mdoc_arg *, int);
 static int              pwarn(struct mdoc *, int, int, int);
 static int              perr(struct mdoc *, int, int, int);
 
@@ -60,9 +57,8 @@ static        int              perr(struct mdoc *, int, int, int);
 /* Error messages. */
 
 #define        EQUOTTERM       (0)
-#define        EOFFSET         (1)
-#define        EARGVAL         (2)
-#define        EARGMANY        (3)
+#define        EARGVAL         (1)
+#define        EARGMANY        (2)
 
 static int mdoc_argflags[MDOC_MAX] = {
        0, /* \" */
@@ -184,10 +180,6 @@ perr(struct mdoc *mdoc, int line, int pos, int code)
                c = mdoc_perr(mdoc, line, pos, 
                                "unterminated quoted parameter");
                break;
-       case (EOFFSET):
-               c = mdoc_perr(mdoc, line, pos, 
-                               "invalid value for offset argument");
-               break;
        case (EARGVAL):
                c = mdoc_perr(mdoc, line, pos, 
                                "argument requires a value");
@@ -637,33 +629,6 @@ lookup(int tok, const char *argv)
 }
 
 
-static int
-postargv(struct mdoc *mdoc, int line, const struct mdoc_arg *v, int pos)
-{
-
-       switch (v->arg) {
-       case (MDOC_Offset):
-               assert(v->value);
-               assert(v->value[0]);
-               if (xstrcmp(v->value[0], "left"))
-                       break;
-               if (xstrcmp(v->value[0], "right"))
-                       break;
-               if (xstrcmp(v->value[0], "center"))
-                       break;
-               if (xstrcmp(v->value[0], "indent"))
-                       break;
-               if (xstrcmp(v->value[0], "indent-two"))
-                       break;
-               return(perr(mdoc, line, pos, EOFFSET));
-       default:
-               break;
-       }
-
-       return(1);
-}
-
-
 static int
 argv_multi(struct mdoc *mdoc, int line, 
                struct mdoc_arg *v, int *pos, char *buf)
@@ -796,8 +761,6 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
        ppos = *pos;
        if ( ! argv(mdoc, line, v, pos, buf))
                return(ARGV_ERROR);
-       if ( ! postargv(mdoc, line, v, ppos))
-               return(ARGV_ERROR);
 
        return(ARGV_ARG);
 }