Fixed two very subtle bugs in retaining overstep and maxrmargin widths between parse...

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 474299113bb0dc16e22d2ea81712c4a7e3903b6b..699d5c00682ee984460016ce6bda3ca039c4b06f 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.109 2010/01/01 18:33:51 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>
  *
@@ -132,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);
 
@@ -175,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 */
@@ -269,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):
@@ -1290,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);