Add -Owidth=width option to mandoc -Tascii. Asked for by joerg@ about a

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index f465a559b5de4d54884448564302312387bdf5dd..e6be6214a9a6e713e5c4f6dd0464493202774e75 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.103 2010/01/01 13:17:59 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.142 2010/06/06 22:08:15 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -14,14 +14,20 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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>
 
 #include <assert.h>
 #include <ctype.h>
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>

+#include <stdint.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

+#include "mandoc.h"

 #include "out.h"
 #include "term.h"
 #include "mdoc.h"
 #include "out.h"
 #include "term.h"
 #include "mdoc.h"


@@ -33,7 +39,6 @@
 
 struct termpair {
        struct termpair  *ppair;
 
 struct termpair {
        struct termpair  *ppair;

-       int               flag; 

        int               count;
 };
 
        int               count;
 };
 


@@ -55,7 +60,7 @@ static        int       arg_hasattr(int, const struct mdoc_node *);
 static int       arg_getattrs(const int *, int *, size_t,
                        const struct mdoc_node *);
 static int       arg_getattr(int, const struct mdoc_node *);
 static int       arg_getattrs(const int *, int *, size_t,
                        const struct mdoc_node *);
 static int       arg_getattr(int, const struct mdoc_node *);

-static int       arg_listtype(const struct mdoc_node *);
+static int       arg_disptype(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 *);


@@ -64,11 +69,6 @@ static       void      print_mdoc_head(DECL_ARGS);
 static void      print_mdoc_nodelist(DECL_ARGS);
 static void      print_foot(DECL_ARGS);
 
 static void      print_mdoc_nodelist(DECL_ARGS);
 static void      print_foot(DECL_ARGS);
 

-#ifdef __linux__
-extern size_t    strlcpy(char *, const char *, size_t);
-extern size_t    strlcat(char *, const char *, size_t);
-#endif
-

 static void      termp____post(DECL_ARGS);
 static void      termp_an_post(DECL_ARGS);
 static void      termp_aq_post(DECL_ARGS);
 static void      termp____post(DECL_ARGS);
 static void      termp_an_post(DECL_ARGS);
 static void      termp_aq_post(DECL_ARGS);


@@ -82,7 +82,6 @@ static        void      termp_dq_post(DECL_ARGS);
 static void      termp_fd_post(DECL_ARGS);
 static void      termp_fn_post(DECL_ARGS);
 static void      termp_fo_post(DECL_ARGS);
 static void      termp_fd_post(DECL_ARGS);
 static void      termp_fn_post(DECL_ARGS);
 static void      termp_fo_post(DECL_ARGS);

-static void      termp_ft_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);


@@ -95,12 +94,12 @@ static      void      termp_sq_post(DECL_ARGS);
 static void      termp_ss_post(DECL_ARGS);
 static void      termp_vt_post(DECL_ARGS);
 
 static void      termp_ss_post(DECL_ARGS);
 static void      termp_vt_post(DECL_ARGS);
 

-static int       termp__t_pre(DECL_ARGS);

 static int       termp_an_pre(DECL_ARGS);
 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_an_pre(DECL_ARGS);
 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_bl_pre(DECL_ARGS);

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


@@ -134,6 +133,7 @@ static      int       termp_sq_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_under_pre(DECL_ARGS);
 static int       termp_ud_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_under_pre(DECL_ARGS);
 static int       termp_ud_pre(DECL_ARGS);

+static int       termp_vt_pre(DECL_ARGS);

 static int       termp_xr_pre(DECL_ARGS);
 static int       termp_xx_pre(DECL_ARGS);
 
 static int       termp_xr_pre(DECL_ARGS);
 static int       termp_xx_pre(DECL_ARGS);
 


@@ -149,7 +149,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_d1_pre, termp_d1_post }, /* Dl */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */
        { termp_d1_pre, termp_d1_post }, /* Dl */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */

-       { NULL, termp_bl_post }, /* Bl */
+       { termp_bl_pre, termp_bl_post }, /* Bl */

        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { NULL, NULL }, /* Ad */ 
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { NULL, NULL }, /* Ad */ 


@@ -165,7 +165,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_bold_pre, termp_fd_post }, /* Fd */ 
        { termp_fl_pre, NULL }, /* Fl */
        { termp_fn_pre, termp_fn_post }, /* Fn */ 
        { termp_bold_pre, termp_fd_post }, /* Fd */ 
        { termp_fl_pre, NULL }, /* Fl */
        { termp_fn_pre, termp_fn_post }, /* Fn */ 

-       { termp_ft_pre, termp_ft_post }, /* Ft */ 
+       { termp_ft_pre, NULL }, /* Ft */ 

        { termp_bold_pre, NULL }, /* Ic */ 
        { termp_in_pre, termp_in_post }, /* In */ 
        { termp_li_pre, NULL }, /* Li */
        { termp_bold_pre, NULL }, /* Ic */ 
        { termp_in_pre, termp_in_post }, /* In */ 
        { termp_li_pre, NULL }, /* Li */


@@ -177,7 +177,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */ 
        { termp_under_pre, NULL }, /* Va */
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */ 
        { termp_under_pre, NULL }, /* Va */

