Revert part of the previous diff to fix a regression (another endless loop)

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index 6cb159e7a04d118323617f8ab3bbd75ad5d1fc27..d289f2d12bfb5f3d6416a24e588cb4dd6b31eacf 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,7 +1,7 @@
-/*     $Id: man_term.c,v 1.229 2019/06/27 12:20:18 schwarze Exp $ */
+/* $Id: man_term.c,v 1.236 2021/06/28 19:50:15 schwarze Exp $ */
 /*
+ * Copyright (c) 2010-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,9 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Plain text formatter for man(7), used by mandoc(1)
+ * for ASCII, UTF-8, PostScript, and PDF output.
  */
 #include "config.h"
 
@@ -27,10 +30,12 @@
 #include <string.h>
 
 #include "mandoc_aux.h"
+#include "mandoc.h"
 #include "roff.h"
 #include "man.h"
 #include "out.h"
 #include "term.h"
+#include "term_tag.h"
 #include "main.h"
 
 #define        MAXMARGINS        64 /* maximum number of indented scopes */
@@ -62,7 +67,7 @@ static        void              print_man_head(struct termp *,
 static void              print_man_foot(struct termp *,
                                const struct roff_meta *);
 static void              print_bvspace(struct termp *,
-                               const struct roff_node *, int);
+                               struct roff_node *, int);
 
 static int               pre_B(DECL_ARGS);
 static int               pre_DT(DECL_ARGS);
@@ -201,19 +206,20 @@ terminal_man(void *arg, const struct roff_meta *man)
  * first, print it.
  */
 static void
-print_bvspace(struct termp *p, const struct roff_node *n, int pardist)
+print_bvspace(struct termp *p, struct roff_node *n, int pardist)
 {
-       int      i;
+       struct roff_node        *nch;
+       int                      i;
 
        term_newln(p);
 
-       if (n->body != NULL && n->body->child != NULL)
-               if (n->body->child->type == ROFFT_TBL)
-                       return;
+       if (n->body != NULL &&
+           (nch = roff_node_child(n->body)) != NULL &&
+           nch->type == ROFFT_TBL)
+               return;
 
-       if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS)
-               if (n->prev == NULL)
-                       return;
+       if (n->parent->tok != MAN_RS && roff_node_prev(n) == NULL)
+               return;
 
        for (i = 0; i < pardist; i++)
                term_vspace(p);
@@ -315,7 +321,7 @@ pre_alternate(DECL_ARGS)
                assert(nn->type == ROFFT_TEXT);
                term_word(p, nn->string);
                if (nn->flags & NODE_EOS)
-                       p->flags |= TERMP_SENTENCE;
+                       p->flags |= TERMP_SENTENCE;
                if (nn->next != NULL)
                        p->flags |= TERMP_NOSPACE;
        }
@@ -665,12 +671,8 @@ pre_SS(DECL_ARGS)
                 * and after an empty subsection.
                 */
 
-               do {
-                       n = n->prev;
-               } while (n != NULL && n->tok >= MAN_TH &&
-                   man_term_act(n->tok)->flags & MAN_NOTEXT);
-               if (n == NULL || n->type == ROFFT_COMMENT ||
-                   (n->tok == MAN_SS && n->body->child == NULL))
+               if ((n = roff_node_prev(n)) == NULL ||
+                   (n->tok == MAN_SS && roff_node_child(n->body) == NULL))
                        break;
 
                for (i = 0; i < mt->pardist; i++)
@@ -710,12 +712,8 @@ pre_SH(DECL_ARGS)
                 * and after an empty section.
                 */
 
-               do {
-                       n = n->prev;
-               } while (n != NULL && n->tok >= MAN_TH &&
-                   man_term_act(n->tok)->flags & MAN_NOTEXT);
-               if (n == NULL || n->type == ROFFT_COMMENT ||
-                   (n->tok == MAN_SH && n->body->child == NULL))
+               if ((n = roff_node_prev(n)) == NULL ||
+                   (n->tok == MAN_SH && roff_node_child(n->body) == NULL))
                        break;
 
                for (i = 0; i < mt->pardist; i++)
@@ -821,7 +819,7 @@ pre_SY(DECL_ARGS)
 
        switch (n->type) {
        case ROFFT_BLOCK:
-               if (n->prev == NULL || n->prev->tok != MAN_SY)
+               if ((nn = roff_node_prev(n)) == NULL || nn->tok != MAN_SY)
                        print_bvspace(p, n, mt->pardist);
                return 1;
        case ROFFT_HEAD:
@@ -902,6 +900,9 @@ print_man_node(DECL_ARGS)
        const struct man_term_act *act;
        int c;
 
+       if (n->flags & NODE_ID)
+               term_tag_write(n, p->line);
+
        switch (n->type) {
        case ROFFT_TEXT:
                /*
@@ -1020,10 +1021,6 @@ print_man_foot(struct termp *p, const struct roff_meta *meta)
         */
 
        if ( ! p->mdocstyle) {
-               if (meta->hasbody) {
-                       term_vspace(p);
-                       term_vspace(p);
-               }
                mandoc_asprintf(&title, "%s(%s)",
                    meta->title, meta->msec);
        } else if (meta->os != NULL) {
@@ -1142,9 +1139,5 @@ print_man_head(struct termp *p, const struct roff_meta *meta)
         */
 
        term_vspace(p);
-       if ( ! p->mdocstyle) {
-               term_vspace(p);
-               term_vspace(p);
-       }
        free(title);
 }