Clarified EXIT STATUS sections. Discussed among schwarze@, Thomas, and

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index b9e7823dab291fc378c08ef20d07be74336fc580..ba16bbc260adf471d75c12c46f297beaa26f7a08 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.157 2010/06/25 18:53:14 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.183 2010/08/21 14:04:13 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 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


@@ -56,8 +57,6 @@ static        size_t    a2width(const struct termp *, const char *);
 static size_t    a2height(const struct termp *, const char *);
 static size_t    a2offs(const struct termp *, const char *);
 
 static size_t    a2height(const struct termp *, const char *);
 static size_t    a2offs(const struct termp *, const char *);
 

-static int       arg_hasattr(int, const struct mdoc_node *);
-static int       arg_getattr(int, const struct mdoc_node *);

 static void      print_bvspace(struct termp *,
                        const struct mdoc_node *,
                        const struct mdoc_node *);
 static void      print_bvspace(struct termp *,
                        const struct mdoc_node *,
                        const struct mdoc_node *);


@@ -72,6 +71,7 @@ static        void      termp____post(DECL_ARGS);
 static void      termp_an_post(DECL_ARGS);
 static void      termp_aq_post(DECL_ARGS);
 static void      termp_bd_post(DECL_ARGS);
 static void      termp_an_post(DECL_ARGS);
 static void      termp_aq_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_bq_post(DECL_ARGS);
 static void      termp_brq_post(DECL_ARGS);
 static void      termp_bl_post(DECL_ARGS);
 static void      termp_bq_post(DECL_ARGS);
 static void      termp_brq_post(DECL_ARGS);


@@ -83,6 +83,7 @@ static        void      termp_fo_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);
 static void      termp_it_post(DECL_ARGS);
 static void      termp_lb_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);
 static void      termp_it_post(DECL_ARGS);
 static void      termp_lb_post(DECL_ARGS);

+static void      termp_nm_post(DECL_ARGS);

 static void      termp_op_post(DECL_ARGS);
 static void      termp_pf_post(DECL_ARGS);
 static void      termp_pq_post(DECL_ARGS);
 static void      termp_op_post(DECL_ARGS);
 static void      termp_pf_post(DECL_ARGS);
 static void      termp_pq_post(DECL_ARGS);


@@ -96,6 +97,7 @@ static        int       termp_ap_pre(DECL_ARGS);
 static int       termp_aq_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_bf_pre(DECL_ARGS);
 static int       termp_aq_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_bf_pre(DECL_ARGS);

+static int       termp_bk_pre(DECL_ARGS);

 static int       termp_bl_pre(DECL_ARGS);
 static int       termp_bold_pre(DECL_ARGS);
 static int       termp_bq_pre(DECL_ARGS);
 static int       termp_bl_pre(DECL_ARGS);
 static int       termp_bold_pre(DECL_ARGS);
 static int       termp_bq_pre(DECL_ARGS);


@@ -149,7 +151,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_bl_pre, termp_bl_post }, /* Bl */
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { termp_bl_pre, termp_bl_post }, /* Bl */
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */

-       { NULL, NULL }, /* Ad */ 
+       { termp_under_pre, NULL }, /* Ad */ 

        { termp_an_pre, termp_an_post }, /* An */
        { termp_under_pre, NULL }, /* Ar */
        { termp_cd_pre, NULL }, /* Cd */
        { termp_an_pre, termp_an_post }, /* An */
        { termp_under_pre, NULL }, /* Ar */
        { termp_cd_pre, NULL }, /* Cd */


@@ -167,7 +169,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_in_pre, termp_in_post }, /* In */ 
        { termp_li_pre, NULL }, /* Li */
        { termp_nd_pre, NULL }, /* Nd */ 
        { termp_in_pre, termp_in_post }, /* In */ 
        { termp_li_pre, NULL }, /* Li */
        { termp_nd_pre, NULL }, /* Nd */ 

-       { termp_nm_pre, NULL }, /* Nm */ 
+       { termp_nm_pre, termp_nm_post }, /* Nm */ 

        { termp_op_pre, termp_op_post }, /* Op */
        { NULL, NULL }, /* Ot */
        { termp_under_pre, NULL }, /* Pa */
        { termp_op_pre, termp_op_post }, /* Op */
        { NULL, NULL }, /* Ot */
        { termp_under_pre, NULL }, /* Pa */


