In URIs in apropos(1) result tables,

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 6b50b5186047f8c15396ba27262f6b5c4bcdd0c7..268d6470ade19460f23314ccd25ff6a3156c0cbb 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,7 +1,7 @@
-/*     $Id: roff.c,v 1.268 2015/04/19 14:57:38 schwarze Exp $ */
+/*     $Id: roff.c,v 1.293 2017/03/09 15:29:35 schwarze Exp $ */

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

- * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -33,9 +33,6 @@
 #include "roff_int.h"
 #include "libroff.h"
 
 #include "roff_int.h"
 #include "libroff.h"
 

-/* Maximum number of nested if-else conditionals. */
-#define        RSTACK_MAX      128
-

 /* Maximum number of string expansions per line, to break infinite loops. */
 #define        EXPAND_LIMIT    1000
 
 /* Maximum number of string expansions per line, to break infinite loops. */
 #define        EXPAND_LIMIT    1000
 


@@ -316,7 +313,6 @@ struct      roffreg {
 
 struct roff {
        struct mparse   *parse; /* parse point */
 
 struct roff {
        struct mparse   *parse; /* parse point */

-       const struct mchars *mchars; /* character table */

        struct roffnode *last; /* leaf of stack */
        int             *rstack; /* stack of inverted `ie' values */
        struct roffreg  *regtab; /* number registers */
        struct roffnode *last; /* leaf of stack */
        int             *rstack; /* stack of inverted `ie' values */
        struct roffreg  *regtab; /* number registers */


@@ -335,6 +331,7 @@ struct      roff {
        int              rstacksz; /* current size limit of rstack */
        int              rstackpos; /* position in rstack */
        int              format; /* current file in mdoc or man format */
        int              rstacksz; /* current size limit of rstack */
        int              rstackpos; /* position in rstack */
        int              format; /* current file in mdoc or man format */

+       int              argc; /* number of args of the last macro */

        char             control; /* control character */
 };
 
        char             control; /* control character */
 };
 


@@ -397,8 +394,7 @@ static      enum rofferr     roff_cond_text(ROFF_ARGS);
 static enum rofferr     roff_cond_sub(ROFF_ARGS);
 static enum rofferr     roff_ds(ROFF_ARGS);
 static enum rofferr     roff_eqndelim(struct roff *, struct buf *, int);
 static enum rofferr     roff_cond_sub(ROFF_ARGS);
 static enum rofferr     roff_ds(ROFF_ARGS);
 static enum rofferr     roff_eqndelim(struct roff *, struct buf *, int);

-static int              roff_evalcond(struct roff *r, int,
-                               const char *, int *);
+static int              roff_evalcond(struct roff *r, int, char *, int *);

 static int              roff_evalnum(struct roff *, int,
                                const char *, int *, int *, int);
 static int              roff_evalpar(struct roff *, int,
 static int              roff_evalnum(struct roff *, int,
                                const char *, int *, int *, int);
 static int              roff_evalpar(struct roff *, int,


@@ -412,9 +408,12 @@ static     int              roff_getnum(const char *, int *, int *, int);
 static int              roff_getop(const char *, int *, char *);
 static int              roff_getregn(const struct roff *,
                                const char *, size_t);
 static int              roff_getop(const char *, int *, char *);
 static int              roff_getregn(const struct roff *,
                                const char *, size_t);

-static int              roff_getregro(const char *name);
+static int              roff_getregro(const struct roff *,
+                               const char *name);

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

+static int              roff_hasregn(const struct roff *,
+                               const char *, size_t);

 static enum rofferr     roff_insec(ROFF_ARGS);
 static enum rofferr     roff_it(ROFF_ARGS);
 static enum rofferr     roff_line_ignore(ROFF_ARGS);
 static enum rofferr     roff_insec(ROFF_ARGS);
 static enum rofferr     roff_it(ROFF_ARGS);
 static enum rofferr     roff_line_ignore(ROFF_ARGS);


@@ -782,17 +781,17 @@ roffhash_find(const char *p, size_t s)
         */
 
        if (p[0] < ASCII_LO || p[0] > ASCII_HI)
         */
 
        if (p[0] < ASCII_LO || p[0] > ASCII_HI)

-               return(ROFF_MAX);
+               return ROFF_MAX;

 
        buc = ROFF_HASH(p);
 
        if (NULL == (n = hash[buc]))
 
        buc = ROFF_HASH(p);
 
        if (NULL == (n = hash[buc]))

-               return(ROFF_MAX);
+               return ROFF_MAX;

        for ( ; n; n = n->next)
                if (0 == strncmp(n->name, p, s) && '\0' == n->name[(int)s])
        for ( ; n; n = n->next)
                if (0 == strncmp(n->name, p, s) && '\0' == n->name[(int)s])

-                       return((enum rofft)(n - roffs));
+                       return (enum rofft)(n - roffs);

 
 

-       return(ROFF_MAX);
+       return ROFF_MAX;

 }
 
 /* --- stack of request blocks -------------------------------------------- */
 }
 
 /* --- stack of request blocks -------------------------------------------- */


@@ -898,20 +897,19 @@ roff_free(struct roff *r)
 }
 
 struct roff *
 }
 
 struct roff *

-roff_alloc(struct mparse *parse, const struct mchars *mchars, int options)
+roff_alloc(struct mparse *parse, int options)

 {
        struct roff     *r;
 
        r = mandoc_calloc(1, sizeof(struct roff));
        r->parse = parse;
 {
        struct roff     *r;
 
        r = mandoc_calloc(1, sizeof(struct roff));
        r->parse = parse;

-       r->mchars = mchars;

        r->options = options;
        r->format = options & (MPARSE_MDOC | MPARSE_MAN);
        r->rstackpos = -1;
 
        roffhash_init();
 
        r->options = options;
        r->format = options & (MPARSE_MDOC | MPARSE_MAN);
        r->rstackpos = -1;
 
        roffhash_init();
 

-       return(r);
+       return r;

 }
 
 /* --- syntax tree state data management ---------------------------------- */
 }
 
 /* --- syntax tree state data management ---------------------------------- */


@@ -974,7 +972,7 @@ roff_man_alloc(struct roff *roff, struct mparse *parse,
        man->defos = defos;
        man->quick = quick;
        roff_man_alloc1(man);
        man->defos = defos;
        man->quick = quick;
        roff_man_alloc1(man);

-       return(man);
+       return man;

 }
 
 /* --- syntax tree handling ----------------------------------------------- */
 }
 
 /* --- syntax tree handling ----------------------------------------------- */


@@ -993,14 +991,14 @@ roff_node_alloc(struct roff_man *man, int line, int pos,
        n->sec = man->lastsec;
 
        if (man->flags & MDOC_SYNOPSIS)
        n->sec = man->lastsec;
 
        if (man->flags & MDOC_SYNOPSIS)

-               n->flags |= MDOC_SYNPRETTY;
+               n->flags |= NODE_SYNPRETTY;

        else
        else

-               n->flags &= ~MDOC_SYNPRETTY;
+               n->flags &= ~NODE_SYNPRETTY;

        if (man->flags & MDOC_NEWLINE)
        if (man->flags & MDOC_NEWLINE)

-               n->flags |= MDOC_LINE;
+               n->flags |= NODE_LINE;

        man->flags &= ~MDOC_NEWLINE;
 
        man->flags &= ~MDOC_NEWLINE;
 

-       return(n);
+       return n;

 }
 
 void
 }
 
 void


@@ -1009,61 +1007,52 @@ roff_node_append(struct roff_man *man, struct roff_node *n)
 
        switch (man->next) {
        case ROFF_NEXT_SIBLING:
 
        switch (man->next) {
        case ROFF_NEXT_SIBLING:

+               if (man->last->next != NULL) {
+                       n->next = man->last->next;
+                       man->last->next->prev = n;
+               } else
+                       man->last->parent->last = n;

                man->last->next = n;
                n->prev = man->last;
                n->parent = man->last->parent;
                break;
        case ROFF_NEXT_CHILD:
                man->last->next = n;
                n->prev = man->last;
                n->parent = man->last->parent;
                break;
        case ROFF_NEXT_CHILD:

+               if (man->last->child != NULL) {
+                       n->next = man->last->child;
+                       man->last->child->prev = n;
+               } else
+                       man->last->last = n;

                man->last->child = n;
                n->parent = man->last;
                break;
        default:
                abort();
                man->last->child = n;
                n->parent = man->last;
                break;
        default:
                abort();

-               /* NOTREACHED */
-       }
-       n->parent->nchild++;
-
-       /*
-        * Copy over the normalised-data pointer of our parent.  Not
-        * everybody has one, but copying a null pointer is fine.
-        */
-
-       switch (n->type) {
-       case ROFFT_BODY:
-               if (n->end != ENDBODY_NOT)
-                       break;
-               /* FALLTHROUGH */
-       case ROFFT_TAIL:
-               /* FALLTHROUGH */
-       case ROFFT_HEAD:
-               n->norm = n->parent->norm;
-               break;
-       default:
-               break;

        }
        }