-       { termp_under_pre, termp_vt_post }, /* Vt */
+       { termp_vt_pre, termp_vt_post }, /* Vt */

        { termp_xr_pre, NULL }, /* Xr */
        { NULL, termp____post }, /* %A */
        { termp_under_pre, termp____post }, /* %B */
        { termp_xr_pre, NULL }, /* Xr */
        { NULL, termp____post }, /* %A */
        { termp_under_pre, termp____post }, /* %B */


@@ -188,7 +188,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, termp____post }, /* %O */
        { NULL, termp____post }, /* %P */
        { NULL, termp____post }, /* %R */
        { NULL, termp____post }, /* %O */
        { NULL, termp____post }, /* %P */
        { NULL, termp____post }, /* %R */

-       { termp__t_pre, termp____post }, /* %T */
+       { termp_under_pre, termp____post }, /* %T */

        { NULL, termp____post }, /* %V */
        { NULL, NULL }, /* Ac */
        { termp_aq_pre, termp_aq_post }, /* Ao */
        { NULL, termp____post }, /* %V */
        { NULL, NULL }, /* Ac */
        { termp_aq_pre, termp_aq_post }, /* Ao */


@@ -204,7 +204,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Dc */
        { termp_dq_pre, termp_dq_post }, /* Do */
        { termp_dq_pre, termp_dq_post }, /* Dq */
        { NULL, NULL }, /* Dc */
        { termp_dq_pre, termp_dq_post }, /* Do */
        { termp_dq_pre, termp_dq_post }, /* Dq */

-       { NULL, NULL }, /* Ec */
+       { NULL, NULL }, /* Ec */ /* FIXME: no space */

        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */
        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */


@@ -259,6 +259,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* sp */ 
        { termp_under_pre, termp____post }, /* %U */ 
        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* sp */ 
        { termp_under_pre, termp____post }, /* %U */ 

+       { NULL, NULL }, /* Ta */ 

 };
 
 
 };
 
 


@@ -271,6 +272,10 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 
        p = (struct termp *)arg;
 
 
        p = (struct termp *)arg;
 

+       p->overstep = 0;
+       p->maxrmargin = p->defrmargin;
+       p->tabwidth = 5;
+

        if (NULL == p->symtab)
                switch (p->enc) {
                case (TERMENC_ASCII):
        if (NULL == p->symtab)
                switch (p->enc) {
                case (TERMENC_ASCII):


@@ -333,6 +338,9 @@ print_mdoc_node(DECL_ARGS)
                if (termacts[n->tok].post)
                        (*termacts[n->tok].post)(p, &npair, m, n);
 
                if (termacts[n->tok].post)
                        (*termacts[n->tok].post)(p, &npair, m, n);
 

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

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


@@ -418,7 +426,7 @@ print_mdoc_head(DECL_ARGS)
                strlcat(buf, ")", BUFSIZ);
        }
 
                strlcat(buf, ")", BUFSIZ);
        }
 

-       snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);
+       snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);

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


@@ -471,13 +479,12 @@ a2width(const struct mdoc_argv *arg, int pos)
        if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
                SCALE_HS_INIT(&su, strlen(arg->value[pos]));
 
        if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
                SCALE_HS_INIT(&su, strlen(arg->value[pos]));
 

-       /* XXX: pachemu? */
-       return(term_hspan(&su) + 2);
+       return(term_hspan(&su));

 }
 
 
 static int
 }
 
 
 static int

-arg_listtype(const struct mdoc_node *n)
+arg_disptype(const struct mdoc_node *n)

 {
        int              i, len;
 
 {
        int              i, len;
 


@@ -485,29 +492,17 @@ arg_listtype(const struct mdoc_node *n)
 
        len = (int)(n->args ? n->args->argc : 0);
 
 
        len = (int)(n->args ? n->args->argc : 0);
 

-       for (i = 0; i < len; i++) 
+       for (i = 0; i < len; i++)

                switch (n->args->argv[i].arg) {
                switch (n->args->argv[i].arg) {

-               case (MDOC_Bullet):
-                       /* FALLTHROUGH */
-               case (MDOC_Dash):
-                       /* FALLTHROUGH */
-               case (MDOC_Enum):
-                       /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       /* FALLTHROUGH */
-               case (MDOC_Tag):
-                       /* FALLTHROUGH */
-               case (MDOC_Inset):
-                       /* FALLTHROUGH */
-               case (MDOC_Diag):
+               case (MDOC_Centred):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Item):
+               case (MDOC_Ragged):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Column):
+               case (MDOC_Filled):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Hang):
+               case (MDOC_Unfilled):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Ohang):
+               case (MDOC_Literal):

                        return(n->args->argv[i].arg);
                default:
                        break;
                        return(n->args->argv[i].arg);
                default:
                        break;


@@ -537,6 +532,10 @@ a2offs(const struct mdoc_argv *arg)
 }
 
 
 }
 
 

+/*
+ * 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)
 {
 static int
 arg_hasattr(int arg, const struct mdoc_node *n)
 {


@@ -545,6 +544,10 @@ arg_hasattr(int arg, const struct mdoc_node *n)
 }
 
 
 }
 
 

+/*
+ * Get the index of an argument in a node's argument list or -1 if it
+ * does not exist.  See arg_getattrs().
+ */

 static int
 arg_getattr(int v, const struct mdoc_node *n)
 {
 static int
 arg_getattr(int v, const struct mdoc_node *n)
 {


@@ -554,6 +557,12 @@ arg_getattr(int v, const struct mdoc_node *n)
 }
 
 
 }
 
 

