Implement line breaking of the generated HTML code at space characters

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index d9814ff0a16641de575e77973581f321b3150789..672ab4163228dc5ce374d2d1a6c54fbaefe3c716 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.186 2015/10/12 00:08:15 schwarze Exp $ */
+/*     $Id: man_term.c,v 1.188 2017/01/10 13:47:00 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -219,7 +219,7 @@ static int
 pre_ll(DECL_ARGS)
 {
 
-       term_setwidth(p, n->nchild ? n->child->string : NULL);
+       term_setwidth(p, n->child != NULL ? n->child->string : NULL);
        return 0;
 }
 
@@ -319,7 +319,7 @@ pre_alternate(DECL_ARGS)
                        mt->fl |= MANT_LITERAL;
                assert(nn->type == ROFFT_TEXT);
                term_word(p, nn->string);
-               if (nn->flags & MAN_EOS)
+               if (nn->flags & NODE_EOS)
                        p->flags |= TERMP_SENTENCE;
                if (nn->next)
                        p->flags |= TERMP_NOSPACE;
@@ -677,7 +677,7 @@ pre_TP(DECL_ARGS)
        /* Calculate offset. */
 
        if ((nn = n->parent->head->child) != NULL &&
-           nn->string != NULL && ! (MAN_LINE & nn->flags) &&
+           nn->string != NULL && ! (NODE_LINE & nn->flags) &&
            a2roffsu(nn->string, &su, SCALE_EN)) {
                len = term_hspan(p, &su) / 24;
                if (len < 0 && (size_t)(-len) > mt->offset)
@@ -698,7 +698,7 @@ pre_TP(DECL_ARGS)
 
                /* Don't print same-line elements. */
                nn = n->child;
-               while (NULL != nn && 0 == (MAN_LINE & nn->flags))
+               while (NULL != nn && 0 == (NODE_LINE & nn->flags))
                        nn = nn->next;
 
                while (NULL != nn) {
@@ -960,17 +960,17 @@ print_man_node(DECL_ARGS)
                if ('\0' == *n->string) {
                        term_vspace(p);
                        return;
-               } else if (' ' == *n->string && MAN_LINE & n->flags)
+               } else if (' ' == *n->string && NODE_LINE & n->flags)
                        term_newln(p);
 
                term_word(p, n->string);
                goto out;
 
        case ROFFT_EQN:
-               if ( ! (n->flags & MAN_LINE))
+               if ( ! (n->flags & NODE_LINE))
                        p->flags |= TERMP_NOSPACE;
                term_eqn(p, n->eqn);
-               if (n->next != NULL && ! (n->next->flags & MAN_LINE))
+               if (n->next != NULL && ! (n->next->flags & NODE_LINE))
                        p->flags |= TERMP_NOSPACE;
                return;
        case ROFFT_TBL:
@@ -1007,7 +1007,7 @@ out:
         */
        if (mt->fl & MANT_LITERAL &&
            ! (p->flags & (TERMP_NOBREAK | TERMP_NONEWLINE)) &&
-           (n->next == NULL || n->next->flags & MAN_LINE)) {
+           (n->next == NULL || n->next->flags & NODE_LINE)) {
                rm = p->rmargin;
                rmax = p->maxrmargin;
                p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
@@ -1023,7 +1023,7 @@ out:
                        p->rmargin = rm;
                p->maxrmargin = rmax;
        }
-       if (MAN_EOS & n->flags)
+       if (NODE_EOS & n->flags)
                p->flags |= TERMP_SENTENCE;
 }