-
-       if (man->macroset == MACROSET_MDOC)
-               mdoc_valid_pre(man, n);
+       man->last = n;

 
        switch (n->type) {
        case ROFFT_HEAD:
 
        switch (n->type) {
        case ROFFT_HEAD:

-               assert(n->parent->type == ROFFT_BLOCK);

                n->parent->head = n;
                break;
        case ROFFT_BODY:
                n->parent->head = n;
                break;
        case ROFFT_BODY:

-               if (n->end)
-                       break;
-               assert(n->parent->type == ROFFT_BLOCK);
+               if (n->end != ENDBODY_NOT)
+                       return;

                n->parent->body = n;
                break;
        case ROFFT_TAIL:
                n->parent->body = n;
                break;
        case ROFFT_TAIL:

-               assert(n->parent->type == ROFFT_BLOCK);

                n->parent->tail = n;
                break;
        default:
                n->parent->tail = n;
                break;
        default:

-               break;
+               return;

        }
        }

-       man->last = n;
+
+       /*
+        * Copy over the normalised-data pointer of our parent.  Not
+        * everybody has one, but copying a null pointer is fine.
+        */
+
+       n->norm = n->parent->norm;
+       assert(n->parent->type == ROFFT_BLOCK);

 }
 
 void
 }
 
 void


@@ -1074,10 +1063,7 @@ roff_word_alloc(struct roff_man *man, int line, int pos, const char *word)
        n = roff_node_alloc(man, line, pos, ROFFT_TEXT, TOKEN_NONE);
        n->string = roff_strdup(man->roff, word);
        roff_node_append(man, n);
        n = roff_node_alloc(man, line, pos, ROFFT_TEXT, TOKEN_NONE);
        n->string = roff_strdup(man->roff, word);
        roff_node_append(man, n);

-       if (man->macroset == MACROSET_MDOC)
-               mdoc_valid_post(man);
-       else
-               man_valid_post(man);
+       n->flags |= NODE_VALID | NODE_ENDED;

        man->next = ROFF_NEXT_SIBLING;
 }
 
        man->next = ROFF_NEXT_SIBLING;
 }
 


@@ -1114,7 +1100,7 @@ roff_block_alloc(struct roff_man *man, int line, int pos, int tok)
        n = roff_node_alloc(man, line, pos, ROFFT_BLOCK, tok);
        roff_node_append(man, n);
        man->next = ROFF_NEXT_CHILD;
        n = roff_node_alloc(man, line, pos, ROFFT_BLOCK, tok);
        roff_node_append(man, n);
        man->next = ROFF_NEXT_CHILD;

-       return(n);
+       return n;

 }
 
 struct roff_node *
 }
 
 struct roff_node *


@@ -1125,7 +1111,7 @@ roff_head_alloc(struct roff_man *man, int line, int pos, int tok)
        n = roff_node_alloc(man, line, pos, ROFFT_HEAD, tok);
        roff_node_append(man, n);
        man->next = ROFF_NEXT_CHILD;
        n = roff_node_alloc(man, line, pos, ROFFT_HEAD, tok);
        roff_node_append(man, n);
        man->next = ROFF_NEXT_CHILD;

-       return(n);
+       return n;

 }
 
 struct roff_node *
 }
 
 struct roff_node *


@@ -1136,7 +1122,7 @@ roff_body_alloc(struct roff_man *man, int line, int pos, int tok)
        n = roff_node_alloc(man, line, pos, ROFFT_BODY, tok);
        roff_node_append(man, n);
        man->next = ROFF_NEXT_CHILD;
        n = roff_node_alloc(man, line, pos, ROFFT_BODY, tok);
        roff_node_append(man, n);
        man->next = ROFF_NEXT_CHILD;

-       return(n);
+       return n;

 }
 
 void
 }
 
 void


@@ -1147,7 +1133,7 @@ roff_addeqn(struct roff_man *man, const struct eqn *eqn)
        n = roff_node_alloc(man, eqn->ln, eqn->pos, ROFFT_EQN, TOKEN_NONE);
        n->eqn = eqn;
        if (eqn->ln > man->last->line)
        n = roff_node_alloc(man, eqn->ln, eqn->pos, ROFFT_EQN, TOKEN_NONE);
        n->eqn = eqn;
        if (eqn->ln > man->last->line)

-               n->flags |= MDOC_LINE;
+               n->flags |= NODE_LINE;

        roff_node_append(man, n);
        man->next = ROFF_NEXT_SIBLING;
 }
        roff_node_append(man, n);
        man->next = ROFF_NEXT_SIBLING;
 }


@@ -1162,10 +1148,7 @@ roff_addtbl(struct roff_man *man, const struct tbl_span *tbl)
        n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE);
        n->span = tbl;
        roff_node_append(man, n);
        n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE);
        n->span = tbl;
        roff_node_append(man, n);

-       if (man->macroset == MACROSET_MDOC)
-               mdoc_valid_post(man);
-       else
-               man_valid_post(man);
+       n->flags |= NODE_VALID | NODE_ENDED;

        man->next = ROFF_NEXT_SIBLING;
 }
 
        man->next = ROFF_NEXT_SIBLING;
 }
 


@@ -1183,7 +1166,6 @@ roff_node_unlink(struct roff_man *man, struct roff_node *n)
        /* Adjust parent. */
 
        if (n->parent != NULL) {
        /* Adjust parent. */
 
        if (n->parent != NULL) {

-               n->parent->nchild--;

                if (n->parent->child == n)
                        n->parent->child = n->next;
                if (n->parent->last == n)
                if (n->parent->child == n)
                        n->parent->child = n->next;
                if (n->parent->last == n)


@@ -1225,11 +1207,59 @@ roff_node_delete(struct roff_man *man, struct roff_node *n)
 
        while (n->child != NULL)
                roff_node_delete(man, n->child);
 
        while (n->child != NULL)
                roff_node_delete(man, n->child);

-       assert(n->nchild == 0);

        roff_node_unlink(man, n);
        roff_node_free(n);
 }
 
        roff_node_unlink(man, n);
        roff_node_free(n);
 }
 

+void
+deroff(char **dest, const struct roff_node *n)
+{
+       char    *cp;
+       size_t   sz;
+
+       if (n->type != ROFFT_TEXT) {
+               for (n = n->child; n != NULL; n = n->next)
+                       deroff(dest, n);
+               return;
+       }
+
+       /* Skip leading whitespace. */
+
+       for (cp = n->string; *cp != '\0'; cp++) {
+               if (cp[0] == '\\' && cp[1] != '\0' &&
+                   strchr(" %&0^|~", cp[1]) != NULL)
+                       cp++;
+               else if ( ! isspace((unsigned char)*cp))
+                       break;
+       }
+
+       /* Skip trailing backslash. */
+
+       sz = strlen(cp);
+       if (sz > 0 && cp[sz - 1] == '\\')
+               sz--;
+
+       /* Skip trailing whitespace. */
+
+       for (; sz; sz--)
+               if ( ! isspace((unsigned char)cp[sz-1]))
+                       break;
+
+       /* Skip empty strings. */
+
+       if (sz == 0)
+               return;
+
+       if (*dest == NULL) {
+               *dest = mandoc_strndup(cp, sz);
+               return;
+       }
+
+       mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp);
+       free(*dest);
+       *dest = cp;
+}
+

 /* --- main functions of the roff parser ---------------------------------- */
 
 /*
 /* --- main functions of the roff parser ---------------------------------- */
 
 /*


@@ -1286,7 +1316,6 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                        res = NULL;
                        break;
                case 'B':
                        res = NULL;
                        break;
                case 'B':

-                       /* FALLTHROUGH */

                case 'w':
                        term = cp[1];
                        /* FALLTHROUGH */
                case 'w':
                        term = cp[1];
                        /* FALLTHROUGH */


