Simplify condition, avoid duplicate code; no functional change.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index a6f9c80b1183c3f10a686d57c8ecbac679b884b8..8b059067021870e5a9ba1e7531ffc22ab7d35bfe 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.217 2011/02/06 22:33:38 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.248 2013/05/29 16:11:40 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -32,12 +32,8 @@
 #include "out.h"
 #include "term.h"
 #include "mdoc.h"
 #include "out.h"
 #include "term.h"
 #include "mdoc.h"

-#include "chars.h"

 #include "main.h"
 
 #include "main.h"
 

-#define        INDENT            5
-#define        HALFINDENT        3
-

 struct termpair {
        struct termpair  *ppair;
        int               count;
 struct termpair {
        struct termpair  *ppair;
        int               count;


@@ -45,8 +41,8 @@ struct        termpair {
 
 #define        DECL_ARGS struct termp *p, \
                  struct termpair *pair, \
 
 #define        DECL_ARGS struct termp *p, \
                  struct termpair *pair, \

-                 const struct mdoc_meta *m, \
-                 const struct mdoc_node *n
+                 const struct mdoc_meta *meta, \
+                 struct mdoc_node *n

 
 struct termact {
        int     (*pre)(DECL_ARGS);
 
 struct termact {
        int     (*pre)(DECL_ARGS);


@@ -73,7 +69,7 @@ static        void      termp_an_post(DECL_ARGS);
 static void      termp_bd_post(DECL_ARGS);
 static void      termp_bk_post(DECL_ARGS);
 static void      termp_bl_post(DECL_ARGS);
 static void      termp_bd_post(DECL_ARGS);
 static void      termp_bk_post(DECL_ARGS);
 static void      termp_bl_post(DECL_ARGS);

-static void      termp_d1_post(DECL_ARGS);
+static void      termp_fd_post(DECL_ARGS);

 static void      termp_fo_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);
 static void      termp_it_post(DECL_ARGS);
 static void      termp_fo_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);
 static void      termp_it_post(DECL_ARGS);


@@ -133,8 +129,8 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_sh_pre, termp_sh_post }, /* Sh */
        { termp_ss_pre, termp_ss_post }, /* Ss */ 
        { termp_sp_pre, NULL }, /* Pp */ 
        { termp_sh_pre, termp_sh_post }, /* Sh */
        { termp_ss_pre, termp_ss_post }, /* Ss */ 
        { termp_sp_pre, NULL }, /* Pp */ 

-       { termp_d1_pre, termp_d1_post }, /* D1 */
-       { termp_d1_pre, termp_d1_post }, /* Dl */
+       { termp_d1_pre, termp_bl_post }, /* D1 */
+       { termp_d1_pre, termp_bl_post }, /* Dl */

        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */
        { termp_bl_pre, termp_bl_post }, /* Bl */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */
        { termp_bl_pre, termp_bl_post }, /* Bl */


@@ -150,7 +146,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ev */ 
        { termp_ex_pre, NULL }, /* Ex */
        { termp_fa_pre, NULL }, /* Fa */ 
        { NULL, NULL }, /* Ev */ 
        { termp_ex_pre, NULL }, /* Ex */
        { termp_fa_pre, NULL }, /* Fa */ 

-       { termp_fd_pre, NULL }, /* Fd */ 
+       { termp_fd_pre, termp_fd_post }, /* Fd */ 

        { termp_fl_pre, NULL }, /* Fl */
        { termp_fn_pre, NULL }, /* Fn */ 
        { termp_ft_pre, NULL }, /* Ft */ 
        { termp_fl_pre, NULL }, /* Fl */
        { termp_fn_pre, NULL }, /* Fn */ 
        { termp_ft_pre, NULL }, /* Ft */ 


@@ -195,7 +191,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ec */ /* FIXME: no space */
        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Ec */ /* FIXME: no space */
        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */ 

-       { NULL, NULL }, /* Eo */
+       { termp_quote_pre, termp_quote_post }, /* Eo */

        { termp_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */
        { termp_igndelim_pre, NULL }, /* No */
        { termp_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */
        { termp_igndelim_pre, NULL }, /* No */


@@ -246,7 +242,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, termp____post }, /* %Q */ 
        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* sp */ 
        { NULL, termp____post }, /* %Q */ 
        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* sp */ 

-       { termp_under_pre, termp____post }, /* %U */ 
+       { NULL, termp____post }, /* %U */ 

        { NULL, NULL }, /* Ta */ 
 };
 
        { NULL, NULL }, /* Ta */ 
 };
 


@@ -255,32 +251,28 @@ void
 terminal_mdoc(void *arg, const struct mdoc *mdoc)
 {
        const struct mdoc_node  *n;
 terminal_mdoc(void *arg, const struct mdoc *mdoc)
 {
        const struct mdoc_node  *n;

-       const struct mdoc_meta  *m;
+       const struct mdoc_meta  *meta;

        struct termp            *p;
 
        p = (struct termp *)arg;
 
        struct termp            *p;
 
        p = (struct termp *)arg;
 

+       if (0 == p->defindent)
+               p->defindent = 5;
+

        p->overstep = 0;
        p->maxrmargin = p->defrmargin;
        p->tabwidth = term_len(p, 5);
 
        if (NULL == p->symtab)
        p->overstep = 0;
        p->maxrmargin = p->defrmargin;
        p->tabwidth = term_len(p, 5);
 
        if (NULL == p->symtab)

-               switch (p->enc) {
-               case (TERMENC_ASCII):
-                       p->symtab = chars_init(CHARS_ASCII);
-                       break;
-               default:
-                       abort();
-                       /* NOTREACHED */
-               }
+               p->symtab = mchars_alloc();

 
        n = mdoc_node(mdoc);
 
        n = mdoc_node(mdoc);

-       m = mdoc_meta(mdoc);
+       meta = mdoc_meta(mdoc);

 
 

-       term_begin(p, print_mdoc_head, print_mdoc_foot, m);
+       term_begin(p, print_mdoc_head, print_mdoc_foot, meta);

 
        if (n->child)
 
        if (n->child)

-               print_mdoc_nodelist(p, NULL, m, n->child);
+               print_mdoc_nodelist(p, NULL, meta, n->child);

 
        term_end(p);
 }
 
        term_end(p);
 }


@@ -290,9 +282,9 @@ static void
 print_mdoc_nodelist(DECL_ARGS)
 {
 
 print_mdoc_nodelist(DECL_ARGS)
 {
 

-       print_mdoc_node(p, pair, m, n);
+       print_mdoc_node(p, pair, meta, n);

        if (n->next)
        if (n->next)

-               print_mdoc_nodelist(p, pair, m, n->next);
+               print_mdoc_nodelist(p, pair, meta, n->next);

 }
 
 
 }
 
 


@@ -301,14 +293,13 @@ static void
 print_mdoc_node(DECL_ARGS)
 {
        int              chld;
 print_mdoc_node(DECL_ARGS)
 {
        int              chld;

-       const void      *font;

        struct termpair  npair;
        size_t           offset, rmargin;
 
        chld = 1;
        offset = p->offset;
        rmargin = p->rmargin;
        struct termpair  npair;
        size_t           offset, rmargin;
 
        chld = 1;
        offset = p->offset;
        rmargin = p->rmargin;

-       font = term_fontq(p);
+       n->prev_font = term_fontq(p);

 
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;
 
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;


@@ -322,14 +313,10 @@ print_mdoc_node(DECL_ARGS)
         */
 
        if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {
         */
 
        if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {

-               if (n->prev && n->prev->line != n->line) {
+               if (n->prev ? (n->prev->line != n->line) :
+                   (n->parent && n->parent->line != n->line)) {

                        p->flags &= ~TERMP_KEEP;
                        p->flags |= TERMP_PREKEEP;
                        p->flags &= ~TERMP_KEEP;
                        p->flags |= TERMP_PREKEEP;

-               } else if (NULL == n->prev) {
-                       if (n->parent && n->parent->line != n->line) {
-                               p->flags &= ~TERMP_KEEP;
-                               p->flags |= TERMP_PREKEEP;
-                       }

                }
        }
 
                }
        }
 


@@ -352,9 +339,14 @@ print_mdoc_node(DECL_ARGS)
        case (MDOC_TEXT):
                if (' ' == *n->string && MDOC_LINE & n->flags)
                        term_newln(p);
        case (MDOC_TEXT):
                if (' ' == *n->string && MDOC_LINE & n->flags)
                        term_newln(p);

+               if (MDOC_DELIMC & n->flags)
+                       p->flags |= TERMP_NOSPACE;

                term_word(p, n->string);
                term_word(p, n->string);

+               if (MDOC_DELIMO & n->flags)
+                       p->flags |= TERMP_NOSPACE;

                break;
        case (MDOC_EQN):
                break;
        case (MDOC_EQN):

+               term_eqn(p, n->eqn);

                break;
        case (MDOC_TBL):
                term_tbl(p, n->span);
                break;
        case (MDOC_TBL):
                term_tbl(p, n->span);


@@ -362,14 +354,15 @@ print_mdoc_node(DECL_ARGS)
        default:
                if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
                        chld = (*termacts[n->tok].pre)
        default:
                if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
                        chld = (*termacts[n->tok].pre)

-                               (p, &npair, m, n);
+                               (p, &npair, meta, n);

                break;
        }
 
        if (chld && n->child)
                break;
        }
 
        if (chld && n->child)

-               print_mdoc_nodelist(p, &npair, m, n->child);
+               print_mdoc_nodelist(p, &npair, meta, n->child);

 
 

-       term_fontpopq(p, font);
+       term_fontpopq(p,
+           (ENDBODY_NOT == n->end ? n : n->pending)->prev_font);

 
        switch (n->type) {
        case (MDOC_TEXT):
 
        switch (n->type) {
        case (MDOC_TEXT):


@@ -381,7 +374,7 @@ print_mdoc_node(DECL_ARGS)
        default:
                if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
                        break;
        default:
                if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
                        break;

-               (void)(*termacts[n->tok].post)(p, &npair, m, n);
+               (void)(*termacts[n->tok].post)(p, &npair, meta, n);

 
                /*
                 * Explicit end tokens not only call the post
 
                /*
                 * Explicit end tokens not only call the post


@@ -412,10 +405,9 @@ print_mdoc_node(DECL_ARGS)
 static void
 print_mdoc_foot(struct termp *p, const void *arg)
 {
 static void
 print_mdoc_foot(struct termp *p, const void *arg)
 {

-       char            buf[DATESIZ], os[BUFSIZ];
-       const struct mdoc_meta *m;
+       const struct mdoc_meta *meta;

 
 

-       m = (const struct mdoc_meta *)arg;
+       meta = (const struct mdoc_meta *)arg;

 
        term_fontrepl(p, TERMFONT_NONE);
 
 
        term_fontrepl(p, TERMFONT_NONE);
 


@@ -427,32 +419,29 @@ print_mdoc_foot(struct termp *p, const void *arg)
         * SYSTEM                  DATE                    SYSTEM
         */
 
         * SYSTEM                  DATE                    SYSTEM
         */
 

-       time2a(m->date, buf, DATESIZ);
-       strlcpy(os, m->os, BUFSIZ);
-

        term_vspace(p);
 
        p->offset = 0;
        p->rmargin = (p->maxrmargin - 
        term_vspace(p);
 
        p->offset = 0;
        p->rmargin = (p->maxrmargin - 

-                       term_strlen(p, buf) + term_len(p, 1)) / 2;
+                       term_strlen(p, meta->date) + term_len(p, 1)) / 2;

        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
 
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
 

-       term_word(p, os);
+       term_word(p, meta->os);

        term_flushln(p);
 
        p->offset = p->rmargin;
        term_flushln(p);
 
        p->offset = p->rmargin;

-       p->rmargin = p->maxrmargin - term_strlen(p, os);
-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+       p->rmargin = p->maxrmargin - term_strlen(p, meta->os);
+       p->flags |= TERMP_NOSPACE;

 
 

-       term_word(p, buf);
+       term_word(p, meta->date);

        term_flushln(p);
 
        p->offset = p->rmargin;
        p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOBREAK;
        term_flushln(p);
 
        p->offset = p->rmargin;
        p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOBREAK;

-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+       p->flags |= TERMP_NOSPACE;

 
 

-       term_word(p, os);
+       term_word(p, meta->os);

        term_flushln(p);
 
        p->offset = 0;
        term_flushln(p);
 
        p->offset = 0;


@@ -465,12 +454,10 @@ static void
 print_mdoc_head(struct termp *p, const void *arg)
 {
        char            buf[BUFSIZ], title[BUFSIZ];
 print_mdoc_head(struct termp *p, const void *arg)
 {
        char            buf[BUFSIZ], title[BUFSIZ];

-       const struct mdoc_meta *m;
+       size_t          buflen, titlen;
+       const struct mdoc_meta *meta;

 
 

-       m = (const struct mdoc_meta *)arg;
-
-       p->rmargin = p->maxrmargin;
-       p->offset = 0;
+       meta = (const struct mdoc_meta *)arg;

 
        /*
         * The header is strange.  It has three components, which are
 
        /*
         * The header is strange.  It has three components, which are


@@ -485,43 +472,52 @@ print_mdoc_head(struct termp *p, const void *arg)
         * switches on the manual section.
         */
 
         * switches on the manual section.
         */
 

-       assert(m->vol);
-       strlcpy(buf, m->vol, BUFSIZ);
+       p->offset = 0;
+       p->rmargin = p->maxrmargin;
+
+       assert(meta->vol);
+       strlcpy(buf, meta->vol, BUFSIZ);
+       buflen = term_strlen(p, buf);

 
 

-       if (m->arch) {
+       if (meta->arch) {

                strlcat(buf, " (", BUFSIZ);
                strlcat(buf, " (", BUFSIZ);

-               strlcat(buf, m->arch, BUFSIZ);
+               strlcat(buf, meta->arch, BUFSIZ);

                strlcat(buf, ")", BUFSIZ);
        }
 
                strlcat(buf, ")", BUFSIZ);
        }
 

-       snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
+       snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
+       titlen = term_strlen(p, title);

 
 

-       p->offset = 0;
-       p->rmargin = (p->maxrmargin - 
-                       term_strlen(p, buf) + term_len(p, 1)) / 2;

        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;

+       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;

 
        term_word(p, title);
        term_flushln(p);
 
 
        term_word(p, title);
        term_flushln(p);
 

+       p->flags |= TERMP_NOSPACE;

        p->offset = p->rmargin;
        p->offset = p->rmargin;

-       p->rmargin = p->maxrmargin - term_strlen(p, title);
-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+       p->rmargin = p->offset + buflen + titlen < p->maxrmargin ?
+           p->maxrmargin - titlen : p->maxrmargin;

 
        term_word(p, buf);
        term_flushln(p);
 
 
        term_word(p, buf);
        term_flushln(p);
 

-       p->offset = p->rmargin;
-       p->rmargin = p->maxrmargin;

        p->flags &= ~TERMP_NOBREAK;
        p->flags &= ~TERMP_NOBREAK;

-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
-
-       term_word(p, title);
-       term_flushln(p);
+       if (p->rmargin + titlen <= p->maxrmargin) {
+               p->flags |= TERMP_NOSPACE;
+               p->offset = p->rmargin;
+               p->rmargin = p->maxrmargin;
+               term_word(p, title);
+               term_flushln(p);
+       }

 
 

+       p->flags &= ~TERMP_NOSPACE;

        p->offset = 0;
        p->rmargin = p->maxrmargin;
        p->offset = 0;
        p->rmargin = p->maxrmargin;

-       p->flags &= ~TERMP_NOSPACE;

 }
 
 
 }
 
 


@@ -530,9 +526,10 @@ a2height(const struct termp *p, const char *v)
 {
        struct roffsu    su;
 
 {
        struct roffsu    su;
 

+

        assert(v);
        if ( ! a2roffsu(v, &su, SCALE_VS))
        assert(v);
        if ( ! a2roffsu(v, &su, SCALE_VS))

-               SCALE_VS_INIT(&su, term_len(p, 1));
+               SCALE_VS_INIT(&su, atoi(v));

 
        return(term_vspan(p, &su));
 }
 
        return(term_vspan(p, &su));
 }


@@ -561,9 +558,9 @@ a2offs(const struct termp *p, const char *v)
        else if (0 == strcmp(v, "left"))
                return(0);
        else if (0 == strcmp(v, "indent"))
        else if (0 == strcmp(v, "left"))
                return(0);
        else if (0 == strcmp(v, "indent"))

-               return(term_len(p, INDENT + 1));
+               return(term_len(p, p->defindent + 1));

        else if (0 == strcmp(v, "indent-two"))
        else if (0 == strcmp(v, "indent-two"))

-               return(term_len(p, (INDENT + 1) * 2));
+               return(term_len(p, (p->defindent + 1) * 2));

        else if ( ! a2roffsu(v, &su, SCALE_MAX))
                SCALE_HS_INIT(&su, term_strlen(p, v));
 
        else if ( ! a2roffsu(v, &su, SCALE_MAX))
                SCALE_HS_INIT(&su, term_strlen(p, v));
 


@@ -583,6 +580,8 @@ print_bvspace(struct termp *p,
 {
        const struct mdoc_node  *nn;
 
 {
        const struct mdoc_node  *nn;
 

+       assert(n);
+

        term_newln(p);
 
        if (MDOC_Bd == bl->tok && bl->norm->Bd.comp)
        term_newln(p);
 
        if (MDOC_Bd == bl->tok && bl->norm->Bd.comp)


@@ -724,12 +723,10 @@ termp_it_pre(DECL_ARGS)
        case (LIST_dash):
                /* FALLTHROUGH */
        case (LIST_hyphen):
        case (LIST_dash):
                /* FALLTHROUGH */
        case (LIST_hyphen):

-               if (width < term_len(p, 4))
-                       width = term_len(p, 4);
-               break;
+               /* FALLTHROUGH */

        case (LIST_enum):
        case (LIST_enum):

-               if (width < term_len(p, 5))
-                       width = term_len(p, 5);
+               if (width < term_len(p, 2))
+                       width = term_len(p, 2);

                break;
        case (LIST_hang):
                if (0 == width)
                break;
        case (LIST_hang):
                if (0 == width)


@@ -784,25 +781,26 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
         */
 
        switch (type) {

+       case (LIST_enum):
+               /*
+                * Weird special case.
+                * Very narrow enum lists actually hang.
+                */
+               if (width == term_len(p, 2))
+                       p->flags |= TERMP_HANG;
+               /* FALLTHROUGH */

        case (LIST_bullet):
                /* FALLTHROUGH */
        case (LIST_dash):
                /* FALLTHROUGH */
        case (LIST_bullet):
                /* FALLTHROUGH */
        case (LIST_dash):
                /* FALLTHROUGH */

-       case (LIST_enum):
-               /* FALLTHROUGH */

        case (LIST_hyphen):
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
        case (LIST_hyphen):
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;

-               else
-                       p->flags |= TERMP_NOLPAD;

                break;
        case (LIST_hang):
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                else
                break;
        case (LIST_hang):
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                else

-                       p->flags |= TERMP_NOLPAD;
-
-               if (MDOC_HEAD != n->type)

                        break;
 
                /*
                        break;
 
                /*


@@ -813,17 +811,14 @@ termp_it_pre(DECL_ARGS)
                 */
                if (n->next->child && 
                                (MDOC_Bl == n->next->child->tok ||
                 */
                if (n->next->child && 
                                (MDOC_Bl == n->next->child->tok ||

-                                MDOC_Bd == n->next->child->tok)) {
+                                MDOC_Bd == n->next->child->tok))

                        p->flags &= ~TERMP_NOBREAK;
                        p->flags &= ~TERMP_NOBREAK;

-                       p->flags &= ~TERMP_NOLPAD;
-               } else
+               else

                        p->flags |= TERMP_HANG;
                break;
        case (LIST_tag):
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
                        p->flags |= TERMP_HANG;
                break;
        case (LIST_tag):
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;

-               else
-                       p->flags |= TERMP_NOLPAD;

 
                if (MDOC_HEAD != n->type)
                        break;
 
                if (MDOC_HEAD != n->type)
                        break;


@@ -839,10 +834,6 @@ termp_it_pre(DECL_ARGS)
                else
                        p->flags |= TERMP_NOBREAK;
 
                else
                        p->flags |= TERMP_NOBREAK;
 

-               assert(n->prev);
-               if (MDOC_BODY == n->prev->type) 
-                       p->flags |= TERMP_NOLPAD;
-

                break;
        case (LIST_diag):
                if (MDOC_HEAD == n->type)
                break;
        case (LIST_diag):
                if (MDOC_HEAD == n->type)


@@ -999,7 +990,6 @@ termp_it_post(DECL_ARGS)
        p->flags &= ~TERMP_DANGLE;
        p->flags &= ~TERMP_NOBREAK;
        p->flags &= ~TERMP_TWOSPACE;
        p->flags &= ~TERMP_DANGLE;
        p->flags &= ~TERMP_NOBREAK;
        p->flags &= ~TERMP_TWOSPACE;

-       p->flags &= ~TERMP_NOLPAD;

        p->flags &= ~TERMP_HANG;
 }
 
        p->flags &= ~TERMP_HANG;
 }
 


@@ -1015,16 +1005,17 @@ termp_nm_pre(DECL_ARGS)
        if (MDOC_BODY == n->type) {
                if (NULL == n->child)
                        return(0);
        if (MDOC_BODY == n->type) {
                if (NULL == n->child)
                        return(0);

-               p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+               p->flags |= TERMP_NOSPACE;

                p->offset += term_len(p, 1) +
                p->offset += term_len(p, 1) +

-                   (NULL == n->prev->child ? term_strlen(p, m->name) :
+                   (NULL == n->prev->child ?
+                    term_strlen(p, meta->name) :

                     MDOC_TEXT == n->prev->child->type ?
                     MDOC_TEXT == n->prev->child->type ?

-                       term_strlen(p, n->prev->child->string) :
+                    term_strlen(p, n->prev->child->string) :

                     term_len(p, 5));
                return(1);
        }
 
                     term_len(p, 5));
                return(1);
        }
 

-       if (NULL == n->child && NULL == m->name)
+       if (NULL == n->child && NULL == meta->name)

                return(0);
 
        if (MDOC_HEAD == n->type)
                return(0);
 
        if (MDOC_HEAD == n->type)


@@ -1034,7 +1025,7 @@ termp_nm_pre(DECL_ARGS)
                p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
                p->rmargin = p->offset + term_len(p, 1);
                if (NULL == n->child) {
                p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
                p->rmargin = p->offset + term_len(p, 1);
                if (NULL == n->child) {

-                       p->rmargin += term_strlen(p, m->name);
+                       p->rmargin += term_strlen(p, meta->name);

                } else if (MDOC_TEXT == n->child->type) {
                        p->rmargin += term_strlen(p, n->child->string);
                        if (n->child->next)
                } else if (MDOC_TEXT == n->child->type) {
                        p->rmargin += term_strlen(p, n->child->string);
                        if (n->child->next)


@@ -1047,7 +1038,7 @@ termp_nm_pre(DECL_ARGS)
 
        term_fontpush(p, TERMFONT_BOLD);
        if (NULL == n->child)
 
        term_fontpush(p, TERMFONT_BOLD);
        if (NULL == n->child)

-               term_word(p, m->name);
+               term_word(p, meta->name);

        return(1);
 }
 
        return(1);
 }
 


@@ -1060,10 +1051,8 @@ termp_nm_post(DECL_ARGS)
        if (MDOC_HEAD == n->type && n->next->child) {
                term_flushln(p);
                p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
        if (MDOC_HEAD == n->type && n->next->child) {
                term_flushln(p);
                p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);

-       } else if (MDOC_BODY == n->type && n->child) {
+       } else if (MDOC_BODY == n->type && n->child)

                term_flushln(p);
                term_flushln(p);

-               p->flags &= ~TERMP_NOLPAD;
-       }

 }
 
                
 }
 
                


@@ -1183,25 +1172,30 @@ termp_rs_pre(DECL_ARGS)
 static int
 termp_rv_pre(DECL_ARGS)
 {
 static int
 termp_rv_pre(DECL_ARGS)
 {

-       const struct mdoc_node  *nn;
+       int              nchild;

 
        term_newln(p);
        term_word(p, "The");
 
 
        term_newln(p);
        term_word(p, "The");
 

-       for (nn = n->child; nn; nn = nn->next) {
+       nchild = n->nchild;
+       for (n = n->child; n; n = n->next) {

                term_fontpush(p, TERMFONT_BOLD);
                term_fontpush(p, TERMFONT_BOLD);

-               term_word(p, nn->string);
+               term_word(p, n->string);

                term_fontpop(p);
                term_fontpop(p);

+

                p->flags |= TERMP_NOSPACE;
                p->flags |= TERMP_NOSPACE;

-               if (nn->next && NULL == nn->next->next)
-                       term_word(p, "(), and");
-               else if (nn->next)
-                       term_word(p, "(),");
-               else
-                       term_word(p, "()");
+               term_word(p, "()");
+
+               if (nchild > 2 && n->next) {
+                       p->flags |= TERMP_NOSPACE;
+                       term_word(p, ",");
+               }
+
+               if (n->next && NULL == n->next->next)
+                       term_word(p, "and");

        }
 
        }
 

-       if (n->child && n->child->next)
+       if (nchild > 1)

                term_word(p, "functions return");
        else
                term_word(p, "function returns");
                term_word(p, "functions return");
        else
                term_word(p, "function returns");


@@ -1224,31 +1218,34 @@ termp_rv_pre(DECL_ARGS)
 static int
 termp_ex_pre(DECL_ARGS)
 {
 static int
 termp_ex_pre(DECL_ARGS)
 {

-       const struct mdoc_node  *nn;
+       int              nchild;

 
 

+       term_newln(p);

        term_word(p, "The");
 
        term_word(p, "The");
 

-       for (nn = n->child; nn; nn = nn->next) {
+       nchild = n->nchild;
+       for (n = n->child; n; n = n->next) {

                term_fontpush(p, TERMFONT_BOLD);
                term_fontpush(p, TERMFONT_BOLD);

-               term_word(p, nn->string);
+               term_word(p, n->string);

                term_fontpop(p);
                term_fontpop(p);

-               p->flags |= TERMP_NOSPACE;
-               if (nn->next && NULL == nn->next->next)
-                       term_word(p, ", and");
-               else if (nn->next)
+
+               if (nchild > 2 && n->next) {
+                       p->flags |= TERMP_NOSPACE;

                        term_word(p, ",");
                        term_word(p, ",");

-               else
-                       p->flags &= ~TERMP_NOSPACE;
+               }
+
+               if (n->next && NULL == n->next->next)
+                       term_word(p, "and");

        }
 
        }
 

-       if (n->child && n->child->next)
+       if (nchild > 1)

                term_word(p, "utilities exit");
        else
                term_word(p, "utility exits");
 
                term_word(p, "0 on success, and >0 if an error occurs.");
                term_word(p, "utilities exit");
        else
                term_word(p, "utility exits");
 
                term_word(p, "0 on success, and >0 if an error occurs.");

-       p->flags |= TERMP_SENTENCE;

 
 

+       p->flags |= TERMP_SENTENCE;

        return(0);
 }
 
        return(0);
 }
 


@@ -1288,31 +1285,33 @@ termp_bl_post(DECL_ARGS)
                term_newln(p);
 }
 
                term_newln(p);
 }
 

-

 /* ARGSUSED */
 static int
 termp_xr_pre(DECL_ARGS)
 {
 /* ARGSUSED */
 static int
 termp_xr_pre(DECL_ARGS)
 {

-       const struct mdoc_node *nn;

 
 

-       if (NULL == n->child)
+       if (NULL == (n = n->child))

                return(0);
 
                return(0);
 

-       assert(MDOC_TEXT == n->child->type);
-       nn = n->child;
+       assert(MDOC_TEXT == n->type);
+       term_word(p, n->string);

 
 

-       term_word(p, nn->string);
-       if (NULL == (nn = nn->next)) 
+       if (NULL == (n = n->next)) 

                return(0);
                return(0);

+

        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");

-       term_word(p, nn->string);
+       p->flags |= TERMP_NOSPACE;
+
+       assert(MDOC_TEXT == n->type);
+       term_word(p, n->string);
+
+       p->flags |= TERMP_NOSPACE;

        term_word(p, ")");
 
        return(0);
 }
 
        term_word(p, ")");
 
        return(0);
 }
 

-

 /*
  * This decides how to assert whitespace before any of the SYNOPSIS set
  * of macros (which, as in the case of Ft/Fo and Ft/Fn, may contain
 /*
  * This decides how to assert whitespace before any of the SYNOPSIS set
  * of macros (which, as in the case of Ft/Fo and Ft/Fn, may contain


@@ -1377,14 +1376,14 @@ termp_vt_pre(DECL_ARGS)
 
        if (MDOC_ELEM == n->type) {
                synopsis_pre(p, n);
 
        if (MDOC_ELEM == n->type) {
                synopsis_pre(p, n);

-               return(termp_under_pre(p, pair, m, n));
+               return(termp_under_pre(p, pair, meta, n));

        } else if (MDOC_BLOCK == n->type) {
                synopsis_pre(p, n);
                return(1);
        } else if (MDOC_HEAD == n->type)
                return(0);
 
        } else if (MDOC_BLOCK == n->type) {
                synopsis_pre(p, n);
                return(1);
        } else if (MDOC_HEAD == n->type)
                return(0);
 

-       return(termp_under_pre(p, pair, m, n));
+       return(termp_under_pre(p, pair, meta, n));

 }
 
 
 }
 
 


@@ -1404,7 +1403,16 @@ termp_fd_pre(DECL_ARGS)
 {
 
        synopsis_pre(p, n);
 {
 
        synopsis_pre(p, n);

-       return(termp_bold_pre(p, pair, m, n));
+       return(termp_bold_pre(p, pair, meta, n));
+}
+
+
+/* ARGSUSED */
+static void
+termp_fd_post(DECL_ARGS)
+{
+
+       term_newln(p);

 }
 
 
 }
 
 


@@ -1426,7 +1434,9 @@ termp_sh_pre(DECL_ARGS)
                term_fontpush(p, TERMFONT_BOLD);
                break;
        case (MDOC_BODY):
                term_fontpush(p, TERMFONT_BOLD);
                break;
        case (MDOC_BODY):

-               p->offset = term_len(p, INDENT);
+               p->offset = term_len(p, p->defindent);
+               if (SEC_AUTHORS == n->sec)
+                       p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);

                break;
        default:
                break;
                break;
        default:
                break;