@@ -206,7 +208,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_under_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */
        { termp_xx_pre, NULL }, /* Fx */
        { termp_under_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */
        { termp_xx_pre, NULL }, /* Fx */

-       { termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */
+       { termp_bold_pre, NULL }, /* Ms */

        { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */
        { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */


@@ -235,7 +237,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Fc */ 
        { termp_op_pre, termp_op_post }, /* Oo */
        { NULL, NULL }, /* Oc */
        { NULL, NULL }, /* Fc */ 
        { termp_op_pre, termp_op_post }, /* Oo */
        { NULL, NULL }, /* Oc */

-       { NULL, NULL }, /* Bk */
+       { termp_bk_pre, termp_bk_post }, /* Bk */

        { NULL, NULL }, /* Ek */
        { termp_bt_pre, NULL }, /* Bt */
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Ek */
        { termp_bt_pre, NULL }, /* Bt */
        { NULL, NULL }, /* Hf */


@@ -322,20 +324,53 @@ print_mdoc_node(DECL_ARGS)
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;
 
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;
 

-       if (MDOC_TEXT != n->type) {
-               if (termacts[n->tok].pre)
-                       chld = (*termacts[n->tok].pre)(p, &npair, m, n);
-       } else 
+       if (MDOC_TEXT == n->type)

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

+       else if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
+               chld = (*termacts[n->tok].pre)(p, &npair, m, n);
+
+       /*
+        * Keeps only work until the end of a line.  If a keep was
+        * invoked in a prior line, revert it to PREKEEP.
+        */
+
+       if (TERMP_KEEP & p->flags) {
+               if (n->prev && n->prev->line != n->line) {
+                       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;
+                       }
+               }
+       }

 
        if (chld && n->child)
                print_mdoc_nodelist(p, &npair, m, n->child);
 
        term_fontpopq(p, font);
 
 
        if (chld && n->child)
                print_mdoc_nodelist(p, &npair, m, n->child);
 
        term_fontpopq(p, font);
 

-       if (MDOC_TEXT != n->type)
-               if (termacts[n->tok].post)
-                       (*termacts[n->tok].post)(p, &npair, m, n);
+       if (MDOC_TEXT != n->type && termacts[n->tok].post && 
+                       ! (MDOC_ENDED & n->flags)) {
+               (void)(*termacts[n->tok].post)(p, &npair, m, n);
+
+               /*
+                * Explicit end tokens not only call the post
+                * handler, but also tell the respective block
+                * that it must not call the post handler again.
+                */
+               if (ENDBODY_NOT != n->end)
+                       n->pending->flags |= MDOC_ENDED;
+
+               /*
+                * End of line terminating an implicit block
+                * while an explicit block is still open.
+                * Continue the explicit block without spacing.
+                */
+               if (ENDBODY_NOSPACE == n->end)
+                       p->flags |= TERMP_NOSPACE;
+       }

 
        if (MDOC_EOS & n->flags)
                p->flags |= TERMP_SENTENCE;
 
        if (MDOC_EOS & n->flags)
                p->flags |= TERMP_SENTENCE;


@@ -507,38 +542,6 @@ a2offs(const struct termp *p, const char *v)
 }
 
 
 }
 
 

-/*
- * Return 1 if an argument has a particular argument value or 0 if it
- * does not.  See arg_getattr().
- */
-static int
-arg_hasattr(int arg, const struct mdoc_node *n)
-{
-
-       return(-1 != arg_getattr(arg, n));
-}
-
-
-/*
- * Get the index of an argument in a node's argument list or -1 if it
- * does not exist.
- */
-static int
-arg_getattr(int v, const struct mdoc_node *n)
-{
-       int              i;
-
-       if (NULL == n->args)
-               return(0);
-
-       for (i = 0; i < (int)n->args->argc; i++) 
-               if (n->args->argv[i].arg == v)
-                       return(i);
-
-       return(-1);
-}
-
-

 /*
  * Determine how much space to print out before block elements of `It'
  * (and thus `Bl') and `Bd'.  And then go ahead and print that space,
 /*
  * Determine how much space to print out before block elements of `It'
  * (and thus `Bl') and `Bd'.  And then go ahead and print that space,


@@ -553,9 +556,9 @@ print_bvspace(struct termp *p,
 
        term_newln(p);
 
 
        term_newln(p);
 

-       if (MDOC_Bd == bl->tok && bl->data.Bd.comp)
+       if (MDOC_Bd == bl->tok && bl->data.Bd->comp)

                return;
                return;

-       if (MDOC_Bl == bl->tok && bl->data.Bl.comp)
+       if (MDOC_Bl == bl->tok && bl->data.Bl->comp)

                return;
 
        /* Do not vspace directly after Ss/Sh. */
                return;
 
        /* Do not vspace directly after Ss/Sh. */


@@ -574,13 +577,13 @@ print_bvspace(struct termp *p,
 
        /* A `-column' does not assert vspace within the list. */
 
 
        /* A `-column' does not assert vspace within the list. */
 

-       if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl.type)
+       if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl->type)

                if (n->prev && MDOC_It == n->prev->tok)
                        return;
 
        /* A `-diag' without body does not vspace. */
 
                if (n->prev && MDOC_It == n->prev->tok)
                        return;
 
        /* A `-diag' without body does not vspace. */
 

