Revert IGNPAR to a warning after clue-stick applied by schwarze@:

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 15568dd2011640a7835c66eeca8a51855744a8c2..3746b3eabd79289b07130302656f2237da408b41 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.195 2010/11/29 13:02:47 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.201 2010/12/22 11:15:16 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>


@@ -319,9 +319,12 @@ print_mdoc_node(DECL_ARGS)
        /*
         * Keeps only work until the end of a line.  If a keep was
         * invoked in a prior line, revert it to PREKEEP.
        /*
         * Keeps only work until the end of a line.  If a keep was
         * invoked in a prior line, revert it to PREKEEP.

+        *
+        * Also let SYNPRETTY sections behave as if they were wrapped
+        * in a `Bk' block.

         */
 
         */
 

-       if (TERMP_KEEP & p->flags) {
+       if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {

                if (n->prev && n->prev->line != n->line) {
                        p->flags &= ~TERMP_KEEP;
                        p->flags |= TERMP_PREKEEP;
                if (n->prev && n->prev->line != n->line) {
                        p->flags &= ~TERMP_KEEP;
                        p->flags |= TERMP_PREKEEP;


@@ -333,6 +336,16 @@ print_mdoc_node(DECL_ARGS)
                }
        }
 
                }
        }
 

+       /*
+        * Since SYNPRETTY sections aren't "turned off" with `Ek',
+        * we have to intuit whether we should disable formatting.
+        */
+
+       if ( ! (MDOC_SYNPRETTY & n->flags) &&
+           ((n->prev   && MDOC_SYNPRETTY & n->prev->flags) ||
+            (n->parent && MDOC_SYNPRETTY & n->parent->flags)))
+               p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
+

        if (chld && n->child)
                print_mdoc_nodelist(p, &npair, m, n->child);
 
        if (chld && n->child)
                print_mdoc_nodelist(p, &npair, m, n->child);
 


@@ -543,9 +556,9 @@ print_bvspace(struct termp *p,
 
        term_newln(p);
 
 
        term_newln(p);
 

-       if (MDOC_Bd == bl->tok && bl->data.Bd->comp)
+       if (MDOC_Bd == bl->tok && bl->norm->d.Bd.comp)

                return;
                return;

-       if (MDOC_Bl == bl->tok && bl->data.Bl->comp)
+       if (MDOC_Bl == bl->tok && bl->norm->d.Bl.comp)

                return;
 
        /* Do not vspace directly after Ss/Sh. */
                return;
 
        /* Do not vspace directly after Ss/Sh. */


@@ -564,13 +577,13 @@ print_bvspace(struct termp *p,
 
        /* A `-column' does not assert vspace within the list. */
 
 
        /* A `-column' does not assert vspace within the list. */
 

-       if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl->type)
+       if (MDOC_Bl == bl->tok && LIST_column == bl->norm->d.Bl.type)

                if (n->prev && MDOC_It == n->prev->tok)
                        return;
 
        /* A `-diag' without body does not vspace. */
 
                if (n->prev && MDOC_It == n->prev->tok)
                        return;
 
        /* A `-diag' without body does not vspace. */
 

-       if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl->type)
+       if (MDOC_Bl == bl->tok && LIST_diag == bl->norm->d.Bl.type)

                if (n->prev && MDOC_It == n->prev->tok) {
                        assert(n->prev->body);
                        if (NULL == n->prev->body->child)
                if (n->prev && MDOC_It == n->prev->tok) {
                        assert(n->prev->body);
                        if (NULL == n->prev->body->child)


@@ -597,8 +610,7 @@ termp_it_pre(DECL_ARGS)
        }
 
        bl = n->parent->parent->parent;
        }
 
        bl = n->parent->parent->parent;

