Fix formatting of empty .Bl -inset item heads.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 98b4fa70e8e9f636a2356f23f1f6d72357fa5ee3..74f86dfb5b679ea1301662e8d4ab880b2bcd6e2b 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,8 @@
-/*     $Id: mdoc_term.c,v 1.197 2010/12/11 14:40:51 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.270 2014/07/03 23:24:56 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>

  *
  * 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


@@ -29,15 +30,12 @@
 #include <string.h>
 
 #include "mandoc.h"
 #include <string.h>
 
 #include "mandoc.h"

+#include "mandoc_aux.h"

 #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 +43,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);


@@ -60,20 +58,20 @@ static      size_t    a2offs(const struct termp *, const char *);
 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 *);

-static void      print_mdoc_node(DECL_ARGS);
+static void      print_mdoc_node(DECL_ARGS);

 static void      print_mdoc_nodelist(DECL_ARGS);
 static void      print_mdoc_head(struct termp *, const void *);
 static void      print_mdoc_foot(struct termp *, const void *);
 static void      print_mdoc_nodelist(DECL_ARGS);
 static void      print_mdoc_head(struct termp *, const void *);
 static void      print_mdoc_foot(struct termp *, const void *);

-static void      synopsis_pre(struct termp *, 
+static void      synopsis_pre(struct termp *,

                        const struct mdoc_node *);
 
 static void      termp____post(DECL_ARGS);
                        const struct mdoc_node *);
 
 static void      termp____post(DECL_ARGS);

+static void      termp__t_post(DECL_ARGS);

 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_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_bx_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);


@@ -85,6 +83,7 @@ static        void      termp_sh_post(DECL_ARGS);
 static void      termp_ss_post(DECL_ARGS);
 
 static int       termp__a_pre(DECL_ARGS);
 static void      termp_ss_post(DECL_ARGS);
 
 static int       termp__a_pre(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_bd_pre(DECL_ARGS);
 static int       termp_an_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);


@@ -93,8 +92,10 @@ static       int       termp_bk_pre(DECL_ARGS);
 static int       termp_bl_pre(DECL_ARGS);
 static int       termp_bold_pre(DECL_ARGS);
 static int       termp_bt_pre(DECL_ARGS);
 static int       termp_bl_pre(DECL_ARGS);
 static int       termp_bold_pre(DECL_ARGS);
 static int       termp_bt_pre(DECL_ARGS);

+static int       termp_bx_pre(DECL_ARGS);

 static int       termp_cd_pre(DECL_ARGS);
 static int       termp_d1_pre(DECL_ARGS);
 static int       termp_cd_pre(DECL_ARGS);
 static int       termp_d1_pre(DECL_ARGS);

+static int       termp_es_pre(DECL_ARGS);

 static int       termp_ex_pre(DECL_ARGS);
 static int       termp_fa_pre(DECL_ARGS);
 static int       termp_fd_pre(DECL_ARGS);
 static int       termp_ex_pre(DECL_ARGS);
 static int       termp_fa_pre(DECL_ARGS);
 static int       termp_fd_pre(DECL_ARGS);


@@ -102,10 +103,10 @@ static    int       termp_fl_pre(DECL_ARGS);
 static int       termp_fn_pre(DECL_ARGS);
 static int       termp_fo_pre(DECL_ARGS);
 static int       termp_ft_pre(DECL_ARGS);
 static int       termp_fn_pre(DECL_ARGS);
 static int       termp_fo_pre(DECL_ARGS);
 static int       termp_ft_pre(DECL_ARGS);

-static int       termp_igndelim_pre(DECL_ARGS);

 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
 static int       termp_li_pre(DECL_ARGS);
 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
 static int       termp_li_pre(DECL_ARGS);

+static int       termp_ll_pre(DECL_ARGS);

 static int       termp_lk_pre(DECL_ARGS);
 static int       termp_nd_pre(DECL_ARGS);
 static int       termp_nm_pre(DECL_ARGS);
 static int       termp_lk_pre(DECL_ARGS);
 static int       termp_nd_pre(DECL_ARGS);
 static int       termp_nm_pre(DECL_ARGS);


@@ -129,39 +130,39 @@ static    const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Dt */
        { NULL, NULL }, /* Os */
        { termp_sh_pre, termp_sh_post }, /* Sh */
        { NULL, NULL }, /* Dt */
        { NULL, NULL }, /* Os */
        { 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_ss_pre, termp_ss_post }, /* Ss */