-       if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl.type)
+       if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl->type)

                if (n->prev && MDOC_It == n->prev->tok) {
                        assert(n->prev->body);
                        if (NULL == n->prev->body->child)
                if (n->prev && MDOC_It == n->prev->tok) {
                        assert(n->prev->body);
                        if (NULL == n->prev->body->child)


@@ -624,7 +627,7 @@ termp_it_pre(DECL_ARGS)
 {
        const struct mdoc_node *bl, *nn;
        char                    buf[7];
 {
        const struct mdoc_node *bl, *nn;
        char                    buf[7];

-       int                     i, col;
+       int                     i;

        size_t                  width, offset, ncols, dcol;
        enum mdoc_list          type;
 
        size_t                  width, offset, ncols, dcol;
        enum mdoc_list          type;
 


@@ -634,7 +637,8 @@ termp_it_pre(DECL_ARGS)
        }
 
        bl = n->parent->parent->parent;
        }
 
        bl = n->parent->parent->parent;

-       type = bl->data.Bl.type;
+       assert(bl->data.Bl);
+       type = bl->data.Bl->type;

 
        /* 
         * First calculate width and offset.  This is pretty easy unless
 
        /* 
         * First calculate width and offset.  This is pretty easy unless


@@ -644,16 +648,14 @@ termp_it_pre(DECL_ARGS)
 
        width = offset = 0;
 
 
        width = offset = 0;
 

-       if (bl->data.Bl.offs)
-               offset = a2offs(p, bl->data.Bl.offs);
+       if (bl->data.Bl->offs)
+               offset = a2offs(p, bl->data.Bl->offs);

 
        switch (type) {
        case (LIST_column):
                if (MDOC_HEAD == n->type)
                        break;
 
 
        switch (type) {
        case (LIST_column):
                if (MDOC_HEAD == n->type)
                        break;
 

-               col = arg_getattr(MDOC_Column, bl);
-

                /*
                 * Imitate groff's column handling:
                 * - For each earlier column, add its width.
                /*
                 * Imitate groff's column handling:
                 * - For each earlier column, add its width.


@@ -663,7 +665,8 @@ termp_it_pre(DECL_ARGS)
                 *   column.
                 * - For more than 5 columns, add only one column.
                 */
                 *   column.
                 * - For more than 5 columns, add only one column.
                 */

-               ncols = bl->args->argv[col].sz;
+               ncols = bl->data.Bl->ncols;
+

                /* LINTED */
                dcol = ncols < 5 ? term_len(p, 4) : 
                        ncols == 5 ? term_len(p, 3) : term_len(p, 1);
                /* LINTED */
                dcol = ncols < 5 ? term_len(p, 4) : 
                        ncols == 5 ? term_len(p, 3) : term_len(p, 1);


@@ -677,7 +680,7 @@ termp_it_pre(DECL_ARGS)
                                nn->prev && i < (int)ncols; 
                                nn = nn->prev, i++)
                        offset += dcol + a2width
                                nn->prev && i < (int)ncols; 
                                nn = nn->prev, i++)
                        offset += dcol + a2width