@@ -1297,7 +1326,7 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                        esc = mandoc_escape(&cp, &stnam, &inaml);
                        if (esc == ESCAPE_ERROR ||
                            (esc == ESCAPE_SPECIAL &&
                        esc = mandoc_escape(&cp, &stnam, &inaml);
                        if (esc == ESCAPE_ERROR ||
                            (esc == ESCAPE_SPECIAL &&

-                            mchars_spec2cp(r->mchars, stnam, inaml) < 0))
+                            mchars_spec2cp(stnam, inaml) < 0))

                                mandoc_vmsg(MANDOCERR_ESC_BAD,
                                    r->parse, ln, (int)(stesc - buf->buf),
                                    "%.*s", (int)(cp - stesc), stesc);
                                mandoc_vmsg(MANDOCERR_ESC_BAD,
                                    r->parse, ln, (int)(stesc - buf->buf),
                                    "%.*s", (int)(cp - stesc), stesc);


@@ -1307,7 +1336,7 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                if (EXPAND_LIMIT < ++expand_count) {
                        mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
                            ln, (int)(stesc - buf->buf), NULL);
                if (EXPAND_LIMIT < ++expand_count) {
                        mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
                            ln, (int)(stesc - buf->buf), NULL);

-                       return(ROFF_IGN);
+                       return ROFF_IGN;

                }
 
                /*
                }
 
                /*


@@ -1361,11 +1390,8 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                        }
                        switch (mandoc_escape(&cp, NULL, NULL)) {
                        case ESCAPE_SPECIAL:
                        }
                        switch (mandoc_escape(&cp, NULL, NULL)) {
                        case ESCAPE_SPECIAL:

-                               /* FALLTHROUGH */

                        case ESCAPE_UNICODE:
                        case ESCAPE_UNICODE:

-                               /* FALLTHROUGH */

                        case ESCAPE_NUMBERED:
                        case ESCAPE_NUMBERED:

-                               /* FALLTHROUGH */

                        case ESCAPE_OVERSTRIKE:
                                naml++;
                                break;
                        case ESCAPE_OVERSTRIKE:
                                naml++;
                                break;


@@ -1414,7 +1440,7 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                } else if (buf->sz + strlen(res) > SHRT_MAX) {
                        mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
                            ln, (int)(stesc - buf->buf), NULL);
                } else if (buf->sz + strlen(res) > SHRT_MAX) {
                        mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
                            ln, (int)(stesc - buf->buf), NULL);

-                       return(ROFF_IGN);
+                       return ROFF_IGN;

                }
 
                /* Replace the escape sequence by the string. */
                }
 
                /* Replace the escape sequence by the string. */


@@ -1430,13 +1456,11 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                free(buf->buf);
                buf->buf = nbuf;
        }
                free(buf->buf);
                buf->buf = nbuf;
        }

-       return(ROFF_CONT);
+       return ROFF_CONT;

 }
 
 /*
 }
 
 /*

- * Process text streams:
- * Convert all breakable hyphens into ASCII_HYPH.
- * Decrement and spring input line trap.
+ * Process text streams.

  */
 static enum rofferr
 roff_parsetext(struct buf *buf, int pos, int *offs)
  */
 static enum rofferr
 roff_parsetext(struct buf *buf, int pos, int *offs)


@@ -1447,6 +1471,22 @@ roff_parsetext(struct buf *buf, int pos, int *offs)
        int              isz;
        enum mandoc_esc  esc;
 
        int              isz;
        enum mandoc_esc  esc;
 

+       /* Spring the input line trap. */
+
+       if (roffit_lines == 1) {
+               isz = mandoc_asprintf(&p, "%s\n.%s", buf->buf, roffit_macro);
+               free(buf->buf);
+               buf->buf = p;
+               buf->sz = isz + 1;
+               *offs = 0;
+               free(roffit_macro);
+               roffit_lines = 0;
+               return ROFF_REPARSE;
+       } else if (roffit_lines > 1)
+               --roffit_lines;
+
+       /* Convert all breakable hyphens into ASCII_HYPH. */
+

        start = p = buf->buf + pos;
 
        while (*p != '\0') {
        start = p = buf->buf + pos;
 
        while (*p != '\0') {


@@ -1475,20 +1515,7 @@ roff_parsetext(struct buf *buf, int pos, int *offs)
                        *p = ASCII_HYPH;
                p++;
        }
                        *p = ASCII_HYPH;
                p++;
        }

-
-       /* Spring the input line trap. */
-       if (roffit_lines == 1) {
-               isz = mandoc_asprintf(&p, "%s\n.%s", buf->buf, roffit_macro);
-               free(buf->buf);
-               buf->buf = p;
-               buf->sz = isz + 1;
-               *offs = 0;
-               free(roffit_macro);
-               roffit_lines = 0;
-               return(ROFF_REPARSE);
-       } else if (roffit_lines > 1)
-               --roffit_lines;
-       return(ROFF_CONT);
+       return ROFF_CONT;

 }
 
 enum rofferr
 }
 
 enum rofferr


@@ -1510,7 +1537,7 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
            (r->eqn == NULL || r->eqn_inline)) {
                e = roff_eqndelim(r, buf, pos);
                if (e == ROFF_REPARSE)
            (r->eqn == NULL || r->eqn_inline)) {
                e = roff_eqndelim(r, buf, pos);
                if (e == ROFF_REPARSE)

-                       return(e);
+                       return e;

                assert(e == ROFF_CONT);
        }
 
                assert(e == ROFF_CONT);
        }
 


@@ -1518,7 +1545,7 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
 
        e = roff_res(r, buf, ln, pos);
        if (e == ROFF_IGN)
 
        e = roff_res(r, buf, ln, pos);
        if (e == ROFF_IGN)

-               return(e);
+               return e;

        assert(e == ROFF_CONT);
 
        ctl = roff_getcontrol(r, buf->buf, &pos);
        assert(e == ROFF_CONT);
 
        ctl = roff_getcontrol(r, buf->buf, &pos);


@@ -1537,23 +1564,23 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
                e = (*roffs[t].text)(r, t, buf, ln, pos, pos, offs);
                assert(e == ROFF_IGN || e == ROFF_CONT);
                if (e != ROFF_CONT)
                e = (*roffs[t].text)(r, t, buf, ln, pos, pos, offs);
                assert(e == ROFF_IGN || e == ROFF_CONT);
                if (e != ROFF_CONT)

-                       return(e);
+                       return e;

        }
        if (r->eqn != NULL)
        }
        if (r->eqn != NULL)

-               return(eqn_read(&r->eqn, ln, buf->buf, ppos, offs));
+               return eqn_read(&r->eqn, ln, buf->buf, ppos, offs);

        if (r->tbl != NULL && ( ! ctl || buf->buf[pos] == '\0'))
        if (r->tbl != NULL && ( ! ctl || buf->buf[pos] == '\0'))

-               return(tbl_read(r->tbl, ln, buf->buf, ppos));
+               return tbl_read(r->tbl, ln, buf->buf, ppos);

        if ( ! ctl)
        if ( ! ctl)

-               return(roff_parsetext(buf, pos, offs));
+               return roff_parsetext(buf, pos, offs);

 
        /* Skip empty request lines. */
 
        if (buf->buf[pos] == '"') {
                mandoc_msg(MANDOCERR_COMMENT_BAD, r->parse,
                    ln, pos, NULL);
 
        /* Skip empty request lines. */
 
        if (buf->buf[pos] == '"') {
                mandoc_msg(MANDOCERR_COMMENT_BAD, r->parse,
                    ln, pos, NULL);

-               return(ROFF_IGN);
+               return ROFF_IGN;

        } else if (buf->buf[pos] == '\0')
        } else if (buf->buf[pos] == '\0')

-               return(ROFF_IGN);
+               return ROFF_IGN;

 
        /*
         * 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,


@@ -1564,7 +1591,7 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);

-               return((*roffs[t].sub)(r, t, buf, ln, ppos, pos, offs));
+               return (*roffs[t].sub)(r, t, buf, ln, ppos, pos, offs);

        }
 
        /* No scope is open.  This is a new request or macro. */
        }
 
        /* No scope is open.  This is a new request or macro. */


