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 8500b74d8ec481a6bb9a6a3578b80c6bcb36ca44..b8e0ea2e612180eeece5afcb43df9fba4f549601 100644 (file)
--- a/tbl_opts.c
+++ b/tbl_opts.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_opts.c,v 1.5 2011/01/02 10:10: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>
  *
@@ -72,12 +72,12 @@ static      const struct tbl_phrase keys[KEY_MAXKEYS] = {
 };
 
 static int              arg(struct tbl_node *, int, 
-                               const char *, int *, int);
+                               const char *, int *, enum tbl_ident);
 static void             opt(struct tbl_node *, int, 
                                const char *, int *);
 
 static int
-arg(struct tbl_node *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];
@@ -102,12 +102,12 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *pos, int key)
 
        switch (key) {
        case (KEY_DELIM):
-               if ('\0' == (tbl->opts.delims[0] = p[(*pos)++])) {
+               if ('\0' == p[(*pos)++]) {
                        TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
                        return(0);
                } 
 
-               if ('\0' == (tbl->opts.delims[1] = p[(*pos)++])) {
+               if ('\0' == p[(*pos)++]) {
                        TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
                        return(0);
                } 
@@ -188,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;
        }