Do not confuse .Bl -column lists that just broken another block

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 1fb02aa96fde48f8e48fc2e446839f63dd813102..8edd8ae4d5b0436de8655d0bb473d3bbce2e31bc 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.305 2015/01/31 00:12:41 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.310 2015/02/12 12:24:33 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -67,6 +67,7 @@ static        void      termp__t_post(DECL_ARGS);
 static void      termp_bd_post(DECL_ARGS);
 static void      termp_bk_post(DECL_ARGS);
 static void      termp_bl_post(DECL_ARGS);
+static void      termp_eo_post(DECL_ARGS);
 static void      termp_fd_post(DECL_ARGS);
 static void      termp_fo_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);
@@ -91,6 +92,7 @@ static        int       termp_bt_pre(DECL_ARGS);
 static int       termp_bx_pre(DECL_ARGS);
 static int       termp_cd_pre(DECL_ARGS);
 static int       termp_d1_pre(DECL_ARGS);
+static int       termp_eo_pre(DECL_ARGS);
 static int       termp_ex_pre(DECL_ARGS);
 static int       termp_fa_pre(DECL_ARGS);
 static int       termp_fd_pre(DECL_ARGS);
@@ -190,7 +192,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ec */ /* FIXME: no space */
        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */
-       { termp_quote_pre, termp_quote_post }, /* Eo */
+       { termp_eo_pre, termp_eo_post }, /* Eo */
        { termp_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */
        { termp_li_pre, NULL }, /* No */
@@ -307,6 +309,7 @@ print_mdoc_node(DECL_ARGS)
        chld = 1;
        offset = p->offset;
        rmargin = p->rmargin;
+       n->flags &= ~MDOC_ENDED;
        n->prev_font = p->fonti;
 
        memset(&npair, 0, sizeof(struct termpair));
@@ -317,12 +320,9 @@ print_mdoc_node(DECL_ARGS)
         * invoked in a prior line, revert it to PREKEEP.
         */
 
-       if (TERMP_KEEP & p->flags) {
-               if (n->prev ? (n->prev->lastline != n->line) :
-                   (n->parent && n->parent->line != n->line)) {
-                       p->flags &= ~TERMP_KEEP;
-                       p->flags |= TERMP_PREKEEP;
-               }
+       if (p->flags & TERMP_KEEP && n->flags & MDOC_LINE) {
+               p->flags &= ~TERMP_KEEP;
+               p->flags |= TERMP_PREKEEP;
        }
 
        /*
@@ -362,7 +362,7 @@ print_mdoc_node(DECL_ARGS)
                print_mdoc_nodelist(p, &npair, meta, n->child);
 
        term_fontpopq(p,
-           (ENDBODY_NOT == n->end ? n : n->pending)->prev_font);
+           (ENDBODY_NOT == n->end ? n : n->body)->prev_font);
 
        switch (n->type) {
        case MDOC_TEXT:
@@ -382,7 +382,7 @@ print_mdoc_node(DECL_ARGS)
                 * that it must not call the post handler again.
                 */
                if (ENDBODY_NOT != n->end)
-                       n->pending->flags |= MDOC_ENDED;
+                       n->body->flags |= MDOC_ENDED;
 
                /*
                 * End of line terminating an implicit block
@@ -1092,9 +1092,6 @@ termp_an_pre(DECL_ARGS)
                return(0);
        }
 
-       if (n->child == NULL)
-               return(0);
-
        if (p->flags & TERMP_SPLIT)
                term_newln(p);
 
@@ -1884,8 +1881,6 @@ termp_quote_pre(DECL_ARGS)
                        return(1);
                term_word(p, n->norm->Es->child->string);
                break;
-       case MDOC_Eo:
-               break;
        case MDOC_Po:
                /* FALLTHROUGH */
        case MDOC_Pq:
@@ -1921,9 +1916,7 @@ termp_quote_post(DECL_ARGS)
        if (n->type != MDOC_BODY && n->type != MDOC_ELEM)
                return;
 
-       if ( ! (n->tok == MDOC_En ||
-           (n->tok == MDOC_Eo && n->end == ENDBODY_SPACE)))
-               p->flags |= TERMP_NOSPACE;
+       p->flags |= TERMP_NOSPACE;
 
        switch (n->tok) {
        case MDOC_Ao:
@@ -1952,14 +1945,12 @@ termp_quote_post(DECL_ARGS)
                term_word(p, "\\(rq");
                break;
        case MDOC_En:
-               if (NULL != n->norm->Es &&
-                   NULL != n->norm->Es->child &&
-                   NULL != n->norm->Es->child->next) {
-                       p->flags |= TERMP_NOSPACE;
+               if (n->norm->Es == NULL ||
+                   n->norm->Es->child == NULL ||
+                   n->norm->Es->child->next == NULL)
+                       p->flags &= ~TERMP_NOSPACE;
+               else
                        term_word(p, n->norm->Es->child->next->string);
-               }
-               break;
-       case MDOC_Eo:
                break;
        case MDOC_Po:
                /* FALLTHROUGH */
@@ -1986,6 +1977,50 @@ termp_quote_post(DECL_ARGS)
        }
 }
 
+static int
+termp_eo_pre(DECL_ARGS)
+{
+
+       if (n->type != MDOC_BODY)
+               return(1);
+
+       if (n->end == ENDBODY_NOT &&
+           n->parent->head->child == NULL &&
+           n->child != NULL &&
+           n->child->end != ENDBODY_NOT)
+               term_word(p, "\\&");
+       else if (n->end != ENDBODY_NOT ? n->child != NULL :
+            n->parent->head->child != NULL && (n->child != NULL ||
+            (n->parent->tail != NULL && n->parent->tail->child != NULL)))
+               p->flags |= TERMP_NOSPACE;
+
+       return(1);
+}
+
+static void
+termp_eo_post(DECL_ARGS)
+{
+       int      body, tail;
+
+       if (n->type != MDOC_BODY)
+               return;
+
+       if (n->end != ENDBODY_NOT) {
+               p->flags &= ~TERMP_NOSPACE;
+               return;
+       }
+
+       body = n->child != NULL || n->parent->head->child != NULL;
+       tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+       if (body && tail)
+               p->flags |= TERMP_NOSPACE;
+       else if ( ! (body || tail))
+               term_word(p, "\\&");
+       else if ( ! tail)
+               p->flags &= ~TERMP_NOSPACE;
+}
+
 static int
 termp_fo_pre(DECL_ARGS)
 {