-       assert(bl->data.Bl);
-       type = bl->data.Bl->type;
+       type = bl->norm->d.Bl.type;

 
        /* 
         * First calculate width and offset.  This is pretty easy unless
 
        /* 
         * First calculate width and offset.  This is pretty easy unless


@@ -608,8 +620,8 @@ termp_it_pre(DECL_ARGS)
 
        width = offset = 0;
 
 
        width = offset = 0;
 

-       if (bl->data.Bl->offs)
-               offset = a2offs(p, bl->data.Bl->offs);
+       if (bl->norm->d.Bl.offs)
+               offset = a2offs(p, bl->norm->d.Bl.offs);

 
        switch (type) {
        case (LIST_column):
 
        switch (type) {
        case (LIST_column):


@@ -625,7 +637,7 @@ termp_it_pre(DECL_ARGS)
                 *   column.
                 * - For more than 5 columns, add only one column.
                 */
                 *   column.
                 * - For more than 5 columns, add only one column.
                 */

-               ncols = bl->data.Bl->ncols;
+               ncols = bl->norm->d.Bl.ncols;

 
                /* LINTED */
                dcol = ncols < 5 ? term_len(p, 4) : 
 
                /* LINTED */
                dcol = ncols < 5 ? term_len(p, 4) : 


@@ -640,7 +652,7 @@ termp_it_pre(DECL_ARGS)
                                nn->prev && i < (int)ncols; 
                                nn = nn->prev, i++)
                        offset += dcol + a2width
                                nn->prev && i < (int)ncols; 
                                nn = nn->prev, i++)
                        offset += dcol + a2width

-                               (p, bl->data.Bl->cols[i]);
+                               (p, bl->norm->d.Bl.cols[i]);

 
                /*
                 * When exceeding the declared number of columns, leave
 
                /*
                 * When exceeding the declared number of columns, leave


@@ -655,10 +667,10 @@ termp_it_pre(DECL_ARGS)
                 * Use the declared column widths, extended as explained
                 * in the preceding paragraph.
                 */
                 * Use the declared column widths, extended as explained
                 * in the preceding paragraph.
                 */

-               width = a2width(p, bl->data.Bl->cols[i]) + dcol;
+               width = a2width(p, bl->norm->d.Bl.cols[i]) + dcol;

                break;
        default:
                break;
        default:

-               if (NULL == bl->data.Bl->width)
+               if (NULL == bl->norm->d.Bl.width)

                        break;
 
                /* 
                        break;
 
                /* 


@@ -666,8 +678,8 @@ termp_it_pre(DECL_ARGS)
                 * number for buffering single arguments.  See the above
                 * handling for column for how this changes.
                 */
                 * number for buffering single arguments.  See the above
                 * handling for column for how this changes.
                 */

-               assert(bl->data.Bl->width);
-               width = a2width(p, bl->data.Bl->width) + term_len(p, 2);
+               assert(bl->norm->d.Bl.width);
+               width = a2width(p, bl->norm->d.Bl.width) + term_len(p, 2);

                break;
        }
 
                break;
        }
 


@@ -929,7 +941,7 @@ termp_it_post(DECL_ARGS)
        if (MDOC_BLOCK == n->type)
                return;
 
        if (MDOC_BLOCK == n->type)
                return;
 

-       type = n->parent->parent->parent->data.Bl->type;
+       type = n->parent->parent->parent->norm->d.Bl.type;

 
        switch (type) {
        case (LIST_item):
 
        switch (type) {
        case (LIST_item):


@@ -1103,10 +1115,10 @@ termp_an_post(DECL_ARGS)
                return;
        }
 
                return;
        }
 

-       if (AUTH_split == n->data.An.auth) {
+       if (AUTH_split == n->norm->d.An.auth) {

                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;
                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;

-       } else if (AUTH_nosplit == n->data.An.auth) {
+       } else if (AUTH_nosplit == n->norm->d.An.auth) {

                p->flags &= ~TERMP_SPLIT;
                p->flags |= TERMP_NOSPLIT;
        }
                p->flags &= ~TERMP_SPLIT;
                p->flags |= TERMP_NOSPLIT;
        }


@@ -1553,9 +1565,8 @@ termp_bd_pre(DECL_ARGS)
        } else if (MDOC_HEAD == n->type)
                return(0);
 
        } else if (MDOC_HEAD == n->type)
                return(0);
 