@@ -1494,22 +1504,11 @@ termp_d1_pre(DECL_ARGS)
        if (MDOC_BLOCK != n->type)
                return(1);
        term_newln(p);
        if (MDOC_BLOCK != n->type)
                return(1);
        term_newln(p);

-       p->offset += term_len(p, (INDENT + 1));
+       p->offset += term_len(p, p->defindent + 1);

        return(1);
 }
 
 
        return(1);
 }
 
 

-/* ARGSUSED */
-static void
-termp_d1_post(DECL_ARGS)
-{
-
-       if (MDOC_BLOCK != n->type) 
-               return;
-       term_newln(p);
-}
-
-

 /* ARGSUSED */
 static int
 termp_ft_pre(DECL_ARGS)
 /* ARGSUSED */
 static int
 termp_ft_pre(DECL_ARGS)


@@ -1526,30 +1525,43 @@ termp_ft_pre(DECL_ARGS)
 static int
 termp_fn_pre(DECL_ARGS)
 {
 static int
 termp_fn_pre(DECL_ARGS)
 {

-       const struct mdoc_node  *nn;
+       int              pretty;
+
+       pretty = MDOC_SYNPRETTY & n->flags;

 
        synopsis_pre(p, n);
 
 
        synopsis_pre(p, n);
 

+       if (NULL == (n = n->child))
+               return(0);
+
+       assert(MDOC_TEXT == n->type);

        term_fontpush(p, TERMFONT_BOLD);
        term_fontpush(p, TERMFONT_BOLD);

-       term_word(p, n->child->string);
+       term_word(p, n->string);

        term_fontpop(p);
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
        term_fontpop(p);
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");

+       p->flags |= TERMP_NOSPACE;

 
 

-       for (nn = n->child->next; nn; nn = nn->next) {
+       for (n = n->next; n; n = n->next) {
+               assert(MDOC_TEXT == n->type);

                term_fontpush(p, TERMFONT_UNDER);
                term_fontpush(p, TERMFONT_UNDER);

-               term_word(p, nn->string);
+               term_word(p, n->string);

                term_fontpop(p);
 
                term_fontpop(p);
 

-               if (nn->next)
+               if (n->next) {
+                       p->flags |= TERMP_NOSPACE;

                        term_word(p, ",");
                        term_word(p, ",");

+               }

        }
 
        }
 

+       p->flags |= TERMP_NOSPACE;

        term_word(p, ")");
 
        term_word(p, ")");
 

-       if (MDOC_SYNPRETTY & n->flags)
+       if (pretty) {
+               p->flags |= TERMP_NOSPACE;

                term_word(p, ";");
                term_word(p, ";");

+       }

 
        return(0);
 }
 
        return(0);
 }