+/*
+ * Walk through the argument list for a node and fill an array "vals"
+ * with the positions of the argument structures listed in "keys".
+ * Return the number of elements that were written into "vals", which
+ * can be zero.
+ */

 static int
 arg_getattrs(const int *keys, int *vals, 
                size_t sz, const struct mdoc_node *n)
 static int
 arg_getattrs(const int *keys, int *vals, 
                size_t sz, const struct mdoc_node *n)


@@ -573,6 +582,11 @@ arg_getattrs(const int *keys, int *vals,
 }
 
 
 }
 
 

+/*
+ * 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,
+ * too.
+ */

 static void
 print_bvspace(struct termp *p, 
                const struct mdoc_node *bl, 
 static void
 print_bvspace(struct termp *p, 
                const struct mdoc_node *bl, 


@@ -600,13 +614,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 && arg_hasattr(MDOC_Column, bl))
+       if (MDOC_Bl == bl->tok && LIST_column == bl->data.list)

                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 && arg_hasattr(MDOC_Diag, bl)) 
+       if (MDOC_Bl == bl->tok && LIST_diag == bl->data.list)

                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)


@@ -650,8 +664,9 @@ 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, type, keys[3], vals[3];
-       size_t                  width, offset;
+       int                     i, keys[3], vals[3];
+       size_t                  width, offset, ncols, dcol;
+       enum mdoc_list          type;

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


@@ -660,11 +675,7 @@ termp_it_pre(DECL_ARGS)
 
        bl = n->parent->parent->parent;
 
 
        bl = n->parent->parent->parent;
 

-       /* Save parent attributes. */
-
-       pair->flag = p->flags;
-
-       /* Get list width and offset. */
+       /* Get list width, offset, and list type from argument list. */

 
        keys[0] = MDOC_Width;
        keys[1] = MDOC_Offset;
 
        keys[0] = MDOC_Width;
        keys[1] = MDOC_Offset;


@@ -672,48 +683,75 @@ termp_it_pre(DECL_ARGS)
 
        vals[0] = vals[1] = vals[2] = -1;
 
 
        vals[0] = vals[1] = vals[2] = -1;
 

-       width = offset = 0;
+       arg_getattrs(keys, vals, 3, bl);

 
 

-       (void)arg_getattrs(keys, vals, 3, bl);
+       type = bl->data.list;

 
 

-       type = arg_listtype(bl);
-       assert(-1 != type);
+       /* 
+        * First calculate width and offset.  This is pretty easy unless
+        * we're a -column list, in which case all prior columns must
+        * be accounted for.
+        */
+
+       width = offset = 0;

 
 

-       /* Calculate real width and offset. */
+       if (vals[1] >= 0) 
+               offset = a2offs(&bl->args->argv[vals[1]]);

 
        switch (type) {
 
        switch (type) {

-       case (MDOC_Column):
-               if (MDOC_BODY == n->type)
+       case (LIST_column):
+               if (MDOC_HEAD == n->type)

                        break;
                        break;

-               /* 
-                * Work around groff's column handling.  The offset is
-                * equal to the sum of all widths leading to the current
-                * column (plus the -offset value).  If this column
-                * exceeds the stated number of columns, the width is
-                * set as 0, else it's the stated column width (later
-                * the 0 will be adjusted to default 10 or, if in the
-                * last column case, set to stretch to the margin).
+               /*
+                * Imitate groff's column handling:
+                * - For each earlier column, add its width.
+                * - For less than 5 columns, add four more blanks per
+                *   column.
+                * - For exactly 5 columns, add three more blank per
+                *   column.
+                * - For more than 5 columns, add only one column.
+                */
+               ncols = bl->args->argv[vals[2]].sz;
+               /* LINTED */
+               dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1;
+
+               /*
+                * Calculate the offset by applying all prior MDOC_BODY,
+                * so we stop at the MDOC_HEAD (NULL == nn->prev).

                 */
                 */

-               for (i = 0, nn = n->prev; nn && 
-                               i < (int)bl->args->argv[vals[2]].sz; 
+
+               for (i = 0, nn = n->prev; 
+                               nn->prev && i < (int)ncols; 

                                nn = nn->prev, i++)
                                nn = nn->prev, i++)

-                       offset += a2width 
+                       offset += dcol + a2width

                                (&bl->args->argv[vals[2]], i);
 
                                (&bl->args->argv[vals[2]], i);
 

-               /* Whether exceeds maximum column. */
-               if (i < (int)bl->args->argv[vals[2]].sz)
-                       width = a2width(&bl->args->argv[vals[2]], i);
-               else
-                       width = 0;

 
 

-               if (vals[1] >= 0) 
-                       offset += a2offs(&bl->args->argv[vals[1]]);
+               /*
+                * When exceeding the declared number of columns, leave
+                * the remaining widths at 0.  This will later be
+                * adjusted to the default width of 10, or, for the last
+                * column, stretched to the right margin.
+                */
+               if (i >= (int)ncols)
+                       break;
+
+               /*
+                * Use the declared column widths, extended as explained
+                * in the preceding paragraph.
+                */
+               width = a2width(&bl->args->argv[vals[2]], i) + dcol;

                break;
        default:
                break;
        default:

-               if (vals[0] >= 0) 
-                       width = a2width(&bl->args->argv[vals[0]], 0);
-               if (vals[1] >= 0) 
-                       offset += a2offs(&bl->args->argv[vals[1]]);
+               if (vals[0] < 0) 
+                       break;
+
+               /* 
+                * Note: buffer the width by 2, which is groff's magic
+                * number for buffering single arguments.  See the above
+                * handling for column for how this changes.
+                */
+               width = a2width(&bl->args->argv[vals[0]], 0) + 2;

                break;
        }
 
                break;
        }
 