-                               (p, bl->args->argv[col].value[i]);
+                               (p, bl->data.Bl->cols[i]);

 
                /*
                 * When exceeding the declared number of columns, leave
 
                /*
                 * When exceeding the declared number of columns, leave


@@ -692,10 +695,10 @@ termp_it_pre(DECL_ARGS)
                 * Use the declared column widths, extended as explained
                 * in the preceding paragraph.
                 */
                 * Use the declared column widths, extended as explained
                 * in the preceding paragraph.
                 */

-               width = a2width(p, bl->args->argv[col].value[i]) + dcol;
+               width = a2width(p, bl->data.Bl->cols[i]) + dcol;

                break;
        default:
                break;
        default:

-               if (NULL == bl->data.Bl.width)
+               if (NULL == bl->data.Bl->width)

                        break;
 
                /* 
                        break;
 
                /* 


@@ -703,8 +706,8 @@ termp_it_pre(DECL_ARGS)
                 * number for buffering single arguments.  See the above
                 * handling for column for how this changes.
                 */
                 * number for buffering single arguments.  See the above
                 * handling for column for how this changes.
                 */

-               assert(bl->data.Bl.width);
-               width = a2width(p, bl->data.Bl.width) + term_len(p, 2);
+               assert(bl->data.Bl->width);
+               width = a2width(p, bl->data.Bl->width) + term_len(p, 2);

                break;
        }
 
                break;
        }
 


@@ -966,7 +969,7 @@ termp_it_post(DECL_ARGS)
        if (MDOC_BLOCK == n->type)
                return;
 
        if (MDOC_BLOCK == n->type)
                return;
 

-       type = n->parent->parent->parent->data.Bl.type;
+       type = n->parent->parent->parent->data.Bl->type;

 
        switch (type) {
        case (LIST_item):
 
        switch (type) {
        case (LIST_item):


@@ -1005,10 +1008,35 @@ static int
 termp_nm_pre(DECL_ARGS)
 {
 
 termp_nm_pre(DECL_ARGS)
 {
 

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

                return(1);
 
                return(1);
 

-       synopsis_pre(p, n);
+       if (MDOC_BODY == n->type) {
+               if (NULL == n->child)
+                       return(0);
+               p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+               p->offset += term_len(p, 1) +
+                   (NULL == n->prev->child ? term_strlen(p, m->name) :
+                    MDOC_TEXT == n->prev->child->type ?
+                       term_strlen(p, n->prev->child->string) :
+                    term_len(p, 5));
+               return(1);
+       }
+
+       if (NULL == n->child && NULL == m->name)
+               return(0);
+
+       if (MDOC_HEAD == n->type)
+               synopsis_pre(p, n->parent);
+
+       if (MDOC_HEAD == n->type && n->next->child) {
+               p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_HANG;
+               p->rmargin = p->offset + term_len(p, 1) +
+                   (NULL == n->child ? term_strlen(p, m->name) :
+                    MDOC_TEXT == n->child->type ?
+                       term_strlen(p, n->child->string) :
+                    term_len(p, 5));
+       }

 
        term_fontpush(p, TERMFONT_BOLD);
        if (NULL == n->child)
 
        term_fontpush(p, TERMFONT_BOLD);
        if (NULL == n->child)


@@ -1017,6 +1045,21 @@ termp_nm_pre(DECL_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */
+static void
+termp_nm_post(DECL_ARGS)
+{
+
+       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) {
+               term_flushln(p);
+               p->flags &= ~TERMP_NOLPAD;
+       }
+}
+
+               

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


@@ -1081,10 +1124,10 @@ termp_an_post(DECL_ARGS)
                return;
        }
 
                return;
        }
 

-       if (arg_hasattr(MDOC_Split, n)) {
+       if (AUTH_split == n->data.An.auth) {

                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;
                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;

-       } else {
+       } else if (AUTH_nosplit == n->data.An.auth) {

                p->flags &= ~TERMP_SPLIT;
                p->flags |= TERMP_NOSPLIT;
        }
                p->flags &= ~TERMP_SPLIT;
                p->flags |= TERMP_NOSPLIT;
        }


@@ -1275,7 +1318,7 @@ synopsis_pre(struct termp *p, const struct mdoc_node *n)
         * Obviously, if we're not in a SYNOPSIS or no prior macros
         * exist, do nothing.
         */
         * Obviously, if we're not in a SYNOPSIS or no prior macros
         * exist, do nothing.
         */

-       if (NULL == n->prev || SEC_SYNOPSIS != n->sec)
+       if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))

                return;
 
        /*
                return;
 
        /*


@@ -1540,7 +1583,7 @@ termp_fn_pre(DECL_ARGS)
 
        term_word(p, ")");
 
 
        term_word(p, ")");
 

-       if (SEC_SYNOPSIS == n->sec)
+       if (MDOC_SYNPRETTY & n->flags)

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


@@ -1578,8 +1621,7 @@ termp_fa_pre(DECL_ARGS)
 static int
 termp_bd_pre(DECL_ARGS)
 {
 static int
 termp_bd_pre(DECL_ARGS)
 {

-       size_t                   tabwidth;
-       size_t                   rm, rmax;
+       size_t                   tabwidth, rm, rmax;

        const struct mdoc_node  *nn;
 
        if (MDOC_BLOCK == n->type) {
        const struct mdoc_node  *nn;
 
        if (MDOC_BLOCK == n->type) {


@@ -1588,8 +1630,9 @@ termp_bd_pre(DECL_ARGS)
        } else if (MDOC_HEAD == n->type)
                return(0);
 
        } else if (MDOC_HEAD == n->type)
                return(0);
 

-       if (n->data.Bd.offs)
-               p->offset += a2offs(p, n->data.Bd.offs);
+       assert(n->data.Bd);
+       if (n->data.Bd->offs)
+               p->offset += a2offs(p, n->data.Bd->offs);

 
        /*
         * If -ragged or -filled are specified, the block does nothing
 
        /*
         * If -ragged or -filled are specified, the block does nothing


@@ -1599,8 +1642,8 @@ termp_bd_pre(DECL_ARGS)
         * lines are allowed.
         */
        
         * lines are allowed.
         */
        

