Implement the \N'number' (numbered character) roff escape sequence.

[mandoc.git] / tbl_opts.c

diff --git a/tbl_opts.c b/tbl_opts.c
index 7470e4e21b4b301a68be50a91d449f58783204e6..b8e0ea2e612180eeece5afcb43df9fba4f549601 100644 (file)
--- a/tbl_opts.c
+++ b/tbl_opts.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_opts.c,v 1.3 2010/12/29 01:16:57 kristaps Exp $ */
+/*     $Id: tbl_opts.c,v 1.8 2011/01/09 05:38:23 joerg Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -71,11 +71,13 @@ static      const struct tbl_phrase keys[KEY_MAXKEYS] = {
        { "nospaces",    TBL_OPT_NOSPACE,       KEY_NOSPACE},
 };
 
-static int              arg(struct tbl *, int, const char *, int *, int);
-static void             opt(struct tbl *, int, const char *, int *);
+static int              arg(struct tbl_node *, int, 
+                               const char *, int *, enum tbl_ident);
+static void             opt(struct tbl_node *, int, 
+                               const char *, int *);
 
 static int
-arg(struct tbl *tbl, int ln, const char *p, int *pos, int key)
+arg(struct tbl_node *tbl, int ln, const char *p, int *pos, enum tbl_ident key)
 {
        int              i;
        char             buf[KEY_MAXNUMSZ];
@@ -100,18 +102,18 @@ arg(struct tbl *tbl, int ln, const char *p, int *pos, int key)
 
        switch (key) {
        case (KEY_DELIM):
-               if ('\0' == (tbl->delims[0] = p[(*pos)++])) {
+               if ('\0' == p[(*pos)++]) {
                        TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
                        return(0);
                } 
 
-               if ('\0' == (tbl->delims[1] = p[(*pos)++])) {
+               if ('\0' == p[(*pos)++]) {
                        TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
                        return(0);
                } 
                break;
        case (KEY_TAB):
-               if ('\0' != (tbl->tab = p[(*pos)++]))
+               if ('\0' != (tbl->opts.tab = p[(*pos)++]))
                        break;
 
                TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
@@ -125,14 +127,14 @@ arg(struct tbl *tbl, int ln, const char *p, int *pos, int key)
 
                if (i < KEY_MAXNUMSZ) {
                        buf[i] = '\0';
-                       tbl->linesize = atoi(buf);
+                       tbl->opts.linesize = atoi(buf);
                        break;
                }
 
                (*tbl->msg)(MANDOCERR_TBL, tbl->data, ln, *pos, NULL);
                return(0);
        case (KEY_DPOINT):
-               if ('\0' != (tbl->decimal = p[(*pos)++]))
+               if ('\0' != (tbl->opts.decimal = p[(*pos)++]))
                        break;
 
                TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
@@ -152,7 +154,7 @@ arg(struct tbl *tbl, int ln, const char *p, int *pos, int key)
 }
 
 static void
-opt(struct tbl *tbl, int ln, const char *p, int *pos)
+opt(struct tbl_node *tbl, int ln, const char *p, int *pos)
 {
        int              i, sv;
        char             buf[KEY_MAXNAME];
@@ -186,7 +188,7 @@ again:      /*
        /* Copy up to first non-alpha character. */
 
        for (sv = *pos, i = 0; i < KEY_MAXNAME; i++, (*pos)++) {
-               buf[i] = tolower(p[*pos]);
+               buf[i] = tolower((unsigned char)p[*pos]);
                if ( ! isalpha((unsigned char)buf[i]))
                        break;
        }
@@ -220,7 +222,7 @@ again:      /*
                 */
 
                if (keys[i].key) 
-                       tbl->opts |= keys[i].key;
+                       tbl->opts.opts |= keys[i].key;
                else if ( ! arg(tbl, ln, p, pos, keys[i].ident))
                        return;
 
@@ -235,13 +237,12 @@ again:    /*
        if (KEY_MAXKEYS == i)
                TBL_MSG(tbl, MANDOCERR_TBLOPT, ln, sv);
 
-       /* Try again... */
-
        goto again;
+       /* NOTREACHED */
 }
 
 int
-tbl_option(struct tbl *tbl, int ln, const char *p)
+tbl_option(struct tbl_node *tbl, int ln, const char *p)
 {
        int              pos;