+       { termp_sp_pre, NULL }, /* Pp */
+       { 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 */
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */
        { termp_bl_pre, termp_bl_post }, /* Bl */
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */

-       { termp_under_pre, 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_bold_pre, NULL }, /* Cm */
        { termp_an_pre, termp_an_post }, /* An */
        { termp_under_pre, NULL }, /* Ar */
        { termp_cd_pre, NULL }, /* Cd */
        { termp_bold_pre, NULL }, /* Cm */

-       { NULL, NULL }, /* Dv */ 
-       { NULL, NULL }, /* Er */ 
-       { NULL, NULL }, /* Ev */ 
+       { NULL, NULL }, /* Dv */
+       { NULL, NULL }, /* Er */
+       { NULL, NULL }, /* Ev */

        { termp_ex_pre, NULL }, /* Ex */
        { termp_ex_pre, NULL }, /* Ex */

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

        { termp_fl_pre, NULL }, /* Fl */
        { termp_fl_pre, NULL }, /* Fl */

-       { termp_fn_pre, NULL }, /* Fn */ 
-       { termp_ft_pre, NULL }, /* Ft */ 
-       { termp_bold_pre, NULL }, /* Ic */ 
-       { termp_in_pre, termp_in_post }, /* In */ 
+       { termp_fn_pre, NULL }, /* Fn */
+       { termp_ft_pre, NULL }, /* Ft */
+       { termp_bold_pre, NULL }, /* Ic */
+       { termp_in_pre, termp_in_post }, /* In */

        { termp_li_pre, NULL }, /* Li */
        { termp_li_pre, NULL }, /* Li */

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

        { termp_quote_pre, termp_quote_post }, /* Op */
        { termp_quote_pre, termp_quote_post }, /* Op */

-       { NULL, NULL }, /* Ot */
+       { termp_ft_pre, NULL }, /* Ot */

        { termp_under_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */
        { termp_under_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */

-       { NULL, NULL }, /* St */ 
+       { NULL, NULL }, /* St */

        { termp_under_pre, NULL }, /* Va */
        { termp_vt_pre, NULL }, /* Vt */
        { termp_xr_pre, NULL }, /* Xr */
        { termp_under_pre, NULL }, /* Va */
        { termp_vt_pre, NULL }, /* Vt */
        { termp_xr_pre, NULL }, /* Xr */


@@ -174,34 +175,34 @@ 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_under_pre, termp____post }, /* %T */
+       { termp__t_pre, termp__t_post }, /* %T */

        { NULL, termp____post }, /* %V */
        { NULL, NULL }, /* Ac */
        { termp_quote_pre, termp_quote_post }, /* Ao */
        { termp_quote_pre, termp_quote_post }, /* Aq */
        { NULL, NULL }, /* At */
        { NULL, NULL }, /* Bc */
        { NULL, termp____post }, /* %V */
        { NULL, NULL }, /* Ac */
        { termp_quote_pre, termp_quote_post }, /* Ao */
        { termp_quote_pre, termp_quote_post }, /* Aq */
        { NULL, NULL }, /* At */
        { NULL, NULL }, /* Bc */

-       { termp_bf_pre, NULL }, /* Bf */ 
+       { termp_bf_pre, NULL }, /* Bf */

        { termp_quote_pre, termp_quote_post }, /* Bo */
        { termp_quote_pre, termp_quote_post }, /* Bq */
        { termp_xx_pre, NULL }, /* Bsx */
        { termp_quote_pre, termp_quote_post }, /* Bo */
        { termp_quote_pre, termp_quote_post }, /* Bq */
        { termp_xx_pre, NULL }, /* Bsx */

-       { NULL, termp_bx_post }, /* Bx */
+       { termp_bx_pre, NULL }, /* Bx */

        { NULL, NULL }, /* Db */
        { NULL, NULL }, /* Dc */
        { termp_quote_pre, termp_quote_post }, /* Do */
        { termp_quote_pre, termp_quote_post }, /* Dq */
        { NULL, NULL }, /* Ec */ /* FIXME: no space */
        { NULL, NULL }, /* Ef */
        { NULL, NULL }, /* Db */
        { NULL, NULL }, /* Dc */
        { termp_quote_pre, termp_quote_post }, /* Do */
        { termp_quote_pre, termp_quote_post }, /* Dq */
        { NULL, NULL }, /* Ec */ /* FIXME: no space */
        { NULL, NULL }, /* Ef */

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

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

-       { termp_igndelim_pre, NULL }, /* No */
+       { NULL, NULL }, /* No */

        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */
        { termp_xx_pre, NULL }, /* Ox */
        { NULL, NULL }, /* Pc */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */
        { termp_xx_pre, NULL }, /* Ox */
        { NULL, NULL }, /* Pc */

-       { termp_igndelim_pre, termp_pf_post }, /* Pf */
+       { NULL, termp_pf_post }, /* Pf */

        { termp_quote_pre, termp_quote_post }, /* Po */
        { termp_quote_pre, termp_quote_post }, /* Pq */
        { NULL, NULL }, /* Qc */
        { termp_quote_pre, termp_quote_post }, /* Po */
        { termp_quote_pre, termp_quote_post }, /* Pq */
        { NULL, NULL }, /* Qc */


@@ -220,32 +221,33 @@ static    const struct termact termacts[MDOC_MAX] = {
        { termp_xx_pre, NULL }, /* Ux */
        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */
        { termp_xx_pre, NULL }, /* Ux */
        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */

-       { termp_fo_pre, termp_fo_post }, /* Fo */ 
-       { NULL, NULL }, /* Fc */ 
+       { termp_fo_pre, termp_fo_post }, /* Fo */
+       { NULL, NULL }, /* Fc */

        { termp_quote_pre, termp_quote_post }, /* Oo */
        { NULL, NULL }, /* Oc */
        { termp_bk_pre, termp_bk_post }, /* Bk */
        { NULL, NULL }, /* Ek */
        { termp_bt_pre, NULL }, /* Bt */
        { NULL, NULL }, /* Hf */
        { termp_quote_pre, termp_quote_post }, /* Oo */
        { NULL, NULL }, /* Oc */
        { termp_bk_pre, termp_bk_post }, /* Bk */
        { NULL, NULL }, /* Ek */
        { termp_bt_pre, NULL }, /* Bt */
        { NULL, NULL }, /* Hf */

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

        { termp_ud_pre, NULL }, /* Ud */
        { NULL, termp_lb_post }, /* Lb */
        { termp_ud_pre, NULL }, /* Ud */
        { NULL, termp_lb_post }, /* Lb */

-       { termp_sp_pre, NULL }, /* Lp */ 
-       { termp_lk_pre, NULL }, /* Lk */ 
-       { termp_under_pre, NULL }, /* Mt */ 
-       { termp_quote_pre, termp_quote_post }, /* Brq */ 
-       { termp_quote_pre, termp_quote_post }, /* Bro */ 
-       { NULL, NULL }, /* Brc */ 
-       { NULL, termp____post }, /* %C */ 
-       { NULL, NULL }, /* Es */ /* TODO */
-       { NULL, NULL }, /* En */ /* TODO */
-       { termp_xx_pre, NULL }, /* Dx */ 
-       { NULL, termp____post }, /* %Q */ 
+       { termp_sp_pre, NULL }, /* Lp */
+       { termp_lk_pre, NULL }, /* Lk */
+       { termp_under_pre, NULL }, /* Mt */
+       { termp_quote_pre, termp_quote_post }, /* Brq */
+       { termp_quote_pre, termp_quote_post }, /* Bro */
+       { NULL, NULL }, /* Brc */
+       { NULL, termp____post }, /* %C */
+       { termp_es_pre, NULL }, /* Es */
+       { termp_quote_pre, termp_quote_post }, /* En */
+       { termp_xx_pre, NULL }, /* Dx */
+       { NULL, termp____post }, /* %Q */

        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* br */

-       { termp_sp_pre, NULL }, /* sp */ 
-       { termp_under_pre, termp____post }, /* %U */ 
-       { NULL, NULL }, /* Ta */ 
+       { termp_sp_pre, NULL }, /* sp */
+       { NULL, termp____post }, /* %U */
+       { NULL, NULL }, /* Ta */
+       { termp_ll_pre, NULL }, /* ll */

 };
 
 
 };
 
 


@@ -253,107 +255,114 @@ 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);
 }
 

-

 static void
 print_mdoc_nodelist(DECL_ARGS)
 {
 
 static void
 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);

 }
 
 }
 

