Allow `.xx\}' where xx is a macro (e.g., `.br\}') to close scope. This is

experimental and hasn't been rigorously tested.  It's only implemented in
-mdoc for the time being.  This is absolutely required for pod2man.  It
does, however, make the pod2man preamble be processed in full.

diff --git a/mdoc.c b/mdoc.c
index f8b09f7af19d9a7eea8b2531cd19a6f14c9d6a05..bee01503f341021bd6e8b3825ecb91ba237c1358 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.163 2010/08/20 01:02:07 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.164 2010/08/29 11:29:51 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -758,11 +758,14 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 
        /* 
         * Copy the first word into a nil-terminated buffer.
-        * Stop copying when a tab, space, or eoln is encountered.
+        * Stop copying when a tab, space, backslash, or eoln is encountered.
         */
 
        j = 0;
-       while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i])
+       while (j < 4 && '\0' != buf[i] && 
+                       ' ' != buf[i] && 
+                       '\t' != buf[i] && 
+                       '\\' != buf[i])
                mac[j++] = buf[i++];
        mac[j] = '\0';
 

diff --git a/roff.c b/roff.c
index b111ad234e56ec2b7cc1c7d5ca1066148ed744e9..ece3dfd2d2a45d5c579440dbab8f289e535b55cf 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.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
 };
@@ -764,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
@@ -797,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);