@@ -1578,12 +1605,12 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
                mandoc_msg(MANDOCERR_TBLMACRO, r->parse,
                    ln, pos, buf->buf + spos);
                if (t == ROFF_TS)
                mandoc_msg(MANDOCERR_TBLMACRO, r->parse,
                    ln, pos, buf->buf + spos);
                if (t == ROFF_TS)

-                       return(ROFF_IGN);
+                       return ROFF_IGN;

                while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ')
                        pos++;
                while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ')
                        pos++;

-               while (buf->buf[pos] != '\0' && buf->buf[pos] == ' ')
+               while (buf->buf[pos] == ' ')

                        pos++;
                        pos++;

-               return(tbl_read(r->tbl, ln, buf->buf, pos));
+               return tbl_read(r->tbl, ln, buf->buf, pos);

        }
 
        /*
        }
 
        /*


@@ -1592,12 +1619,12 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
         */
 
        if (t == ROFF_MAX)
         */
 
        if (t == ROFF_MAX)

-               return(ROFF_CONT);
+               return ROFF_CONT;

 
        /* Execute a roff request or a user defined macro. */
 
        assert(roffs[t].proc);
 
        /* Execute a roff request or a user defined macro. */
 
        assert(roffs[t].proc);

-       return((*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs));
+       return (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs);

 }
 
 void
 }
 
 void


@@ -1637,7 +1664,7 @@ roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos)
        cp = buf + *pos;
 
        if ('\0' == *cp || '"' == *cp || '\t' == *cp || ' ' == *cp)
        cp = buf + *pos;
 
        if ('\0' == *cp || '"' == *cp || '\t' == *cp || ' ' == *cp)

-               return(ROFF_MAX);
+               return ROFF_MAX;

 
        mac = cp;
        maclen = roff_getname(r, &cp, ln, ppos);
 
        mac = cp;
        maclen = roff_getname(r, &cp, ln, ppos);


@@ -1648,7 +1675,7 @@ roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos)
        if (ROFF_MAX != t)
                *pos = cp - buf;
 
        if (ROFF_MAX != t)
                *pos = cp - buf;
 

-       return(t);
+       return t;

 }
 
 /* --- handling of request blocks ----------------------------------------- */
 }
 
 /* --- handling of request blocks ----------------------------------------- */


@@ -1665,26 +1692,22 @@ roff_cblock(ROFF_ARGS)
        if (r->last == NULL) {
                mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
                    ln, ppos, "..");
        if (r->last == NULL) {
                mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
                    ln, ppos, "..");

-               return(ROFF_IGN);
+               return ROFF_IGN;

        }
 
        switch (r->last->tok) {
        case ROFF_am:
                /* ROFF_am1 is remapped to ROFF_am in roff_block(). */
        }
 
        switch (r->last->tok) {
        case ROFF_am:
                /* ROFF_am1 is remapped to ROFF_am in roff_block(). */

-               /* FALLTHROUGH */

        case ROFF_ami:
        case ROFF_ami:

-               /* FALLTHROUGH */

        case ROFF_de:
                /* ROFF_de1 is remapped to ROFF_de in roff_block(). */
        case ROFF_de:
                /* ROFF_de1 is remapped to ROFF_de in roff_block(). */

-               /* FALLTHROUGH */

        case ROFF_dei:
        case ROFF_dei:

-               /* FALLTHROUGH */

        case ROFF_ig:
                break;
        default:
                mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
                    ln, ppos, "..");
        case ROFF_ig:
                break;
        default:
                mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
                    ln, ppos, "..");

-               return(ROFF_IGN);
+               return ROFF_IGN;

        }
 
        if (buf->buf[pos] != '\0')
        }
 
        if (buf->buf[pos] != '\0')


@@ -1693,7 +1716,7 @@ roff_cblock(ROFF_ARGS)
 
        roffnode_pop(r);
        roffnode_cleanscope(r);
 
        roffnode_pop(r);
        roffnode_cleanscope(r);

-       return(ROFF_IGN);
+       return ROFF_IGN;

 
 }
 
 
 }
 


@@ -1720,9 +1743,7 @@ roff_ccond(struct roff *r, int ln, int ppos)
 
        switch (r->last->tok) {
        case ROFF_el:
 
        switch (r->last->tok) {
        case ROFF_el:

-               /* FALLTHROUGH */

        case ROFF_ie:
        case ROFF_ie:

-               /* FALLTHROUGH */

        case ROFF_if:
                break;
        default:
        case ROFF_if:
                break;
        default:


@@ -1788,7 +1809,7 @@ roff_block(ROFF_ARGS)
        if (namesz == 0 && tok != ROFF_ig) {
                mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse,
                    ln, ppos, roffs[tok].name);
        if (namesz == 0 && tok != ROFF_ig) {
                mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse,
                    ln, ppos, roffs[tok].name);

-               return(ROFF_IGN);
+               return ROFF_IGN;

        }
 
        roffnode_push(r, tok, name, ln, ppos);
        }
 
        roffnode_push(r, tok, name, ln, ppos);


@@ -1803,7 +1824,7 @@ roff_block(ROFF_ARGS)
                roff_setstrn(&r->strtab, name, namesz, "", 0, 0);
 
        if (*cp == '\0')
                roff_setstrn(&r->strtab, name, namesz, "", 0, 0);
 
        if (*cp == '\0')

-               return(ROFF_IGN);
+               return ROFF_IGN;

 
        /* Get the custom end marker. */
 
 
        /* Get the custom end marker. */
 


@@ -1830,7 +1851,7 @@ roff_block(ROFF_ARGS)
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
                    ln, pos, ".%s ... %s", roffs[tok].name, cp);
 
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
                    ln, pos, ".%s ... %s", roffs[tok].name, cp);
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1866,8 +1887,8 @@ roff_block_sub(ROFF_ARGS)
                        pos = i;
                        if (roff_parse(r, buf->buf, &pos, ln, ppos) !=
                            ROFF_MAX)
                        pos = i;
                        if (roff_parse(r, buf->buf, &pos, ln, ppos) !=
                            ROFF_MAX)

-                               return(ROFF_RERUN);
-                       return(ROFF_IGN);
+                               return ROFF_RERUN;
+                       return ROFF_IGN;

                }
        }
 
                }
        }
 


@@ -1881,11 +1902,11 @@ roff_block_sub(ROFF_ARGS)
        if (t != ROFF_cblock) {
                if (tok != ROFF_ig)
                        roff_setstr(r, r->last->name, buf->buf + ppos, 2);
        if (t != ROFF_cblock) {
                if (tok != ROFF_ig)
                        roff_setstr(r, r->last->name, buf->buf + ppos, 2);

-               return(ROFF_IGN);
+               return ROFF_IGN;

        }
 
        assert(roffs[t].proc);
        }
 
        assert(roffs[t].proc);

-       return((*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs));
+       return (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs);

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1895,7 +1916,7 @@ roff_block_text(ROFF_ARGS)
        if (tok != ROFF_ig)
                roff_setstr(r, r->last->name, buf->buf + pos, 2);
 
        if (tok != ROFF_ig)
                roff_setstr(r, r->last->name, buf->buf + pos, 2);
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1917,7 +1938,7 @@ roff_cond_sub(ROFF_ARGS)
        if ((t != ROFF_MAX) &&
            (rr || roffs[t].flags & ROFFMAC_STRUCT)) {
                assert(roffs[t].proc);
        if ((t != ROFF_MAX) &&
            (rr || roffs[t].flags & ROFFMAC_STRUCT)) {
                assert(roffs[t].proc);

-               return((*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs));
+               return (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs);

        }
 
        /*
        }
 
        /*


@@ -1939,7 +1960,7 @@ roff_cond_sub(ROFF_ARGS)
                if (*ep != '\0')
                        ++ep;
        }
                if (*ep != '\0')
                        ++ep;
        }

-       return(rr ? ROFF_CONT : ROFF_IGN);
+       return rr ? ROFF_CONT : ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1960,7 +1981,7 @@ roff_cond_text(ROFF_ARGS)
                if (*ep != '\0')
                        ++ep;
        }
                if (*ep != '\0')
                        ++ep;
        }

-       return(rr ? ROFF_CONT : ROFF_IGN);
+       return rr ? ROFF_CONT : ROFF_IGN;

 }
 
 /* --- handling of numeric and conditional expressions -------------------- */
 }
 
 /* --- handling of numeric and conditional expressions -------------------- */


