correct the spacing after in-line equations

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index f3fc411483a308f9733d5af66dbf84d3607a4c3d..ab2888586a3a48e52958750b44cca34f2676f777 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.147 2014/04/20 20:18:12 schwarze Exp $ */
+/*     $Id: man_term.c,v 1.154 2014/10/20 15:50:24 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,9 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
@@ -143,38 +141,50 @@ void
 terminal_man(void *arg, const struct man *man)
 {
        struct termp            *p;
-       const struct man_node   *n;
        const struct man_meta   *meta;
+       struct man_node         *n;
        struct mtermp            mt;
 
        p = (struct termp *)arg;
 
-       if (0 == p->defindent)
-               p->defindent = 7;
-
        p->overstep = 0;
-       p->maxrmargin = p->defrmargin;
+       p->rmargin = p->maxrmargin = p->defrmargin;
        p->tabwidth = term_len(p, 5);
 
        if (NULL == p->symtab)
                p->symtab = mchars_alloc();
 
-       n = man_node(man);
+       n = man_node(man)->child;
        meta = man_meta(man);
 
-       term_begin(p, print_man_head, print_man_foot, meta);
-       p->flags |= TERMP_NOSPACE;
-
        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;
 
-       if (n->child)
-               print_man_nodelist(p, &mt, n->child, meta);
-
-       term_end(p);
+       if (p->synopsisonly) {
+               while (n != NULL) {
+                       if (n->tok == MAN_SH &&
+                           n->child->child->type == MAN_TEXT &&
+                           !strcmp(n->child->child->string, "SYNOPSIS")) {
+                               if (n->child->next->child != NULL)
+                                       print_man_nodelist(p, &mt,
+                                           n->child->next->child, meta);
+                               term_newln(p);
+                               break;
+                       }
+                       n = n->next;
+               }
+       } else {
+               if (p->defindent == 0)
+                       p->defindent = 7;
+               term_begin(p, print_man_head, print_man_foot, meta);
+               p->flags |= TERMP_NOSPACE;
+               if (n != NULL)
+                       print_man_nodelist(p, &mt, n, meta);
+               term_end(p);
+       }
 }
 
 
@@ -977,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:
                /*
@@ -1061,7 +1075,8 @@ print_man_foot(struct termp *p, const void *arg)
 
        term_fontrepl(p, TERMFONT_NONE);
 
-       term_vspace(p);
+       if (meta->hasbody)
+               term_vspace(p);
 
        /*
         * Temporary, undocumented option to imitate mdoc(7) output.
@@ -1070,8 +1085,10 @@ print_man_foot(struct termp *p, const void *arg)
         */
 
        if ( ! p->mdocstyle) {
-               term_vspace(p);
-               term_vspace(p);
+               if (meta->hasbody) {
+                       term_vspace(p);
+                       term_vspace(p);
+               }
                mandoc_asprintf(&title, "%s(%s)",
                    meta->title, meta->msec);
        } else if (meta->source) {
@@ -1119,20 +1136,17 @@ print_man_foot(struct termp *p, const void *arg)
 static void
 print_man_head(struct termp *p, const void *arg)
 {
-       char                     buf[BUFSIZ];
        const struct man_meta   *meta;
+       const char              *volume;
        char                    *title;
-       size_t                   buflen, titlen;
+       size_t                   vollen, titlen;
 
        meta = (const struct man_meta *)arg;
        assert(meta->title);
        assert(meta->msec);
 
-       if (meta->vol)
-               strlcpy(buf, meta->vol, BUFSIZ);
-       else
-               buf[0] = '\0';
-       buflen = term_strlen(p, buf);
+       volume = NULL == meta->vol ? "" : meta->vol;
+       vollen = term_strlen(p, volume);
 
        /* Top left corner: manual title and section. */
 
@@ -1142,10 +1156,9 @@ print_man_head(struct termp *p, const void *arg)
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->trailspace = 1;
        p->offset = 0;
-       p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?
-           (p->maxrmargin -
-            term_strlen(p, buf) + term_len(p, 1)) / 2 :
-           p->maxrmargin - buflen;
+       p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
+           (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
+           p->maxrmargin - vollen;
 
        term_word(p, title);
        term_flushln(p);
@@ -1154,10 +1167,10 @@ print_man_head(struct termp *p, const void *arg)
 
        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
-       p->rmargin = p->offset + buflen + titlen < p->maxrmargin ?
+       p->rmargin = p->offset + vollen + titlen < p->maxrmargin ?
            p->maxrmargin - titlen : p->maxrmargin;
 
-       term_word(p, buf);
+       term_word(p, volume);
        term_flushln(p);
 
        /* Top right corner: title and section, again. */