-       if (DISP_literal != n->data.Bd.type && 
-                       DISP_unfilled != n->data.Bd.type)
+       if (DISP_literal != n->data.Bd->type && 
+                       DISP_unfilled != n->data.Bd->type)

                return(1);
 
        tabwidth = p->tabwidth;
                return(1);
 
        tabwidth = p->tabwidth;


@@ -1610,12 +1653,11 @@ 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) {

-               p->flags |= TERMP_NOSPACE;

                print_mdoc_node(p, pair, m, nn);
                print_mdoc_node(p, pair, m, nn);

-               if (NULL == nn->prev ||
-                   nn->prev->line < nn->line ||
-                   NULL == nn->next)
-                       term_flushln(p);
+               if (nn->next && nn->next->line == nn->line)
+                       continue;
+               term_flushln(p);
+               p->flags |= TERMP_NOSPACE;

        }
 
        p->tabwidth = tabwidth;
        }
 
        p->tabwidth = tabwidth;


@@ -1637,8 +1679,9 @@ termp_bd_post(DECL_ARGS)
        rm = p->rmargin;
        rmax = p->maxrmargin;
 
        rm = p->rmargin;
        rmax = p->maxrmargin;
 

-       if (DISP_literal == n->data.Bd.type || 
-                       DISP_unfilled == n->data.Bd.type)
+       assert(n->data.Bd);
+       if (DISP_literal == n->data.Bd->type || 
+                       DISP_unfilled == n->data.Bd->type)

                p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        p->flags |= TERMP_NOSPACE;
                p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        p->flags |= TERMP_NOSPACE;


@@ -1817,7 +1860,7 @@ termp_in_pre(DECL_ARGS)
 
        synopsis_pre(p, n);
 
 
        synopsis_pre(p, n);
 

-       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {
+       if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) {

                term_fontpush(p, TERMFONT_BOLD);
                term_word(p, "#include");
                term_word(p, "<");
                term_fontpush(p, TERMFONT_BOLD);
                term_word(p, "#include");
                term_word(p, "<");


@@ -1836,13 +1879,13 @@ static void
 termp_in_post(DECL_ARGS)
 {
 
 termp_in_post(DECL_ARGS)
 {
 

-       if (SEC_SYNOPSIS == n->sec)
+       if (MDOC_SYNPRETTY & n->flags)

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

-       if (SEC_SYNOPSIS == n->sec)
+       if (MDOC_SYNPRETTY & n->flags)

                term_fontpop(p);
 }
 
                term_fontpop(p);
 }
 


@@ -1861,6 +1904,11 @@ termp_sp_pre(DECL_ARGS)
                len = 0;
                break;
        default:
                len = 0;
                break;
        default:

+               assert(n->parent);
+               if ((NULL == n->next || NULL == n->prev) &&
+                               (MDOC_Ss == n->parent->tok ||
+                                MDOC_Sh == n->parent->tok))
+                       return(0);

                len = 1;
                break;
        }
                len = 1;
                break;
        }