@@ -1571,12 +1583,16 @@ termp_fa_pre(DECL_ARGS)
                term_word(p, nn->string);
                term_fontpop(p);
 
                term_word(p, nn->string);
                term_fontpop(p);
 

-               if (nn->next)
+               if (nn->next) {
+                       p->flags |= TERMP_NOSPACE;

                        term_word(p, ",");
                        term_word(p, ",");

+               }

        }
 
        }
 

-       if (n->child && n->next && n->next->tok == MDOC_Fa)
+       if (n->child && n->next && n->next->tok == MDOC_Fa) {
+               p->flags |= TERMP_NOSPACE;

                term_word(p, ",");
                term_word(p, ",");

+       }

 
        return(0);
 }
 
        return(0);
 }


@@ -1587,7 +1603,7 @@ static int
 termp_bd_pre(DECL_ARGS)
 {
        size_t                   tabwidth, rm, rmax;
 termp_bd_pre(DECL_ARGS)
 {
        size_t                   tabwidth, rm, rmax;

-       const struct mdoc_node  *nn;
+       struct mdoc_node        *nn;

 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n, n);
 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n, n);


@@ -1619,7 +1635,7 @@ termp_bd_pre(DECL_ARGS)
        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        for (nn = n->child; nn; nn = nn->next) {
        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        for (nn = n->child; nn; nn = nn->next) {

-               print_mdoc_node(p, pair, m, nn);
+               print_mdoc_node(p, pair, meta, nn);

                /*
                 * If the printed node flushes its own line, then we
                 * needn't do it here as well.  This is hacky, but the
                /*
                 * If the printed node flushes its own line, then we
                 * needn't do it here as well.  This is hacky, but the


@@ -1713,6 +1729,7 @@ static int
 termp_xx_pre(DECL_ARGS)
 {
        const char      *pp;
 termp_xx_pre(DECL_ARGS)
 {
        const char      *pp;

+       int              flags;

 
        pp = NULL;
        switch (n->tok) {
 
        pp = NULL;
        switch (n->tok) {


@@ -1735,14 +1752,16 @@ termp_xx_pre(DECL_ARGS)
                pp = "UNIX";
                break;
        default:
                pp = "UNIX";
                break;
        default:

-               break;
+               abort();
+               /* NOTREACHED */

        }
 
        term_word(p, pp);
        if (n->child) {
        }
 
        term_word(p, pp);
        if (n->child) {

+               flags = p->flags;

                p->flags |= TERMP_KEEP;
                term_word(p, n->child->string);
                p->flags |= TERMP_KEEP;
                term_word(p, n->child->string);

-               p->flags &= ~TERMP_KEEP;
+               p->flags = flags;

        }
        return(0);
 }
        }
        return(0);
 }


@@ -1780,7 +1799,7 @@ termp_ss_pre(DECL_ARGS)
                break;
        case (MDOC_HEAD):
                term_fontpush(p, TERMFONT_BOLD);
                break;
        case (MDOC_HEAD):
                term_fontpush(p, TERMFONT_BOLD);

-               p->offset = term_len(p, HALFINDENT);
+               p->offset = term_len(p, (p->defindent+1)/2);

                break;
        default:
                break;
                break;
        default:
                break;


@@ -1908,6 +1927,8 @@ termp_quote_pre(DECL_ARGS)
        case (MDOC_Dq):
                term_word(p, "``");
                break;
        case (MDOC_Dq):
                term_word(p, "``");
                break;

+       case (MDOC_Eo):
+               break;

        case (MDOC_Po):
                /* FALLTHROUGH */
        case (MDOC_Pq):
        case (MDOC_Po):
                /* FALLTHROUGH */
        case (MDOC_Pq):


@@ -1972,6 +1993,8 @@ termp_quote_post(DECL_ARGS)
        case (MDOC_Dq):
                term_word(p, "''");
                break;
        case (MDOC_Dq):
                term_word(p, "''");
                break;

+       case (MDOC_Eo):
+               break;

        case (MDOC_Po):
                /* FALLTHROUGH */
        case (MDOC_Pq):
        case (MDOC_Po):
                /* FALLTHROUGH */
        case (MDOC_Pq):


