Support `size' constructs in eqn.7. Generalise mandoc_strontou to this

effect.

diff --git a/chars.c b/chars.c
index d0fd8724250f73616975f39abc4ebe401328f0d0..369aac2fe1085cc695fc74a5c0629e7fadda7433 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,4 +1,4 @@
-/*     $Id: chars.c,v 1.47 2011/07/07 06:41:50 kristaps Exp $ */
+/*     $Id: chars.c,v 1.48 2011/07/21 15:21:13 kristaps Exp $ */

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


@@ -111,7 +111,7 @@ mchars_num2char(const char *p, size_t sz)
 {
        int               i;
 
 {
        int               i;
 

-       if ((i = mandoc_strntou(p, sz, 10)) < 0)
+       if ((i = mandoc_strntoi(p, sz, 10)) < 0)

                return('\0');
        return(isprint(i) ? i : '\0');
 }
                return('\0');
        return(isprint(i) ? i : '\0');
 }


@@ -121,7 +121,7 @@ mchars_num2uc(const char *p, size_t sz)
 {
        int               i;
 
 {
        int               i;
 

-       if ((i = mandoc_strntou(p, sz, 16)) < 0)
+       if ((i = mandoc_strntoi(p, sz, 16)) < 0)

                return('\0');
        /* FIXME: make sure we're not in a bogus range. */
        return(i > 0x80 && i <= 0x10FFFF ? i : '\0');
                return('\0');
        /* FIXME: make sure we're not in a bogus range. */
        return(i > 0x80 && i <= 0x10FFFF ? i : '\0');

diff --git a/eqn.7 b/eqn.7
index 7304a307c32d6541b4a399f102969f22dd422d12..0bf047006668fbc8ddcf5d8407228da6a0136166 100644 (file)
--- a/eqn.7
+++ b/eqn.7
@@ -1,4 +1,4 @@
-.\"    $Id: eqn.7,v 1.11 2011/07/21 14:13:00 kristaps Exp $
+.\"    $Id: eqn.7,v 1.12 2011/07/21 15:21:13 kristaps Exp $

 .\"
 .\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
 .\"
 .\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"


@@ -70,6 +70,7 @@ box     : text
         | box pos box
         | box mark
         | font box
         | box pos box
         | box mark
         | font box

+        | SIZE text box

 text    : TEXT
 pos     : OVER
         | SUP
 text    : TEXT
 pos     : OVER
         | SUP

diff --git a/eqn.c b/eqn.c
index 23dd934e766f09725247fb95375e4b7389e6a8b5..706a31cfc957bc5cc97cc74df89c5df34c2070a1 100644 (file)
--- a/eqn.c
+++ b/eqn.c
@@ -1,4 +1,4 @@
-/*     $Id: eqn.c,v 1.18 2011/07/21 14:13:00 kristaps Exp $ */
+/*     $Id: eqn.c,v 1.19 2011/07/21 15:21:13 kristaps Exp $ */

 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -19,6 +19,7 @@
 #endif
 
 #include <assert.h>
 #endif
 
 #include <assert.h>

+#include <limits.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -188,7 +189,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last, struct eqn_box **sv)
 {
        size_t           sz;
        const char      *start;
 {
        size_t           sz;
        const char      *start;

-       int              c, i, nextc;
+       int              c, i, nextc, size;

        enum eqn_fontt   font;
        struct eqn_box  *bp;
 
        enum eqn_fontt   font;
        struct eqn_box  *bp;
 


@@ -201,6 +202,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last, struct eqn_box **sv)
        *sv = last;
        nextc = 1;
        font = EQNFONT_NONE;  
        *sv = last;
        nextc = 1;
        font = EQNFONT_NONE;  

+       size = EQN_DEFSIZE;

 again:
        if (NULL == (start = eqn_nexttok(ep, &sz)))
                return(0);
 again:
        if (NULL == (start = eqn_nexttok(ep, &sz)))
                return(0);


@@ -242,14 +244,22 @@ again:
                goto again;
        }
 
                goto again;
        }
 

-       /* Exit this [hopefully] subexpression. */
+       if (sz == 4 && 0 == strncmp("size", start, 1)) {
+               if (NULL == (start = eqn_nexttok(ep, &sz)))
+                       return(0);
+               size = mandoc_strntoi(start, sz, 10);
+               goto again;
+       }

 
        if (sz == 1 && 0 == strncmp("}", start, 1)) 
                return(1);
 
        bp = mandoc_calloc(1, sizeof(struct eqn_box));
        bp->font = font;
 
        if (sz == 1 && 0 == strncmp("}", start, 1)) 
                return(1);
 
        bp = mandoc_calloc(1, sizeof(struct eqn_box));
        bp->font = font;

+       bp->size = size;
+

        font = EQNFONT_NONE;
        font = EQNFONT_NONE;

+       size = EQN_DEFSIZE;

 
        if (nextc)
                last->child = bp;
 
        if (nextc)
                last->child = bp;

diff --git a/libmandoc.h b/libmandoc.h
index 737f70fea9f7c8986afe95932b2a36441337d5b3..ad3ed254cc9a59259640428ddb33519a6deb04cc 100644 (file)
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmandoc.h,v 1.23 2011/07/18 07:46:41 kristaps Exp $ */
+/*     $Id: libmandoc.h,v 1.24 2011/07/21 15:21:13 kristaps Exp $ */

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


@@ -49,7 +49,7 @@ char          *mandoc_normdate(struct mparse *, char *, int, int);
 int             mandoc_eos(const char *, size_t, int);
 int             mandoc_hyph(const char *, const char *);
 int             mandoc_getcontrol(const char *, int *);
 int             mandoc_eos(const char *, size_t, int);
 int             mandoc_hyph(const char *, const char *);
 int             mandoc_getcontrol(const char *, int *);

-int             mandoc_strntou(const char *, size_t, int);
+int             mandoc_strntoi(const char *, size_t, int);

 
 void            mdoc_free(struct mdoc *);
 struct mdoc    *mdoc_alloc(struct roff *, struct mparse *);
 
 void            mdoc_free(struct mdoc *);
 struct mdoc    *mdoc_alloc(struct roff *, struct mparse *);

diff --git a/mandoc.c b/mandoc.c
index 465965a469c2b946a353e57c7afc9c85015696b2..891b95118bb6f55a3150864e9e6ead9f1bcd70cb 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.53 2011/05/24 21:31:23 kristaps Exp $ */
+/*     $Id: mandoc.c,v 1.54 2011/07/21 15:21:13 kristaps Exp $ */

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


@@ -698,7 +698,7 @@ mandoc_getcontrol(const char *cp, int *ppos)
  * If the string is invalid, or is less than 0, return -1.
  */
 int
  * If the string is invalid, or is less than 0, return -1.
  */
 int

-mandoc_strntou(const char *p, size_t sz, int base)
+mandoc_strntoi(const char *p, size_t sz, int base)

 {
        char             buf[32];
        char            *ep;
 {
        char             buf[32];
        char            *ep;


@@ -716,11 +716,10 @@ mandoc_strntou(const char *p, size_t sz, int base)
        if (buf[0] == '\0' || *ep != '\0')
                return(-1);
 
        if (buf[0] == '\0' || *ep != '\0')
                return(-1);
 

-       if ((errno == ERANGE && 
-                       (v == LONG_MAX || v == LONG_MIN)) ||
-                       (v > INT_MAX || v < 0))
-               return(-1);
+       if (v > INT_MAX)
+               v = INT_MAX;
+       if (v < INT_MIN)
+               v = INT_MIN;

 
        return((int)v);
 }
 
        return((int)v);
 }

-

diff --git a/mandoc.h b/mandoc.h
index cd29e688f5b2db223b95c7f26a796c9cdacd8cb8..556a88a81725e2e82dac3538bbe67250571d0322 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.87 2011/07/21 14:13:00 kristaps Exp $ */
+/*     $Id: mandoc.h,v 1.88 2011/07/21 15:21:13 kristaps Exp $ */

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


@@ -322,6 +322,8 @@ enum        eqn_post {
  * grammar.
  */
 struct eqn_box {
  * grammar.
  */
 struct eqn_box {

+       int               size; /* font size of expression */
+#define        EQN_DEFSIZE       INT_MIN

        enum eqn_boxt     type; /* type of node */
        struct eqn_box   *child; /* child node */
        struct eqn_box   *next; /* next in tree */
        enum eqn_boxt     type; /* type of node */
        struct eqn_box   *child; /* child node */
        struct eqn_box   *next; /* next in tree */

diff --git a/roff.c b/roff.c
index bc7e74cc82c7b780eec392313279161daa133145..66fab654b6b25df1b2e9671eb9d5d266945b57ba 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.148 2011/07/21 10:24:35 kristaps Exp $ */
+/*     $Id: roff.c,v 1.149 2011/07/21 15:21:13 kristaps Exp $ */

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


@@ -1149,7 +1149,7 @@ roff_nr(ROFF_ARGS)
 
        if (0 == strcmp(key, "nS")) {
                r->regs[(int)REG_nS].set = 1;
 
        if (0 == strcmp(key, "nS")) {
                r->regs[(int)REG_nS].set = 1;

-               if ((iv = mandoc_strntou(val, strlen(val), 10)) >= 0)
+               if ((iv = mandoc_strntoi(val, strlen(val), 10)) >= 0)

                        r->regs[(int)REG_nS].u = (unsigned)iv;
                else
                        r->regs[(int)REG_nS].u = 0u;
                        r->regs[(int)REG_nS].u = (unsigned)iv;
                else
                        r->regs[(int)REG_nS].u = 0u;

diff --git a/tree.c b/tree.c
index 1c03c716347aa62034cd66a1b6b10dc8b0596f3a..3d7f9085143153ba2a4c0c918d607dc529171e96 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,4 +1,4 @@
-/*     $Id: tree.c,v 1.42 2011/07/21 14:13:00 kristaps Exp $ */
+/*     $Id: tree.c,v 1.43 2011/07/21 15:21:13 kristaps Exp $ */

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


@@ -19,6 +19,7 @@
 #endif
 
 #include <assert.h>
 #endif
 
 #include <assert.h>

+#include <limits.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>


@@ -270,17 +271,20 @@ print_box(const struct eqn_box *ep, int indent)
 
        switch (ep->type) {
        case (EQN_ROOT):
 
        switch (ep->type) {
        case (EQN_ROOT):

-               printf("eqn-root(%d, %d, %d)\n", 
+               printf("eqn-root(%d, %d, %d, %d)\n", 
+                       EQN_DEFSIZE == ep->size ? 0 : ep->size,

                        ep->pos, ep->font, ep->mark);
                print_box(ep->child, indent + 1);
                break;
        case (EQN_SUBEXPR):
                        ep->pos, ep->font, ep->mark);
                print_box(ep->child, indent + 1);
                break;
        case (EQN_SUBEXPR):

-               printf("eqn-subxpr(%d, %d, %d)\n", 
+               printf("eqn-subxpr(%d, %d, %d, %d)\n", 
+                       EQN_DEFSIZE == ep->size ? 0 : ep->size,

                        ep->pos, ep->font, ep->mark);
                print_box(ep->child, indent + 1);
                break;
        case (EQN_TEXT):
                        ep->pos, ep->font, ep->mark);
                print_box(ep->child, indent + 1);
                break;
        case (EQN_TEXT):

-               printf("eqn-text(%d, %d, %d): [%s]\n", 
+               printf("eqn-text(%d, %d, %d, %d): [%s]\n", 
+                       EQN_DEFSIZE == ep->size ? 0 : ep->size,

                        ep->pos, ep->font, ep->mark, ep->text);
                break;
        default:
                        ep->pos, ep->font, ep->mark, ep->text);
                break;
        default: