warning about unknown .Lb arguments; inspired by mdoclint(1)

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index bed304c18544da0232251efaba8717eead68bbb0..27d6d9388cae24c9cd0275b3a099555833e6539c 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.321 2015/07/25 14:02:06 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.362 2017/06/07 17:38:26 schwarze Exp $ */

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

- * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -80,6 +80,7 @@ static        void      termp_pf_post(DECL_ARGS);
 static void      termp_quote_post(DECL_ARGS);
 static void      termp_sh_post(DECL_ARGS);
 static void      termp_ss_post(DECL_ARGS);
 static void      termp_quote_post(DECL_ARGS);
 static void      termp_sh_post(DECL_ARGS);
 static void      termp_ss_post(DECL_ARGS);

+static void      termp_xx_post(DECL_ARGS);

 
 static int       termp__a_pre(DECL_ARGS);
 static int       termp__t_pre(DECL_ARGS);
 
 static int       termp__a_pre(DECL_ARGS);
 static int       termp__t_pre(DECL_ARGS);


@@ -90,11 +91,11 @@ static      int       termp_bf_pre(DECL_ARGS);
 static int       termp_bk_pre(DECL_ARGS);
 static int       termp_bl_pre(DECL_ARGS);
 static int       termp_bold_pre(DECL_ARGS);
 static int       termp_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_bx_pre(DECL_ARGS);

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

+static int       termp_em_pre(DECL_ARGS);
+static int       termp_er_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);


@@ -105,34 +106,31 @@ static    int       termp_ft_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_ns_pre(DECL_ARGS);
 static int       termp_quote_pre(DECL_ARGS);
 static int       termp_rs_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_ns_pre(DECL_ARGS);
 static int       termp_quote_pre(DECL_ARGS);
 static int       termp_rs_pre(DECL_ARGS);

-static int       termp_rv_pre(DECL_ARGS);

 static int       termp_sh_pre(DECL_ARGS);
 static int       termp_skip_pre(DECL_ARGS);
 static int       termp_sm_pre(DECL_ARGS);
 static int       termp_sh_pre(DECL_ARGS);
 static int       termp_skip_pre(DECL_ARGS);
 static int       termp_sm_pre(DECL_ARGS);

-static int       termp_sp_pre(DECL_ARGS);
+static int       termp_pp_pre(DECL_ARGS);

 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);

+static int       termp_sy_pre(DECL_ARGS);

 static int       termp_tag_pre(DECL_ARGS);
 static int       termp_under_pre(DECL_ARGS);
 static int       termp_tag_pre(DECL_ARGS);
 static int       termp_under_pre(DECL_ARGS);

-static int       termp_ud_pre(DECL_ARGS);

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