@@ -724,25 +762,25 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
         */
 
        switch (type) {

-       case (MDOC_Bullet):
+       case (LIST_bullet):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dash):
+       case (LIST_dash):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
+       case (LIST_hyphen):

                if (width < 4)
                        width = 4;
                break;
                if (width < 4)
                        width = 4;
                break;

-       case (MDOC_Enum):
+       case (LIST_enum):

                if (width < 5)
                        width = 5;
                break;
                if (width < 5)
                        width = 5;
                break;

-       case (MDOC_Hang):
+       case (LIST_hang):

                if (0 == width)
                        width = 8;
                break;
                if (0 == width)
                        width = 8;
                break;

-       case (MDOC_Column):
+       case (LIST_column):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Tag):
+       case (LIST_tag):

                if (0 == width)
                        width = 10;
                break;
                if (0 == width)
                        width = 10;
                break;


@@ -758,11 +796,11 @@ termp_it_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {

-       case (MDOC_Diag):
+       case (LIST_diag):

                if (MDOC_BODY == n->type)
                        term_word(p, "\\ \\ ");
                break;
                if (MDOC_BODY == n->type)
                        term_word(p, "\\ \\ ");
                break;

-       case (MDOC_Inset):
+       case (LIST_inset):

                if (MDOC_BODY == n->type) 
                        term_word(p, "\\ ");
                break;
                if (MDOC_BODY == n->type) 
                        term_word(p, "\\ ");
                break;


@@ -773,7 +811,7 @@ termp_it_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {

-       case (MDOC_Diag):
+       case (LIST_diag):

                if (MDOC_HEAD == n->type)
                        term_fontpush(p, TERMFONT_BOLD);
                break;
                if (MDOC_HEAD == n->type)
                        term_fontpush(p, TERMFONT_BOLD);
                break;


@@ -782,27 +820,26 @@ termp_it_pre(DECL_ARGS)
        }
 
        /*
        }
 
        /*

-        * Pad and break control.  This is the tricker part.  Lists with
-        * set right-margins for the head get TERMP_NOBREAK because, if
-        * they overrun the margin, they wrap to the new margin.
-        * Correspondingly, the body for these types don't left-pad, as
-        * the head will pad out to to the right.
+        * Pad and break control.  This is the tricky part.  These flags
+        * are documented in term_flushln() in term.c.  Note that we're
+        * going to unset all of these flags in termp_it_post() when we
+        * exit.

         */
 
        switch (type) {
         */
 
        switch (type) {

-       case (MDOC_Bullet):
+       case (LIST_bullet):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dash):
+       case (LIST_dash):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Enum):
+       case (LIST_enum):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
+       case (LIST_hyphen):

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

-       case (MDOC_Hang):
+       case (LIST_hang):

                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                else
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                else


@@ -825,7 +862,7 @@ termp_it_pre(DECL_ARGS)
                } else
                        p->flags |= TERMP_HANG;
                break;
                } else
                        p->flags |= TERMP_HANG;
                break;

-       case (MDOC_Tag):
+       case (LIST_tag):

                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
                else
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
                else


@@ -836,18 +873,21 @@ termp_it_pre(DECL_ARGS)
                if (NULL == n->next || NULL == n->next->child)
                        p->flags |= TERMP_DANGLE;
                break;
                if (NULL == n->next || NULL == n->next->child)
                        p->flags |= TERMP_DANGLE;
                break;

-       case (MDOC_Column):
-               if (MDOC_HEAD == n->type) {
-                       assert(n->next);
-                       if (MDOC_BODY == n->next->type)
-                               p->flags &= ~TERMP_NOBREAK;
-                       else
-                               p->flags |= TERMP_NOBREAK;
-                       if (n->prev) 
-                               p->flags |= TERMP_NOLPAD;
-               }
+       case (LIST_column):
+               if (MDOC_HEAD == n->type)
+                       break;
+
+               if (NULL == n->next)
+                       p->flags &= ~TERMP_NOBREAK;
+               else
+                       p->flags |= TERMP_NOBREAK;
+
+               assert(n->prev);
+               if (MDOC_BODY == n->prev->type) 
+                       p->flags |= TERMP_NOLPAD;
+

                break;
                break;

-       case (MDOC_Diag):
+       case (LIST_diag):

                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                break;
                if (MDOC_HEAD == n->type)
                        p->flags |= TERMP_NOBREAK;
                break;


