Add support for markers. These decorate the last box: see eqn.7.

[mandoc.git] / tbl_opts.c

diff --git a/tbl_opts.c b/tbl_opts.c
index 91fd0ce5b9b237ac6e265877c8ef8bf148eb7ba8..7b67c13b479aca63038bb911cf4df1b5da71e213 100644 (file)
--- a/tbl_opts.c
+++ b/tbl_opts.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_opts.c,v 1.4 2010/12/29 14:38:14 kristaps Exp $ */
+/*     $Id: tbl_opts.c,v 1.11 2011/04/04 23:04:38 kristaps Exp $ */

 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -14,12 +14,17 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"

+#include "libmandoc.h"

 #include "libroff.h"
 
 enum   tbl_ident {
 #include "libroff.h"
 
 enum   tbl_ident {


@@ -71,11 +76,13 @@ static      const struct tbl_phrase keys[KEY_MAXKEYS] = {
        { "nospaces",    TBL_OPT_NOSPACE,       KEY_NOSPACE},
 };
 
        { "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
 
 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];
 {
        int              i;
        char             buf[KEY_MAXNUMSZ];


@@ -86,7 +93,8 @@ arg(struct tbl *tbl, int ln, const char *p, int *pos, int key)
        /* Arguments always begin with a parenthesis. */
 
        if ('(' != p[*pos]) {
        /* Arguments always begin with a parenthesis. */
 
        if ('(' != p[*pos]) {

-               TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, 
+                               ln, *pos, NULL);

                return(0);
        }
 
                return(0);
        }
 


@@ -100,21 +108,24 @@ arg(struct tbl *tbl, int ln, const char *p, int *pos, int key)
 
        switch (key) {
        case (KEY_DELIM):
 
        switch (key) {
        case (KEY_DELIM):

-               if ('\0' == (tbl->delims[0] = p[(*pos)++])) {
-                       TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
+               if ('\0' == p[(*pos)++]) {
+                       mandoc_msg(MANDOCERR_TBL, tbl->parse,
+                                       ln, *pos - 1, NULL);

                        return(0);
                } 
 
                        return(0);
                } 
 

-               if ('\0' == (tbl->delims[1] = p[(*pos)++])) {
-                       TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
+               if ('\0' == p[(*pos)++]) {
+                       mandoc_msg(MANDOCERR_TBL, tbl->parse,
+                                       ln, *pos - 1, NULL);

                        return(0);
                } 
                break;
        case (KEY_TAB):
                        return(0);
                } 
                break;
        case (KEY_TAB):

-               if ('\0' != (tbl->tab = p[(*pos)++]))
+               if ('\0' != (tbl->opts.tab = p[(*pos)++]))

                        break;
 
                        break;
 

-               TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse,
+                               ln, *pos - 1, NULL);

                return(0);
        case (KEY_LINESIZE):
                for (i = 0; i < KEY_MAXNUMSZ && p[*pos]; i++, (*pos)++) {
                return(0);
        case (KEY_LINESIZE):
                for (i = 0; i < KEY_MAXNUMSZ && p[*pos]; i++, (*pos)++) {


@@ -125,17 +136,18 @@ arg(struct tbl *tbl, int ln, const char *p, int *pos, int key)
 
                if (i < KEY_MAXNUMSZ) {
                        buf[i] = '\0';
 
                if (i < KEY_MAXNUMSZ) {
                        buf[i] = '\0';

-                       tbl->linesize = atoi(buf);
+                       tbl->opts.linesize = atoi(buf);

                        break;
                }
 
                        break;
                }
 

-               (*tbl->msg)(MANDOCERR_TBL, tbl->data, ln, *pos, NULL);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, *pos, NULL);

                return(0);
        case (KEY_DPOINT):
                return(0);
        case (KEY_DPOINT):

-               if ('\0' != (tbl->decimal = p[(*pos)++]))
+               if ('\0' != (tbl->opts.decimal = p[(*pos)++]))

                        break;
 
                        break;
 

-               TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, 
+                               ln, *pos - 1, NULL);

                return(0);
        default:
                abort();
                return(0);
        default:
                abort();


@@ -147,12 +159,12 @@ arg(struct tbl *tbl, int ln, const char *p, int *pos, int key)
        if (')' == p[(*pos)++])
                return(1);
 
        if (')' == p[(*pos)++])
                return(1);
 

-       TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos - 1);
+       mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, *pos - 1, NULL);

        return(0);
 }
 
 static void
        return(0);
 }
 
 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];
 {
        int              i, sv;
        char             buf[KEY_MAXNAME];


@@ -186,7 +198,7 @@ again:      /*
        /* Copy up to first non-alpha character. */
 
        for (sv = *pos, i = 0; i < KEY_MAXNAME; i++, (*pos)++) {
        /* Copy up to first non-alpha character. */
 
        for (sv = *pos, i = 0; i < KEY_MAXNAME; i++, (*pos)++) {

-               buf[i] = tolower(p[*pos]);
+               buf[i] = (char)tolower((unsigned char)p[*pos]);

                if ( ! isalpha((unsigned char)buf[i]))
                        break;
        }
                if ( ! isalpha((unsigned char)buf[i]))
                        break;
        }


@@ -194,7 +206,7 @@ again:      /*
        /* Exit if buffer is empty (or overrun). */
 
        if (KEY_MAXNAME == i || 0 == i) {
        /* Exit if buffer is empty (or overrun). */
 
        if (KEY_MAXNAME == i || 0 == i) {

-               TBL_MSG(tbl, MANDOCERR_TBL, ln, *pos);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, *pos, NULL);

                return;
        }
 
                return;
        }
 


@@ -220,7 +232,7 @@ again:      /*
                 */
 
                if (keys[i].key) 
                 */
 
                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;
 
                else if ( ! arg(tbl, ln, p, pos, keys[i].ident))
                        return;
 


@@ -233,14 +245,14 @@ again:    /*
         */
 
        if (KEY_MAXKEYS == i)
         */
 
        if (KEY_MAXKEYS == i)

-               TBL_MSG(tbl, MANDOCERR_TBLOPT, ln, sv);
+               mandoc_msg(MANDOCERR_TBLOPT, tbl->parse, ln, sv, NULL);

 
        goto again;
        /* NOTREACHED */
 }
 
 int
 
        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;
 
 {
        int              pos;