-
-/* ARGSUSED */

 static void
 print_mdoc_node(DECL_ARGS)
 {
        int              chld;
 static void
 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;
 

-       if (MDOC_TEXT == n->type)
-               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.
        /*
         * Keeps only work until the end of a line.  If a keep was
         * invoked in a prior line, revert it to PREKEEP.

-        *
-        * Also let SYNPRETTY sections behave as if they were wrapped
-        * in a `Bk' block.

         */
 
         */
 

-       if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {
-               if (n->prev && n->prev->line != n->line) {
+       if (TERMP_KEEP & p->flags) {
+               if (n->prev ? (n->prev->lastline != 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;
-                       }

                }
        }
 
        /*
                }
        }
 
        /*

-        * Since SYNPRETTY sections aren't "turned off" with `Ek',
-        * we have to intuit whether we should disable formatting.
+        * After the keep flags have been set up, we may now
+        * produce output.  Note that some pre-handlers do so.

         */
 
         */
 

-       if ( ! (MDOC_SYNPRETTY & n->flags) &&
-           ((n->prev   && MDOC_SYNPRETTY & n->prev->flags) ||
-            (n->parent && MDOC_SYNPRETTY & n->parent->flags)))
-               p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
+       switch (n->type) {
+       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);
+               if (MDOC_DELIMO & n->flags)
+                       p->flags |= TERMP_NOSPACE;
+               break;
+       case MDOC_EQN:
+               term_eqn(p, n->eqn);
+               break;
+       case MDOC_TBL:
+               term_tbl(p, n->span);
+               break;
+       default:
+               if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
+                       chld = (*termacts[n->tok].pre)
+                               (p, &npair, meta, n);
+               break;
+       }

 
        if (chld && n->child)
 
        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);

 
 

-       if (MDOC_TEXT != n->type && termacts[n->tok].post && 
-                       ! (MDOC_ENDED & n->flags)) {
-               (void)(*termacts[n->tok].post)(p, &npair, m, n);
+       switch (n->type) {
+       case MDOC_TEXT:
+               break;
+       case MDOC_TBL:
+               break;
+       case MDOC_EQN:
+               break;
+       default:
+               if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
+                       break;
+               (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


@@ -370,27 +379,28 @@ print_mdoc_node(DECL_ARGS)
                 */
                if (ENDBODY_NOSPACE == n->end)
                        p->flags |= TERMP_NOSPACE;
                 */
                if (ENDBODY_NOSPACE == n->end)
                        p->flags |= TERMP_NOSPACE;

+               break;

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

-       p->offset = offset;
-       p->rmargin = rmargin;
+       if (MDOC_ll != n->tok) {
+               p->offset = offset;
+               p->rmargin = rmargin;
+       }

 }
 
 }
 

-

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

-       /* 
+       /*

         * Output the footer in new-groff style, that is, three columns
         * with the middle being the manual date and flanking columns
         * being the operating system:
         * Output the footer in new-groff style, that is, three columns
         * with the middle being the manual date and flanking columns
         * being the operating system:


@@ -398,32 +408,31 @@ 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;
        term_vspace(p);
 
        p->offset = 0;

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

        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;
        term_flushln(p);
 
        p->offset = p->rmargin;
        p->rmargin = p->maxrmargin;

+       p->trailspace = 0;

        p->flags &= ~TERMP_NOBREAK;
        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;


@@ -431,17 +440,14 @@ print_mdoc_foot(struct termp *p, const void *arg)
        p->flags = 0;
 }
 
        p->flags = 0;
 }
 

-

 static void
 print_mdoc_head(struct termp *p, const void *arg)
 {
 static void
 print_mdoc_head(struct termp *p, const void *arg)
 {

-       char            buf[BUFSIZ], title[BUFSIZ];
-       const struct mdoc_meta *m;
-
-       m = (const struct mdoc_meta *)arg;
+       const struct mdoc_meta  *meta;
+       char                    *volume, *title;
+       size_t                   vollen, titlen;

 
 

-       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


@@ -456,59 +462,68 @@ 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;

 
 

-       if (m->arch) {
-               strlcat(buf, " (", BUFSIZ);
-               strlcat(buf, m->arch, BUFSIZ);
-               strlcat(buf, ")", BUFSIZ);
-       }
+       assert(meta->vol);
+       if (NULL == meta->arch)
+               volume = mandoc_strdup(meta->vol);
+       else
+               mandoc_asprintf(&volume, "%s (%s)",
+                   meta->vol, meta->arch);
+       vollen = term_strlen(p, volume);

 
 

-       snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
+       mandoc_asprintf(&title, "%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->trailspace = 1;
+       p->offset = 0;
+       p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
+           (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
+           p->maxrmargin - vollen;

 
        term_word(p, title);
        term_flushln(p);
 
 
        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 + vollen + titlen < p->maxrmargin ?
+           p->maxrmargin - titlen : p->maxrmargin;

 
 

-       term_word(p, buf);
+       term_word(p, volume);

        term_flushln(p);
 
        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);
+       p->trailspace = 0;
+       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;
+       free(title);
+       free(volume);

 }
 
 }
 

-

 static size_t
 a2height(const struct termp *p, const char *v)
 {
        struct roffsu    su;
 
 static size_t
 a2height(const struct termp *p, const char *v)
 {
        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));
 }
 

-

 static size_t
 a2width(const struct termp *p, const char *v)
 {
 static size_t
 a2width(const struct termp *p, const char *v)
 {


@@ -521,7 +536,6 @@ a2width(const struct termp *p, const char *v)
        return(term_hspan(p, &su));
 }
 
        return(term_hspan(p, &su));
 }
 

-

 static size_t
 a2offs(const struct termp *p, const char *v)
 {
 static size_t
 a2offs(const struct termp *p, const char *v)
 {


@@ -532,33 +546,34 @@ 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));
 
        return(term_hspan(p, &su));
 }
 
        else if ( ! a2roffsu(v, &su, SCALE_MAX))
                SCALE_HS_INIT(&su, term_strlen(p, v));
 
        return(term_hspan(p, &su));
 }
 

-

 /*
  * 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
 /*
  * 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, 
-               const struct mdoc_node *n)
+print_bvspace(struct termp *p,
+       const struct mdoc_node *bl,
+       const struct mdoc_node *n)

 {
        const struct mdoc_node  *nn;
 
 {
        const struct mdoc_node  *nn;
 

+       assert(n);
+

        term_newln(p);
 
        term_newln(p);
 

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

                return;
                return;

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

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


@@ -577,13 +592,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->norm->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->norm->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)


@@ -594,14 +609,21 @@ print_bvspace(struct termp *p,
 }
 
 
 }
 
 

-/* ARGSUSED */
+static int
+termp_ll_pre(DECL_ARGS)
+{
+
+       term_setwidth(p, n->nchild ? n->child->string : NULL);
+       return(0);
+}
+

 static int
 termp_it_pre(DECL_ARGS)
 {
        const struct mdoc_node *bl, *nn;
 static int
 termp_it_pre(DECL_ARGS)
 {
        const struct mdoc_node *bl, *nn;

-       char                    buf[7];
-       int                     i;
-       size_t                  width, offset, ncols, dcol;
+       char                    buf[24];
+       int                     i;
+       size_t                  width, offset, ncols, dcol;

        enum mdoc_list          type;
 
        if (MDOC_BLOCK == n->type) {
        enum mdoc_list          type;
 
        if (MDOC_BLOCK == n->type) {


@@ -610,10 +632,9 @@ termp_it_pre(DECL_ARGS)
        }
 
        bl = n->parent->parent->parent;
        }
 
        bl = n->parent->parent->parent;

-       assert(bl->data.Bl);
-       type = bl->data.Bl->type;
+       type = bl->norm->Bl.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.
         * 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.


@@ -621,11 +642,11 @@ 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->norm->Bl.offs)
+               offset = a2offs(p, bl->norm->Bl.offs);

 
        switch (type) {
 
        switch (type) {

-       case (LIST_column):
+       case LIST_column:

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


@@ -638,22 +659,20 @@ 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->data.Bl->ncols;
-
-               /* LINTED */
-               dcol = ncols < 5 ? term_len(p, 4) : 
-                       ncols == 5 ? term_len(p, 3) : term_len(p, 1);
+               ncols = bl->norm->Bl.ncols;
+               dcol = ncols < 5 ? term_len(p, 4) :
+                   ncols == 5 ? term_len(p, 3) : term_len(p, 1);

 
                /*
                 * Calculate the offset by applying all prior MDOC_BODY,
                 * so we stop at the MDOC_HEAD (NULL == nn->prev).
                 */
 
 
                /*
                 * 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->prev && i < (int)ncols; 
-                               nn = nn->prev, i++)
-                       offset += dcol + a2width
-                               (p, bl->data.Bl->cols[i]);
+               for (i = 0, nn = n->prev;
+                   nn->prev && i < (int)ncols;
+                   nn = nn->prev, i++)
+                       offset += dcol + a2width(p,
+                           bl->norm->Bl.cols[i]);

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


@@ -668,48 +687,46 @@ 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->data.Bl->cols[i]) + dcol;
+               width = a2width(p, bl->norm->Bl.cols[i]) + dcol;

                break;
        default:
                break;
        default:

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

                        break;
 
                        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.
                 */
                 * 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.
                 */

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

                break;
        }
 
                break;
        }
 

-       /* 
+       /*

         * List-type can override the width in the case of fixed-head
         * values (bullet, dash/hyphen, enum).  Tags need a non-zero
         * offset.
         */
 
        switch (type) {
         * List-type can override the width in the case of fixed-head
         * values (bullet, dash/hyphen, enum).  Tags need a non-zero
         * offset.
         */
 
        switch (type) {

-       case (LIST_bullet):
+       case LIST_bullet:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_dash):
+       case LIST_dash:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_hyphen):
-               if (width < term_len(p, 4))
-                       width = term_len(p, 4);
-               break;
-       case (LIST_enum):
-               if (width < term_len(p, 5))
-                       width = term_len(p, 5);
+       case LIST_hyphen:
+               /* FALLTHROUGH */
+       case LIST_enum:
+               if (width < term_len(p, 2))
+                       width = term_len(p, 2);

                break;
                break;

-       case (LIST_hang):
+       case LIST_hang:

                if (0 == width)
                        width = term_len(p, 8);
                break;
                if (0 == width)
                        width = term_len(p, 8);
                break;

-       case (LIST_column):
+       case LIST_column:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_tag):
+       case LIST_tag:

                if (0 == width)
                        width = term_len(p, 10);
                break;
                if (0 == width)
                        width = term_len(p, 10);
                break;


@@ -717,7 +734,7 @@ termp_it_pre(DECL_ARGS)
                break;
        }
 
                break;
        }
 

