Low-hanging fruit: add OpenBSD's `ad', `hy', `ne', and `nh' handling.

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index b111ad234e56ec2b7cc1c7d5ca1066148ed744e9..e5eb089fc0c3bcea77be139b00abe28545ef5c15 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.99 2010/08/24 12:48:43 kristaps Exp $ */
+/*     $Id: roff.c,v 1.103 2010/12/01 10:21:25 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -45,6 +45,7 @@
 #endif
 
 enum   rofft {
+       ROFF_ad,
        ROFF_am,
        ROFF_ami,
        ROFF_am1,
@@ -53,13 +54,16 @@ enum        rofft {
        ROFF_de1,
        ROFF_ds,
        ROFF_el,
+       ROFF_hy,
        ROFF_ie,
        ROFF_if,
        ROFF_ig,
+       ROFF_ne,
+       ROFF_nh,
        ROFF_rm,
        ROFF_tr,
        ROFF_cblock,
-       ROFF_ccond,
+       ROFF_ccond, /* FIXME: remove this. */
        ROFF_nr,
        ROFF_MAX
 };
@@ -130,7 +134,7 @@ static      enum roffrule    roff_evalcond(const char *, int *);
 static void             roff_freestr(struct roff *);
 static const char      *roff_getstrn(const struct roff *, 
                                const char *, size_t);
-static enum rofferr     roff_line(ROFF_ARGS);
+static enum rofferr     roff_line_ignore(ROFF_ARGS);
 static enum rofferr     roff_nr(ROFF_ARGS);
 static int              roff_res(struct roff *, 
                                char **, size_t *, int);
@@ -147,6 +151,7 @@ static      char            *roff_strdup(const char *);
 static struct roffmac  *hash[HASHWIDTH];
 
 static struct roffmac   roffs[ROFF_MAX] = {
+       { "ad", roff_line_ignore, NULL, NULL, 0, NULL },
        { "am", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
@@ -155,11 +160,14 @@ 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 },
+       { "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 },
        { "ig", roff_block, roff_block_text, roff_block_sub, 0, NULL },
-       { "rm", roff_line, NULL, NULL, 0, NULL },
-       { "tr", roff_line, NULL, NULL, 0, NULL },
+       { "ne", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "nh", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "rm", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "tr", roff_line_ignore, NULL, NULL, 0, NULL },
        { ".", roff_cblock, NULL, NULL, 0, NULL },
        { "\\}", roff_ccond, NULL, NULL, 0, NULL },
        { "nr", roff_nr, NULL, NULL, 0, NULL },
@@ -248,6 +256,7 @@ roffnode_pop(struct roff *r)
                if (r->rstackpos > -1)
                        r->rstackpos--;
 
+       ROFF_DEBUG("roff: popping scope\n");
        r->last = r->last->parent;
        if (p->end)
                free(p->end);
@@ -426,8 +435,8 @@ roff_parseln(struct roff *r, int ln, char **bufp,
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);
-               ROFF_DEBUG("roff: intercept scoped context: %s\n", 
-                               roffs[t].name);
+               ROFF_DEBUG("roff: intercept scoped context: %s, [%s]\n", 
+                               roffs[t].name, &(*bufp)[pos]);
                return((*roffs[t].sub)
                                (r, t, bufp, szp, 
                                 ln, pos, pos, offs));
@@ -748,7 +757,6 @@ roff_cond_sub(ROFF_ARGS)
 {
        enum rofft       t;
        enum roffrule    rr;
-       struct roffnode *l;
 
        ppos = pos;
        rr = r->last->rule;
@@ -758,14 +766,15 @@ roff_cond_sub(ROFF_ARGS)
         * continue. 
         */
 
-       l = r->last;
        roffnode_cleanscope(r);
 
-       if (l != r->last)
-               return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
-
-       if (ROFF_MAX == (t = roff_parse(*bufp, &pos)))
+       if (ROFF_MAX == (t = roff_parse(*bufp, &pos))) {
+               if ('\\' == (*bufp)[pos] && '}' == (*bufp)[pos + 1])
+                       return(roff_ccond
+                               (r, ROFF_ccond, bufp, szp, 
+                                ln, pos, pos + 2, offs));
                return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
+       }
 
        /*
         * A denied conditional must evaluate its children if and only
@@ -797,6 +806,8 @@ roff_cond_text(ROFF_ARGS)
         * scope permits us to do so.
         */
 
+       /* FIXME: use roff_ccond? */
+
        st = &(*bufp)[pos];
        if (NULL == (ep = strstr(st, "\\}"))) {
                roffnode_cleanscope(r);
@@ -838,7 +849,7 @@ roff_evalcond(const char *v, int *pos)
 
 /* ARGSUSED */
 static enum rofferr
-roff_line(ROFF_ARGS)
+roff_line_ignore(ROFF_ARGS)
 {
 
        return(ROFF_IGN);