@@ -2009,12 +2030,10 @@ roff_getnum(const char *v, int *pos, int *res, int flags)
                scaled = *res * 240 / 2.54;
                break;
        case 'v':
                scaled = *res * 240 / 2.54;
                break;
        case 'v':

-               /* FALLTROUGH */

        case 'P':
                scaled = *res * 40;
                break;
        case 'm':
        case 'P':
                scaled = *res * 40;
                break;
        case 'm':

-               /* FALLTROUGH */

        case 'n':
                scaled = *res * 24;
                break;
        case 'n':
                scaled = *res * 24;
                break;


@@ -2036,7 +2055,7 @@ roff_getnum(const char *v, int *pos, int *res, int flags)
                *res = scaled;
 
        *pos = p + 1;
                *res = scaled;
 
        *pos = p + 1;

-       return(1);
+       return 1;

 }
 
 /*
 }
 
 /*


@@ -2079,7 +2098,7 @@ out:
        else if (*s3 != '\0')
                s3++;
        *pos = s3 - v;
        else if (*s3 != '\0')
                s3++;
        *pos = s3 - v;

-       return(match);
+       return match;

 }
 
 /*
 }
 
 /*


@@ -2087,8 +2106,10 @@ out:
  * or string condition.
  */
 static int
  * or string condition.
  */
 static int

-roff_evalcond(struct roff *r, int ln, const char *v, int *pos)
+roff_evalcond(struct roff *r, int ln, char *v, int *pos)

 {
 {

+       char    *cp, *name;
+       size_t   sz;

        int      number, savepos, wanttrue;
 
        if ('!' == v[*pos]) {
        int      number, savepos, wanttrue;
 
        if ('!' == v[*pos]) {


@@ -2099,43 +2120,41 @@ roff_evalcond(struct roff *r, int ln, const char *v, int *pos)
 
        switch (v[*pos]) {
        case '\0':
 
        switch (v[*pos]) {
        case '\0':

-               return(0);
+               return 0;

        case 'n':
        case 'n':

-               /* FALLTHROUGH */

        case 'o':
                (*pos)++;
        case 'o':
                (*pos)++;

-               return(wanttrue);
+               return wanttrue;

        case 'c':
        case 'c':

-               /* FALLTHROUGH */

        case 'd':
        case 'd':

-               /* FALLTHROUGH */

        case 'e':
        case 'e':

-               /* FALLTHROUGH */
-       case 'r':
-               /* FALLTHROUGH */

        case 't':
        case 't':

-               /* FALLTHROUGH */

        case 'v':
                (*pos)++;
        case 'v':
                (*pos)++;

-               return(!wanttrue);
+               return !wanttrue;
+       case 'r':
+               cp = name = v + ++*pos;
+               sz = roff_getname(r, &cp, ln, *pos);
+               *pos = cp - v;
+               return (sz && roff_hasregn(r, name, sz)) == wanttrue;

        default:
                break;
        }
 
        savepos = *pos;
        if (roff_evalnum(r, ln, v, pos, &number, ROFFNUM_SCALE))
        default:
                break;
        }
 
        savepos = *pos;
        if (roff_evalnum(r, ln, v, pos, &number, ROFFNUM_SCALE))

-               return((number > 0) == wanttrue);
+               return (number > 0) == wanttrue;

        else if (*pos == savepos)
        else if (*pos == savepos)

-               return(roff_evalstrcond(v, pos) == wanttrue);
+               return roff_evalstrcond(v, pos) == wanttrue;

        else
        else

-               return (0);
+               return 0;

 }
 
 static enum rofferr
 roff_line_ignore(ROFF_ARGS)
 {
 
 }
 
 static enum rofferr
 roff_line_ignore(ROFF_ARGS)
 {
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2144,7 +2163,7 @@ roff_insec(ROFF_ARGS)
 
        mandoc_msg(MANDOCERR_REQ_INSEC, r->parse,
            ln, ppos, roffs[tok].name);
 
        mandoc_msg(MANDOCERR_REQ_INSEC, r->parse,
            ln, ppos, roffs[tok].name);

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2153,7 +2172,7 @@ roff_unsupp(ROFF_ARGS)
 
        mandoc_msg(MANDOCERR_REQ_UNSUPP, r->parse,
            ln, ppos, roffs[tok].name);
 
        mandoc_msg(MANDOCERR_REQ_UNSUPP, r->parse,
            ln, ppos, roffs[tok].name);

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2212,6 +2231,8 @@ roff_cond(ROFF_ARGS)
        if (buf->buf[pos] == '\\' && buf->buf[pos + 1] == '{') {
                r->last->endspan = -1;
                pos += 2;
        if (buf->buf[pos] == '\\' && buf->buf[pos + 1] == '{') {
                r->last->endspan = -1;
                pos += 2;

+               while (buf->buf[pos] == ' ')
+                       pos++;

                goto out;
        }
 
                goto out;
        }
 


@@ -2229,7 +2250,7 @@ roff_cond(ROFF_ARGS)
 
 out:
        *offs = pos;
 
 out:
        *offs = pos;

-       return(ROFF_RERUN);
+       return ROFF_RERUN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2254,11 +2275,11 @@ roff_ds(ROFF_ARGS)
 
        name = string = buf->buf + pos;
        if (*name == '\0')
 
        name = string = buf->buf + pos;
        if (*name == '\0')

-               return(ROFF_IGN);
+               return ROFF_IGN;

 
        namesz = roff_getname(r, &string, ln, pos);
        if (name[namesz] == '\\')
 
        namesz = roff_getname(r, &string, ln, pos);
        if (name[namesz] == '\\')

-               return(ROFF_IGN);
+               return ROFF_IGN;

 
        /* Read past the initial double-quote, if any. */
        if (*string == '"')
 
        /* Read past the initial double-quote, if any. */
        if (*string == '"')


@@ -2267,7 +2288,7 @@ roff_ds(ROFF_ARGS)
        /* The rest is the value. */
        roff_setstrn(&r->strtab, name, namesz, string, strlen(string),
            ROFF_as == tok);
        /* The rest is the value. */
        roff_setstrn(&r->strtab, name, namesz, string, strlen(string),
            ROFF_as == tok);

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 /*
 }
 
 /*


@@ -2283,17 +2304,11 @@ roff_getop(const char *v, int *pos, char *res)
 
        switch (*res) {
        case '+':
 
        switch (*res) {
        case '+':

-               /* FALLTHROUGH */

        case '-':
        case '-':

-               /* FALLTHROUGH */

        case '*':
        case '*':

-               /* FALLTHROUGH */

        case '/':
        case '/':

-               /* FALLTHROUGH */

        case '%':
        case '%':

-               /* FALLTHROUGH */

        case '&':
        case '&':

-               /* FALLTHROUGH */

        case ':':
                break;
        case '<':
        case ':':
                break;
        case '<':


@@ -2333,11 +2348,11 @@ roff_getop(const char *v, int *pos, char *res)
                        (*pos)++;
                break;
        default:
                        (*pos)++;
                break;
        default:

-               return(0);
+               return 0;

        }
        (*pos)++;
 
        }
        (*pos)++;
 

-       return(*res);
+       return *res;

 }
 
 /*
 }
 
 /*


@@ -2350,11 +2365,11 @@ roff_evalpar(struct roff *r, int ln,
 {
 
        if ('(' != v[*pos])
 {
 
        if ('(' != v[*pos])

-               return(roff_getnum(v, pos, res, flags));
+               return roff_getnum(v, pos, res, flags);

 
        (*pos)++;
        if ( ! roff_evalnum(r, ln, v, pos, res, flags | ROFFNUM_WHITE))
 
        (*pos)++;
        if ( ! roff_evalnum(r, ln, v, pos, res, flags | ROFFNUM_WHITE))

-               return(0);
+               return 0;

 
        /*
         * Omission of the closing parenthesis
 
        /*
         * Omission of the closing parenthesis


@@ -2365,9 +2380,9 @@ roff_evalpar(struct roff *r, int ln,
        if (')' == v[*pos])
                (*pos)++;
        else if (NULL == res)
        if (')' == v[*pos])
                (*pos)++;
        else if (NULL == res)

-               return(0);
+               return 0;

 
 

-       return(1);
+       return 1;

 }
 
 /*
 }
 
 /*


@@ -2391,7 +2406,7 @@ roff_evalnum(struct roff *r, int ln, const char *v,
                        (*pos)++;
 
        if ( ! roff_evalpar(r, ln, v, pos, res, flags))
                        (*pos)++;
 
        if ( ! roff_evalpar(r, ln, v, pos, res, flags))

-               return(0);
+               return 0;

 
        while (1) {
                if (flags & ROFFNUM_WHITE)
 
        while (1) {
                if (flags & ROFFNUM_WHITE)


@@ -2406,7 +2421,7 @@ roff_evalnum(struct roff *r, int ln, const char *v,
                                (*pos)++;
 
                if ( ! roff_evalpar(r, ln, v, pos, &operand2, flags))
                                (*pos)++;
 
                if ( ! roff_evalpar(r, ln, v, pos, &operand2, flags))

-                       return(0);
+                       return 0;

 
                if (flags & ROFFNUM_WHITE)
                        while (isspace((unsigned char)v[*pos]))
 
                if (flags & ROFFNUM_WHITE)
                        while (isspace((unsigned char)v[*pos]))


@@ -2479,7 +2494,7 @@ roff_evalnum(struct roff *r, int ln, const char *v,
                        abort();
                }
        }
                        abort();
                }
        }

-       return(1);
+       return 1;

 }
 
 /* --- register management ------------------------------------------------ */
 }
 
 /* --- register management ------------------------------------------------ */