-       /* 
+       /*

         * Whitespace control.  Inset bodies need an initial space,
         * while diagonal bodies need two.
         */
         * Whitespace control.  Inset bodies need an initial space,
         * while diagonal bodies need two.
         */


@@ -725,12 +742,12 @@ termp_it_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {

-       case (LIST_diag):
+       case LIST_diag:

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

-       case (LIST_inset):
-               if (MDOC_BODY == n->type) 
+       case LIST_inset:
+               if (MDOC_BODY == n->type && n->parent->head->nchild)

                        term_word(p, "\\ ");
                break;
        default:
                        term_word(p, "\\ ");
                break;
        default:


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

-       case (LIST_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;


@@ -756,24 +773,25 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
         */
 
        switch (type) {

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_dash):
+       case LIST_bullet:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_enum):
+       case LIST_dash:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_hyphen):
-               if (MDOC_HEAD == n->type)
-                       p->flags |= TERMP_NOBREAK;
-               else
-                       p->flags |= TERMP_NOLPAD;
+       case LIST_hyphen:
+               if (MDOC_HEAD != n->type)
+                       break;
+               p->flags |= TERMP_NOBREAK;
+               p->trailspace = 1;

                break;
                break;

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

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


@@ -783,48 +801,48 @@ termp_it_pre(DECL_ARGS)
                 * the "overstep" effect in term_flushln() and treat
                 * this as a `-ohang' list instead.
                 */
                 * the "overstep" effect in term_flushln() and treat
                 * this as a `-ohang' list instead.
                 */

-               if (n->next->child && 
-                               (MDOC_Bl == n->next->child->tok ||
-                                MDOC_Bd == n->next->child->tok)) {
-                       p->flags &= ~TERMP_NOBREAK;
-                       p->flags &= ~TERMP_NOLPAD;
-               } else
-                       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 (n->next->child &&
+                   (MDOC_Bl == n->next->child->tok ||
+                    MDOC_Bd == n->next->child->tok))
+                       break;

 
 

+               p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
+               p->trailspace = 1;
+               break;
+       case LIST_tag:

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

+
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND;
+               p->trailspace = 2;
+

                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 (LIST_column):
+       case LIST_column:

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

-               if (NULL == n->next)
+               if (NULL == n->next) {

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

-               else
+                       p->trailspace = 0;
+               } else {

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

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

 
                break;
 
                break;

-       case (LIST_diag):
-               if (MDOC_HEAD == n->type)
-                       p->flags |= TERMP_NOBREAK;
+       case LIST_diag:
+               if (MDOC_HEAD != n->type)
+                       break;
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND;
+               p->trailspace = 1;

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

-       /* 
+       /*

         * Margin control.  Set-head-width lists have their right
         * margins shortened.  The body for these lists has the offset
         * necessarily lengthened.  Everybody gets the offset.
         * Margin control.  Set-head-width lists have their right
         * margins shortened.  The body for these lists has the offset
         * necessarily lengthened.  Everybody gets the offset.


@@ -833,36 +851,39 @@ termp_it_pre(DECL_ARGS)
        p->offset += offset;
 
        switch (type) {
        p->offset += offset;
 
        switch (type) {

-       case (LIST_hang):
+       case LIST_hang:

                /*
                 * Same stipulation as above, regarding `-hang'.  We
                 * don't want to recalculate rmargin and offsets when
                 * using `Bd' or `Bl' within `-hang' overstep lists.
                 */
                if (MDOC_HEAD == n->type && n->next->child &&
                /*
                 * Same stipulation as above, regarding `-hang'.  We
                 * don't want to recalculate rmargin and offsets when
                 * using `Bd' or `Bl' within `-hang' overstep lists.
                 */
                if (MDOC_HEAD == n->type && n->next->child &&

-                               (MDOC_Bl == n->next->child->tok || 
-                                MDOC_Bd == n->next->child->tok))
+                   (MDOC_Bl == n->next->child->tok ||
+                    MDOC_Bd == n->next->child->tok))

                        break;
                /* FALLTHROUGH */
                        break;
                /* FALLTHROUGH */

-       case (LIST_bullet):
+       case LIST_bullet:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_dash):
+       case LIST_dash:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_enum):
+       case LIST_enum:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_hyphen):
+       case LIST_hyphen:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_tag):
+       case LIST_tag:

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

-               else 
+               else {

                        p->offset += width;
                        p->offset += width;

+                       if (p->rmargin < p->offset)
+                               p->rmargin = p->offset;
+               }

                break;
                break;

-       case (LIST_column):
+       case LIST_column:

                assert(width);
                p->rmargin = p->offset + width;
                assert(width);
                p->rmargin = p->offset + width;

-               /* 
+               /*

                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */
                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */


@@ -875,53 +896,53 @@ termp_it_pre(DECL_ARGS)
                break;
        }
 
                break;
        }
 

-       /* 
+       /*

         * The dash, hyphen, bullet and enum lists all have a special
         * The dash, hyphen, bullet and enum lists all have a special

-        * HEAD character (temporarily bold, in some cases).  
+        * HEAD character (temporarily bold, in some cases).

         */
 
        if (MDOC_HEAD == n->type)
                switch (type) {
         */
 
        if (MDOC_HEAD == n->type)
                switch (type) {

-               case (LIST_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 (LIST_dash):
+               case LIST_dash:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (LIST_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 (LIST_enum):
+               case LIST_enum:

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

-                       snprintf(buf, sizeof(buf), "%d.", 
-                                       pair->ppair->ppair->count);
+                       (void)snprintf(buf, sizeof(buf), "%d.",
+                           pair->ppair->ppair->count);

                        term_word(p, buf);
                        break;
                default:
                        break;
                }
 
                        term_word(p, buf);
                        break;
                default:
                        break;
                }
 

-       /* 
+       /*

         * If we're not going to process our children, indicate so here.
         */
 
        switch (type) {
         * If we're not going to process our children, indicate so here.
         */
 
        switch (type) {

-       case (LIST_bullet):
+       case LIST_bullet:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_item):
+       case LIST_item:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_dash):
+       case LIST_dash:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_hyphen):
+       case LIST_hyphen:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_enum):
+       case LIST_enum:

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

-       case (LIST_column):
+       case LIST_column:

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


