Fixed re-adjustment of scope in exiting roff instructions (libman).

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index b51ce2367bc04111b000510c11d82ef72cb214ca..699d5c00682ee984460016ce6bda3ca039c4b06f 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.108 2010/01/01 18:01:40 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.111 2010/03/23 12:42:22 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -37,7 +37,6 @@
 
 struct termpair {
        struct termpair  *ppair;
-       int               flag; 
        int               count;
 };
 
@@ -133,6 +132,7 @@ static      int       termp_sq_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_under_pre(DECL_ARGS);
 static int       termp_ud_pre(DECL_ARGS);
+static int       termp_vt_pre(DECL_ARGS);
 static int       termp_xr_pre(DECL_ARGS);
 static int       termp_xx_pre(DECL_ARGS);
 
@@ -176,7 +176,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */ 
        { termp_under_pre, NULL }, /* Va */
-       { termp_under_pre, termp_vt_post }, /* Vt */
+       { termp_vt_pre, termp_vt_post }, /* Vt */
        { termp_xr_pre, NULL }, /* Xr */
        { NULL, termp____post }, /* %A */
        { termp_under_pre, termp____post }, /* %B */
@@ -270,6 +270,9 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 
        p = (struct termp *)arg;
 
+       p->overstep = 0;
+       p->maxrmargin = 78;
+
        if (NULL == p->symtab)
                switch (p->enc) {
                case (TERMENC_ASCII):
@@ -677,10 +680,6 @@ termp_it_pre(DECL_ARGS)
 
        bl = n->parent->parent->parent;
 
-       /* Save parent attributes. */
-
-       pair->flag = p->flags;
-
        /* Get list width, offset, and list type from argument list. */
 
        keys[0] = MDOC_Width;
@@ -822,11 +821,10 @@ termp_it_pre(DECL_ARGS)
        }
 
        /*
-        * Pad and break control.  This is the tricker part.  Lists with
-        * set right-margins for the head get TERMP_NOBREAK because, if
-        * they overrun the margin, they wrap to the new margin.
-        * Correspondingly, the body for these types don't left-pad, as
-        * the head will pad out to to the right.
+        * Pad and break control.  This is the tricky part.  These flags
+        * are documented in term_flushln() in term.c.  Note that we're
+        * going to unset all of these flags in termp_it_post() when we
+        * exit.
         */
 
        switch (type) {
@@ -967,7 +965,7 @@ termp_it_pre(DECL_ARGS)
                        break;
                case (MDOC_Enum):
                        (pair->ppair->ppair->count)++;
-                       (void)snprintf(buf, sizeof(buf), "%d.", 
+                       snprintf(buf, sizeof(buf), "%d.", 
                                        pair->ppair->ppair->count);
                        term_word(p, buf);
                        break;
@@ -1010,7 +1008,7 @@ termp_it_post(DECL_ARGS)
 {
        int                type;
 
-       if (MDOC_BODY != n->type && MDOC_HEAD != n->type)
+       if (MDOC_BLOCK == n->type)
                return;
 
        type = arg_listtype(n->parent->parent->parent);
@@ -1034,7 +1032,17 @@ termp_it_post(DECL_ARGS)
                break;
        }
 
-       p->flags = pair->flag;
+       /* 
+        * Now that our output is flushed, we can reset our tags.  Since
+        * only `It' sets these flags, we're free to assume that nobody
+        * has munged them in the meanwhile.
+        */
+
+       p->flags &= ~TERMP_DANGLE;
+       p->flags &= ~TERMP_NOBREAK;
+       p->flags &= ~TERMP_TWOSPACE;
+       p->flags &= ~TERMP_NOLPAD;
+       p->flags &= ~TERMP_HANG;
 }
 
 
@@ -1286,12 +1294,27 @@ termp_xr_pre(DECL_ARGS)
 }
 
 
+static int
+termp_vt_pre(DECL_ARGS)
+{
+
+       if (MDOC_ELEM == n->type)
+               return(termp_under_pre(p, pair, m, n));
+       else if (MDOC_HEAD == n->type)
+               return(0);
+       else if (MDOC_BLOCK == n->type)
+               return(1);
+
+       return(termp_under_pre(p, pair, m, n));
+}
+
+
 /* ARGSUSED */
 static void
 termp_vt_post(DECL_ARGS)
 {
 
-       if (n->sec != SEC_SYNOPSIS)
+       if (MDOC_BLOCK != n->type)
                return;
        if (n->next && MDOC_Vt == n->next->tok)
                term_newln(p);
@@ -2015,10 +2038,9 @@ termp_sm_pre(DECL_ARGS)
 {
 
        assert(n->child && MDOC_TEXT == n->child->type);
-       if (0 == strcmp("on", n->child->string)) {
+       if (0 == strcmp("on", n->child->string))
                p->flags &= ~TERMP_NONOSPACE;
-               p->flags &= ~TERMP_NOSPACE;
-       } else
+       else
                p->flags |= TERMP_NONOSPACE;
 
        return(0);