@@ -2520,24 +2535,26 @@ roff_setreg(struct roff *r, const char *name, int val, char sign)
  * were to turn up, another special value would have to be chosen.
  */
 static int
  * were to turn up, another special value would have to be chosen.
  */
 static int

-roff_getregro(const char *name)
+roff_getregro(const struct roff *r, const char *name)

 {
 
        switch (*name) {
 {
 
        switch (*name) {

+       case '$':  /* Number of arguments of the last macro evaluated. */
+               return r->argc;

        case 'A':  /* ASCII approximation mode is always off. */
        case 'A':  /* ASCII approximation mode is always off. */

-               return(0);
+               return 0;

        case 'g':  /* Groff compatibility mode is always on. */
        case 'g':  /* Groff compatibility mode is always on. */

-               return(1);
+               return 1;

        case 'H':  /* Fixed horizontal resolution. */
        case 'H':  /* Fixed horizontal resolution. */

-               return (24);
+               return 24;

        case 'j':  /* Always adjust left margin only. */
        case 'j':  /* Always adjust left margin only. */

-               return(0);
+               return 0;

        case 'T':  /* Some output device is always defined. */
        case 'T':  /* Some output device is always defined. */

-               return(1);
+               return 1;

        case 'V':  /* Fixed vertical resolution. */
        case 'V':  /* Fixed vertical resolution. */

-               return (40);
+               return 40;

        default:
        default:

-               return (-1);
+               return -1;

        }
 }
 
        }
 }
 


@@ -2548,16 +2565,16 @@ roff_getreg(const struct roff *r, const char *name)
        int              val;
 
        if ('.' == name[0] && '\0' != name[1] && '\0' == name[2]) {
        int              val;
 
        if ('.' == name[0] && '\0' != name[1] && '\0' == name[2]) {

-               val = roff_getregro(name + 1);
+               val = roff_getregro(r, name + 1);

                if (-1 != val)
                if (-1 != val)

-                       return (val);
+                       return val;

        }
 
        for (reg = r->regtab; reg; reg = reg->next)
                if (0 == strcmp(name, reg->key.p))
        }
 
        for (reg = r->regtab; reg; reg = reg->next)
                if (0 == strcmp(name, reg->key.p))

-                       return(reg->val);
+                       return reg->val;

 
 

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -2567,17 +2584,37 @@ roff_getregn(const struct roff *r, const char *name, size_t len)
        int              val;
 
        if ('.' == name[0] && 2 == len) {
        int              val;
 
        if ('.' == name[0] && 2 == len) {

-               val = roff_getregro(name + 1);
+               val = roff_getregro(r, name + 1);

                if (-1 != val)
                if (-1 != val)

-                       return (val);
+                       return val;

        }
 
        for (reg = r->regtab; reg; reg = reg->next)
                if (len == reg->key.sz &&
                    0 == strncmp(name, reg->key.p, len))
        }
 
        for (reg = r->regtab; reg; reg = reg->next)
                if (len == reg->key.sz &&
                    0 == strncmp(name, reg->key.p, len))

-                       return(reg->val);
+                       return reg->val;

 
 

-       return(0);
+       return 0;
+}
+
+static int
+roff_hasregn(const struct roff *r, const char *name, size_t len)
+{
+       struct roffreg  *reg;
+       int              val;
+
+       if ('.' == name[0] && 2 == len) {
+               val = roff_getregro(r, name + 1);
+               if (-1 != val)
+                       return 1;
+       }
+
+       for (reg = r->regtab; reg; reg = reg->next)
+               if (len == reg->key.sz &&
+                   0 == strncmp(name, reg->key.p, len))
+                       return 1;
+
+       return 0;

 }
 
 static void
 }
 
 static void


@@ -2603,11 +2640,11 @@ roff_nr(ROFF_ARGS)
 
        key = val = buf->buf + pos;
        if (*key == '\0')
 
        key = val = buf->buf + pos;
        if (*key == '\0')

-               return(ROFF_IGN);
+               return ROFF_IGN;

 
        keysz = roff_getname(r, &val, ln, pos);
        if (key[keysz] == '\\')
 
        keysz = roff_getname(r, &val, ln, pos);
        if (key[keysz] == '\\')

-               return(ROFF_IGN);
+               return ROFF_IGN;

        key[keysz] = '\0';
 
        sign = *val;
        key[keysz] = '\0';
 
        sign = *val;


@@ -2617,7 +2654,7 @@ roff_nr(ROFF_ARGS)
        if (roff_evalnum(r, ln, val, NULL, &iv, ROFFNUM_SCALE))
                roff_setreg(r, key, iv, sign);
 
        if (roff_evalnum(r, ln, val, NULL, &iv, ROFFNUM_SCALE))
                roff_setreg(r, key, iv, sign);
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2629,7 +2666,7 @@ roff_rr(ROFF_ARGS)
 
        name = cp = buf->buf + pos;
        if (*name == '\0')
 
        name = cp = buf->buf + pos;
        if (*name == '\0')

-               return(ROFF_IGN);
+               return ROFF_IGN;

        namesz = roff_getname(r, &cp, ln, pos);
        name[namesz] = '\0';
 
        namesz = roff_getname(r, &cp, ln, pos);
        name[namesz] = '\0';
 


@@ -2645,7 +2682,7 @@ roff_rr(ROFF_ARGS)
                free(reg->key.p);
                free(reg);
        }
                free(reg->key.p);
                free(reg);
        }

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 /* --- handler functions for roff requests -------------------------------- */
 }
 
 /* --- handler functions for roff requests -------------------------------- */


@@ -2665,7 +2702,7 @@ roff_rm(ROFF_ARGS)
                if (name[namesz] == '\\')
                        break;
        }
                if (name[namesz] == '\\')
                        break;
        }

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2678,7 +2715,7 @@ roff_it(ROFF_ARGS)
        if ( ! roff_evalnum(r, ln, buf->buf, &pos, &iv, 0)) {
                mandoc_msg(MANDOCERR_IT_NONUM, r->parse,
                    ln, ppos, buf->buf + 1);
        if ( ! roff_evalnum(r, ln, buf->buf, &pos, &iv, 0)) {
                mandoc_msg(MANDOCERR_IT_NONUM, r->parse,
                    ln, ppos, buf->buf + 1);

-               return(ROFF_IGN);
+               return ROFF_IGN;

        }
 
        while (isspace((unsigned char)buf->buf[pos]))
        }
 
        while (isspace((unsigned char)buf->buf[pos]))