@@ -932,8 +953,6 @@ termp_it_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 termp_it_post(DECL_ARGS)
 {
 static void
 termp_it_post(DECL_ARGS)
 {


@@ -942,18 +961,18 @@ 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->norm->Bl.type;

 
        switch (type) {
 
        switch (type) {

-       case (LIST_item):
+       case LIST_item:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_diag):
+       case LIST_diag:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_inset):
+       case LIST_inset:

                if (MDOC_BODY == n->type)
                        term_newln(p);
                break;
                if (MDOC_BODY == n->type)
                        term_newln(p);
                break;

-       case (LIST_column):
+       case LIST_column:

                if (MDOC_BODY == n->type)
                        term_flushln(p);
                break;
                if (MDOC_BODY == n->type)
                        term_flushln(p);
                break;


@@ -962,51 +981,53 @@ termp_it_post(DECL_ARGS)
                break;
        }
 
                break;
        }
 

-       /* 
+       /*

         * 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.
         */
 
         * 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;
+       p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
+                       TERMP_DANGLE | TERMP_HANG);
+       p->trailspace = 0;

 }
 
 }
 

-
-/* ARGSUSED */

 static int
 termp_nm_pre(DECL_ARGS)
 {
 
 static int
 termp_nm_pre(DECL_ARGS)
 {
 

-       if (MDOC_BLOCK == n->type)
+       if (MDOC_BLOCK == n->type) {
+               p->flags |= TERMP_PREKEEP;

                return(1);
                return(1);

+       }

 
        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));
                     term_len(p, 5));

+               if (p->rmargin < p->offset)
+                       p->rmargin = p->offset;

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

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

                return(0);
 
        if (MDOC_HEAD == n->type)
                synopsis_pre(p, n->parent);
 
        if (MDOC_HEAD == n->type && n->next->child) {
                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;
+               p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND;
+               p->trailspace = 1;

                p->rmargin = p->offset + term_len(p, 1);
                if (NULL == n->child) {
                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)


@@ -1019,27 +1040,24 @@ 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);
 }
 