@@ -864,7 +904,7 @@ termp_it_pre(DECL_ARGS)
        p->offset += offset;
 
        switch (type) {
        p->offset += offset;
 
        switch (type) {

-       case (MDOC_Hang):
+       case (LIST_hang):

                /*
                 * Same stipulation as above, regarding `-hang'.  We
                 * don't want to recalculate rmargin and offsets when
                /*
                 * Same stipulation as above, regarding `-hang'.  We
                 * don't want to recalculate rmargin and offsets when


@@ -875,30 +915,31 @@ termp_it_pre(DECL_ARGS)
                                 MDOC_Bd == n->next->child->tok))
                        break;
                /* FALLTHROUGH */
                                 MDOC_Bd == n->next->child->tok))
                        break;
                /* FALLTHROUGH */

-       case (MDOC_Bullet):
+       case (LIST_bullet):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dash):
+       case (LIST_dash):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Enum):
+       case (LIST_enum):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
+       case (LIST_hyphen):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Tag):
+       case (LIST_tag):

                assert(width);
                if (MDOC_HEAD == n->type)
                        p->rmargin = p->offset + width;
                else 
                        p->offset += width;
                break;
                assert(width);
                if (MDOC_HEAD == n->type)
                        p->rmargin = p->offset + width;
                else 
                        p->offset += width;
                break;

-       case (MDOC_Column):
+       case (LIST_column):

                assert(width);
                p->rmargin = p->offset + width;
                /* 
                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */
                assert(width);
                p->rmargin = p->offset + width;
                /* 
                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */

-               if (MDOC_HEAD == n->type &&
-                               MDOC_BODY == n->next->type)
+               if (MDOC_HEAD == n->type)
+                       break;
+               if (NULL == n->next && p->rmargin < p->maxrmargin)

                        p->rmargin = p->maxrmargin;
                break;
        default:
                        p->rmargin = p->maxrmargin;
                break;
        default:


@@ -912,21 +953,21 @@ termp_it_pre(DECL_ARGS)
 
        if (MDOC_HEAD == n->type)
                switch (type) {
 
        if (MDOC_HEAD == n->type)
                switch (type) {

-               case (MDOC_Bullet):
+               case (LIST_bullet):

                        term_fontpush(p, TERMFONT_BOLD);
                        term_word(p, "\\[bu]");
                        term_fontpop(p);
                        break;
                        term_fontpush(p, TERMFONT_BOLD);
                        term_word(p, "\\[bu]");
                        term_fontpop(p);
                        break;

-               case (MDOC_Dash):
+               case (LIST_dash):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Hyphen):
+               case (LIST_hyphen):

                        term_fontpush(p, TERMFONT_BOLD);
                        term_word(p, "\\(hy");
                        term_fontpop(p);
                        break;
                        term_fontpush(p, TERMFONT_BOLD);
                        term_word(p, "\\(hy");
                        term_fontpop(p);
                        break;

-               case (MDOC_Enum):
+               case (LIST_enum):

                        (pair->ppair->ppair->count)++;
                        (pair->ppair->ppair->count)++;

-                       (void)snprintf(buf, sizeof(buf), "%d.", 
+                       snprintf(buf, sizeof(buf), "%d.", 

                                        pair->ppair->ppair->count);
                        term_word(p, buf);
                        break;
                                        pair->ppair->ppair->count);
                        term_word(p, buf);
                        break;


@@ -939,20 +980,20 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
         */
 
        switch (type) {

-       case (MDOC_Bullet):
+       case (LIST_bullet):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Item):
+       case (LIST_item):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dash):
+       case (LIST_dash):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
+       case (LIST_hyphen):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Enum):
+       case (LIST_enum):

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

-       case (MDOC_Column):
-               if (MDOC_BODY == n->type)
+       case (LIST_column):
+               if (MDOC_HEAD == n->type)

                        return(0);
                break;
        default:
                        return(0);
                break;
        default:


@@ -967,33 +1008,42 @@ termp_it_pre(DECL_ARGS)
 static void
 termp_it_post(DECL_ARGS)
 {
 static void
 termp_it_post(DECL_ARGS)
 {

-       int                type;
+       enum mdoc_list     type;

 
 

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

                return;
 
                return;
 

-       type = arg_listtype(n->parent->parent->parent);
-       assert(-1 != type);
+       type = n->parent->parent->parent->data.list;

 
        switch (type) {
 
        switch (type) {

-       case (MDOC_Item):
+       case (LIST_item):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Diag):
+       case (LIST_diag):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Inset):
+       case (LIST_inset):

                if (MDOC_BODY == n->type)
                if (MDOC_BODY == n->type)

-                       term_flushln(p);
+                       term_newln(p);

                break;
                break;

-       case (MDOC_Column):
-               if (MDOC_HEAD == n->type)
+       case (LIST_column):
+               if (MDOC_BODY == n->type)

                        term_flushln(p);
                break;
        default:
                        term_flushln(p);
                break;
        default:

-               term_flushln(p);
+               term_newln(p);

                break;
        }
 
                break;
        }
 