@@ -1963,9 +2011,11 @@ termp_fo_pre(DECL_ARGS)
                return(1);
        } 
 
                return(1);
        } 
 

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

        /* XXX: we drop non-initial arguments as per groff. */
 
        /* XXX: we drop non-initial arguments as per groff. */
 

-       assert(n->child);

        assert(n->child->string);
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, n->child->string);
        assert(n->child->string);
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, n->child->string);


@@ -1984,7 +2034,7 @@ termp_fo_post(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
        term_word(p, ")");
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, ")");
 

-       if (SEC_SYNOPSIS == n->sec) {
+       if (MDOC_SYNPRETTY & n->flags) {

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


@@ -1995,30 +2045,19 @@ termp_fo_post(DECL_ARGS)
 static int
 termp_bf_pre(DECL_ARGS)
 {
 static int
 termp_bf_pre(DECL_ARGS)
 {

-       const struct mdoc_node  *nn;

 
        if (MDOC_HEAD == n->type)
                return(0);
        else if (MDOC_BLOCK != n->type)
                return(1);
 
 
        if (MDOC_HEAD == n->type)
                return(0);
        else if (MDOC_BLOCK != n->type)
                return(1);
 

-       if (NULL == (nn = n->head->child)) {
-               if (arg_hasattr(MDOC_Emphasis, n))
-                       term_fontpush(p, TERMFONT_UNDER);
-               else if (arg_hasattr(MDOC_Symbolic, n))
-                       term_fontpush(p, TERMFONT_BOLD);
-               else
-                       term_fontpush(p, TERMFONT_NONE);
-
-               return(1);
-       } 
+       assert(n->data.Bf);

 
 

-       assert(MDOC_TEXT == nn->type);
-       if (0 == strcmp("Em", nn->string))
+       if (FONT_Em == n->data.Bf->font) 

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

-       else if (0 == strcmp("Sy", nn->string))
+       else if (FONT_Sy == n->data.Bf->font) 

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

-       else
+       else 

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


@@ -2031,9 +2070,11 @@ termp_sm_pre(DECL_ARGS)
 {
 
        assert(n->child && MDOC_TEXT == n->child->type);
 {
 
        assert(n->child && MDOC_TEXT == n->child->type);

-       if (0 == strcmp("on", n->child->string))
+       if (0 == strcmp("on", n->child->string)) {
+               if (p->col)
+                       p->flags &= ~TERMP_NOSPACE;

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

-       else
+       } else

                p->flags |= TERMP_NONOSPACE;
 
        return(0);
                p->flags |= TERMP_NONOSPACE;
 
        return(0);


@@ -2078,29 +2119,62 @@ termp_li_pre(DECL_ARGS)
 static int
 termp_lk_pre(DECL_ARGS)
 {
 static int
 termp_lk_pre(DECL_ARGS)
 {

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

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

-       nn = n->child;
+
+       nn = sv = n->child;

 
        if (NULL == nn->next)
                return(1);
 
 
        if (NULL == nn->next)
                return(1);
 

-       term_word(p, nn->string);
+       for (nn = nn->next; nn; nn = nn->next) 
+               term_word(p, nn->string);
+

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

-       for (nn = nn->next; nn; nn = nn->next) 
-               term_word(p, nn->string);
+       term_word(p, sv->string);

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

+/* ARGSUSED */
+static int
+termp_bk_pre(DECL_ARGS)
+{
+
+       switch (n->type) {
+       case (MDOC_BLOCK):
+               break;
+       case (MDOC_HEAD):
+               return(0);
+       case (MDOC_BODY):
+               p->flags |= TERMP_PREKEEP;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       return(1);
+}
+
+
+/* ARGSUSED */
+static void
+termp_bk_post(DECL_ARGS)
+{
+
+       if (MDOC_BODY == n->type)
+               p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
+}
+

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