-
-/* ARGSUSED */

 static void
 termp_nm_post(DECL_ARGS)
 {
 
 static void
 termp_nm_post(DECL_ARGS)
 {
 

-       if (MDOC_HEAD == n->type && n->next->child) {
+       if (MDOC_BLOCK == n->type) {
+               p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
+       } else if (MDOC_HEAD == n->type && n->next->child) {

                term_flushln(p);
                term_flushln(p);

-               p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
-       } else if (MDOC_BODY == n->type && n->child) {
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
+               p->trailspace = 0;
+       } else if (MDOC_BODY == n->type && n->child)

                term_flushln(p);
                term_flushln(p);

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

 }
 
 }
 

-               
-/* ARGSUSED */

 static int
 termp_fl_pre(DECL_ARGS)
 {
 static int
 termp_fl_pre(DECL_ARGS)
 {


@@ -1055,8 +1073,6 @@ termp_fl_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 termp__a_pre(DECL_ARGS)
 {
 static int
 termp__a_pre(DECL_ARGS)
 {


@@ -1068,8 +1084,6 @@ termp__a_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 termp_an_pre(DECL_ARGS)
 {
 static int
 termp_an_pre(DECL_ARGS)
 {


@@ -1085,7 +1099,7 @@ termp_an_pre(DECL_ARGS)
         * with other macros/text, are split.  -split, in this case,
         * will override the condition of the implied first -nosplit.
         */
         * with other macros/text, are split.  -split, in this case,
         * will override the condition of the implied first -nosplit.
         */

-       
+

        if (n->sec == SEC_AUTHORS) {
                if ( ! (TERMP_ANPREC & p->flags)) {
                        if (TERMP_SPLIT & p->flags)
        if (n->sec == SEC_AUTHORS) {
                if ( ! (TERMP_ANPREC & p->flags)) {
                        if (TERMP_SPLIT & p->flags)


@@ -1104,8 +1118,6 @@ termp_an_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 termp_an_post(DECL_ARGS)
 {
 static void
 termp_an_post(DECL_ARGS)
 {


@@ -1116,28 +1128,25 @@ termp_an_post(DECL_ARGS)
                return;
        }
 
                return;
        }
 

-       if (AUTH_split == n->data.An.auth) {
+       if (AUTH_split == n->norm->An.auth) {

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

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

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

-
-/* ARGSUSED */

 static int
 termp_ns_pre(DECL_ARGS)
 {
 
 static int
 termp_ns_pre(DECL_ARGS)
 {
 

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

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

-
-/* ARGSUSED */

 static int
 termp_rs_pre(DECL_ARGS)
 {
 static int
 termp_rs_pre(DECL_ARGS)
 {


@@ -1149,82 +1158,84 @@ termp_rs_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 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");
 

-               term_word(p, "the value 0 if successful; otherwise the value "
-                       "-1 is returned and the global variable");
+       term_word(p, "the value 0 if successful; otherwise the "
+           "value -1 is returned and the global variable");

 
        term_fontpush(p, TERMFONT_UNDER);
        term_word(p, "errno");
        term_fontpop(p);
 
 
        term_fontpush(p, TERMFONT_UNDER);
        term_word(p, "errno");
        term_fontpop(p);
 

-               term_word(p, "is set to indicate the error.");
+       term_word(p, "is set to indicate the error.");

        p->flags |= TERMP_SENTENCE;
 
        return(0);
 }
 
        p->flags |= TERMP_SENTENCE;
 
        return(0);
 }
 

-
-/* ARGSUSED */

 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, "utilities exit");
        else
                term_word(p, "utility exits");
 

-               term_word(p, "0 on success, and >0 if an error occurs.");
-       p->flags |= TERMP_SENTENCE;
+       term_word(p, "0 on success, and >0 if an error occurs.");

 
 

+       p->flags |= TERMP_SENTENCE;

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

-
-/* ARGSUSED */

 static int
 termp_nd_pre(DECL_ARGS)
 {
 static int
 termp_nd_pre(DECL_ARGS)
 {


@@ -1240,8 +1251,6 @@ termp_nd_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 termp_bl_pre(DECL_ARGS)
 {
 static int
 termp_bl_pre(DECL_ARGS)
 {


@@ -1249,8 +1258,6 @@ termp_bl_pre(DECL_ARGS)
        return(MDOC_HEAD != n->type);
 }
 
        return(MDOC_HEAD != n->type);
 }
 

-
-/* ARGSUSED */

 static void
 termp_bl_post(DECL_ARGS)
 {
 static void
 termp_bl_post(DECL_ARGS)
 {


@@ -1259,31 +1266,32 @@ termp_bl_post(DECL_ARGS)
                term_newln(p);
 }
 
                term_newln(p);
 }
 

-
-/* ARGSUSED */

 static int
 termp_xr_pre(DECL_ARGS)
 {
 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


@@ -1292,7 +1300,7 @@ termp_xr_pre(DECL_ARGS)
 static void
 synopsis_pre(struct termp *p, const struct mdoc_node *n)
 {
 static void
 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.
         */


@@ -1304,10 +1312,10 @@ synopsis_pre(struct termp *p, const struct mdoc_node *n)
         * newline and return.  UNLESS we're `Fo', `Fn', `Fn', in which
         * case we soldier on.
         */
         * newline and return.  UNLESS we're `Fo', `Fn', `Fn', in which
         * case we soldier on.
         */

-       if (n->prev->tok == n->tok && 
-                       MDOC_Ft != n->tok && 
-                       MDOC_Fo != n->tok && 
-                       MDOC_Fn != n->tok) {
+       if (n->prev->tok == n->tok &&
+           MDOC_Ft != n->tok &&
+           MDOC_Fo != n->tok &&
+           MDOC_Fn != n->tok) {

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


@@ -1318,18 +1326,18 @@ synopsis_pre(struct termp *p, const struct mdoc_node *n)
         * vertical space, else only newline and move on.
         */
        switch (n->prev->tok) {
         * vertical space, else only newline and move on.
         */
        switch (n->prev->tok) {

-       case (MDOC_Fd):
+       case MDOC_Fd:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Fn):
+       case MDOC_Fn:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Fo):
+       case MDOC_Fo:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_In):
+       case MDOC_In:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Vt):
+       case MDOC_Vt:

                term_vspace(p);
                break;
                term_vspace(p);
                break;

-       case (MDOC_Ft):
+       case MDOC_Ft:

                if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
                        term_vspace(p);
                        break;
                if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
                        term_vspace(p);
                        break;


@@ -1341,25 +1349,22 @@ synopsis_pre(struct termp *p, const struct mdoc_node *n)
        }
 }
 
        }
 }
 

-

 static int
 termp_vt_pre(DECL_ARGS)
 {
 
        if (MDOC_ELEM == n->type) {
                synopsis_pre(p, n);
 static int
 termp_vt_pre(DECL_ARGS)
 {
 
        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));

 }
 
 }
 

-
-/* ARGSUSED */

 static int
 termp_bold_pre(DECL_ARGS)
 {
 static int
 termp_bold_pre(DECL_ARGS)
 {


@@ -1368,18 +1373,21 @@ termp_bold_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 termp_fd_pre(DECL_ARGS)
 {
 
        synopsis_pre(p, n);
 static int
 termp_fd_pre(DECL_ARGS)
 {
 
        synopsis_pre(p, n);

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

 }
 
 }
 

+static void
+termp_fd_post(DECL_ARGS)
+{
+
+       term_newln(p);
+}

 
 

-/* ARGSUSED */

 static int
 termp_sh_pre(DECL_ARGS)
 {
 static int
 termp_sh_pre(DECL_ARGS)
 {


@@ -1387,17 +1395,19 @@ termp_sh_pre(DECL_ARGS)
        /* No vspace between consecutive `Sh' calls. */
 
        switch (n->type) {
        /* No vspace between consecutive `Sh' calls. */
 
        switch (n->type) {

-       case (MDOC_BLOCK):
+       case MDOC_BLOCK:

                if (n->prev && MDOC_Sh == n->prev->tok)
                        if (NULL == n->prev->body->child)
                                break;
                term_vspace(p);
                break;
                if (n->prev && MDOC_Sh == n->prev->tok)
                        if (NULL == n->prev->body->child)
                                break;
                term_vspace(p);
                break;

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

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

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

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


@@ -1405,17 +1415,15 @@ termp_sh_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 termp_sh_post(DECL_ARGS)
 {
 
        switch (n->type) {
 static void
 termp_sh_post(DECL_ARGS)
 {
 
        switch (n->type) {

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                term_newln(p);
                break;
                term_newln(p);
                break;

-       case (MDOC_BODY):
+       case MDOC_BODY:

                term_newln(p);
                p->offset = 0;
                break;
                term_newln(p);
                p->offset = 0;
                break;


@@ -1424,8 +1432,6 @@ termp_sh_post(DECL_ARGS)
        }
 }
 
        }
 }
 

-
-/* ARGSUSED */

 static int
 termp_bt_pre(DECL_ARGS)
 {
 static int
 termp_bt_pre(DECL_ARGS)
 {


@@ -1435,8 +1441,6 @@ termp_bt_pre(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-
-/* ARGSUSED */

 static void
 termp_lb_post(DECL_ARGS)
 {
 static void
 termp_lb_post(DECL_ARGS)
 {


@@ -1445,8 +1449,6 @@ termp_lb_post(DECL_ARGS)
                term_newln(p);
 }
 
                term_newln(p);
 }
 

-
-/* ARGSUSED */

 static int
 termp_ud_pre(DECL_ARGS)
 {
 static int
 termp_ud_pre(DECL_ARGS)
 {


@@ -1456,8 +1458,6 @@ termp_ud_pre(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-
-/* ARGSUSED */

 static int
 termp_d1_pre(DECL_ARGS)
 {
 static int
 termp_d1_pre(DECL_ARGS)
 {


@@ -1465,23 +1465,10 @@ 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)
 {
 static int
 termp_ft_pre(DECL_ARGS)
 {


@@ -1492,41 +1479,67 @@ termp_ft_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 termp_fn_pre(DECL_ARGS)
 {
 static int
 termp_fn_pre(DECL_ARGS)
 {

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

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

+       if (NULL == (n = n->child))
+               return(0);
+
+       if (pretty) {
+               rmargin = p->rmargin;
+               p->rmargin = p->offset + term_len(p, 4);
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
+       }
+
+       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);
 
        term_fontpop(p);
 

+       if (pretty) {
+               term_flushln(p);
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
+               p->offset = p->rmargin;
+               p->rmargin = rmargin;
+       }
+

        p->flags |= TERMP_NOSPACE;
        term_word(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);
+               if (pretty)
+                       p->flags |= TERMP_NBRWORD;
+               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, ";");

+               term_flushln(p);
+       }

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

-
-/* ARGSUSED */

 static int
 termp_fa_pre(DECL_ARGS)
 {
 static int
 termp_fa_pre(DECL_ARGS)
 {


@@ -1539,26 +1552,24 @@ termp_fa_pre(DECL_ARGS)
 
        for (nn = n->child; nn; nn = nn->next) {
                term_fontpush(p, TERMFONT_UNDER);
 
        for (nn = n->child; nn; nn = nn->next) {
                term_fontpush(p, TERMFONT_UNDER);

+               p->flags |= TERMP_NBRWORD;

                term_word(p, nn->string);
                term_fontpop(p);
 
                term_word(p, nn->string);
                term_fontpop(p);
 

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

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

+               }

        }
 
        }
 

-       if (n->child && n->next && n->next->tok == MDOC_Fa)
-               term_word(p, ",");
-

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

-
-/* ARGSUSED */

 static int
 termp_bd_pre(DECL_ARGS)
 {
        size_t                   tabwidth, rm, rmax;
 static int
 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);


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

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

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


@@ -1577,19 +1587,21 @@ termp_bd_pre(DECL_ARGS)
         * for macro lines, a newline is appended to the line.  Blank
         * lines are allowed.
         */
         * for macro lines, a newline is appended to the line.  Blank
         * lines are allowed.
         */

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

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

-       p->tabwidth = term_len(p, 8);
+       if (DISP_literal == n->norm->Bd.type)
+               p->tabwidth = term_len(p, 8);
+

        rm = p->rmargin;
        rmax = p->maxrmargin;
        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        for (nn = n->child; nn; nn = nn->next) {
        rm = p->rmargin;
        rmax = p->maxrmargin;
        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


@@ -1597,21 +1609,21 @@ termp_bd_pre(DECL_ARGS)
                 * anyway, so don't sweat it.
                 */
                switch (nn->tok) {
                 * anyway, so don't sweat it.
                 */
                switch (nn->tok) {

-               case (MDOC_Sm):
+               case MDOC_Sm:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_br):
+               case MDOC_br:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_sp):
+               case MDOC_sp:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Bl):
+               case MDOC_Bl:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_D1):
+               case MDOC_D1:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Dl):
+               case MDOC_Dl:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Lp):
+               case MDOC_Lp:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Pp):
+               case MDOC_Pp:

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


@@ -1628,22 +1640,19 @@ termp_bd_pre(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-
-/* ARGSUSED */

 static void
 termp_bd_post(DECL_ARGS)
 {
        size_t           rm, rmax;
 
 static void
 termp_bd_post(DECL_ARGS)
 {
        size_t           rm, rmax;
 

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

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

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

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


@@ -1653,65 +1662,70 @@ termp_bd_post(DECL_ARGS)
        p->maxrmargin = rmax;
 }
 
        p->maxrmargin = rmax;
 }
 

-
-/* ARGSUSED */
-static void
-termp_bx_post(DECL_ARGS)
+static int
+termp_bx_pre(DECL_ARGS)

 {
 
 {
 

-       if (n->child)
+       if (NULL != (n = n->child)) {
+               term_word(p, n->string);

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

-       term_word(p, "BSD");
-}
+               term_word(p, "BSD");
+       } else {
+               term_word(p, "BSD");
+               return(0);
+       }
+
+       if (NULL != (n = n->next)) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, "-");
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, n->string);
+       }

 
 

+       return(0);
+}

 
 

-/* ARGSUSED */

 static int
 termp_xx_pre(DECL_ARGS)
 {
        const char      *pp;
 static int
 termp_xx_pre(DECL_ARGS)
 {
        const char      *pp;

+       int              flags;

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

-       case (MDOC_Bsx):
+       case MDOC_Bsx:

                pp = "BSD/OS";
                break;
                pp = "BSD/OS";
                break;

-       case (MDOC_Dx):
+       case MDOC_Dx:

                pp = "DragonFly";
                break;
                pp = "DragonFly";
                break;

-       case (MDOC_Fx):
+       case MDOC_Fx:

                pp = "FreeBSD";
                break;
                pp = "FreeBSD";
                break;

-       case (MDOC_Nx):
+       case MDOC_Nx:

                pp = "NetBSD";
                break;
                pp = "NetBSD";
                break;

-       case (MDOC_Ox):
+       case MDOC_Ox:

                pp = "OpenBSD";
                break;
                pp = "OpenBSD";
                break;

-       case (MDOC_Ux):
+       case MDOC_Ux:

                pp = "UNIX";
                break;
        default:
                pp = "UNIX";
                break;
        default:

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

        }
 
        }
 

-       assert(pp);

        term_word(p, pp);
        term_word(p, pp);

-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_igndelim_pre(DECL_ARGS)
-{
-
-       p->flags |= TERMP_IGNDELIM;
-       return(1);
+       if (n->child) {
+               flags = p->flags;
+               p->flags |= TERMP_KEEP;
+               term_word(p, n->child->string);
+               p->flags = flags;
+       }
+       return(0);

 }
 
 }
 

-
-/* ARGSUSED */

 static void
 termp_pf_post(DECL_ARGS)
 {
 static void
 termp_pf_post(DECL_ARGS)
 {


@@ -1719,21 +1733,19 @@ termp_pf_post(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
 }
 
        p->flags |= TERMP_NOSPACE;
 }
 

-
-/* ARGSUSED */

 static int
 termp_ss_pre(DECL_ARGS)
 {
 
        switch (n->type) {
 static int
 termp_ss_pre(DECL_ARGS)
 {
 
        switch (n->type) {

-       case (MDOC_BLOCK):
+       case MDOC_BLOCK:

                term_newln(p);
                if (n->prev)
                        term_vspace(p);
                break;
                term_newln(p);
                if (n->prev)
                        term_vspace(p);
                break;

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                term_fontpush(p, TERMFONT_BOLD);
                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;


@@ -1742,8 +1754,6 @@ termp_ss_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 termp_ss_post(DECL_ARGS)
 {
 static void
 termp_ss_post(DECL_ARGS)
 {


@@ -1752,8 +1762,6 @@ termp_ss_post(DECL_ARGS)
                term_newln(p);
 }
 
                term_newln(p);
 }
 

-
-/* ARGSUSED */

 static int
 termp_cd_pre(DECL_ARGS)
 {
 static int
 termp_cd_pre(DECL_ARGS)
 {


@@ -1763,8 +1771,6 @@ termp_cd_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 termp_in_pre(DECL_ARGS)
 {
 static int
 termp_in_pre(DECL_ARGS)
 {


@@ -1784,8 +1790,6 @@ termp_in_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 termp_in_post(DECL_ARGS)
 {
 static void
 termp_in_post(DECL_ARGS)
 {


@@ -1800,26 +1804,19 @@ termp_in_post(DECL_ARGS)
                term_fontpop(p);
 }
 
                term_fontpop(p);
 }
 

-
-/* ARGSUSED */

 static int
 termp_sp_pre(DECL_ARGS)
 {
        size_t           i, len;
 
        switch (n->tok) {
 static int
 termp_sp_pre(DECL_ARGS)
 {
        size_t           i, len;
 
        switch (n->tok) {

-       case (MDOC_sp):
+       case MDOC_sp:

                len = n->child ? a2height(p, n->child->string) : 1;
                break;
                len = n->child ? a2height(p, n->child->string) : 1;
                break;

-       case (MDOC_br):
+       case MDOC_br:

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


@@ -1832,56 +1829,71 @@ termp_sp_pre(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

+static int
+termp_es_pre(DECL_ARGS)
+{
+
+       return(0);
+}

 
 

-/* ARGSUSED */

 static int
 termp_quote_pre(DECL_ARGS)
 {
 
 static int
 termp_quote_pre(DECL_ARGS)
 {
 

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

                return(1);
 
        switch (n->tok) {
                return(1);
 
        switch (n->tok) {

-       case (MDOC_Ao):
+       case MDOC_Ao:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Aq):
+       case MDOC_Aq:

                term_word(p, "<");
                break;
                term_word(p, "<");
                break;

-       case (MDOC_Bro):
+       case MDOC_Bro:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Brq):
+       case MDOC_Brq:

                term_word(p, "{");
                break;
                term_word(p, "{");
                break;

-       case (MDOC_Oo):
+       case MDOC_Oo:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Op):
+       case MDOC_Op:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Bo):
+       case MDOC_Bo:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Bq):
+       case MDOC_Bq:

                term_word(p, "[");
                break;
                term_word(p, "[");
                break;

-       case (MDOC_Do):
+       case MDOC_Do:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dq):
-               term_word(p, "``");
+       case MDOC_Dq:
+               term_word(p, "\\(lq");
+               break;
+       case MDOC_En:
+               if (NULL == n->norm->Es ||
+                   NULL == n->norm->Es->child)
+                       return(1);
+               term_word(p, n->norm->Es->child->string);

                break;
                break;

-       case (MDOC_Po):
+       case MDOC_Eo:
+               break;
+       case MDOC_Po:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Pq):
+       case MDOC_Pq:

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

-       case (MDOC_Qo):
+       case MDOC__T:
+               /* FALLTHROUGH */
+       case MDOC_Qo:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Qq):
+       case MDOC_Qq:

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

-       case (MDOC_Ql):
+       case MDOC_Ql:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_So):
+       case MDOC_So:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Sq):
-               term_word(p, "`");
+       case MDOC_Sq:
+               term_word(p, "\\(oq");

                break;
        default:
                abort();
                break;
        default:
                abort();


@@ -1892,58 +1904,69 @@ termp_quote_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 termp_quote_post(DECL_ARGS)
 {
 
 static void
 termp_quote_post(DECL_ARGS)
 {
 

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

                return;
 
                return;
 

-       p->flags |= TERMP_NOSPACE;
+       if (MDOC_En != n->tok)
+               p->flags |= TERMP_NOSPACE;

 
        switch (n->tok) {
 
        switch (n->tok) {

-       case (MDOC_Ao):
+       case MDOC_Ao:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Aq):
+       case MDOC_Aq:

                term_word(p, ">");
                break;
                term_word(p, ">");
                break;

-       case (MDOC_Bro):
+       case MDOC_Bro:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Brq):
+       case MDOC_Brq:

                term_word(p, "}");
                break;
                term_word(p, "}");
                break;

-       case (MDOC_Oo):
+       case MDOC_Oo:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Op):
+       case MDOC_Op:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Bo):
+       case MDOC_Bo:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Bq):
+       case MDOC_Bq:

                term_word(p, "]");
                break;
                term_word(p, "]");
                break;

-       case (MDOC_Do):
+       case MDOC_Do:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dq):
-               term_word(p, "''");
+       case MDOC_Dq:
+               term_word(p, "\\(rq");
+               break;
+       case MDOC_En:
+               if (NULL != n->norm->Es &&
+                   NULL != n->norm->Es->child &&
+                   NULL != n->norm->Es->child->next) {
+                       p->flags |= TERMP_NOSPACE;
+                       term_word(p, n->norm->Es->child->next->string);
+               }
+               break;
+       case MDOC_Eo:

                break;
                break;

-       case (MDOC_Po):
+       case MDOC_Po:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Pq):
+       case MDOC_Pq:

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

-       case (MDOC_Qo):
+       case MDOC__T:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Qq):
+       case MDOC_Qo:
+               /* FALLTHROUGH */
+       case MDOC_Qq:

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

-       case (MDOC_Ql):
+       case MDOC_Ql:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_So):
+       case MDOC_So:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Sq):
-               term_word(p, "'");
+       case MDOC_Sq:
+               term_word(p, "\\(cq");

                break;
        default:
                abort();
                break;
        default:
                abort();


@@ -1951,20 +1974,36 @@ termp_quote_post(DECL_ARGS)
        }
 }
 
        }
 }
 

-
-/* ARGSUSED */

 static int
 termp_fo_pre(DECL_ARGS)
 {
 static int
 termp_fo_pre(DECL_ARGS)
 {

+       size_t           rmargin = 0;
+       int              pretty;
+
+       pretty = MDOC_SYNPRETTY & n->flags;

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

+               if (pretty) {
+                       rmargin = p->rmargin;
+                       p->rmargin = p->offset + term_len(p, 4);
+                       p->flags |= TERMP_NOBREAK | TERMP_BRIND |
+                                       TERMP_HANG;
+               }

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

+               p->flags |= TERMP_NOSPACE;
+               if (pretty) {
+                       term_flushln(p);
+                       p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
+                                       TERMP_HANG);
+                       p->offset = p->rmargin;
+                       p->rmargin = rmargin;
+               }

                return(1);
                return(1);

-       } 
+       }

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


@@ -1977,63 +2016,59 @@ termp_fo_pre(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-
-/* ARGSUSED */

 static void
 termp_fo_post(DECL_ARGS)
 {
 
 static void
 termp_fo_post(DECL_ARGS)
 {
 

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

                return;
 
                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, ";");

+               term_flushln(p);
+       }

 }
 
 }
 

-
-/* ARGSUSED */

 static int
 termp_bf_pre(DECL_ARGS)
 {
 
        if (MDOC_HEAD == n->type)
                return(0);
 static int
 termp_bf_pre(DECL_ARGS)
 {
 
        if (MDOC_HEAD == n->type)
                return(0);

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

                return(1);
 
                return(1);
 

-       assert(n->data.Bf);
-
-       if (FONT_Em == n->data.Bf->font) 
+       if (FONT_Em == n->norm->Bf.font)

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

-       else if (FONT_Sy == n->data.Bf->font) 
+       else if (FONT_Sy == n->norm->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);
 }
 

-
-/* ARGSUSED */

 static int
 termp_sm_pre(DECL_ARGS)
 {
 
 static int
 termp_sm_pre(DECL_ARGS)
 {
 

-       assert(n->child && MDOC_TEXT == n->child->type);
-       if (0 == strcmp("on", n->child->string)) {
-               if (p->col)
-                       p->flags &= ~TERMP_NOSPACE;
+       if (NULL == n->child)
+               p->flags ^= TERMP_NONOSPACE;
+       else if (0 == strcmp("on", n->child->string))

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

-       } else
+       else

                p->flags |= TERMP_NONOSPACE;
 
                p->flags |= TERMP_NONOSPACE;
 

+       if (p->col && ! (TERMP_NONOSPACE & p->flags))
+               p->flags &= ~TERMP_NOSPACE;
+

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

-
-/* ARGSUSED */

 static int
 termp_ap_pre(DECL_ARGS)
 {
 static int
 termp_ap_pre(DECL_ARGS)
 {


@@ -2044,8 +2079,6 @@ termp_ap_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 termp____post(DECL_ARGS)
 {
 static void
 termp____post(DECL_ARGS)
 {


@@ -2065,6 +2098,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;


@@ -2072,8 +2106,6 @@ termp____post(DECL_ARGS)
                term_word(p, ",");
 }
 
                term_word(p, ",");
 }
 

-
-/* ARGSUSED */

 static int
 termp_li_pre(DECL_ARGS)
 {
 static int
 termp_li_pre(DECL_ARGS)
 {


@@ -2082,47 +2114,44 @@ termp_li_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 termp_lk_pre(DECL_ARGS)
 {
 static int
 termp_lk_pre(DECL_ARGS)
 {

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

 
 

-       term_fontpush(p, TERMFONT_UNDER);
-
-       nn = sv = n->child;
-
-       if (NULL == nn || NULL == nn->next)
-               return(1);
-
-       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);
 }
 

-
-/* ARGSUSED */

 static int
 termp_bk_pre(DECL_ARGS)
 {
 
        switch (n->type) {
 static int
 termp_bk_pre(DECL_ARGS)
 {
 
        switch (n->type) {

-       case (MDOC_BLOCK):
+       case MDOC_BLOCK:

                break;
                break;

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                return(0);
                return(0);

-       case (MDOC_BODY):
-               p->flags |= TERMP_PREKEEP;
+       case MDOC_BODY:
+               if (n->parent->args || 0 == n->prev->nchild)
+                       p->flags |= TERMP_PREKEEP;

                break;
        default:
                abort();
                break;
        default:
                abort();


@@ -2132,8 +2161,6 @@ termp_bk_pre(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 termp_bk_post(DECL_ARGS)
 {
 static void
 termp_bk_post(DECL_ARGS)
 {


@@ -2142,7 +2169,37 @@ termp_bk_post(DECL_ARGS)
                p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }
 
                p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }
 

-/* ARGSUSED */
+static void
+termp__t_post(DECL_ARGS)
+{
+
+       /*
+        * If we're in an `Rs' and there's a journal present, then quote
+        * us instead of underlining us (for disambiguation).
+        */
+       if (n->parent && MDOC_Rs == n->parent->tok &&
+           n->parent->norm->Rs.quote_T)
+               termp_quote_post(p, pair, meta, n);
+
+       termp____post(p, pair, meta, n);
+}
+
+static int
+termp__t_pre(DECL_ARGS)
+{
+
+       /*
+        * If we're in an `Rs' and there's a journal present, then quote
+        * us instead of underlining us (for disambiguation).
+        */
+       if (n->parent && MDOC_Rs == n->parent->tok &&
+           n->parent->norm->Rs.quote_T)
+               return(termp_quote_pre(p, pair, meta, n));
+
+       term_fontpush(p, TERMFONT_UNDER);
+       return(1);
+}
+

 static int
 termp_under_pre(DECL_ARGS)
 {
 static int
 termp_under_pre(DECL_ARGS)
 {