-static const struct termact termacts[MDOC_MAX] = {
-       { termp_ap_pre, NULL }, /* Ap */
+static const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {

        { NULL, NULL }, /* Dd */
        { NULL, NULL }, /* Dt */
        { NULL, NULL }, /* Os */
        { termp_sh_pre, termp_sh_post }, /* Sh */
        { termp_ss_pre, termp_ss_post }, /* Ss */
        { NULL, NULL }, /* Dd */
        { 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_pp_pre, NULL }, /* Pp */

        { termp_d1_pre, termp_bl_post }, /* D1 */
        { termp_d1_pre, termp_bl_post }, /* Dl */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { termp_d1_pre, termp_bl_post }, /* D1 */
        { termp_d1_pre, termp_bl_post }, /* Dl */
        { termp_bd_pre, termp_bd_post }, /* Bd */


@@ -142,11 +140,12 @@ static    const struct termact termacts[MDOC_MAX] = {
        { termp_it_pre, termp_it_post }, /* It */
        { termp_under_pre, NULL }, /* Ad */
        { termp_an_pre, NULL }, /* An */
        { termp_it_pre, termp_it_post }, /* It */
        { termp_under_pre, NULL }, /* Ad */
        { termp_an_pre, NULL }, /* An */

+       { termp_ap_pre, NULL }, /* Ap */

        { termp_under_pre, NULL }, /* Ar */
        { termp_cd_pre, NULL }, /* Cd */
        { termp_bold_pre, NULL }, /* Cm */
        { termp_under_pre, NULL }, /* Ar */
        { termp_cd_pre, NULL }, /* Cd */
        { termp_bold_pre, NULL }, /* Cm */

-       { NULL, NULL }, /* Dv */
-       { NULL, NULL }, /* Er */
+       { termp_li_pre, NULL }, /* Dv */
+       { termp_er_pre, NULL }, /* Er */

        { termp_tag_pre, NULL }, /* Ev */
        { termp_ex_pre, NULL }, /* Ex */
        { termp_fa_pre, NULL }, /* Fa */
        { termp_tag_pre, NULL }, /* Ev */
        { termp_ex_pre, NULL }, /* Ex */
        { termp_fa_pre, NULL }, /* Fa */


@@ -162,7 +161,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_quote_pre, termp_quote_post }, /* Op */
        { termp_ft_pre, NULL }, /* Ot */
        { termp_under_pre, NULL }, /* Pa */
        { termp_quote_pre, termp_quote_post }, /* Op */
        { termp_ft_pre, NULL }, /* Ot */
        { termp_under_pre, NULL }, /* Pa */

-       { termp_rv_pre, NULL }, /* Rv */
+       { termp_ex_pre, NULL }, /* Rv */

        { NULL, NULL }, /* St */
        { termp_under_pre, NULL }, /* Va */
        { termp_vt_pre, NULL }, /* Vt */
        { NULL, NULL }, /* St */
        { termp_under_pre, NULL }, /* Va */
        { termp_vt_pre, NULL }, /* Vt */


@@ -186,22 +185,22 @@ static    const struct termact termacts[MDOC_MAX] = {
        { termp_bf_pre, NULL }, /* Bf */
        { termp_quote_pre, termp_quote_post }, /* Bo */
        { termp_quote_pre, termp_quote_post }, /* Bq */
        { 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_bx_pre, NULL }, /* Bx */
+       { termp_xx_pre, termp_xx_post }, /* Bsx */
+       { NULL, NULL }, /* Bx */

        { termp_skip_pre, 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_skip_pre, 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 */
+       { termp_em_pre, NULL }, /* Em */

        { termp_eo_pre, termp_eo_post }, /* Eo */
        { termp_eo_pre, termp_eo_post }, /* Eo */

-       { termp_xx_pre, NULL }, /* Fx */
+       { termp_xx_pre, termp_xx_post }, /* Fx */

        { termp_bold_pre, NULL }, /* Ms */
        { termp_li_pre, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_bold_pre, NULL }, /* Ms */
        { termp_li_pre, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */

-       { termp_xx_pre, NULL }, /* Nx */
-       { termp_xx_pre, NULL }, /* Ox */
+       { termp_xx_pre, termp_xx_post }, /* Nx */
+       { termp_xx_pre, termp_xx_post }, /* Ox */

        { NULL, NULL }, /* Pc */
        { NULL, termp_pf_post }, /* Pf */
        { termp_quote_pre, termp_quote_post }, /* Po */
        { NULL, NULL }, /* Pc */
        { NULL, termp_pf_post }, /* Pf */
        { termp_quote_pre, termp_quote_post }, /* Po */


@@ -217,9 +216,9 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_quote_pre, termp_quote_post }, /* Sq */
        { termp_sm_pre, NULL }, /* Sm */
        { termp_under_pre, NULL }, /* Sx */
        { termp_quote_pre, termp_quote_post }, /* Sq */
        { termp_sm_pre, NULL }, /* Sm */
        { termp_under_pre, NULL }, /* Sx */

-       { termp_bold_pre, NULL }, /* Sy */
+       { termp_sy_pre, NULL }, /* Sy */

        { NULL, NULL }, /* Tn */
        { NULL, NULL }, /* Tn */

-       { termp_xx_pre, NULL }, /* Ux */
+       { termp_xx_pre, termp_xx_post }, /* Ux */

        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */
        { termp_fo_pre, termp_fo_post }, /* Fo */
        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */
        { termp_fo_pre, termp_fo_post }, /* Fo */


@@ -228,12 +227,12 @@ static    const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Oc */
        { termp_bk_pre, termp_bk_post }, /* Bk */
        { NULL, NULL }, /* Ek */
        { NULL, NULL }, /* Oc */
        { termp_bk_pre, termp_bk_post }, /* Bk */
        { NULL, NULL }, /* Ek */

-       { termp_bt_pre, NULL }, /* Bt */
+       { NULL, NULL }, /* Bt */

        { NULL, NULL }, /* Hf */
        { termp_under_pre, NULL }, /* Fr */
        { NULL, NULL }, /* Hf */
        { termp_under_pre, NULL }, /* Fr */

-       { termp_ud_pre, NULL }, /* Ud */
+       { NULL, NULL }, /* Ud */

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

-       { termp_sp_pre, NULL }, /* Lp */
+       { termp_pp_pre, NULL }, /* Lp */

        { termp_lk_pre, NULL }, /* Lk */
        { termp_under_pre, NULL }, /* Mt */
        { termp_quote_pre, termp_quote_post }, /* Brq */
        { termp_lk_pre, NULL }, /* Lk */
        { termp_under_pre, NULL }, /* Mt */
        { termp_quote_pre, termp_quote_post }, /* Brq */


@@ -242,14 +241,14 @@ static    const struct termact termacts[MDOC_MAX] = {
        { NULL, termp____post }, /* %C */
        { termp_skip_pre, NULL }, /* Es */
        { termp_quote_pre, termp_quote_post }, /* En */
        { NULL, termp____post }, /* %C */
        { termp_skip_pre, NULL }, /* Es */
        { termp_quote_pre, termp_quote_post }, /* En */

-       { termp_xx_pre, NULL }, /* Dx */
+       { termp_xx_pre, termp_xx_post }, /* Dx */

        { NULL, termp____post }, /* %Q */
        { NULL, termp____post }, /* %Q */

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

        { NULL, termp____post }, /* %U */
        { NULL, NULL }, /* Ta */
        { NULL, termp____post }, /* %U */
        { NULL, NULL }, /* Ta */

-       { termp_ll_pre, NULL }, /* ll */

 };
 };

+static const struct termact *const termacts = __termacts - MDOC_Dd;
+
+static int      fn_prio;

 
 
 void
 
 
 void


@@ -257,11 +256,13 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
 {
        struct roff_node        *n;
        struct termp            *p;
 {
        struct roff_node        *n;
        struct termp            *p;

+       size_t                   save_defindent;

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

-       p->overstep = 0;
-       p->rmargin = p->maxrmargin = p->defrmargin;
-       p->tabwidth = term_len(p, 5);
+       p->tcol->rmargin = p->maxrmargin = p->defrmargin;
+       term_tab_set(p, NULL);
+       term_tab_set(p, "T");
+       term_tab_set(p, ".5i");

 
        n = mdoc->first->child;
        if (p->synopsisonly) {
 
        n = mdoc->first->child;
        if (p->synopsisonly) {


@@ -277,16 +278,20 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
                        n = n->next;
                }
        } else {
                        n = n->next;
                }
        } else {

+               save_defindent = p->defindent;

                if (p->defindent == 0)
                        p->defindent = 5;
                term_begin(p, print_mdoc_head, print_mdoc_foot,
                    &mdoc->meta);
                if (p->defindent == 0)
                        p->defindent = 5;
                term_begin(p, print_mdoc_head, print_mdoc_foot,
                    &mdoc->meta);

+               while (n != NULL && n->flags & NODE_NOPRT)
+                       n = n->next;

                if (n != NULL) {
                        if (n->tok != MDOC_Sh)
                                term_vspace(p);
                        print_mdoc_nodelist(p, NULL, &mdoc->meta, n);
                }
                term_end(p);
                if (n != NULL) {
                        if (n->tok != MDOC_Sh)
                                term_vspace(p);
                        print_mdoc_nodelist(p, NULL, &mdoc->meta, n);
                }
                term_end(p);

+               p->defindent = save_defindent;

        }
 }
 
        }
 }
 


@@ -307,10 +312,13 @@ print_mdoc_node(DECL_ARGS)
        struct termpair  npair;
        size_t           offset, rmargin;
 
        struct termpair  npair;
        size_t           offset, rmargin;
 

+       if (n->flags & NODE_NOPRT)
+               return;
+

        chld = 1;
        chld = 1;

-       offset = p->offset;
-       rmargin = p->rmargin;
-       n->flags &= ~MDOC_ENDED;
+       offset = p->tcol->offset;
+       rmargin = p->tcol->rmargin;
+       n->flags &= ~NODE_ENDED;

        n->prev_font = p->fonti;
 
        memset(&npair, 0, sizeof(struct termpair));
        n->prev_font = p->fonti;
 
        memset(&npair, 0, sizeof(struct termpair));


@@ -321,7 +329,7 @@ print_mdoc_node(DECL_ARGS)
         * invoked in a prior line, revert it to PREKEEP.
         */
 
         * invoked in a prior line, revert it to PREKEEP.
         */
 

-       if (p->flags & TERMP_KEEP && n->flags & MDOC_LINE) {
+       if (p->flags & TERMP_KEEP && n->flags & NODE_LINE) {

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


@@ -333,19 +341,20 @@ print_mdoc_node(DECL_ARGS)
 
        switch (n->type) {
        case ROFFT_TEXT:
 
        switch (n->type) {
        case ROFFT_TEXT:

-               if (' ' == *n->string && MDOC_LINE & n->flags)
+               if (*n->string == ' ' && n->flags & NODE_LINE &&
+                   (p->flags & TERMP_NONEWLINE) == 0)

                        term_newln(p);
                        term_newln(p);

-               if (MDOC_DELIMC & n->flags)
+               if (NODE_DELIMC & n->flags)

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

-               if (MDOC_DELIMO & n->flags)
+               if (NODE_DELIMO & n->flags)

                        p->flags |= TERMP_NOSPACE;
                break;
        case ROFFT_EQN:
                        p->flags |= TERMP_NOSPACE;
                break;
        case ROFFT_EQN:

-               if ( ! (n->flags & MDOC_LINE))
+               if ( ! (n->flags & NODE_LINE))

                        p->flags |= TERMP_NOSPACE;
                term_eqn(p, n->eqn);
                        p->flags |= TERMP_NOSPACE;
                term_eqn(p, n->eqn);

-               if (n->next != NULL && ! (n->next->flags & MDOC_LINE))
+               if (n->next != NULL && ! (n->next->flags & NODE_LINE))

                        p->flags |= TERMP_NOSPACE;
                break;
        case ROFFT_TBL:
                        p->flags |= TERMP_NOSPACE;
                break;
        case ROFFT_TBL:


@@ -354,8 +363,13 @@ print_mdoc_node(DECL_ARGS)
                term_tbl(p, n->span);
                break;
        default:
                term_tbl(p, n->span);
                break;
        default:

-               if (termacts[n->tok].pre &&
-                   (n->end == ENDBODY_NOT || n->nchild))
+               if (n->tok < ROFF_MAX) {
+                       roff_term_pre(p, n);
+                       return;
+               }
+               assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
+               if (termacts[n->tok].pre != NULL &&
+                   (n->end == ENDBODY_NOT || n->child != NULL))

                        chld = (*termacts[n->tok].pre)
                                (p, &npair, meta, n);
                break;
                        chld = (*termacts[n->tok].pre)
                                (p, &npair, meta, n);
                break;


@@ -375,7 +389,7 @@ print_mdoc_node(DECL_ARGS)
        case ROFFT_EQN:
                break;
        default:
        case ROFFT_EQN:
                break;
        default:

-               if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
+               if (termacts[n->tok].post == NULL || n->flags & NODE_ENDED)

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


@@ -385,25 +399,16 @@ print_mdoc_node(DECL_ARGS)
                 * that it must not call the post handler again.
                 */
                if (ENDBODY_NOT != n->end)
                 * that it must not call the post handler again.
                 */
                if (ENDBODY_NOT != n->end)

-                       n->body->flags |= MDOC_ENDED;
-
-               /*
-                * End of line terminating an implicit block
-                * while an explicit block is still open.
-                * Continue the explicit block without spacing.
-                */
-               if (ENDBODY_NOSPACE == n->end)
-                       p->flags |= TERMP_NOSPACE;
+                       n->body->flags |= NODE_ENDED;

                break;
        }
 
                break;
        }
 

-       if (MDOC_EOS & n->flags)
+       if (NODE_EOS & n->flags)

                p->flags |= TERMP_SENTENCE;
 
                p->flags |= TERMP_SENTENCE;
 

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

 }
 
 static void
 }
 
 static void


@@ -423,9 +428,9 @@ print_mdoc_foot(struct termp *p, const struct roff_meta *meta)
 
        term_vspace(p);
 
 
        term_vspace(p);
 

-       p->offset = 0;
+       p->tcol->offset = 0;

        sz = term_strlen(p, meta->date);
        sz = term_strlen(p, meta->date);

-       p->rmargin = p->maxrmargin > sz ?
+       p->tcol->rmargin = p->maxrmargin > sz ?

            (p->maxrmargin + term_len(p, 1) - sz) / 2 : 0;
        p->trailspace = 1;
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
            (p->maxrmargin + term_len(p, 1) - sz) / 2 : 0;
        p->trailspace = 1;
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;


@@ -433,16 +438,16 @@ print_mdoc_foot(struct termp *p, const struct roff_meta *meta)
        term_word(p, meta->os);
        term_flushln(p);
 
        term_word(p, meta->os);
        term_flushln(p);
 

-       p->offset = p->rmargin;
+       p->tcol->offset = p->tcol->rmargin;

        sz = term_strlen(p, meta->os);
        sz = term_strlen(p, meta->os);

-       p->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0;
+       p->tcol->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0;

        p->flags |= TERMP_NOSPACE;
 
        term_word(p, meta->date);
        term_flushln(p);
 
        p->flags |= TERMP_NOSPACE;
 
        term_word(p, meta->date);
        term_flushln(p);
 

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

        p->trailspace = 0;
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE;
        p->trailspace = 0;
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE;


@@ -450,8 +455,8 @@ print_mdoc_foot(struct termp *p, const struct roff_meta *meta)
        term_word(p, meta->os);
        term_flushln(p);
 
        term_word(p, meta->os);
        term_flushln(p);
 

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

        p->flags = 0;
 }
 
        p->flags = 0;
 }
 


@@ -491,8 +496,8 @@ print_mdoc_head(struct termp *p, const struct roff_meta *meta)
 
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->trailspace = 1;
 
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->trailspace = 1;

-       p->offset = 0;
-       p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
+       p->tcol->offset = 0;
+       p->tcol->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?

            (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
            vollen < p->maxrmargin ?  p->maxrmargin - vollen : 0;
 
            (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
            vollen < p->maxrmargin ?  p->maxrmargin - vollen : 0;
 


@@ -500,26 +505,26 @@ print_mdoc_head(struct termp *p, const struct roff_meta *meta)
        term_flushln(p);
 
        p->flags |= TERMP_NOSPACE;
        term_flushln(p);
 
        p->flags |= TERMP_NOSPACE;

-       p->offset = p->rmargin;
-       p->rmargin = p->offset + vollen + titlen < p->maxrmargin ?
-           p->maxrmargin - titlen : p->maxrmargin;
+       p->tcol->offset = p->tcol->rmargin;
+       p->tcol->rmargin = p->tcol->offset + vollen + titlen <
+           p->maxrmargin ? p->maxrmargin - titlen : p->maxrmargin;

 
        term_word(p, volume);
        term_flushln(p);
 
        p->flags &= ~TERMP_NOBREAK;
        p->trailspace = 0;
 
        term_word(p, volume);
        term_flushln(p);
 
        p->flags &= ~TERMP_NOBREAK;
        p->trailspace = 0;

-       if (p->rmargin + titlen <= p->maxrmargin) {
+       if (p->tcol->rmargin + titlen <= p->maxrmargin) {

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

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

                term_word(p, title);
                term_flushln(p);
        }
 
        p->flags &= ~TERMP_NOSPACE;
                term_word(p, title);
                term_flushln(p);
        }
 
        p->flags &= ~TERMP_NOSPACE;

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

        free(title);
        free(volume);
 }
        free(title);
        free(volume);
 }


@@ -533,7 +538,7 @@ a2width(const struct termp *p, const char *v)
                SCALE_HS_INIT(&su, term_strlen(p, v));
                su.scale /= term_strlen(p, "0");
        }
                SCALE_HS_INIT(&su, term_strlen(p, v));
                su.scale /= term_strlen(p, "0");
        }

-       return(term_hspan(p, &su) / 24);
+       return term_hspan(p, &su) / 24;

 }
 
 /*
 }
 
 /*


@@ -560,6 +565,8 @@ print_bvspace(struct termp *p,
        /* Do not vspace directly after Ss/Sh. */
 
        nn = n;
        /* Do not vspace directly after Ss/Sh. */
 
        nn = n;

+       while (nn->prev != NULL && nn->prev->flags & NODE_NOPRT)
+               nn = nn->prev;

        while (nn->prev == NULL) {
                do {
                        nn = nn->parent;
        while (nn->prev == NULL) {
                do {
                        nn = nn->parent;


@@ -592,17 +599,10 @@ print_bvspace(struct termp *p,
 }
 
 
 }
 
 

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

+       struct roffsu           su;

        char                    buf[24];
        const struct roff_node *bl, *nn;
        size_t                  ncols, dcol;
        char                    buf[24];
        const struct roff_node *bl, *nn;
        size_t                  ncols, dcol;


@@ -611,7 +611,7 @@ termp_it_pre(DECL_ARGS)
 
        if (n->type == ROFFT_BLOCK) {
                print_bvspace(p, n->parent->parent, n);
 
        if (n->type == ROFFT_BLOCK) {
                print_bvspace(p, n->parent->parent, n);

-               return(1);
+               return 1;

        }
 
        bl = n->parent->parent->parent;
        }
 
        bl = n->parent->parent->parent;


@@ -623,20 +623,16 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_bullet:
 
        switch (type) {
        case LIST_bullet:

-               /* FALLTHROUGH */

        case LIST_dash:
        case LIST_dash:

-               /* FALLTHROUGH */

        case LIST_hyphen:
        case LIST_hyphen:

-               /* FALLTHROUGH */

        case LIST_enum:
                width = term_len(p, 2);
                break;
        case LIST_hang:
        case LIST_enum:
                width = term_len(p, 2);
                break;
        case LIST_hang:

+       case LIST_tag:

                width = term_len(p, 8);
                break;
        case LIST_column:
                width = term_len(p, 8);
                break;
        case LIST_column:

-               /* FALLTHROUGH */
-       case LIST_tag:

                width = term_len(p, 10);
                break;
        default:
                width = term_len(p, 10);
                break;
        default:


@@ -653,8 +649,8 @@ termp_it_pre(DECL_ARGS)
 
        if (bl->norm->Bl.offs != NULL) {
                offset = a2width(p, bl->norm->Bl.offs);
 
        if (bl->norm->Bl.offs != NULL) {
                offset = a2width(p, bl->norm->Bl.offs);

-               if (offset < 0 && (size_t)(-offset) > p->offset)
-                       offset = -p->offset;
+               if (offset < 0 && (size_t)(-offset) > p->tcol->offset)
+                       offset = -p->tcol->offset;

                else if (offset > SHRT_MAX)
                        offset = 0;
        }
                else if (offset > SHRT_MAX)
                        offset = 0;
        }


@@ -684,9 +680,12 @@ termp_it_pre(DECL_ARGS)
 
                for (i = 0, nn = n->prev;
                    nn->prev && i < (int)ncols;
 
                for (i = 0, nn = n->prev;
                    nn->prev && i < (int)ncols;

-                   nn = nn->prev, i++)
-                       offset += dcol + a2width(p,
-                           bl->norm->Bl.cols[i]);
+                   nn = nn->prev, i++) {
+                       SCALE_HS_INIT(&su,
+                           term_strlen(p, bl->norm->Bl.cols[i]));
+                       su.scale /= term_strlen(p, "0");
+                       offset += term_hspan(p, &su) / 24 + dcol;
+               }

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


@@ -701,7 +700,9 @@ 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->norm->Bl.cols[i]) + dcol;
+               SCALE_HS_INIT(&su, term_strlen(p, bl->norm->Bl.cols[i]));
+               su.scale /= term_strlen(p, "0");
+               width = term_hspan(p, &su) / 24 + dcol;

                break;
        default:
                if (NULL == bl->norm->Bl.width)
                break;
        default:
                if (NULL == bl->norm->Bl.width)


@@ -713,8 +714,8 @@ termp_it_pre(DECL_ARGS)
                 * handling for column for how this changes.
                 */
                width = a2width(p, bl->norm->Bl.width) + term_len(p, 2);
                 * handling for column for how this changes.
                 */
                width = a2width(p, bl->norm->Bl.width) + term_len(p, 2);

-               if (width < 0 && (size_t)(-width) > p->offset)
-                       width = -p->offset;
+               if (width < 0 && (size_t)(-width) > p->tcol->offset)
+                       width = -p->tcol->offset;

                else if (width > SHRT_MAX)
                        width = 0;
                break;
                else if (width > SHRT_MAX)
                        width = 0;
                break;


@@ -733,7 +734,7 @@ termp_it_pre(DECL_ARGS)
                        term_word(p, "\\ \\ ");
                break;
        case LIST_inset:
                        term_word(p, "\\ \\ ");
                break;
        case LIST_inset:

-               if (n->type == ROFFT_BODY && n->parent->head->nchild)
+               if (n->type == ROFFT_BODY && n->parent->head->child != NULL)

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


@@ -760,39 +761,18 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_enum:
 
        switch (type) {
        case LIST_enum:

-               /*
-                * Weird special case.
-                * Some very narrow lists actually hang.
-                */
-               /* FALLTHROUGH */

        case LIST_bullet:
        case LIST_bullet:

-               /* FALLTHROUGH */

        case LIST_dash:
        case LIST_dash:

-               /* FALLTHROUGH */

        case LIST_hyphen:
        case LIST_hyphen:

-               if (width <= (int)term_len(p, 2))
-                       p->flags |= TERMP_HANG;
-               if (n->type != ROFFT_HEAD)
-                       break;
-               p->flags |= TERMP_NOBREAK;
-               p->trailspace = 1;
+               if (n->type == ROFFT_HEAD) {
+                       p->flags |= TERMP_NOBREAK | TERMP_HANG;
+                       p->trailspace = 1;
+               } else if (width <= (int)term_len(p, 2))
+                       p->flags |= TERMP_NOPAD;

                break;
        case LIST_hang:
                if (n->type != ROFFT_HEAD)
                        break;
                break;
        case LIST_hang:
                if (n->type != ROFFT_HEAD)
                        break;

-
-               /*
-                * This is ugly.  If `-hang' is specified and the body
-                * is a `Bl' or `Bd', then we want basically to nullify
-                * the "overstep" effect in term_flushln() and treat
-                * this as a `-ohang' list instead.
-                */
-               if (NULL != n->next &&
-                   NULL != 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;
                p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
                p->trailspace = 1;
                break;


@@ -800,11 +780,11 @@ termp_it_pre(DECL_ARGS)
                if (n->type != ROFFT_HEAD)
                        break;
 
                if (n->type != ROFFT_HEAD)
                        break;
 

-               p->flags |= TERMP_NOBREAK | TERMP_BRIND;
+               p->flags |= TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND;

                p->trailspace = 2;
 
                if (NULL == n->next || NULL == n->next->child)
                p->trailspace = 2;
 
                if (NULL == n->next || NULL == n->next->child)

-                       p->flags |= TERMP_DANGLE;
+                       p->flags |= TERMP_HANG;

                break;
        case LIST_column:
                if (n->type == ROFFT_HEAD)
                break;
        case LIST_column:
                if (n->type == ROFFT_HEAD)


@@ -835,47 +815,31 @@ termp_it_pre(DECL_ARGS)
         * necessarily lengthened.  Everybody gets the offset.
         */
 
         * necessarily lengthened.  Everybody gets the offset.
         */
 

-       p->offset += offset;
+       p->tcol->offset += offset;

 
        switch (type) {
 
        switch (type) {

-       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 (n->type == ROFFT_HEAD &&
-                   NULL != n->next &&
-                   NULL != n->next->child &&
-                   (MDOC_Bl == n->next->child->tok ||
-                    MDOC_Bd == n->next->child->tok))
-                       break;
-               /* FALLTHROUGH */

        case LIST_bullet:
        case LIST_bullet:

-               /* FALLTHROUGH */

        case LIST_dash:
        case LIST_dash:

-               /* FALLTHROUGH */

        case LIST_enum:
        case LIST_enum:

-               /* FALLTHROUGH */

        case LIST_hyphen:
        case LIST_hyphen:

-               /* FALLTHROUGH */
+       case LIST_hang:

        case LIST_tag:
                if (n->type == ROFFT_HEAD)
        case LIST_tag:
                if (n->type == ROFFT_HEAD)

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

                else
                else

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

                break;
        case LIST_column:
                assert(width);
                break;
        case LIST_column:
                assert(width);

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

                /*
                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */
                if (n->type == ROFFT_HEAD)
                        break;
                /*
                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */
                if (n->type == ROFFT_HEAD)
                        break;

-               if (NULL == n->next && p->rmargin < p->maxrmargin)
-                       p->rmargin = p->maxrmargin;
+               if (n->next == NULL && p->tcol->rmargin < p->maxrmargin)
+                       p->tcol->rmargin = p->maxrmargin;

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


@@ -894,10 +858,9 @@ termp_it_pre(DECL_ARGS)
                        term_fontpop(p);
                        break;
                case LIST_dash:
                        term_fontpop(p);
                        break;
                case LIST_dash:

-                       /* FALLTHROUGH */

                case LIST_hyphen:
                        term_fontpush(p, TERMFONT_BOLD);
                case LIST_hyphen:
                        term_fontpush(p, TERMFONT_BOLD);

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

                        term_fontpop(p);
                        break;
                case LIST_enum:
                        term_fontpop(p);
                        break;
                case LIST_enum:


@@ -916,26 +879,23 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_bullet:
 
        switch (type) {
        case LIST_bullet:

-               /* FALLTHROUGH */

        case LIST_item:
        case LIST_item:

-               /* FALLTHROUGH */

        case LIST_dash:
        case LIST_dash:

-               /* FALLTHROUGH */

        case LIST_hyphen:
        case LIST_hyphen:

-               /* FALLTHROUGH */

        case LIST_enum:
                if (n->type == ROFFT_HEAD)
        case LIST_enum:
                if (n->type == ROFFT_HEAD)

-                       return(0);
+                       return 0;

                break;
        case LIST_column:
                if (n->type == ROFFT_HEAD)
                break;
        case LIST_column:
                if (n->type == ROFFT_HEAD)

-                       return(0);
+                       return 0;
+               p->minbl = 0;

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

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -950,9 +910,7 @@ termp_it_post(DECL_ARGS)
 
        switch (type) {
        case LIST_item:
 
        switch (type) {
        case LIST_item:

-               /* FALLTHROUGH */

        case LIST_diag:
        case LIST_diag:

-               /* FALLTHROUGH */

        case LIST_inset:
                if (n->type == ROFFT_BODY)
                        term_newln(p);
        case LIST_inset:
                if (n->type == ROFFT_BODY)
                        term_newln(p);


@@ -972,8 +930,7 @@ termp_it_post(DECL_ARGS)
         * has munged them in the meanwhile.
         */
 
         * has munged them in the meanwhile.
         */
 

-       p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
-                       TERMP_DANGLE | TERMP_HANG);
+       p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND | TERMP_HANG);

        p->trailspace = 0;
 }
 
        p->trailspace = 0;
 }
 


@@ -984,12 +941,12 @@ termp_nm_pre(DECL_ARGS)
 
        if (n->type == ROFFT_BLOCK) {
                p->flags |= TERMP_PREKEEP;
 
        if (n->type == ROFFT_BLOCK) {
                p->flags |= TERMP_PREKEEP;

-               return(1);
+               return 1;

        }
 
        if (n->type == ROFFT_BODY) {
        }
 
        if (n->type == ROFFT_BODY) {

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

                p->flags |= TERMP_NOSPACE;
                cp = NULL;
                if (n->prev->child != NULL)
                p->flags |= TERMP_NOSPACE;
                cp = NULL;
                if (n->prev->child != NULL)


@@ -997,39 +954,38 @@ termp_nm_pre(DECL_ARGS)
                if (cp == NULL)
                        cp = meta->name;
                if (cp == NULL)
                if (cp == NULL)
                        cp = meta->name;
                if (cp == NULL)

-                       p->offset += term_len(p, 6);
+                       p->tcol->offset += term_len(p, 6);

                else
                else

-                       p->offset += term_len(p, 1) + term_strlen(p, cp);
-               return(1);
+                       p->tcol->offset += term_len(p, 1) +
+                           term_strlen(p, cp);
+               return 1;

        }
 
        }
 

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

 
        if (n->type == ROFFT_HEAD)
                synopsis_pre(p, n->parent);
 
        if (n->type == ROFFT_HEAD &&
 
        if (n->type == ROFFT_HEAD)
                synopsis_pre(p, n->parent);
 
        if (n->type == ROFFT_HEAD &&

-           NULL != n->next && NULL != n->next->child) {
+           n->next != NULL && n->next->child != NULL) {

                p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND;
                p->trailspace = 1;
                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 += term_strlen(p, meta->name);
-               } else if (n->child->type == ROFFT_TEXT) {
-                       p->rmargin += term_strlen(p, n->child->string);
-                       if (n->child->next)
+               p->tcol->rmargin = p->tcol->offset + term_len(p, 1);
+               if (n->child == NULL)
+                       p->tcol->rmargin += term_strlen(p, meta->name);
+               else if (n->child->type == ROFFT_TEXT) {
+                       p->tcol->rmargin += term_strlen(p, n->child->string);
+                       if (n->child->next != NULL)

                                p->flags |= TERMP_HANG;
                } else {
                                p->flags |= TERMP_HANG;
                } else {

-                       p->rmargin += term_len(p, 5);
+                       p->tcol->rmargin += term_len(p, 5);

                        p->flags |= TERMP_HANG;
                }
        }
 
        term_fontpush(p, TERMFONT_BOLD);
                        p->flags |= TERMP_HANG;
                }
        }
 
        term_fontpush(p, TERMFONT_BOLD);

-       if (NULL == n->child)
-               term_word(p, meta->name);
-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1055,13 +1011,13 @@ termp_fl_pre(DECL_ARGS)
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, "\\-");
 
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, "\\-");
 

-       if ( ! (n->nchild == 0 &&
+       if (!(n->child == NULL &&

            (n->next == NULL ||
             n->next->type == ROFFT_TEXT ||
            (n->next == NULL ||
             n->next->type == ROFFT_TEXT ||

-            n->next->flags & MDOC_LINE)))
+            n->next->flags & NODE_LINE)))

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

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1072,7 +1028,7 @@ termp__a_pre(DECL_ARGS)
                if (NULL == n->next || MDOC__A != n->next->tok)
                        term_word(p, "and");
 
                if (NULL == n->next || MDOC__A != n->next->tok)
                        term_word(p, "and");
 

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1082,12 +1038,12 @@ termp_an_pre(DECL_ARGS)
        if (n->norm->An.auth == AUTH_split) {
                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;
        if (n->norm->An.auth == AUTH_split) {
                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;

-               return(0);
+               return 0;

        }
        if (n->norm->An.auth == AUTH_nosplit) {
                p->flags &= ~TERMP_SPLIT;
                p->flags |= TERMP_NOSPLIT;
        }
        if (n->norm->An.auth == AUTH_nosplit) {
                p->flags &= ~TERMP_SPLIT;
                p->flags |= TERMP_NOSPLIT;

-               return(0);
+               return 0;

        }
 
        if (p->flags & TERMP_SPLIT)
        }
 
        if (p->flags & TERMP_SPLIT)


@@ -1096,16 +1052,16 @@ termp_an_pre(DECL_ARGS)
        if (n->sec == SEC_AUTHORS && ! (p->flags & TERMP_NOSPLIT))
                p->flags |= TERMP_SPLIT;
 
        if (n->sec == SEC_AUTHORS && ! (p->flags & TERMP_NOSPLIT))
                p->flags |= TERMP_SPLIT;
 

-       return(1);
+       return 1;

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

-       if ( ! (MDOC_LINE & n->flags))
+       if ( ! (NODE_LINE & n->flags))

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

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1113,97 +1069,17 @@ termp_rs_pre(DECL_ARGS)
 {
 
        if (SEC_SEE_ALSO != n->sec)
 {
 
        if (SEC_SEE_ALSO != n->sec)

-               return(1);
+               return 1;

        if (n->type == ROFFT_BLOCK && n->prev != NULL)
                term_vspace(p);
        if (n->type == ROFFT_BLOCK && n->prev != NULL)
                term_vspace(p);

-       return(1);
-}
-
-static int
-termp_rv_pre(DECL_ARGS)
-{
-       int              nchild;
-
-       term_newln(p);
-
-       nchild = n->nchild;
-       if (nchild > 0) {
-               term_word(p, "The");
-
-               for (n = n->child; n; n = n->next) {
-                       term_fontpush(p, TERMFONT_BOLD);
-                       term_word(p, n->string);
-                       term_fontpop(p);
-
-                       p->flags |= TERMP_NOSPACE;
-                       term_word(p, "()");
-
-                       if (n->next == NULL)
-                               continue;
-
-                       if (nchild > 2) {
-                               p->flags |= TERMP_NOSPACE;
-                               term_word(p, ",");
-                       }
-                       if (n->next->next == NULL)
-                               term_word(p, "and");
-               }
-
-               if (nchild > 1)
-                       term_word(p, "functions return");
-               else
-                       term_word(p, "function returns");
-
-               term_word(p, "the value\\~0 if successful;");
-       } else
-               term_word(p, "Upon successful completion,"
-                   " the value\\~0 is returned;");
-
-       term_word(p, "otherwise the value\\~\\-1 is returned"
-           " and the global variable");
-
-       term_fontpush(p, TERMFONT_UNDER);
-       term_word(p, "errno");
-       term_fontpop(p);
-
-       term_word(p, "is set to indicate the error.");
-       p->flags |= TERMP_SENTENCE;
-
-       return(0);
+       return 1;

 }
 
 static int
 termp_ex_pre(DECL_ARGS)
 {
 }
 
 static int
 termp_ex_pre(DECL_ARGS)
 {

-       int              nchild;
-

        term_newln(p);
        term_newln(p);

-       term_word(p, "The");
-
-       nchild = n->nchild;
-       for (n = n->child; n; n = n->next) {
-               term_fontpush(p, TERMFONT_BOLD);
-               term_word(p, n->string);
-               term_fontpop(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 (nchild > 1)
-               term_word(p, "utilities exit\\~0");
-       else
-               term_word(p, "utility exits\\~0");
-
-       term_word(p, "on success, and\\~>0 if an error occurs.");
-
-       p->flags |= TERMP_SENTENCE;
-       return(0);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1212,22 +1088,28 @@ termp_nd_pre(DECL_ARGS)
 
        if (n->type == ROFFT_BODY)
                term_word(p, "\\(en");
 
        if (n->type == ROFFT_BODY)
                term_word(p, "\\(en");

-       return(1);
+       return 1;

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

-       return(n->type != ROFFT_HEAD);
+       return n->type != ROFFT_HEAD;

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

-       if (n->type == ROFFT_BLOCK)
-               term_newln(p);
+       if (n->type != ROFFT_BLOCK)
+               return;
+       term_newln(p);
+       if (n->tok != MDOC_Bl || n->norm->Bl.type != LIST_column)
+               return;
+       term_tab_set(p, NULL);
+       term_tab_set(p, "T");
+       term_tab_set(p, ".5i");

 }
 
 static int
 }
 
 static int


@@ -1235,13 +1117,13 @@ termp_xr_pre(DECL_ARGS)
 {
 
        if (NULL == (n = n->child))
 {
 
        if (NULL == (n = n->child))

-               return(0);
+               return 0;

 
        assert(n->type == ROFFT_TEXT);
        term_word(p, n->string);
 
        if (NULL == (n = n->next))
 
        assert(n->type == ROFFT_TEXT);
        term_word(p, n->string);
 
        if (NULL == (n = n->next))

-               return(0);
+               return 0;

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


@@ -1253,7 +1135,7 @@ termp_xr_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
        term_word(p, ")");
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, ")");
 

-       return(0);
+       return 0;

 }
 
 /*
 }
 
 /*


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

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

                return;
 
        /*
                return;
 
        /*


@@ -1291,13 +1173,9 @@ synopsis_pre(struct termp *p, const struct roff_node *n)
         */
        switch (n->prev->tok) {
        case MDOC_Fd:
         */
        switch (n->prev->tok) {
        case MDOC_Fd:

-               /* FALLTHROUGH */

        case MDOC_Fn:
        case MDOC_Fn:

-               /* FALLTHROUGH */

        case MDOC_Fo:
        case MDOC_Fo:

-               /* FALLTHROUGH */

        case MDOC_In:
        case MDOC_In:

-               /* FALLTHROUGH */

        case MDOC_Vt:
                term_vspace(p);
                break;
        case MDOC_Vt:
                term_vspace(p);
                break;


@@ -1319,14 +1197,14 @@ termp_vt_pre(DECL_ARGS)
 
        if (n->type == ROFFT_ELEM) {
                synopsis_pre(p, n);
 
        if (n->type == ROFFT_ELEM) {
                synopsis_pre(p, n);

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

        } else if (n->type == ROFFT_BLOCK) {
                synopsis_pre(p, n);
        } else if (n->type == ROFFT_BLOCK) {
                synopsis_pre(p, n);

-               return(1);
+               return 1;

        } else if (n->type == ROFFT_HEAD)
        } else if (n->type == ROFFT_HEAD)

-               return(0);
+               return 0;

 
 

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

 }
 
 static int
 }
 
 static int


@@ -1335,7 +1213,7 @@ termp_bold_pre(DECL_ARGS)
 
        termp_tag_pre(p, pair, meta, n);
        term_fontpush(p, TERMFONT_BOLD);
 
        termp_tag_pre(p, pair, meta, n);
        term_fontpush(p, TERMFONT_BOLD);

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1343,7 +1221,7 @@ termp_fd_pre(DECL_ARGS)
 {
 
        synopsis_pre(p, n);
 {
 
        synopsis_pre(p, n);

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

 }
 
 static void
 }
 
 static void


@@ -1364,7 +1242,7 @@ termp_sh_pre(DECL_ARGS)
                 * when the previous section was empty.
                 */
                if (n->prev == NULL ||
                 * when the previous section was empty.
                 */
                if (n->prev == NULL ||

-                   MDOC_Sh != n->prev->tok ||
+                   n->prev->tok != MDOC_Sh ||

                    (n->prev->body != NULL &&
                     n->prev->body->child != NULL))
                        term_vspace(p);
                    (n->prev->body != NULL &&
                     n->prev->body->child != NULL))
                        term_vspace(p);


@@ -1373,14 +1251,25 @@ termp_sh_pre(DECL_ARGS)
                term_fontpush(p, TERMFONT_BOLD);
                break;
        case ROFFT_BODY:
                term_fontpush(p, TERMFONT_BOLD);
                break;
        case ROFFT_BODY:

-               p->offset = term_len(p, p->defindent);
-               if (SEC_AUTHORS == n->sec)
+               p->tcol->offset = term_len(p, p->defindent);
+               term_tab_set(p, NULL);
+               term_tab_set(p, "T");
+               term_tab_set(p, ".5i");
+               switch (n->sec) {
+               case SEC_DESCRIPTION:
+                       fn_prio = 0;
+                       break;
+               case SEC_AUTHORS:

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

+                       break;
+               default:
+                       break;
+               }

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

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1393,58 +1282,43 @@ termp_sh_post(DECL_ARGS)
                break;
        case ROFFT_BODY:
                term_newln(p);
                break;
        case ROFFT_BODY:
                term_newln(p);

-               p->offset = 0;
+               p->tcol->offset = 0;

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

-static int
-termp_bt_pre(DECL_ARGS)
-{
-
-       term_word(p, "is currently in beta test.");
-       p->flags |= TERMP_SENTENCE;
-       return(0);
-}
-

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

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

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

-static int
-termp_ud_pre(DECL_ARGS)
-{
-
-       term_word(p, "currently under development.");
-       p->flags |= TERMP_SENTENCE;
-       return(0);
-}
-

 static int
 termp_d1_pre(DECL_ARGS)
 {
 
        if (n->type != ROFFT_BLOCK)
 static int
 termp_d1_pre(DECL_ARGS)
 {
 
        if (n->type != ROFFT_BLOCK)

-               return(1);
+               return 1;

        term_newln(p);
        term_newln(p);

-       p->offset += term_len(p, p->defindent + 1);
-       return(1);
+       p->tcol->offset += term_len(p, p->defindent + 1);
+       term_tab_set(p, NULL);
+       term_tab_set(p, "T");
+       term_tab_set(p, ".5i");
+       return 1;

 }
 
 static int
 termp_ft_pre(DECL_ARGS)
 {
 
 }
 
 static int
 termp_ft_pre(DECL_ARGS)
 {
 

-       /* NB: MDOC_LINE does not effect this! */
+       /* NB: NODE_LINE does not effect this! */

        synopsis_pre(p, n);
        term_fontpush(p, TERMFONT_UNDER);
        synopsis_pre(p, n);
        term_fontpush(p, TERMFONT_UNDER);

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1453,16 +1327,16 @@ termp_fn_pre(DECL_ARGS)
        size_t           rmargin = 0;
        int              pretty;
 
        size_t           rmargin = 0;
        int              pretty;
 

-       pretty = MDOC_SYNPRETTY & n->flags;
+       pretty = NODE_SYNPRETTY & n->flags;

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

-               return(0);
+               return 0;

 
        if (pretty) {
 
        if (pretty) {

-               rmargin = p->rmargin;
-               p->rmargin = p->offset + term_len(p, 4);
+               rmargin = p->tcol->rmargin;
+               p->tcol->rmargin = p->tcol->offset + term_len(p, 4);

                p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
        }
 
                p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
        }
 


@@ -1471,11 +1345,15 @@ termp_fn_pre(DECL_ARGS)
        term_word(p, n->string);
        term_fontpop(p);
 
        term_word(p, n->string);
        term_fontpop(p);
 

+       if (n->sec == SEC_DESCRIPTION || n->sec == SEC_CUSTOM)
+               tag_put(n->string, ++fn_prio, p->line);
+

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

-               p->offset = p->rmargin;
-               p->rmargin = rmargin;
+               p->flags |= TERMP_NOPAD;
+               p->tcol->offset = p->tcol->rmargin;
+               p->tcol->rmargin = rmargin;

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


@@ -1505,7 +1383,7 @@ termp_fn_pre(DECL_ARGS)
                term_flushln(p);
        }
 
                term_flushln(p);
        }
 

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1515,7 +1393,7 @@ termp_fa_pre(DECL_ARGS)
 
        if (n->parent->tok != MDOC_Fo) {
                term_fontpush(p, TERMFONT_UNDER);
 
        if (n->parent->tok != MDOC_Fo) {
                term_fontpush(p, TERMFONT_UNDER);

-               return(1);
+               return 1;

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


@@ -1530,21 +1408,21 @@ termp_fa_pre(DECL_ARGS)
                }
        }
 
                }
        }
 

-       return(0);
+       return 0;

 }
 
 static int
 termp_bd_pre(DECL_ARGS)
 {
 }
 
 static int
 termp_bd_pre(DECL_ARGS)
 {

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

        struct roff_node        *nn;
        int                      offset;
 
        if (n->type == ROFFT_BLOCK) {
                print_bvspace(p, n, n);
        struct roff_node        *nn;
        int                      offset;
 
        if (n->type == ROFFT_BLOCK) {
                print_bvspace(p, n, n);

-               return(1);
+               return 1;

        } else if (n->type == ROFFT_HEAD)
        } else if (n->type == ROFFT_HEAD)

-               return(0);
+               return 0;

 
        /* Handle the -offset argument. */
 
 
        /* Handle the -offset argument. */
 


@@ -1552,15 +1430,15 @@ termp_bd_pre(DECL_ARGS)
            ! strcmp(n->norm->Bd.offs, "left"))
                /* nothing */;
        else if ( ! strcmp(n->norm->Bd.offs, "indent"))
            ! strcmp(n->norm->Bd.offs, "left"))
                /* nothing */;
        else if ( ! strcmp(n->norm->Bd.offs, "indent"))

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

        else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
        else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))

-               p->offset += term_len(p, (p->defindent + 1) * 2);
+               p->tcol->offset += term_len(p, (p->defindent + 1) * 2);

        else {
                offset = a2width(p, n->norm->Bd.offs);
        else {
                offset = a2width(p, n->norm->Bd.offs);

-               if (offset < 0 && (size_t)(-offset) > p->offset)
-                       p->offset = 0;
+               if (offset < 0 && (size_t)(-offset) > p->tcol->offset)
+                       p->tcol->offset = 0;

                else if (offset < SHRT_MAX)
                else if (offset < SHRT_MAX)

-                       p->offset += offset;
+                       p->tcol->offset += offset;

        }
 
        /*
        }
 
        /*


@@ -1571,29 +1449,29 @@ termp_bd_pre(DECL_ARGS)
         * lines are allowed.
         */
 
         * lines are allowed.
         */
 

-       if (DISP_literal != n->norm->Bd.type &&
-           DISP_unfilled != n->norm->Bd.type &&
-           DISP_centered != n->norm->Bd.type)
-               return(1);
-
-       tabwidth = p->tabwidth;
-       if (DISP_literal == n->norm->Bd.type)
-               p->tabwidth = term_len(p, 8);
+       if (n->norm->Bd.type != DISP_literal &&
+           n->norm->Bd.type != DISP_unfilled &&
+           n->norm->Bd.type != DISP_centered)
+               return 1;

 
 

-       lm = p->offset;
-       rm = p->rmargin;
-       rmax = p->maxrmargin;
-       p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
+       if (n->norm->Bd.type == DISP_literal) {
+               term_tab_set(p, NULL);
+               term_tab_set(p, "T");
+               term_tab_set(p, "8n");
+       }

 
 

-       for (nn = n->child; nn; nn = nn->next) {
-               if (DISP_centered == n->norm->Bd.type) {
+       lm = p->tcol->offset;
+       p->flags |= TERMP_BRNEVER;
+       for (nn = n->child; nn != NULL; nn = nn->next) {
+               if (n->norm->Bd.type == DISP_centered) {

                        if (nn->type == ROFFT_TEXT) {
                                len = term_strlen(p, nn->string);
                        if (nn->type == ROFFT_TEXT) {
                                len = term_strlen(p, nn->string);

-                               p->offset = len >= rm ? 0 :
-                                   lm + len >= rm ? rm - len :
-                                   (lm + rm - len) / 2;
+                               p->tcol->offset = len >= p->tcol->rmargin ?
+                                   0 : lm + len >= p->tcol->rmargin ?
+                                   p->tcol->rmargin - len :
+                                   (lm + p->tcol->rmargin - len) / 2;

                        } else
                        } else

-                               p->offset = lm;
+                               p->tcol->offset = lm;

                }
                print_mdoc_node(p, pair, meta, nn);
                /*
                }
                print_mdoc_node(p, pair, meta, nn);
                /*


@@ -1602,155 +1480,94 @@ termp_bd_pre(DECL_ARGS)
                 * notion of selective eoln whitespace is pretty dumb
                 * anyway, so don't sweat it.
                 */
                 * notion of selective eoln whitespace is pretty dumb
                 * anyway, so don't sweat it.
                 */

+               if (nn->tok < ROFF_MAX)
+                       continue;

                switch (nn->tok) {
                case MDOC_Sm:
                switch (nn->tok) {
                case MDOC_Sm:

-                       /* FALLTHROUGH */
-               case MDOC_br:
-                       /* FALLTHROUGH */
-               case MDOC_sp:
-                       /* FALLTHROUGH */

                case MDOC_Bl:
                case MDOC_Bl:

-                       /* FALLTHROUGH */

                case MDOC_D1:
                case MDOC_D1:

-                       /* FALLTHROUGH */

                case MDOC_Dl:
                case MDOC_Dl:

-                       /* FALLTHROUGH */

                case MDOC_Lp:
                case MDOC_Lp:

-                       /* FALLTHROUGH */

                case MDOC_Pp:
                        continue;
                default:
                        break;
                }
                if (p->flags & TERMP_NONEWLINE ||
                case MDOC_Pp:
                        continue;
                default:
                        break;
                }
                if (p->flags & TERMP_NONEWLINE ||

-                   (nn->next && ! (nn->next->flags & MDOC_LINE)))
+                   (nn->next && ! (nn->next->flags & NODE_LINE)))

                        continue;
                term_flushln(p);
                p->flags |= TERMP_NOSPACE;
        }
                        continue;
                term_flushln(p);
                p->flags |= TERMP_NOSPACE;
        }

-
-       p->tabwidth = tabwidth;
-       p->rmargin = rm;
-       p->maxrmargin = rmax;
-       return(0);
+       p->flags &= ~TERMP_BRNEVER;
+       return 0;

 }
 
 static void
 termp_bd_post(DECL_ARGS)
 {
 }
 
 static void
 termp_bd_post(DECL_ARGS)
 {

-       size_t           rm, rmax;
-

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

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

        if (DISP_literal == n->norm->Bd.type ||
            DISP_unfilled == n->norm->Bd.type)
        if (DISP_literal == n->norm->Bd.type ||
            DISP_unfilled == n->norm->Bd.type)

-               p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
-
+               p->flags |= TERMP_BRNEVER;

        p->flags |= TERMP_NOSPACE;
        term_newln(p);
        p->flags |= TERMP_NOSPACE;
        term_newln(p);

-
-       p->rmargin = rm;
-       p->maxrmargin = rmax;
+       p->flags &= ~TERMP_BRNEVER;

 }
 
 static int
 }
 
 static int

-termp_bx_pre(DECL_ARGS)
+termp_xx_pre(DECL_ARGS)

 {
 {

-
-       if (NULL != (n = n->child)) {
-               term_word(p, n->string);
-               p->flags |= TERMP_NOSPACE;
-               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);
+       if ((n->aux = p->flags & TERMP_PREKEEP) == 0)
+               p->flags |= TERMP_PREKEEP;
+       return 1;

 }
 
 }
 

-static int
-termp_xx_pre(DECL_ARGS)
+static void
+termp_xx_post(DECL_ARGS)

 {
 {

-       const char      *pp;
-       int              flags;
-
-       pp = NULL;
-       switch (n->tok) {
-       case MDOC_Bsx:
-               pp = "BSD/OS";
-               break;
-       case MDOC_Dx:
-               pp = "DragonFly";
-               break;
-       case MDOC_Fx:
-               pp = "FreeBSD";
-               break;
-       case MDOC_Nx:
-               pp = "NetBSD";
-               break;
-       case MDOC_Ox:
-               pp = "OpenBSD";
-               break;
-       case MDOC_Ux:
-               pp = "UNIX";
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
-
-       term_word(p, pp);
-       if (n->child) {
-               flags = p->flags;
-               p->flags |= TERMP_KEEP;
-               term_word(p, n->child->string);
-               p->flags = flags;
-       }
-       return(0);
+       if (n->aux == 0)
+               p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);

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

-       if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+       if ( ! (n->next == NULL || n->next->flags & NODE_LINE))

                p->flags |= TERMP_NOSPACE;
 }
 
 static int
 termp_ss_pre(DECL_ARGS)
 {
                p->flags |= TERMP_NOSPACE;
 }
 
 static int
 termp_ss_pre(DECL_ARGS)
 {

+       struct roff_node *nn;

 
        switch (n->type) {
        case ROFFT_BLOCK:
                term_newln(p);
 
        switch (n->type) {
        case ROFFT_BLOCK:
                term_newln(p);

-               if (n->prev)
+               for (nn = n->prev; nn != NULL; nn = nn->prev)
+                       if ((nn->flags & NODE_NOPRT) == 0)
+                               break;
+               if (nn != NULL)

                        term_vspace(p);
                break;
        case ROFFT_HEAD:
                term_fontpush(p, TERMFONT_BOLD);
                        term_vspace(p);
                break;
        case ROFFT_HEAD:
                term_fontpush(p, TERMFONT_BOLD);

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

                break;
        case ROFFT_BODY:
                break;
        case ROFFT_BODY:

-               p->offset = term_len(p, p->defindent);
+               p->tcol->offset = term_len(p, p->defindent);
+               term_tab_set(p, NULL);
+               term_tab_set(p, "T");
+               term_tab_set(p, ".5i");

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

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1767,7 +1584,7 @@ termp_cd_pre(DECL_ARGS)
 
        synopsis_pre(p, n);
        term_fontpush(p, TERMFONT_BOLD);
 
        synopsis_pre(p, n);
        term_fontpush(p, TERMFONT_BOLD);

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1776,7 +1593,7 @@ termp_in_pre(DECL_ARGS)
 
        synopsis_pre(p, n);
 
 
        synopsis_pre(p, n);
 

-       if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) {
+       if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags) {

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


@@ -1786,62 +1603,36 @@ termp_in_pre(DECL_ARGS)
        }
 
        p->flags |= TERMP_NOSPACE;
        }
 
        p->flags |= TERMP_NOSPACE;

-       return(1);
+       return 1;

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

-       if (MDOC_SYNPRETTY & n->flags)
+       if (NODE_SYNPRETTY & n->flags)

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

-       if (MDOC_SYNPRETTY & n->flags)
+       if (NODE_SYNPRETTY & n->flags)

                term_fontpop(p);
 }
 
 static int
                term_fontpop(p);
 }
 
 static int

-termp_sp_pre(DECL_ARGS)
+termp_pp_pre(DECL_ARGS)

 {
 {

-       struct roffsu    su;
-       int              i, len;
-
-       switch (n->tok) {
-       case MDOC_sp:
-               if (n->child) {
-                       if ( ! a2roffsu(n->child->string, &su, SCALE_VS))
-                               su.scale = 1.0;
-                       len = term_vspan(p, &su);
-               } else
-                       len = 1;
-               break;
-       case MDOC_br:
-               len = 0;
-               break;
-       default:
-               len = 1;
-               break;
-       }
-
-       if (0 == len)
-               term_newln(p);
-       else if (len < 0)
-               p->skipvsp -= len;
-       else
-               for (i = 0; i < len; i++)
-                       term_vspace(p);
-
-       return(0);
+       fn_prio = 0;
+       term_vspace(p);
+       return 0;

 }
 
 static int
 termp_skip_pre(DECL_ARGS)
 {
 
 }
 
 static int
 termp_skip_pre(DECL_ARGS)
 {
 

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1849,66 +1640,55 @@ termp_quote_pre(DECL_ARGS)
 {
 
        if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)
 {
 
        if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)

-               return(1);
+               return 1;

 
        switch (n->tok) {
        case MDOC_Ao:
 
        switch (n->tok) {
        case MDOC_Ao:

-               /* FALLTHROUGH */

        case MDOC_Aq:
        case MDOC_Aq:

-               term_word(p, n->nchild == 1 &&
+               term_word(p, n->child != NULL && n->child->next == NULL &&

                    n->child->tok == MDOC_Mt ? "<" : "\\(la");
                break;
        case MDOC_Bro:
                    n->child->tok == MDOC_Mt ? "<" : "\\(la");
                break;
        case MDOC_Bro:

-               /* FALLTHROUGH */

        case MDOC_Brq:
                term_word(p, "{");
                break;
        case MDOC_Oo:
        case MDOC_Brq:
                term_word(p, "{");
                break;
        case MDOC_Oo:

-               /* FALLTHROUGH */

        case MDOC_Op:
        case MDOC_Op:

-               /* FALLTHROUGH */

        case MDOC_Bo:
        case MDOC_Bo:

-               /* FALLTHROUGH */

        case MDOC_Bq:
                term_word(p, "[");
                break;
        case MDOC_Bq:
                term_word(p, "[");
                break;

-       case MDOC_Do:
+       case MDOC__T:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

+       case MDOC_Do:

        case MDOC_Dq:
                term_word(p, "\\(Lq");
                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||
                    NULL == n->norm->Es->child)
        case MDOC_Dq:
                term_word(p, "\\(Lq");
                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||
                    NULL == n->norm->Es->child)

-                       return(1);
+                       return 1;

                term_word(p, n->norm->Es->child->string);
                break;
        case MDOC_Po:
                term_word(p, n->norm->Es->child->string);
                break;
        case MDOC_Po:

-               /* FALLTHROUGH */

        case MDOC_Pq:
                term_word(p, "(");
                break;
        case MDOC_Pq:
                term_word(p, "(");
                break;

-       case MDOC__T:
-               /* FALLTHROUGH */

        case MDOC_Qo:
        case MDOC_Qo:

-               /* FALLTHROUGH */

        case MDOC_Qq:
                term_word(p, "\"");
                break;
        case MDOC_Ql:
        case MDOC_Qq:
                term_word(p, "\"");
                break;
        case MDOC_Ql:

-               /* FALLTHROUGH */

        case MDOC_So:
        case MDOC_So:

-               /* FALLTHROUGH */

        case MDOC_Sq:
                term_word(p, "\\(oq");
                break;
        default:
                abort();
        case MDOC_Sq:
                term_word(p, "\\(oq");
                break;
        default:
                abort();

-               /* NOTREACHED */

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

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1922,27 +1702,23 @@ termp_quote_post(DECL_ARGS)
 
        switch (n->tok) {
        case MDOC_Ao:
 
        switch (n->tok) {
        case MDOC_Ao:

-               /* FALLTHROUGH */

        case MDOC_Aq:
        case MDOC_Aq:

-               term_word(p, n->nchild == 1 &&
+               term_word(p, n->child != NULL && n->child->next == NULL &&

                    n->child->tok == MDOC_Mt ? ">" : "\\(ra");
                break;
        case MDOC_Bro:
                    n->child->tok == MDOC_Mt ? ">" : "\\(ra");
                break;
        case MDOC_Bro:

-               /* FALLTHROUGH */

        case MDOC_Brq:
                term_word(p, "}");
                break;
        case MDOC_Oo:
        case MDOC_Brq:
                term_word(p, "}");
                break;
        case MDOC_Oo:

-               /* FALLTHROUGH */

        case MDOC_Op:
        case MDOC_Op:

-               /* FALLTHROUGH */

        case MDOC_Bo:
        case MDOC_Bo:

-               /* FALLTHROUGH */

        case MDOC_Bq:
                term_word(p, "]");
                break;
        case MDOC_Bq:
                term_word(p, "]");
                break;

-       case MDOC_Do:
+       case MDOC__T:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

+       case MDOC_Do:

        case MDOC_Dq:
                term_word(p, "\\(Rq");
                break;
        case MDOC_Dq:
                term_word(p, "\\(Rq");
                break;


@@ -1955,27 +1731,20 @@ termp_quote_post(DECL_ARGS)
                        term_word(p, n->norm->Es->child->next->string);
                break;
        case MDOC_Po:
                        term_word(p, n->norm->Es->child->next->string);
                break;
        case MDOC_Po:

-               /* FALLTHROUGH */

        case MDOC_Pq:
                term_word(p, ")");
                break;
        case MDOC_Pq:
                term_word(p, ")");
                break;

-       case MDOC__T:
-               /* FALLTHROUGH */

        case MDOC_Qo:
        case MDOC_Qo:

-               /* FALLTHROUGH */

        case MDOC_Qq:
                term_word(p, "\"");
                break;
        case MDOC_Ql:
        case MDOC_Qq:
                term_word(p, "\"");
                break;
        case MDOC_Ql:

-               /* FALLTHROUGH */

        case MDOC_So:
        case MDOC_So:

-               /* FALLTHROUGH */

        case MDOC_Sq:
                term_word(p, "\\(cq");
                break;
        default:
                abort();
        case MDOC_Sq:
                term_word(p, "\\(cq");
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 }
 
        }
 }
 


@@ -1984,7 +1753,7 @@ termp_eo_pre(DECL_ARGS)
 {
 
        if (n->type != ROFFT_BODY)
 {
 
        if (n->type != ROFFT_BODY)

-               return(1);
+               return 1;

 
        if (n->end == ENDBODY_NOT &&
            n->parent->head->child == NULL &&
 
        if (n->end == ENDBODY_NOT &&
            n->parent->head->child == NULL &&


@@ -1996,7 +1765,7 @@ termp_eo_pre(DECL_ARGS)
             (n->parent->tail != NULL && n->parent->tail->child != NULL)))
                p->flags |= TERMP_NOSPACE;
 
             (n->parent->tail != NULL && n->parent->tail->child != NULL)))
                p->flags |= TERMP_NOSPACE;
 

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -2029,15 +1798,15 @@ termp_fo_pre(DECL_ARGS)
        size_t           rmargin = 0;
        int              pretty;
 
        size_t           rmargin = 0;
        int              pretty;
 

-       pretty = MDOC_SYNPRETTY & n->flags;
+       pretty = NODE_SYNPRETTY & n->flags;

 
        if (n->type == ROFFT_BLOCK) {
                synopsis_pre(p, n);
 
        if (n->type == ROFFT_BLOCK) {
                synopsis_pre(p, n);

-               return(1);
+               return 1;

        } else if (n->type == ROFFT_BODY) {
                if (pretty) {
        } else if (n->type == ROFFT_BODY) {
                if (pretty) {

-                       rmargin = p->rmargin;
-                       p->rmargin = p->offset + term_len(p, 4);
+                       rmargin = p->tcol->rmargin;
+                       p->tcol->rmargin = p->tcol->offset + term_len(p, 4);

                        p->flags |= TERMP_NOBREAK | TERMP_BRIND |
                                        TERMP_HANG;
                }
                        p->flags |= TERMP_NOBREAK | TERMP_BRIND |
                                        TERMP_HANG;
                }


@@ -2048,21 +1817,22 @@ termp_fo_pre(DECL_ARGS)
                        term_flushln(p);
                        p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
                                        TERMP_HANG);
                        term_flushln(p);
                        p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
                                        TERMP_HANG);

-                       p->offset = p->rmargin;
-                       p->rmargin = rmargin;
+                       p->flags |= TERMP_NOPAD;
+                       p->tcol->offset = p->tcol->rmargin;
+                       p->tcol->rmargin = rmargin;

                }
                }