@@ -2694,7 +2731,7 @@ roff_it(ROFF_ARGS)
        roffit_macro = mandoc_strdup(iv != 1 ||
            strcmp(buf->buf + pos, "an-trap") ?
            buf->buf + pos : "br");
        roffit_macro = mandoc_strdup(iv != 1 ||
            strcmp(buf->buf + pos, "an-trap") ?
            buf->buf + pos : "br");

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2709,7 +2746,7 @@ roff_Dd(ROFF_ARGS)
        if (r->format == 0)
                r->format = MPARSE_MDOC;
 
        if (r->format == 0)
                r->format = MPARSE_MDOC;
 

-       return(ROFF_CONT);
+       return ROFF_CONT;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2724,7 +2761,7 @@ roff_TH(ROFF_ARGS)
        if (r->format == 0)
                r->format = MPARSE_MAN;
 
        if (r->format == 0)
                r->format = MPARSE_MAN;
 

-       return(ROFF_CONT);
+       return ROFF_CONT;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2738,9 +2775,9 @@ roff_TE(ROFF_ARGS)
                free(buf->buf);
                buf->buf = mandoc_strdup(".sp");
                buf->sz = 4;
                free(buf->buf);
                buf->buf = mandoc_strdup(".sp");
                buf->sz = 4;

-               return(ROFF_REPARSE);
+               return ROFF_REPARSE;

        }
        }

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2753,7 +2790,7 @@ roff_T_(ROFF_ARGS)
        else
                tbl_restart(ppos, ln, r->tbl);
 
        else
                tbl_restart(ppos, ln, r->tbl);
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 /*
 }
 
 /*


@@ -2776,7 +2813,7 @@ roff_eqndelim(struct roff *r, struct buf *buf, int pos)
        cp2 = strchr(cp1, r->eqn == NULL ?
            r->last_eqn->odelim : r->last_eqn->cdelim);
        if (cp2 == NULL)
        cp2 = strchr(cp1, r->eqn == NULL ?
            r->last_eqn->odelim : r->last_eqn->cdelim);
        if (cp2 == NULL)

-               return(ROFF_CONT);
+               return ROFF_CONT;

 
        *cp2++ = '\0';
        bef_pr = bef_nl = aft_nl = aft_pr = "";
 
        *cp2++ = '\0';
        bef_pr = bef_nl = aft_nl = aft_pr = "";


@@ -2819,7 +2856,7 @@ roff_eqndelim(struct roff *r, struct buf *buf, int pos)
        /* Toggle the in-line state of the eqn subsystem. */
 
        r->eqn_inline = r->eqn == NULL;
        /* Toggle the in-line state of the eqn subsystem. */
 
        r->eqn_inline = r->eqn == NULL;

-       return(ROFF_REPARSE);
+       return ROFF_REPARSE;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2844,7 +2881,7 @@ roff_EQ(ROFF_ARGS)
                mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,
                    ".EQ %s", buf->buf + pos);
 
                mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,
                    ".EQ %s", buf->buf + pos);
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2852,7 +2889,7 @@ roff_EN(ROFF_ARGS)
 {
 
        mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, ln, ppos, "EN");
 {
 
        mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, ln, ppos, "EN");

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2874,7 +2911,7 @@ roff_TS(ROFF_ARGS)
                r->first_tbl = r->last_tbl = tbl;
 
        r->tbl = r->last_tbl = tbl;
                r->first_tbl = r->last_tbl = tbl;
 
        r->tbl = r->last_tbl = tbl;

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2882,7 +2919,7 @@ roff_brp(ROFF_ARGS)
 {
 
        buf->buf[pos - 1] = '\0';
 {
 
        buf->buf[pos - 1] = '\0';

-       return(ROFF_CONT);
+       return ROFF_CONT;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2899,7 +2936,7 @@ roff_cc(ROFF_ARGS)
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
                    ln, p - buf->buf, "cc ... %s", p);
 
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
                    ln, p - buf->buf, "cc ... %s", p);
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2913,7 +2950,7 @@ roff_tr(ROFF_ARGS)
 
        if (*p == '\0') {
                mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse, ln, ppos, "tr");
 
        if (*p == '\0') {
                mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse, ln, ppos, "tr");

-               return(ROFF_IGN);
+               return ROFF_IGN;

        }
 
        while (*p != '\0') {
        }
 
        while (*p != '\0') {


@@ -2925,7 +2962,7 @@ roff_tr(ROFF_ARGS)
                        if (esc == ESCAPE_ERROR) {
                                mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
                                    ln, (int)(p - buf->buf), first);
                        if (esc == ESCAPE_ERROR) {
                                mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
                                    ln, (int)(p - buf->buf), first);

-                               return(ROFF_IGN);
+                               return ROFF_IGN;

                        }
                        fsz = (size_t)(p - first);
                }
                        }
                        fsz = (size_t)(p - first);
                }


@@ -2936,7 +2973,7 @@ roff_tr(ROFF_ARGS)
                        if (esc == ESCAPE_ERROR) {
                                mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
                                    ln, (int)(p - buf->buf), second);
                        if (esc == ESCAPE_ERROR) {
                                mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
                                    ln, (int)(p - buf->buf), second);

-                               return(ROFF_IGN);
+                               return ROFF_IGN;

                        }
                        ssz = (size_t)(p - second);
                } else if (*second == '\0') {
                        }
                        ssz = (size_t)(p - second);
                } else if (*second == '\0') {


@@ -2961,7 +2998,7 @@ roff_tr(ROFF_ARGS)
                r->xtab[(int)*first].sz = ssz;
        }
 
                r->xtab[(int)*first].sz = ssz;
        }
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -2987,11 +3024,11 @@ roff_so(ROFF_ARGS)
                free(buf->buf);
                buf->buf = cp;
                *offs = 0;
                free(buf->buf);
                buf->buf = cp;
                *offs = 0;

-               return(ROFF_REPARSE);
+               return ROFF_REPARSE;

        }
 
        *offs = pos;
        }
 
        *offs = pos;

-       return(ROFF_SO);
+       return ROFF_SO;

 }
 
 /* --- user defined strings and macros ------------------------------------ */
 }
 
 /* --- user defined strings and macros ------------------------------------ */


