Fill mode changes don't break next-line scope in all cases,

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index cd1a2099d6db3545c26eaa654e7b9b07fc7402f9..a79e5e27b3c7e07f30e8c0e5f56afaa0ac7be22d 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.172 2015/04/02 22:48:17 schwarze Exp $ */
+/*     $Id: man_term.c,v 1.183 2015/04/19 19:44:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -49,7 +49,7 @@ struct        mtermp {
 #define        DECL_ARGS         struct termp *p, \
                          struct mtermp *mt, \
                          struct roff_node *n, \
-                         const struct man_meta *meta
+                         const struct roff_meta *meta
 
 struct termact {
        int             (*pre)(DECL_ARGS);
@@ -60,8 +60,10 @@ struct       termact {
 
 static void              print_man_nodelist(DECL_ARGS);
 static void              print_man_node(DECL_ARGS);
-static void              print_man_head(struct termp *, const void *);
-static void              print_man_foot(struct termp *, const void *);
+static void              print_man_head(struct termp *,
+                               const struct roff_meta *);
+static void              print_man_foot(struct termp *,
+                               const struct roff_meta *);
 static void              print_bvspace(struct termp *,
                                const struct roff_node *, int);
 
@@ -136,28 +138,23 @@ static    const struct termact termacts[MAN_MAX] = {
 
 
 void
-terminal_man(void *arg, const struct man *man)
+terminal_man(void *arg, const struct roff_man *man)
 {
        struct termp            *p;
-       const struct man_meta   *meta;
        struct roff_node        *n;
        struct mtermp            mt;
 
        p = (struct termp *)arg;
-
        p->overstep = 0;
        p->rmargin = p->maxrmargin = p->defrmargin;
        p->tabwidth = term_len(p, 5);
 
-       n = man_node(man)->child;
-       meta = man_meta(man);
-
        memset(&mt, 0, sizeof(struct mtermp));
-
        mt.lmargin[mt.lmargincur] = term_len(p, p->defindent);
        mt.offset = term_len(p, p->defindent);
        mt.pardist = 1;
 
+       n = man->first->child;
        if (p->synopsisonly) {
                while (n != NULL) {
                        if (n->tok == MAN_SH &&
@@ -165,7 +162,8 @@ terminal_man(void *arg, const struct man *man)
                            !strcmp(n->child->child->string, "SYNOPSIS")) {
                                if (n->child->next->child != NULL)
                                        print_man_nodelist(p, &mt,
-                                           n->child->next->child, meta);
+                                           n->child->next->child,
+                                           &man->meta);
                                term_newln(p);
                                break;
                        }
@@ -174,10 +172,10 @@ terminal_man(void *arg, const struct man *man)
        } else {
                if (p->defindent == 0)
                        p->defindent = 7;
-               term_begin(p, print_man_head, print_man_foot, meta);
+               term_begin(p, print_man_head, print_man_foot, &man->meta);
                p->flags |= TERMP_NOSPACE;
                if (n != NULL)
-                       print_man_nodelist(p, &mt, n, meta);
+                       print_man_nodelist(p, &mt, n, &man->meta);
                term_end(p);
        }
 }
@@ -319,7 +317,10 @@ pre_alternate(DECL_ARGS)
                term_fontrepl(p, font[i]);
                if (savelit && NULL == nn->next)
                        mt->fl |= MANT_LITERAL;
-               print_man_node(p, mt, nn, meta);
+               assert(nn->type == ROFFT_TEXT);
+               term_word(p, nn->string);
+               if (nn->flags & MAN_EOS)
+                       p->flags |= TERMP_SENTENCE;
                if (nn->next)
                        p->flags |= TERMP_NOSPACE;
        }
@@ -425,7 +426,7 @@ pre_in(DECL_ARGS)
        if ( ! a2roffsu(++cp, &su, SCALE_EN))
                return(0);
 
-       v = term_hspan(p, &su);
+       v = (term_hspan(p, &su) + 11) / 24;
 
        if (less < 0)
                p->offset -= p->offset > v ? v : p->offset;
@@ -481,6 +482,17 @@ pre_sp(DECL_ARGS)
                for (i = 0; i < len; i++)
                        term_vspace(p);
 
+       /*
+        * Handle an explicit break request in the same way
+        * as an overflowing line.
+        */
+
+       if (p->flags & TERMP_BRIND) {
+               p->offset = p->rmargin;
+               p->rmargin = p->maxrmargin;
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
+       }
+
        return(0);
 }
 