@@ -2009,6 +2032,7 @@ termp_fo_pre(DECL_ARGS)
        } else if (MDOC_BODY == n->type) {
                p->flags |= TERMP_NOSPACE;
                term_word(p, "(");
        } else if (MDOC_BODY == n->type) {
                p->flags |= TERMP_NOSPACE;
                term_word(p, "(");

+               p->flags |= TERMP_NOSPACE;

                return(1);
        } 
 
                return(1);
        } 
 


@@ -2032,10 +2056,13 @@ termp_fo_post(DECL_ARGS)
        if (MDOC_BODY != n->type) 
                return;
 
        if (MDOC_BODY != n->type) 
                return;
 

+       p->flags |= TERMP_NOSPACE;

        term_word(p, ")");
 
        term_word(p, ")");
 

-       if (MDOC_SYNPRETTY & n->flags)
+       if (MDOC_SYNPRETTY & n->flags) {
+               p->flags |= TERMP_NOSPACE;

                term_word(p, ";");
                term_word(p, ";");

+       }

 }
 
 
 }
 
 


@@ -2046,7 +2073,7 @@ termp_bf_pre(DECL_ARGS)
 
        if (MDOC_HEAD == n->type)
                return(0);
 
        if (MDOC_HEAD == n->type)
                return(0);