-               return(1);
+               return 1;

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

-               return(0);
+               return 0;

 
        /* XXX: we drop non-initial arguments as per groff. */
 
        assert(n->child->string);
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, n->child->string);
 
        /* XXX: we drop non-initial arguments as per groff. */
 
        assert(n->child->string);
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, n->child->string);

-       return(0);
+       return 0;

 }
 
 static void
 }
 
 static void


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

-       if (MDOC_SYNPRETTY & n->flags) {
+       if (NODE_SYNPRETTY & n->flags) {

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


@@ -2087,9 +1857,9 @@ termp_bf_pre(DECL_ARGS)
 {
 
        if (n->type == ROFFT_HEAD)
 {
 
        if (n->type == ROFFT_HEAD)

-               return(0);
+               return 0;

        else if (n->type != ROFFT_BODY)
        else if (n->type != ROFFT_BODY)

-               return(1);
+               return 1;

 
        if (FONT_Em == n->norm->Bf.font)
                term_fontpush(p, TERMFONT_UNDER);
 
        if (FONT_Em == n->norm->Bf.font)
                term_fontpush(p, TERMFONT_UNDER);


@@ -2098,7 +1868,7 @@ termp_bf_pre(DECL_ARGS)
        else
                term_fontpush(p, TERMFONT_NONE);
 
        else
                term_fontpush(p, TERMFONT_NONE);
 

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -2115,7 +1885,7 @@ termp_sm_pre(DECL_ARGS)
        if (p->col && ! (TERMP_NONOSPACE & p->flags))
                p->flags &= ~TERMP_NOSPACE;
 
        if (p->col && ! (TERMP_NONOSPACE & p->flags))
                p->flags &= ~TERMP_NOSPACE;
 

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -2125,7 +1895,7 @@ termp_ap_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
        term_word(p, "'");
        p->flags |= TERMP_NOSPACE;
        p->flags |= TERMP_NOSPACE;
        term_word(p, "'");
        p->flags |= TERMP_NOSPACE;

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -2159,34 +1929,59 @@ static int
 termp_li_pre(DECL_ARGS)
 {
 
 termp_li_pre(DECL_ARGS)
 {
 

+       termp_tag_pre(p, pair, meta, n);

        term_fontpush(p, TERMFONT_NONE);
        term_fontpush(p, TERMFONT_NONE);

-       return(1);
+       return 1;

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

-       const struct roff_node *link, *descr;
+       const struct roff_node *link, *descr, *punct;
+       int display;
+
+       if ((link = n->child) == NULL)
+               return 0;

 
 

-       if (NULL == (link = n->child))
-               return(0);
+       /* Find beginning of trailing punctuation. */
+       punct = n->last;
+       while (punct != link && punct->flags & NODE_DELIMC)
+               punct = punct->prev;
+       punct = punct->next;

 
 

-       if (NULL != (descr = link->next)) {
+       /* Link text. */
+       if ((descr = link->next) != NULL && descr != punct) {

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

-               while (NULL != descr) {
+               while (descr != punct) {
+                       if (descr->flags & (NODE_DELIMC | NODE_DELIMO))
+                               p->flags |= TERMP_NOSPACE;

                        term_word(p, descr->string);
                        descr = descr->next;
                }
                        term_word(p, descr->string);
                        descr = descr->next;
                }

+               term_fontpop(p);

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

-               term_fontpop(p);

        }
 
        }
 

+       /* Link target. */
+       display = term_strlen(p, link->string) >= 26;
+       if (display) {
+               term_newln(p);
+               p->tcol->offset += term_len(p, p->defindent + 1);
+       }

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

-       return(0);
+       /* Trailing punctuation. */
+       while (punct != NULL) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, punct->string);
+               punct = punct->next;
+       }
+       if (display)
+               term_newln(p);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -2197,17 +1992,16 @@ termp_bk_pre(DECL_ARGS)
        case ROFFT_BLOCK:
                break;
        case ROFFT_HEAD:
        case ROFFT_BLOCK:
                break;
        case ROFFT_HEAD:

-               return(0);
+               return 0;

        case ROFFT_BODY:
        case ROFFT_BODY:

-               if (n->parent->args || 0 == n->prev->nchild)
+               if (n->parent->args != NULL || n->prev->child == NULL)

                        p->flags |= TERMP_PREKEEP;
                break;
        default:
                abort();
                        p->flags |= TERMP_PREKEEP;
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 
        }
 

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -2243,10 +2037,10 @@ termp__t_pre(DECL_ARGS)
         */
        if (n->parent && MDOC_Rs == n->parent->tok &&
            n->parent->norm->Rs.quote_T)
         */
        if (n->parent && MDOC_Rs == n->parent->tok &&
            n->parent->norm->Rs.quote_T)

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

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

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -2254,7 +2048,39 @@ termp_under_pre(DECL_ARGS)
 {
 
        term_fontpush(p, TERMFONT_UNDER);
 {
 
        term_fontpush(p, TERMFONT_UNDER);

-       return(1);
+       return 1;
+}
+
+static int
+termp_em_pre(DECL_ARGS)
+{
+       if (n->child != NULL &&
+           n->child->type == ROFFT_TEXT)
+               tag_put(n->child->string, 0, p->line);
+       term_fontpush(p, TERMFONT_UNDER);
+       return 1;
+}
+
+static int
+termp_sy_pre(DECL_ARGS)
+{
+       if (n->child != NULL &&
+           n->child->type == ROFFT_TEXT)
+               tag_put(n->child->string, 0, p->line);
+       term_fontpush(p, TERMFONT_BOLD);
+       return 1;
+}
+
+static int
+termp_er_pre(DECL_ARGS)
+{
+
+       if (n->sec == SEC_ERRORS &&
+           (n->parent->tok == MDOC_It ||
+            (n->parent->tok == MDOC_Bq &&
+             n->parent->parent->parent->tok == MDOC_It)))
+               tag_put(n->child->string, 1, p->line);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -2263,12 +2089,13 @@ termp_tag_pre(DECL_ARGS)
 
        if (n->child != NULL &&
            n->child->type == ROFFT_TEXT &&
 
        if (n->child != NULL &&
            n->child->type == ROFFT_TEXT &&

-           n->prev == NULL &&
+           (n->prev == NULL ||
+            (n->prev->type == ROFFT_TEXT &&
+             strcmp(n->prev->string, "|") == 0)) &&

            (n->parent->tok == MDOC_It ||
             (n->parent->tok == MDOC_Xo &&
              n->parent->parent->prev == NULL &&
            (n->parent->tok == MDOC_It ||
             (n->parent->tok == MDOC_Xo &&
              n->parent->parent->prev == NULL &&

-             n->parent->parent->parent->tok == MDOC_It)) &&
-           ! tag_get(n->child->string, 0, 1))
-               tag_put(n->child->string, 0, 1, p->line);
-       return(1);
+             n->parent->parent->parent->tok == MDOC_It)))
+               tag_put(n->child->string, 1, p->line);
+       return 1;

 }
 }