-       p->flags = pair->flag;
+       /* 
+        * Now that our output is flushed, we can reset our tags.  Since
+        * only `It' sets these flags, we're free to assume that nobody
+        * has munged them in the meanwhile.
+        */
+
+       p->flags &= ~TERMP_DANGLE;
+       p->flags &= ~TERMP_NOBREAK;
+       p->flags &= ~TERMP_TWOSPACE;
+       p->flags &= ~TERMP_NOLPAD;
+       p->flags &= ~TERMP_HANG;

 }
 
 
 }
 
 


@@ -1002,13 +1052,17 @@ static int
 termp_nm_pre(DECL_ARGS)
 {
 
 termp_nm_pre(DECL_ARGS)
 {
 

-       if (SEC_SYNOPSIS == n->sec)
+       if (NULL == n->child && NULL == m->name)
+               return(1);
+
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)

                term_newln(p);
 
        term_fontpush(p, TERMFONT_BOLD);
 
        if (NULL == n->child)
                term_word(p, m->name);
                term_newln(p);
 
        term_fontpush(p, TERMFONT_BOLD);
 
        if (NULL == n->child)
                term_word(p, m->name);

+

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


@@ -1019,22 +1073,12 @@ termp_fl_pre(DECL_ARGS)
 {
 
        term_fontpush(p, TERMFONT_BOLD);
 {
 
        term_fontpush(p, TERMFONT_BOLD);

-
-       /* A zero-length child shouldn't get a dash. */
-
-       if (n->child) {
-               assert(MDOC_TEXT == n->child->type);
-               assert(n->child->string);
-               if ('\0' == *n->child->string)
-                       return(0);
-       }
-

        term_word(p, "\\-");
 
        term_word(p, "\\-");
 

-       /* A blank `Fl' should incur a subsequent space. */
-

        if (n->child)
                p->flags |= TERMP_NOSPACE;
        if (n->child)
                p->flags |= TERMP_NOSPACE;

+       else if (n->next && n->next->line == n->line)
+               p->flags |= TERMP_NOSPACE;

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


@@ -1087,7 +1131,7 @@ termp_an_post(DECL_ARGS)
                return;
        }
 
                return;
        }
 

-       if (arg_getattr(MDOC_Split, n) > -1) {
+       if (arg_hasattr(MDOC_Split, n)) {

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


@@ -1143,7 +1187,7 @@ termp_rv_pre(DECL_ARGS)
                        term_word(p, "()");
        }
 
                        term_word(p, "()");
        }
 

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

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


@@ -1156,6 +1200,7 @@ termp_rv_pre(DECL_ARGS)
        term_fontpop(p);
 
                term_word(p, "is set to indicate the error.");
        term_fontpop(p);
 
                term_word(p, "is set to indicate the error.");

+       p->flags |= TERMP_SENTENCE;

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


@@ -1182,12 +1227,13 @@ termp_ex_pre(DECL_ARGS)
                        p->flags &= ~TERMP_NOSPACE;
        }
 
                        p->flags &= ~TERMP_NOSPACE;
        }
 

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

                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;

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


