Split mlinks_undupe() out of mpages_merge()

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index ab7514e778d9e8001fad35cdbe557dbcec76948c..e33216c40970f719a4f18da04d9bbf9e5f091be2 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.181 2013/10/05 22:15:03 schwarze Exp $ */
+/*     $Id: roff.c,v 1.188 2013/12/25 00:50:05 schwarze Exp $ */

 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>


@@ -46,6 +46,8 @@ enum  rofft {
        ROFF_de1,
        ROFF_ds,
        ROFF_el,
        ROFF_de1,
        ROFF_ds,
        ROFF_el,

+       ROFF_fam,
+       ROFF_hw,

        ROFF_hy,
        ROFF_ie,
        ROFF_if,
        ROFF_hy,
        ROFF_ie,
        ROFF_if,


@@ -74,8 +76,8 @@ enum  rofft {
 };
 
 enum   roffrule {
 };
 
 enum   roffrule {

-       ROFFRULE_ALLOW,
-       ROFFRULE_DENY
+       ROFFRULE_DENY,
+       ROFFRULE_ALLOW

 };
 
 /*
 };
 
 /*


@@ -185,6 +187,8 @@ static      void             roff_free1(struct roff *);
 static void             roff_freereg(struct roffreg *);
 static void             roff_freestr(struct roffkv *);
 static char            *roff_getname(struct roff *, char **, int, int);
 static void             roff_freereg(struct roffreg *);
 static void             roff_freestr(struct roffkv *);
 static char            *roff_getname(struct roff *, char **, int, int);

+static int              roff_getnum(const char *, int *, int *);
+static int              roff_getop(const char *, int *, char *);

 static int              roff_getregn(const struct roff *,
                                const char *, size_t);
 static const char      *roff_getstrn(const struct roff *, 
 static int              roff_getregn(const struct roff *,
                                const char *, size_t);
 static const char      *roff_getstrn(const struct roff *, 


@@ -233,6 +237,8 @@ static      struct roffmac   roffs[ROFF_MAX] = {
        { "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "ds", roff_ds, NULL, NULL, 0, NULL },
        { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "ds", roff_ds, NULL, NULL, 0, NULL },
        { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },

+       { "fam", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hw", roff_line_ignore, NULL, NULL, 0, NULL },

        { "hy", roff_line_ignore, NULL, NULL, 0, NULL },
        { "ie", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "if", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "hy", roff_line_ignore, NULL, NULL, 0, NULL },
        { "ie", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "if", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },


@@ -712,19 +718,14 @@ roff_parseln(struct roff *r, int ln, char **bufp,
                assert(ROFF_IGN == e || ROFF_CONT == e);
                if (ROFF_CONT != e)
                        return(e);
                assert(ROFF_IGN == e || ROFF_CONT == e);
                if (ROFF_CONT != e)
                        return(e);

-               if (r->eqn)
-                       return(eqn_read(&r->eqn, ln, *bufp, pos, offs));
-               if (r->tbl)
-                       return(tbl_read(r->tbl, ln, *bufp, pos));
-               return(roff_parsetext(bufp, szp, pos, offs));
-       } else if ( ! ctl) {
-               if (r->eqn)
-                       return(eqn_read(&r->eqn, ln, *bufp, pos, offs));
+       }
+       if (r->eqn)
+               return(eqn_read(&r->eqn, ln, *bufp, ppos, offs));
+       if ( ! ctl) {

                if (r->tbl)
                        return(tbl_read(r->tbl, ln, *bufp, pos));
                return(roff_parsetext(bufp, szp, pos, offs));
                if (r->tbl)
                        return(tbl_read(r->tbl, ln, *bufp, pos));
                return(roff_parsetext(bufp, szp, pos, offs));

-       } else if (r->eqn)
-               return(eqn_read(&r->eqn, ln, *bufp, ppos, offs));
+       }

 
        /*
         * If a scope is open, go to the child handler for that macro,
 
        /*
         * If a scope is open, go to the child handler for that macro,


@@ -1130,9 +1131,61 @@ roff_cond_text(ROFF_ARGS)
        return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
 }
 
        return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
 }
 

+static int
+roff_getnum(const char *v, int *pos, int *res)
+{
+       int p, n;
+
+       p = *pos;
+       n = v[p] == '-';
+       if (n)
+               p++;
+
+       for (*res = 0; isdigit((unsigned char)v[p]); p++)
+               *res += 10 * *res + v[p] - '0';
+       if (p == *pos + n)
+               return 0;
+
+       if (n)
+               *res = -*res;
+
+       *pos = p;
+       return 1;
+}
+
+static int
+roff_getop(const char *v, int *pos, char *res)
+{
+       int e;
+
+       *res = v[*pos];
+       e = v[*pos + 1] == '=';
+
+       switch (*res) {
+       case '=':
+               break;
+       case '>':
+               if (e)
+                       *res = 'g';
+               break;
+       case '<':
+               if (e)
+                       *res = 'l';
+               break;
+       default:
+               return(0);
+       }
+
+       *pos += 1 + e;
+
+       return(*res);
+}
+

 static enum roffrule
 roff_evalcond(const char *v, int *pos)
 {
 static enum roffrule
 roff_evalcond(const char *v, int *pos)
 {

+       int      not, lh, rh;
+       char     op;

 
        switch (v[*pos]) {
        case ('n'):
 
        switch (v[*pos]) {
        case ('n'):


@@ -1145,13 +1198,47 @@ roff_evalcond(const char *v, int *pos)
        case ('t'):
                (*pos)++;
                return(ROFFRULE_DENY);
        case ('t'):
                (*pos)++;
                return(ROFFRULE_DENY);

+       case ('!'):
+               (*pos)++;
+               not = 1;
+               break;

        default:
        default:

+               not = 0;

                break;
        }
 
                break;
        }
 

-       while (v[*pos] && ' ' != v[*pos])
-               (*pos)++;
-       return(ROFFRULE_DENY);
+       if (!roff_getnum(v, pos, &lh))
+               return ROFFRULE_DENY;
+       if (!roff_getop(v, pos, &op)) {
+               if (lh < 0)
+                       lh = 0;
+               goto out;
+       }
+       if (!roff_getnum(v, pos, &rh))
+               return ROFFRULE_DENY;
+       switch (op) {
+       case 'g':
+               lh = lh >= rh;
+               break;
+       case 'l':
+               lh = lh <= rh;
+               break;
+       case '=':
+               lh = lh == rh;
+               break;
+       case '>':
+               lh = lh > rh;
+               break;
+       case '<':
+               lh = lh < rh;
+               break;
+       default:
+               return ROFFRULE_DENY;
+       }
+out:
+       if (not)
+               lh = !lh;
+       return lh ? ROFFRULE_ALLOW : ROFFRULE_DENY;

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */


@@ -1273,7 +1360,7 @@ roff_ds(ROFF_ARGS)
 }
 
 void
 }
 
 void