@@ -3001,7 +3038,7 @@ roff_userdef(ROFF_ARGS)
 {
        const char       *arg[9], *ap;
        char             *cp, *n1, *n2;
 {
        const char       *arg[9], *ap;
        char             *cp, *n1, *n2;

-       int               i;
+       int               expand_count, i, ib, ie;

        size_t            asz, rsz;
 
        /*
        size_t            asz, rsz;
 
        /*


@@ -3009,18 +3046,25 @@ roff_userdef(ROFF_ARGS)
         * and NUL-terminate them.
         */
 
         * and NUL-terminate them.
         */
 

+       r->argc = 0;

        cp = buf->buf + pos;
        cp = buf->buf + pos;

-       for (i = 0; i < 9; i++)
-               arg[i] = *cp == '\0' ? "" :
-                   mandoc_getarg(r->parse, &cp, ln, &pos);
+       for (i = 0; i < 9; i++) {
+               if (*cp == '\0')
+                       arg[i] = "";
+               else {
+                       arg[i] = mandoc_getarg(r->parse, &cp, ln, &pos);
+                       r->argc = i + 1;
+               }
+       }

 
        /*
         * Expand macro arguments.
         */
 
        buf->sz = strlen(r->current_string) + 1;
 
        /*
         * Expand macro arguments.
         */
 
        buf->sz = strlen(r->current_string) + 1;

-       n1 = cp = mandoc_malloc(buf->sz);
+       n1 = n2 = cp = mandoc_malloc(buf->sz);

        memcpy(n1, r->current_string, buf->sz);
        memcpy(n1, r->current_string, buf->sz);

+       expand_count = 0;

        while (*cp != '\0') {
 
                /* Scan ahead for the next argument invocation. */
        while (*cp != '\0') {
 
                /* Scan ahead for the next argument invocation. */


@@ -3029,21 +3073,42 @@ roff_userdef(ROFF_ARGS)
                        continue;
                if (*cp++ != '$')
                        continue;
                        continue;
                if (*cp++ != '$')
                        continue;

-               i = *cp - '1';
-               if (0 > i || 8 < i)
-                       continue;
+               if (*cp == '*') {  /* \\$* inserts all arguments */
+                       ib = 0;
+                       ie = r->argc - 1;
+               } else {  /* \\$1 .. \\$9 insert one argument */
+                       ib = ie = *cp - '1';
+                       if (ib < 0 || ib > 8)
+                               continue;
+               }

                cp -= 2;
 
                cp -= 2;
 

+               /*
+                * Prevent infinite recursion.
+                */
+
+               if (cp >= n2)
+                       expand_count = 1;
+               else if (++expand_count > EXPAND_LIMIT) {
+                       mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
+                           ln, (int)(cp - n1), NULL);
+                       free(buf->buf);
+                       buf->buf = n1;
+                       return ROFF_IGN;
+               }
+

                /*
                 * Determine the size of the expanded argument,
                 * taking escaping of quotes into account.
                 */
 
                /*
                 * Determine the size of the expanded argument,
                 * taking escaping of quotes into account.
                 */
 

-               asz = 0;
-               for (ap = arg[i]; *ap != '\0'; ap++) {
-                       asz++;
-                       if (*ap == '"')
-                               asz += 3;
+               asz = ie > ib ? ie - ib : 0;  /* for blanks */
+               for (i = ib; i <= ie; i++) {
+                       for (ap = arg[i]; *ap != '\0'; ap++) {
+                               asz++;
+                               if (*ap == '"')
+                                       asz += 3;
+                       }

                }
                if (asz != 3) {
 
                }
                if (asz != 3) {
 


@@ -3084,12 +3149,16 @@ roff_userdef(ROFF_ARGS)
                /* Copy the expanded argument, escaping quotes. */
 
                n2 = cp;
                /* Copy the expanded argument, escaping quotes. */
 
                n2 = cp;

-               for (ap = arg[i]; *ap != '\0'; ap++) {
-                       if (*ap == '"') {
-                               memcpy(n2, "\\(dq", 4);
-                               n2 += 4;
-                       } else
-                               *n2++ = *ap;
+               for (i = ib; i <= ie; i++) {
+                       for (ap = arg[i]; *ap != '\0'; ap++) {
+                               if (*ap == '"') {
+                                       memcpy(n2, "\\(dq", 4);
+                                       n2 += 4;
+                               } else
+                                       *n2++ = *ap;
+                       }
+                       if (i < ie)
+                               *n2++ = ' ';

                }
        }
 
                }
        }
 


@@ -3102,8 +3171,8 @@ roff_userdef(ROFF_ARGS)
        buf->buf = n1;
        *offs = 0;
 
        buf->buf = n1;
        *offs = 0;
 

-       return(buf->sz > 1 && buf->buf[buf->sz - 2] == '\n' ?
-          ROFF_REPARSE : ROFF_APPEND);
+       return buf->sz > 1 && buf->buf[buf->sz - 2] == '\n' ?
+          ROFF_REPARSE : ROFF_APPEND;

 }
 
 static size_t
 }
 
 static size_t


@@ -3114,7 +3183,7 @@ roff_getname(struct roff *r, char **cpp, int ln, int pos)
 
        name = *cpp;
        if ('\0' == *name)
 
        name = *cpp;
        if ('\0' == *name)

-               return(0);
+               return 0;

 
        /* Read until end of name and terminate it with NUL. */
        for (cp = name; 1; cp++) {
 
        /* Read until end of name and terminate it with NUL. */
        for (cp = name; 1; cp++) {


@@ -3141,7 +3210,7 @@ roff_getname(struct roff *r, char **cpp, int ln, int pos)
                cp++;
 
        *cpp = cp;
                cp++;
 
        *cpp = cp;

-       return(namesz);
+       return namesz;

 }
 
 /*
 }
 
 /*


@@ -3241,14 +3310,14 @@ roff_getstrn(const struct roff *r, const char *name, size_t len)
        for (n = r->strtab; n; n = n->next)
                if (0 == strncmp(name, n->key.p, len) &&
                    '\0' == n->key.p[(int)len])
        for (n = r->strtab; n; n = n->next)
                if (0 == strncmp(name, n->key.p, len) &&
                    '\0' == n->key.p[(int)len])

-                       return(n->val.p);
+                       return n->val.p;

 
        for (i = 0; i < PREDEFS_MAX; i++)
                if (0 == strncmp(name, predefs[i].name, len) &&
                                '\0' == predefs[i].name[(int)len])
 
        for (i = 0; i < PREDEFS_MAX; i++)
                if (0 == strncmp(name, predefs[i].name, len) &&
                                '\0' == predefs[i].name[(int)len])

-                       return(predefs[i].str);
+                       return predefs[i].str;

 
 

-       return(NULL);
+       return NULL;

 }
 
 static void
 }
 
 static void


@@ -3270,14 +3339,14 @@ const struct tbl_span *
 roff_span(const struct roff *r)
 {
 
 roff_span(const struct roff *r)
 {
 

-       return(r->tbl ? tbl_span(r->tbl) : NULL);
+       return r->tbl ? tbl_span(r->tbl) : NULL;

 }
 
 const struct eqn *
 roff_eqn(const struct roff *r)
 {
 
 }
 
 const struct eqn *
 roff_eqn(const struct roff *r)
 {
 

-       return(r->last_eqn ? &r->last_eqn->eqn : NULL);
+       return r->last_eqn ? &r->last_eqn->eqn : NULL;

 }
 
 /*
 }
 
 /*


@@ -3295,9 +3364,9 @@ roff_strdup(const struct roff *r, const char *p)
        enum mandoc_esc  esc;
 
        if (NULL == r->xmbtab && NULL == r->xtab)
        enum mandoc_esc  esc;
 
        if (NULL == r->xmbtab && NULL == r->xtab)

-               return(mandoc_strdup(p));
+               return mandoc_strdup(p);

        else if ('\0' == *p)
        else if ('\0' == *p)

-               return(mandoc_strdup(""));
+               return mandoc_strdup("");

 
        /*
         * Step through each character looking for term matches
 
        /*
         * Step through each character looking for term matches


@@ -3311,7 +3380,8 @@ roff_strdup(const struct roff *r, const char *p)
        ssz = 0;
 
        while ('\0' != *p) {
        ssz = 0;
 
        while ('\0' != *p) {

-               if ('\\' != *p && r->xtab && r->xtab[(int)*p].p) {
+               assert((unsigned int)*p < 128);
+               if ('\\' != *p && r->xtab && r->xtab[(unsigned int)*p].p) {

                        sz = r->xtab[(int)*p].sz;
                        res = mandoc_realloc(res, ssz + sz + 1);
                        memcpy(res + ssz, r->xtab[(int)*p].p, sz);
                        sz = r->xtab[(int)*p].sz;
                        res = mandoc_realloc(res, ssz + sz + 1);
                        memcpy(res + ssz, r->xtab[(int)*p].p, sz);


@@ -3369,14 +3439,14 @@ roff_strdup(const struct roff *r, const char *p)
        }
 
        res[(int)ssz] = '\0';
        }
 
        res[(int)ssz] = '\0';

-       return(res);
+       return res;

 }
 
 int
 roff_getformat(const struct roff *r)
 {
 
 }
 
 int
 roff_getformat(const struct roff *r)
 {
 

-       return(r->format);
+       return r->format;

 }
 
 /*
 }
 
 /*


@@ -3399,17 +3469,17 @@ roff_getcontrol(const struct roff *r, const char *cp, int *ppos)
        if (0 != r->control && cp[pos] == r->control)
                pos++;
        else if (0 != r->control)
        if (0 != r->control && cp[pos] == r->control)
                pos++;
        else if (0 != r->control)

-               return(0);
+               return 0;

        else if ('\\' == cp[pos] && '.' == cp[pos + 1])
                pos += 2;
        else if ('.' == cp[pos] || '\'' == cp[pos])
                pos++;
        else
        else if ('\\' == cp[pos] && '.' == cp[pos + 1])
                pos += 2;
        else if ('.' == cp[pos] || '\'' == cp[pos])
                pos++;
        else

-               return(0);
+               return 0;

 
        while (' ' == cp[pos] || '\t' == cp[pos])
                pos++;
 
        *ppos = pos;
 
        while (' ' == cp[pos] || '\t' == cp[pos])
                pos++;
 
        *ppos = pos;

-       return(1);
+       return 1;

 }
 }