Remove the pod2man table entries. They can now be properly read and

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index cb962277fbf3fff102e7cd8d07ca6d4af16dd047..ece3dfd2d2a45d5c579440dbab8f289e535b55cf 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.98 2010/08/20 01:02:07 schwarze Exp $ */
+/*     $Id: roff.c,v 1.100 2010/08/29 11:29:51 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -59,7 +59,7 @@ enum  rofft {
        ROFF_rm,
        ROFF_tr,
        ROFF_cblock,
-       ROFF_ccond,
+       ROFF_ccond, /* FIXME: remove this. */
        ROFF_nr,
        ROFF_MAX
 };
@@ -136,6 +136,7 @@ static      int              roff_res(struct roff *,
                                char **, size_t *, int);
 static void             roff_setstr(struct roff *,
                                const char *, const char *);
+static char            *roff_strdup(const char *);
 
 /* See roff_hash_find() */
 
@@ -763,8 +764,13 @@ roff_cond_sub(ROFF_ARGS)
        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
@@ -796,6 +802,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);
@@ -1035,6 +1043,27 @@ roff_nr(ROFF_ARGS)
 }
 
 
+static char *
+roff_strdup(const char *name)
+{
+       char            *namecopy, *sv;
+
+       /* 
+        * This isn't a nice simple mandoc_strdup() because we must
+        * handle roff's stupid double-escape rule. 
+        */
+       sv = namecopy = mandoc_malloc(strlen(name) + 1);
+       while (*name) {
+               if ('\\' == *name && '\\' == *(name + 1))
+                       name++;
+               *namecopy++ = *name++;
+       }
+
+       *namecopy = '\0';
+       return(sv);
+}
+
+
 static void
 roff_setstr(struct roff *r, const char *name, const char *string)
 {
@@ -1054,8 +1083,9 @@ roff_setstr(struct roff *r, const char *name, const char *string)
        } else
                free(n->string);
 
-       ROFF_DEBUG("roff: new symbol: [%s] = [%s]\n", name, string);
-       n->string = string ? strdup(string) : NULL;
+       /* Don't use mandoc_strdup: clean out double-escapes. */
+       n->string = string ? roff_strdup(string) : NULL;
+       ROFF_DEBUG("roff: new symbol: [%s] = [%s]\n", name, n->string);
 }