-       else if (MDOC_BLOCK != n->type)
+       else if (MDOC_BODY != n->type)

                return(1);
 
        if (FONT_Em == n->norm->Bf.font) 
                return(1);
 
        if (FONT_Em == n->norm->Bf.font) 


@@ -2109,6 +2136,7 @@ termp____post(DECL_ARGS)
        if (NULL == n->parent || MDOC_Rs != n->parent->tok)
                return;
 
        if (NULL == n->parent || MDOC_Rs != n->parent->tok)
                return;
 

+       p->flags |= TERMP_NOSPACE;

        if (NULL == n->next) {
                term_word(p, ".");
                p->flags |= TERMP_SENTENCE;
        if (NULL == n->next) {
                term_word(p, ".");
                p->flags |= TERMP_SENTENCE;


@@ -2131,24 +2159,24 @@ termp_li_pre(DECL_ARGS)
 static int
 termp_lk_pre(DECL_ARGS)
 {
 static int
 termp_lk_pre(DECL_ARGS)
 {

-       const struct mdoc_node *nn, *sv;
-
-       term_fontpush(p, TERMFONT_UNDER);
-
-       nn = sv = n->child;
-
-       if (NULL == nn || NULL == nn->next)
-               return(1);
+       const struct mdoc_node *link, *descr;

 
 

-       for (nn = nn->next; nn; nn = nn->next) 
-               term_word(p, nn->string);
-
-       term_fontpop(p);
+       if (NULL == (link = n->child))
+               return(0);

 
 

-       term_word(p, ":");
+       if (NULL != (descr = link->next)) {
+               term_fontpush(p, TERMFONT_UNDER);
+               while (NULL != descr) {
+                       term_word(p, descr->string);
+                       descr = descr->next;
+               }
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, ":");
+               term_fontpop(p);
+       }

 
        term_fontpush(p, TERMFONT_BOLD);
 
        term_fontpush(p, TERMFONT_BOLD);

-       term_word(p, sv->string);
+       term_word(p, link->string);

        term_fontpop(p);
 
        return(0);
        term_fontpop(p);
 
        return(0);


@@ -2183,7 +2211,7 @@ static void
 termp_bk_post(DECL_ARGS)
 {
 
 termp_bk_post(DECL_ARGS)
 {
 

-       if (MDOC_BODY == n->type)
+       if (MDOC_BODY == n->type && ! (MDOC_SYNPRETTY & n->flags))

                p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }
 
                p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }
 


@@ -2198,9 +2226,9 @@ termp__t_post(DECL_ARGS)
         */
        if (n->parent && MDOC_Rs == n->parent->tok &&
                        n->parent->norm->Rs.quote_T)
         */
        if (n->parent && MDOC_Rs == n->parent->tok &&
                        n->parent->norm->Rs.quote_T)

-               termp_quote_post(p, pair, m, n);
+               termp_quote_post(p, pair, meta, n);

 
 

-       termp____post(p, pair, m, n);
+       termp____post(p, pair, meta, n);

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */


@@ -2214,7 +2242,7 @@ termp__t_pre(DECL_ARGS)
         */
        if (n->parent && MDOC_Rs == n->parent->tok &&
                        n->parent->norm->Rs.quote_T)
         */
        if (n->parent && MDOC_Rs == n->parent->tok &&
                        n->parent->norm->Rs.quote_T)

-               return(termp_quote_pre(p, pair, m, n));
+               return(termp_quote_pre(p, pair, meta, n));

 
        term_fontpush(p, TERMFONT_UNDER);
        return(1);
 
        term_fontpush(p, TERMFONT_UNDER);
        return(1);