in the SYNOPSIS, add .Fo and first .Fn arguments to the names table

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index 3057d32609b1bb1f4090755597aa67acd045cfb6..9a9abafdbc5ba9561bfed26dcf8f75fb1e5884ca 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.151 2014/09/03 05:22:45 schwarze Exp $ */
+/*     $Id: man_term.c,v 1.159 2014/12/04 02:05:42 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -123,7 +123,7 @@ static      const struct termact termacts[MAN_MAX] = {
        { NULL, NULL, 0 }, /* RE */
        { pre_RS, post_RS, 0 }, /* RS */
        { pre_ign, NULL, 0 }, /* DT */
-       { pre_ign, NULL, 0 }, /* UC */
+       { pre_ign, NULL, MAN_NOTEXT }, /* UC */
        { pre_PD, NULL, MAN_NOTEXT }, /* PD */
        { pre_ign, NULL, 0 }, /* AT */
        { pre_in, NULL, MAN_NOTEXT }, /* in */
@@ -151,9 +151,6 @@ terminal_man(void *arg, const struct man *man)
        p->rmargin = p->maxrmargin = p->defrmargin;
        p->tabwidth = term_len(p, 5);
 
-       if (NULL == p->symtab)
-               p->symtab = mchars_alloc();
-
        n = man_node(man)->child;
        meta = man_meta(man);
 
@@ -204,7 +201,7 @@ a2width(const struct termp *p, const char *cp)
 {
        struct roffsu    su;
 
-       if ( ! a2roffsu(cp, &su, SCALE_BU))
+       if ( ! a2roffsu(cp, &su, SCALE_EN))
                return(-1);
 
        return((int)term_hspan(p, &su));
@@ -459,11 +456,6 @@ pre_in(DECL_ARGS)
        else
                p->offset = v;
 
-       /* Don't let this creep beyond the right margin. */
-
-       if (p->offset > p->rmargin)
-               p->offset = p->rmargin;
-
        return(0);
 }
 
@@ -657,8 +649,7 @@ pre_IP(DECL_ARGS)
                return(0);
        case MAN_BODY:
                p->offset = mt->offset + len;
-               p->rmargin = p->maxrmargin > p->offset ?
-                   p->maxrmargin : p->offset;
+               p->rmargin = p->maxrmargin;
                break;
        default:
                break;
@@ -749,8 +740,7 @@ pre_TP(DECL_ARGS)
                return(0);
        case MAN_BODY:
                p->offset = mt->offset + len;
-               p->rmargin = p->maxrmargin > p->offset ?
-                   p->maxrmargin : p->offset;
+               p->rmargin = p->maxrmargin;
                p->trailspace = 0;
                p->flags &= ~TERMP_NOBREAK;
                break;
@@ -788,12 +778,18 @@ pre_SS(DECL_ARGS)
                mt->fl &= ~MANT_LITERAL;
                mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
                mt->offset = term_len(p, p->defindent);
-               /* If following a prior empty `SS', no vspace. */
-               if (n->prev && MAN_SS == n->prev->tok)
-                       if (NULL == n->prev->body->child)
-                               break;
-               if (NULL == n->prev)
+
+               /*
+                * No vertical space before the first subsection
+                * and after an empty subsection.
+                */
+
+               do {
+                       n = n->prev;
+               } while (n != NULL && termacts[n->tok].flags & MAN_NOTEXT);
+               if (n == NULL || (n->tok == MAN_SS && n->body->child == NULL))
                        break;
+
                for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;
@@ -837,13 +833,18 @@ pre_SH(DECL_ARGS)
                mt->fl &= ~MANT_LITERAL;
                mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
                mt->offset = term_len(p, p->defindent);
-               /* If following a prior empty `SH', no vspace. */
-               if (n->prev && MAN_SH == n->prev->tok)
-                       if (NULL == n->prev->body->child)
-                               break;
-               /* If the first macro, no vspae. */
-               if (NULL == n->prev)
+
+               /*
+                * No vertical space before the first section
+                * and after an empty section.
+                */
+
+               do {
+                       n = n->prev;
+               } while (n != NULL && termacts[n->tok].flags & MAN_NOTEXT);
+               if (n == NULL || (n->tok == MAN_SH && n->body->child == NULL))
                        break;
+
                for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;
@@ -901,8 +902,7 @@ pre_RS(DECL_ARGS)
 
        mt->offset += sz;
        p->offset = mt->offset;
-       p->rmargin = p->maxrmargin > p->offset ?
-           p->maxrmargin : p->offset;
+       p->rmargin = p->maxrmargin;
 
        if (++mt->lmarginsz < MAXMARGINS)
                mt->lmargincur = mt->lmarginsz;
@@ -987,7 +987,11 @@ print_man_node(DECL_ARGS)
                goto out;
 
        case MAN_EQN:
+               if ( ! (n->flags & MAN_LINE))
+                       p->flags |= TERMP_NOSPACE;
                term_eqn(p, n->eqn);
+               if (n->next != NULL && ! (n->next->flags & MAN_LINE))
+                       p->flags |= TERMP_NOSPACE;
                return;
        case MAN_TBL:
                /*
@@ -1025,13 +1029,14 @@ out:
         * -man doesn't have nested macros, we don't need to be
         * more specific than this.
         */
-       if (MANT_LITERAL & mt->fl && ! (TERMP_NOBREAK & p->flags) &&
-           (NULL == n->next || MAN_LINE & n->next->flags)) {
+       if (mt->fl & MANT_LITERAL &&
+           ! (p->flags & (TERMP_NOBREAK | TERMP_NONEWLINE)) &&
+           (n->next == NULL || n->next->flags & MAN_LINE)) {
                rm = p->rmargin;
                rmax = p->maxrmargin;
                p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
                p->flags |= TERMP_NOSPACE;
-               if (NULL != n->string && '\0' != *n->string)
+               if (n->string != NULL && *n->string != '\0')
                        term_flushln(p);
                else
                        term_newln(p);
@@ -1062,7 +1067,7 @@ print_man_foot(struct termp *p, const void *arg)
 {
        const struct man_meta   *meta;
        char                    *title;
-       size_t                   datelen;
+       size_t                   datelen, titlen;
 
        meta = (const struct man_meta *)arg;
        assert(meta->title);
@@ -1099,7 +1104,8 @@ print_man_foot(struct termp *p, const void *arg)
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
        p->trailspace = 1;
        p->offset = 0;
-       p->rmargin = (p->maxrmargin - datelen + term_len(p, 1)) / 2;
+       p->rmargin = p->maxrmargin > datelen ?
+           (p->maxrmargin + term_len(p, 1) - datelen) / 2 : 0;
 
        if (meta->source)
                term_word(p, meta->source);
@@ -1107,11 +1113,10 @@ print_man_foot(struct termp *p, const void *arg)
 
        /* At the bottom in the middle: manual date. */
 
-       p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
-       p->rmargin = p->maxrmargin - term_strlen(p, title);
-       if (p->offset + datelen >= p->rmargin)
-               p->rmargin = p->offset + datelen;
+       titlen = term_strlen(p, title);
+       p->rmargin = p->maxrmargin > titlen ? p->maxrmargin - titlen : 0;
+       p->flags |= TERMP_NOSPACE;
 
        term_word(p, meta->date);
        term_flushln(p);
@@ -1154,7 +1159,7 @@ print_man_head(struct termp *p, const void *arg)
        p->offset = 0;
        p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
            (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
-           p->maxrmargin - vollen;
+           vollen < p->maxrmargin ? p->maxrmargin - vollen : 0;
 
        term_word(p, title);
        term_flushln(p);