-       assert(n->data.Bd);
-       if (n->data.Bd->offs)
-               p->offset += a2offs(p, n->data.Bd->offs);
+       if (n->norm->d.Bd.offs)
+               p->offset += a2offs(p, n->norm->d.Bd.offs);

 
        /*
         * If -ragged or -filled are specified, the block does nothing
 
        /*
         * If -ragged or -filled are specified, the block does nothing


@@ -1565,8 +1576,8 @@ termp_bd_pre(DECL_ARGS)
         * lines are allowed.
         */
        
         * lines are allowed.
         */
        

-       if (DISP_literal != n->data.Bd->type && 
-                       DISP_unfilled != n->data.Bd->type)
+       if (DISP_literal != n->norm->d.Bd.type && 
+                       DISP_unfilled != n->norm->d.Bd.type)

                return(1);
 
        tabwidth = p->tabwidth;
                return(1);
 
        tabwidth = p->tabwidth;


@@ -1592,6 +1603,10 @@ termp_bd_pre(DECL_ARGS)
                        /* FALLTHROUGH */
                case (MDOC_Bl):
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
                case (MDOC_Bl):
                        /* FALLTHROUGH */

+               case (MDOC_D1):
+                       /* FALLTHROUGH */
+               case (MDOC_Dl):
+                       /* FALLTHROUGH */

                case (MDOC_Lp):
                        /* FALLTHROUGH */
                case (MDOC_Pp):
                case (MDOC_Lp):
                        /* FALLTHROUGH */
                case (MDOC_Pp):


@@ -1624,9 +1639,8 @@ termp_bd_post(DECL_ARGS)
        rm = p->rmargin;
        rmax = p->maxrmargin;
 
        rm = p->rmargin;
        rmax = p->maxrmargin;
 

-       assert(n->data.Bd);
-       if (DISP_literal == n->data.Bd->type || 
-                       DISP_unfilled == n->data.Bd->type)
+       if (DISP_literal == n->norm->d.Bd.type || 
+                       DISP_unfilled == n->norm->d.Bd.type)

                p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        p->flags |= TERMP_NOSPACE;
                p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        p->flags |= TERMP_NOSPACE;


@@ -1798,11 +1812,6 @@ termp_sp_pre(DECL_ARGS)
                len = 0;
                break;
        default:
                len = 0;
                break;
        default:

-               assert(n->parent);
-               if ((NULL == n->next || NULL == n->prev) &&
-                               (MDOC_Ss == n->parent->tok ||
-                                MDOC_Sh == n->parent->tok))
-                       return(0);

                len = 1;
                break;
        }
                len = 1;
                break;
        }


@@ -1986,11 +1995,9 @@ termp_bf_pre(DECL_ARGS)
        else if (MDOC_BLOCK != n->type)
                return(1);
 
        else if (MDOC_BLOCK != n->type)
                return(1);
 

-       assert(n->data.Bf);
-
-       if (FONT_Em == n->data.Bf->font) 
+       if (FONT_Em == n->norm->d.Bf.font) 

                term_fontpush(p, TERMFONT_UNDER);
                term_fontpush(p, TERMFONT_UNDER);

-       else if (FONT_Sy == n->data.Bf->font) 
+       else if (FONT_Sy == n->norm->d.Bf.font) 

                term_fontpush(p, TERMFONT_BOLD);
        else 
                term_fontpush(p, TERMFONT_NONE);
                term_fontpush(p, TERMFONT_BOLD);
        else 
                term_fontpush(p, TERMFONT_NONE);


@@ -2105,7 +2112,8 @@ termp_bk_pre(DECL_ARGS)
        case (MDOC_HEAD):
                return(0);
        case (MDOC_BODY):
        case (MDOC_HEAD):
                return(0);
        case (MDOC_BODY):

-               p->flags |= TERMP_PREKEEP;
+               if (n->parent->args || 0 == n->prev->nchild)
+                       p->flags |= TERMP_PREKEEP;

                break;
        default:
                abort();
                break;
        default:
                abort();