@@ -510,7 +522,7 @@ pre_HP(DECL_ARGS)
 
        if ((nn = n->parent->head->child) != NULL &&
            a2roffsu(nn->string, &su, SCALE_EN)) {
-               len = term_hspan(p, &su);
+               len = term_hspan(p, &su) / 24;
                if (len < 0 && (size_t)(-len) > mt->offset)
                        len = -mt->offset;
                else if (len > SHRT_MAX)
@@ -531,6 +543,17 @@ post_HP(DECL_ARGS)
        switch (n->type) {
        case ROFFT_BODY:
                term_newln(p);
+
+               /*
+                * Compatibility with a groff bug.
+                * The .HP macro uses the undocumented .tag request
+                * which causes a line break and cancels no-space
+                * mode even if there isn't any output.
+                */
+
+               if (n->child == NULL)
+                       term_vspace(p);
+
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
                p->trailspace = 0;
                p->offset = mt->offset;
@@ -584,7 +607,7 @@ pre_IP(DECL_ARGS)
        if ((nn = n->parent->head->child) != NULL &&
            (nn = nn->next) != NULL &&
            a2roffsu(nn->string, &su, SCALE_EN)) {
-               len = term_hspan(p, &su);
+               len = term_hspan(p, &su) / 24;
                if (len < 0 && (size_t)(-len) > mt->offset)
                        len = -mt->offset;
                else if (len > SHRT_MAX)
@@ -666,7 +689,7 @@ pre_TP(DECL_ARGS)
        if ((nn = n->parent->head->child) != NULL &&
            nn->string != NULL && ! (MAN_LINE & nn->flags) &&
            a2roffsu(nn->string, &su, SCALE_EN)) {
-               len = term_hspan(p, &su);
+               len = term_hspan(p, &su) / 24;
                if (len < 0 && (size_t)(-len) > mt->offset)
                        len = -mt->offset;
                else if (len > SHRT_MAX)
@@ -744,7 +767,7 @@ pre_SS(DECL_ARGS)
 
                do {
                        n = n->prev;
-               } while (n != NULL && n->tok != MAN_MAX &&
+               } while (n != NULL && n->tok != TOKEN_NONE &&
                    termacts[n->tok].flags & MAN_NOTEXT);
                if (n == NULL || (n->tok == MAN_SS && n->body->child == NULL))
                        break;
@@ -755,9 +778,15 @@ pre_SS(DECL_ARGS)
        case ROFFT_HEAD:
                term_fontrepl(p, TERMFONT_BOLD);
                p->offset = term_len(p, 3);
+               p->rmargin = mt->offset;
+               p->trailspace = mt->offset;
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND;
                break;
        case ROFFT_BODY:
                p->offset = mt->offset;
+               p->rmargin = p->maxrmargin;
+               p->trailspace = 0;
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
                break;
        default:
                break;
@@ -810,9 +839,15 @@ pre_SH(DECL_ARGS)
        case ROFFT_HEAD:
                term_fontrepl(p, TERMFONT_BOLD);
                p->offset = 0;
+               p->rmargin = mt->offset;
+               p->trailspace = mt->offset;
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND;
                break;
        case ROFFT_BODY:
                p->offset = mt->offset;
+               p->rmargin = p->maxrmargin;
+               p->trailspace = 0;
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
                break;
        default:
                break;
@@ -854,8 +889,10 @@ pre_RS(DECL_ARGS)
 
        n = n->parent->head;
        n->aux = SHRT_MAX + 1;
-       if (n->child != NULL && a2roffsu(n->child->string, &su, SCALE_EN))
-               n->aux = term_hspan(p, &su);
+       if (n->child == NULL)
+               n->aux = mt->lmargin[mt->lmargincur];
+       else if (a2roffsu(n->child->string, &su, SCALE_EN))
+               n->aux = term_hspan(p, &su) / 24;
        if (n->aux < 0 && (size_t)(-n->aux) > mt->offset)
                n->aux = -mt->offset;
        else if (n->aux > SHRT_MAX)
@@ -868,7 +905,7 @@ pre_RS(DECL_ARGS)
        if (++mt->lmarginsz < MAXMARGINS)
                mt->lmargincur = mt->lmarginsz;
 
-       mt->lmargin[mt->lmargincur] = mt->lmargin[mt->lmargincur - 1];
+       mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
        return(1);
 }
 
@@ -1012,13 +1049,11 @@ print_man_nodelist(DECL_ARGS)
 }
 
 static void
-print_man_foot(struct termp *p, const void *arg)
+print_man_foot(struct termp *p, const struct roff_meta *meta)
 {
-       const struct man_meta   *meta;
        char                    *title;
        size_t                   datelen, titlen;
 
-       meta = (const struct man_meta *)arg;
        assert(meta->title);
        assert(meta->msec);
        assert(meta->date);
@@ -1030,8 +1065,8 @@ print_man_foot(struct termp *p, const void *arg)
 
        /*
         * Temporary, undocumented option to imitate mdoc(7) output.
-        * In the bottom right corner, use the source instead of
-        * the title.
+        * In the bottom right corner, use the operating system
+        * instead of the title.
         */
 
        if ( ! p->mdocstyle) {
@@ -1041,14 +1076,14 @@ print_man_foot(struct termp *p, const void *arg)
                }
                mandoc_asprintf(&title, "%s(%s)",
                    meta->title, meta->msec);
-       } else if (meta->source) {
-               title = mandoc_strdup(meta->source);
+       } else if (meta->os) {
+               title = mandoc_strdup(meta->os);
        } else {
                title = mandoc_strdup("");
        }
        datelen = term_strlen(p, meta->date);
 
-       /* Bottom left corner: manual source. */
+       /* Bottom left corner: operating system. */
 
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
        p->trailspace = 1;
@@ -1056,8 +1091,8 @@ print_man_foot(struct termp *p, const void *arg)
        p->rmargin = p->maxrmargin > datelen ?
            (p->maxrmargin + term_len(p, 1) - datelen) / 2 : 0;
 
-       if (meta->source)
-               term_word(p, meta->source);
+       if (meta->os)
+               term_word(p, meta->os);
        term_flushln(p);
 
        /* At the bottom in the middle: manual date. */
@@ -1084,14 +1119,12 @@ print_man_foot(struct termp *p, const void *arg)
 }
 
 static void
-print_man_head(struct termp *p, const void *arg)
+print_man_head(struct termp *p, const struct roff_meta *meta)
 {
-       const struct man_meta   *meta;
        const char              *volume;
        char                    *title;
        size_t                   vollen, titlen;
 
-       meta = (const struct man_meta *)arg;
        assert(meta->title);
        assert(meta->msec);