@@ -1210,6 +1256,15 @@ termp_nd_pre(DECL_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */
+static int
+termp_bl_pre(DECL_ARGS)
+{
+
+       return(MDOC_HEAD != n->type);
+}
+
+

 /* ARGSUSED */
 static void
 termp_bl_post(DECL_ARGS)
 /* ARGSUSED */
 static void
 termp_bl_post(DECL_ARGS)


@@ -1238,7 +1293,10 @@ termp_xr_pre(DECL_ARGS)
 {
        const struct mdoc_node *nn;
 
 {
        const struct mdoc_node *nn;
 

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

        nn = n->child;
 
        term_word(p, nn->string);
        nn = n->child;
 
        term_word(p, nn->string);


@@ -1255,12 +1313,27 @@ termp_xr_pre(DECL_ARGS)
 }
 
 
 }
 
 

+static int
+termp_vt_pre(DECL_ARGS)
+{
+
+       if (MDOC_ELEM == n->type)
+               return(termp_under_pre(p, pair, m, n));
+       else if (MDOC_HEAD == n->type)
+               return(0);
+       else if (MDOC_BLOCK == n->type)
+               return(1);
+
+       return(termp_under_pre(p, pair, m, n));
+}
+
+

 /* ARGSUSED */
 static void
 termp_vt_post(DECL_ARGS)
 {
 
 /* ARGSUSED */
 static void
 termp_vt_post(DECL_ARGS)
 {
 

-       if (n->sec != SEC_SYNOPSIS)
+       if (MDOC_BLOCK != n->type)

                return;
        if (n->next && MDOC_Vt == n->next->tok)
                term_newln(p);
                return;
        if (n->next && MDOC_Vt == n->next->tok)
                term_newln(p);


@@ -1284,12 +1357,7 @@ static void
 termp_fd_post(DECL_ARGS)
 {
 
 termp_fd_post(DECL_ARGS)
 {
 

-       if (n->sec != SEC_SYNOPSIS)
-               return;
-

        term_newln(p);
        term_newln(p);

-       if (n->next && MDOC_Fd != n->next->tok)
-               term_vspace(p);

 }
 
 
 }
 
 


@@ -1362,6 +1430,7 @@ termp_bt_pre(DECL_ARGS)
 {
 
        term_word(p, "is currently in beta test.");
 {
 
        term_word(p, "is currently in beta test.");

+       p->flags |= TERMP_SENTENCE;

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


@@ -1371,7 +1440,7 @@ static void
 termp_lb_post(DECL_ARGS)
 {
 
 termp_lb_post(DECL_ARGS)
 {
 

-       if (SEC_LIBRARY == n->sec)
+       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)

                term_newln(p);
 }
 
                term_newln(p);
 }
 


@@ -1382,6 +1451,7 @@ termp_ud_pre(DECL_ARGS)
 {
 
        term_word(p, "currently under development.");
 {
 
        term_word(p, "currently under development.");

+       p->flags |= TERMP_SENTENCE;

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


@@ -1440,31 +1510,29 @@ static int
 termp_ft_pre(DECL_ARGS)
 {
 
 termp_ft_pre(DECL_ARGS)
 {
 

-       if (SEC_SYNOPSIS == n->sec)
-               if (n->prev && MDOC_Fo == n->prev->tok)
-                       term_vspace(p);
+       /* NB: MDOC_LINE does not effect this! */
+       if (SEC_SYNOPSIS == n->sec && n->prev)
+               term_vspace(p);

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

-/* ARGSUSED */
-static void
-termp_ft_post(DECL_ARGS)
-{
-
-       if (SEC_SYNOPSIS == n->sec)
-               term_newln(p);
-}
-
-

 /* ARGSUSED */
 static int
 termp_fn_pre(DECL_ARGS)
 {
        const struct mdoc_node  *nn;
 
 /* ARGSUSED */
 static int
 termp_fn_pre(DECL_ARGS)
 {
        const struct mdoc_node  *nn;
 

+       /* NB: MDOC_LINE has no effect on this macro! */
+       if (SEC_SYNOPSIS == n->sec) {
+               if (n->prev && MDOC_Ft == n->prev->tok)
+                       term_newln(p);
+               else if (n->prev)
+                       term_vspace(p);
+       }
+

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


@@ -1495,8 +1563,9 @@ static void
 termp_fn_post(DECL_ARGS)
 {
 
 termp_fn_post(DECL_ARGS)
 {
 

-       if (n->sec == SEC_SYNOPSIS && n->next)
-               term_vspace(p);
+       /* NB: MDOC_LINE has no effect on this macro! */
+       if (SEC_SYNOPSIS == n->sec)
+               term_newln(p);

 }
 
 
 }
 
 


@@ -1531,37 +1600,24 @@ termp_fa_pre(DECL_ARGS)
 static int
 termp_bd_pre(DECL_ARGS)
 {
 static int
 termp_bd_pre(DECL_ARGS)
 {

+       size_t                   tabwidth;

        int                      i, type;
        int                      i, type;

+       size_t                   rm, rmax;

        const struct mdoc_node  *nn;
 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n, n);
                return(1);
        const struct mdoc_node  *nn;
 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n, n);
                return(1);

-       } else if (MDOC_BODY != n->type)
-               return(1);
+       } else if (MDOC_HEAD == n->type)
+               return(0);

 
        nn = n->parent;
 
 
        nn = n->parent;
 

-       for (type = -1, i = 0; i < (int)nn->args->argc; i++) {
-               switch (nn->args->argv[i].arg) {
-               case (MDOC_Centred):
-                       /* FALLTHROUGH */
-               case (MDOC_Ragged):
-                       /* FALLTHROUGH */
-               case (MDOC_Filled):
-                       /* FALLTHROUGH */
-               case (MDOC_Unfilled):
-                       /* FALLTHROUGH */
-               case (MDOC_Literal):
-                       type = nn->args->argv[i].arg;
-                       break;
-               case (MDOC_Offset):
-                       p->offset += a2offs(&nn->args->argv[i]);
-                       break;
-               default:
-                       break;
-               }
-       }
+       type = arg_disptype(nn);
+       assert(-1 != type);
+
+       if (-1 != (i = arg_getattr(MDOC_Offset, nn)))
+               p->offset += a2offs(&nn->args->argv[i]);

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


@@ -1571,21 +1627,27 @@ termp_bd_pre(DECL_ARGS)
         * lines are allowed.
         */
        
         * lines are allowed.
         */
        

-       assert(type > -1);

        if (MDOC_Literal != type && MDOC_Unfilled != type)
                return(1);
 
        if (MDOC_Literal != type && MDOC_Unfilled != type)
                return(1);
 

+       tabwidth = p->tabwidth;
+       p->tabwidth = 8;
+       rm = p->rmargin;
+       rmax = p->maxrmargin;
+       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);
        for (nn = n->child; nn; nn = nn->next) {
                p->flags |= TERMP_NOSPACE;
                print_mdoc_node(p, pair, m, nn);

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

                        term_flushln(p);
        }
                        term_flushln(p);
        }

+       p->tabwidth = tabwidth;

 
 

+       p->rmargin = rm;
+       p->maxrmargin = rmax;

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


@@ -1594,11 +1656,26 @@ termp_bd_pre(DECL_ARGS)
 static void
 termp_bd_post(DECL_ARGS)
 {
 static void
 termp_bd_post(DECL_ARGS)
 {

+       int              type;
+       size_t           rm, rmax;

 
        if (MDOC_BODY != n->type) 
                return;
 
        if (MDOC_BODY != n->type) 
                return;

+
+       type = arg_disptype(n->parent);
+       assert(-1 != type);
+
+       rm = p->rmargin;
+       rmax = p->maxrmargin;
+
+       if (MDOC_Literal == type || MDOC_Unfilled == type)
+               p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
+

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

-       term_flushln(p);
+       term_newln(p);
+
+       p->rmargin = rm;
+       p->maxrmargin = rmax;

 }
 
 
 }
 
 


@@ -1768,11 +1845,18 @@ static int
 termp_in_pre(DECL_ARGS)
 {
 
 termp_in_pre(DECL_ARGS)
 {
 

-       term_fontpush(p, TERMFONT_BOLD);
-       if (SEC_SYNOPSIS == n->sec)
+       if (SEC_SYNOPSIS == n->sec && n->prev && MDOC_In != n->prev->tok)
+               term_vspace(p);
+
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {
+               term_fontpush(p, TERMFONT_BOLD);

                term_word(p, "#include");
                term_word(p, "#include");

+               term_word(p, "<");
+       } else {
+               term_word(p, "<");
+               term_fontpush(p, TERMFONT_UNDER);
+       }

 
 

-       term_word(p, "<");

        p->flags |= TERMP_NOSPACE;
        return(1);
 }
        p->flags |= TERMP_NOSPACE;
        return(1);
 }


@@ -1783,23 +1867,16 @@ static void
 termp_in_post(DECL_ARGS)
 {
 
 termp_in_post(DECL_ARGS)
 {
 

-       term_fontpush(p, TERMFONT_BOLD);
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
+               term_fontpush(p, TERMFONT_BOLD);
+

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

-       term_fontpop(p);
-
-       if (SEC_SYNOPSIS != n->sec)
-               return;

 
 

-       term_newln(p);
-       /* 
-        * XXX Not entirely correct.  If `.In foo bar' is specified in
-        * the SYNOPSIS section, then it produces a single break after
-        * the <foo>; mandoc asserts a vertical space.  Since this
-        * construction is rarely used, I think it's fine.
-        */
-       if (n->next && MDOC_In != n->next->tok)
-               term_vspace(p);
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {
+               term_fontpop(p);
+               term_newln(p);
+       }

 }
 
 
 }
 
 


@@ -1908,23 +1985,29 @@ termp_pq_post(DECL_ARGS)
 static int
 termp_fo_pre(DECL_ARGS)
 {
 static int
 termp_fo_pre(DECL_ARGS)
 {

-       const struct mdoc_node *nn;

 
 

-       if (MDOC_BODY == n->type) {
+       if (MDOC_BLOCK == n->type) {
+               /* NB: MDOC_LINE has no effect on this macro! */
+               if (SEC_SYNOPSIS != n->sec)
+                       return(1);
+               if (n->prev && MDOC_Ft == n->prev->tok)
+                       term_newln(p);
+               else if (n->prev)
+                       term_vspace(p);
+               return(1);
+       } else if (MDOC_BODY == n->type) {

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

-       } else if (MDOC_HEAD != n->type) 
-               return(1);
+       } 

 
 

-       term_fontpush(p, TERMFONT_BOLD);
-       for (nn = n->child; nn; nn = nn->next) {
-               assert(MDOC_TEXT == nn->type);
-               term_word(p, nn->string);
-       }
-       term_fontpop(p);
+       /* 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);

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


@@ -1934,13 +2017,18 @@ static void
 termp_fo_post(DECL_ARGS)
 {
 
 termp_fo_post(DECL_ARGS)
 {
 

-       if (MDOC_BODY != n->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, ")");
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, ";");
-       term_newln(p);
+       if (MDOC_BLOCK == n->type) {
+               /* NB: MDOC_LINE has no effect on this macro! */
+               if (SEC_SYNOPSIS == n->sec)
+                       term_newln(p);
+       } else if (MDOC_BODY == n->type) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, ")");
+               if (SEC_SYNOPSIS == n->sec) {
+                       p->flags |= TERMP_NOSPACE;
+                       term_word(p, ";");
+               }
+       }

 }
 
 
 }
 
 


@@ -1984,10 +2072,9 @@ 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))

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

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

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


@@ -2014,14 +2101,6 @@ termp____post(DECL_ARGS)
        /* TODO: %U. */
 
        p->flags |= TERMP_NOSPACE;
        /* TODO: %U. */
 
        p->flags |= TERMP_NOSPACE;

-       switch (n->tok) {
-       case (MDOC__T):
-               term_word(p, "\\(rq");
-               p->flags |= TERMP_NOSPACE;
-               break;
-       default:
-               break;
-       }

        term_word(p, n->next ? "," : ".");
 }
 
        term_word(p, n->next ? "," : ".");
 }
 


@@ -2071,14 +2150,3 @@ termp_under_pre(DECL_ARGS)
        term_fontpush(p, TERMFONT_UNDER);
        return(1);
 }
        term_fontpush(p, TERMFONT_UNDER);
        return(1);
 }

-
-
-/* ARGSUSED */
-static int
-termp__t_pre(DECL_ARGS)
-{
-
-       term_word(p, "\\(lq");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}