-roff_setreg(struct roff *r, const char *name, int val)
+roff_setreg(struct roff *r, const char *name, int val, char sign)

 {
        struct roffreg  *reg;
 
 {
        struct roffreg  *reg;
 


@@ -1288,11 +1375,17 @@ roff_setreg(struct roff *r, const char *name, int val)
                reg = mandoc_malloc(sizeof(struct roffreg));
                reg->key.p = mandoc_strdup(name);
                reg->key.sz = strlen(name);
                reg = mandoc_malloc(sizeof(struct roffreg));
                reg->key.p = mandoc_strdup(name);
                reg->key.sz = strlen(name);

+               reg->val = 0;

                reg->next = r->regtab;
                r->regtab = reg;
        }
 
                reg->next = r->regtab;
                r->regtab = reg;
        }
 

-       reg->val = val;
+       if ('+' == sign)
+               reg->val += val;
+       else if ('-' == sign)
+               reg->val -= val;
+       else
+               reg->val = val;

 }
 
 int
 }
 
 int


@@ -1339,14 +1432,21 @@ roff_nr(ROFF_ARGS)
 {
        const char      *key;
        char            *val;
 {
        const char      *key;
        char            *val;

+       size_t           sz;

        int              iv;
        int              iv;

+       char             sign;

 
        val = *bufp + pos;
        key = roff_getname(r, &val, ln, pos);
 
 
        val = *bufp + pos;
        key = roff_getname(r, &val, ln, pos);
 

-       iv = mandoc_strntoi(val, strlen(val), 10);
+       sign = *val;
+       if ('+' == sign || '-' == sign)
+               val++;
+
+       sz = strspn(val, "0123456789");
+       iv = sz ? mandoc_strntoi(val, sz, 10) : 0;

 
 

-       roff_setreg(r, key, iv);
+       roff_setreg(r, key, iv, sign);

 
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }


@@ -1633,7 +1733,7 @@ roff_userdef(ROFF_ARGS)
 
        /*
         * Collect pointers to macro argument strings
 
        /*
         * Collect pointers to macro argument strings

-        * and null-terminate them.
+        * and NUL-terminate them.

         */
        cp = *bufp + pos;
        for (i = 0; i < 9; i++)
         */
        cp = *bufp + pos;
        for (i = 0; i < 9; i++)