Make -man check for tabs correctly print the column.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 7c70a1a53e1396a0420da9bfb537a3eb574501f0..0603b72160a1cc6690710ec4c31693ccafd6ea60 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_term.c,v 1.186 2010/09/25 15:51:30 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.233 2011/07/22 10:50:46 kristaps Exp $ */

 /*
 /*

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

  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -32,7 +32,6 @@
 #include "out.h"
 #include "term.h"
 #include "mdoc.h"
 #include "out.h"
 #include "term.h"
 #include "mdoc.h"

-#include "chars.h"

 #include "main.h"
 
 #define        INDENT            5
 #include "main.h"
 
 #define        INDENT            5


@@ -68,51 +67,43 @@ 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_an_post(DECL_ARGS);

-static void      termp_aq_post(DECL_ARGS);

 static void      termp_bd_post(DECL_ARGS);
 static void      termp_bk_post(DECL_ARGS);
 static void      termp_bl_post(DECL_ARGS);
 static void      termp_bd_post(DECL_ARGS);
 static void      termp_bk_post(DECL_ARGS);
 static void      termp_bl_post(DECL_ARGS);

-static void      termp_bq_post(DECL_ARGS);
-static void      termp_brq_post(DECL_ARGS);
-static void      termp_bx_post(DECL_ARGS);

 static void      termp_d1_post(DECL_ARGS);
 static void      termp_d1_post(DECL_ARGS);

-static void      termp_dq_post(DECL_ARGS);
-static int       termp_fd_pre(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_lb_post(DECL_ARGS);
 static void      termp_nm_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_lb_post(DECL_ARGS);
 static void      termp_nm_post(DECL_ARGS);

-static void      termp_op_post(DECL_ARGS);

 static void      termp_pf_post(DECL_ARGS);
 static void      termp_pf_post(DECL_ARGS);

-static void      termp_pq_post(DECL_ARGS);
-static void      termp_qq_post(DECL_ARGS);
+static void      termp_quote_post(DECL_ARGS);

 static void      termp_sh_post(DECL_ARGS);
 static void      termp_sh_post(DECL_ARGS);

-static void      termp_sq_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_an_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);

-static int       termp_aq_pre(DECL_ARGS);

 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_bf_pre(DECL_ARGS);
 static int       termp_bk_pre(DECL_ARGS);
 static int       termp_bl_pre(DECL_ARGS);
 static int       termp_bold_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_bf_pre(DECL_ARGS);
 static int       termp_bk_pre(DECL_ARGS);
 static int       termp_bl_pre(DECL_ARGS);
 static int       termp_bold_pre(DECL_ARGS);

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

 static int       termp_bt_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_dq_pre(DECL_ARGS);

 static int       termp_ex_pre(DECL_ARGS);
 static int       termp_fa_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_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_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_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);


@@ -120,16 +111,12 @@ 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_nd_pre(DECL_ARGS);
 static int       termp_nm_pre(DECL_ARGS);
 static int       termp_ns_pre(DECL_ARGS);

-static int       termp_op_pre(DECL_ARGS);
-static int       termp_pf_pre(DECL_ARGS);
-static int       termp_pq_pre(DECL_ARGS);
-static int       termp_qq_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_sm_pre(DECL_ARGS);
 static int       termp_sp_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_sm_pre(DECL_ARGS);
 static int       termp_sp_pre(DECL_ARGS);

-static int       termp_sq_pre(DECL_ARGS);

 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_under_pre(DECL_ARGS);
 static int       termp_ud_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_under_pre(DECL_ARGS);
 static int       termp_ud_pre(DECL_ARGS);


@@ -171,7 +158,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_li_pre, NULL }, /* Li */
        { termp_nd_pre, NULL }, /* Nd */ 
        { termp_nm_pre, termp_nm_post }, /* Nm */ 
        { termp_li_pre, NULL }, /* Li */
        { termp_nd_pre, NULL }, /* Nd */ 
        { termp_nm_pre, termp_nm_post }, /* Nm */ 

-       { termp_op_pre, termp_op_post }, /* Op */
+       { termp_quote_pre, termp_quote_post }, /* Op */

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


@@ -188,45 +175,45 @@ 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 */
        { NULL, termp____post }, /* %V */
        { NULL, NULL }, /* Ac */

-       { termp_aq_pre, termp_aq_post }, /* Ao */
-       { termp_aq_pre, termp_aq_post }, /* Aq */
+       { 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 */ 
        { NULL, NULL }, /* At */
        { NULL, NULL }, /* Bc */
        { termp_bf_pre, NULL }, /* Bf */ 

-       { termp_bq_pre, termp_bq_post }, /* Bo */
-       { termp_bq_pre, termp_bq_post }, /* Bq */
+       { termp_quote_pre, termp_quote_post }, /* Bo */
+       { termp_quote_pre, termp_quote_post }, /* Bq */

        { termp_xx_pre, NULL }, /* Bsx */
        { termp_xx_pre, NULL }, /* Bsx */

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

        { NULL, NULL }, /* Db */
        { NULL, NULL }, /* Dc */
        { NULL, NULL }, /* Db */
        { NULL, NULL }, /* Dc */

-       { termp_dq_pre, termp_dq_post }, /* Do */
-       { termp_dq_pre, termp_dq_post }, /* Dq */
+       { 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_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */
        { NULL, NULL }, /* Ec */ /* FIXME: no space */
        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */
        { termp_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */

-       { NULL, NULL }, /* No */
+       { termp_igndelim_pre, 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_pf_pre, termp_pf_post }, /* Pf */
-       { termp_pq_pre, termp_pq_post }, /* Po */
-       { termp_pq_pre, termp_pq_post }, /* Pq */
+       { termp_igndelim_pre, termp_pf_post }, /* Pf */
+       { termp_quote_pre, termp_quote_post }, /* Po */
+       { termp_quote_pre, termp_quote_post }, /* Pq */

        { NULL, NULL }, /* Qc */
        { NULL, NULL }, /* Qc */

-       { termp_sq_pre, termp_sq_post }, /* Ql */
-       { termp_qq_pre, termp_qq_post }, /* Qo */
-       { termp_qq_pre, termp_qq_post }, /* Qq */
+       { termp_quote_pre, termp_quote_post }, /* Ql */
+       { termp_quote_pre, termp_quote_post }, /* Qo */
+       { termp_quote_pre, termp_quote_post }, /* Qq */

        { NULL, NULL }, /* Re */
        { termp_rs_pre, NULL }, /* Rs */
        { NULL, NULL }, /* Sc */
        { NULL, NULL }, /* Re */
        { termp_rs_pre, NULL }, /* Rs */
        { NULL, NULL }, /* Sc */

-       { termp_sq_pre, termp_sq_post }, /* So */
-       { termp_sq_pre, termp_sq_post }, /* Sq */
+       { termp_quote_pre, termp_quote_post }, /* So */
+       { termp_quote_pre, termp_quote_post }, /* Sq */

        { termp_sm_pre, NULL }, /* Sm */
        { termp_under_pre, NULL }, /* Sx */
        { termp_bold_pre, NULL }, /* Sy */
        { termp_sm_pre, NULL }, /* Sm */
        { termp_under_pre, NULL }, /* Sx */
        { termp_bold_pre, NULL }, /* Sy */


@@ -236,7 +223,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Xo */
        { termp_fo_pre, termp_fo_post }, /* Fo */ 
        { NULL, NULL }, /* Fc */ 
        { NULL, NULL }, /* Xo */
        { termp_fo_pre, termp_fo_post }, /* Fo */ 
        { NULL, NULL }, /* Fc */ 

-       { termp_op_pre, termp_op_post }, /* Oo */
+       { termp_quote_pre, termp_quote_post }, /* Oo */

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


@@ -248,8 +235,8 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_sp_pre, NULL }, /* Lp */ 
        { termp_lk_pre, NULL }, /* Lk */ 
        { termp_under_pre, NULL }, /* Mt */ 
        { termp_sp_pre, NULL }, /* Lp */ 
        { termp_lk_pre, NULL }, /* Lk */ 
        { termp_under_pre, NULL }, /* Mt */ 

-       { termp_brq_pre, termp_brq_post }, /* Brq */ 
-       { termp_brq_pre, termp_brq_post }, /* Bro */ 
+       { 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 }, /* Brc */ 
        { NULL, termp____post }, /* %C */ 
        { NULL, NULL }, /* Es */ /* TODO */


@@ -277,14 +264,7 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
        p->tabwidth = term_len(p, 5);
 
        if (NULL == p->symtab)
        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);
        m = mdoc_meta(mdoc);
 
        n = mdoc_node(mdoc);
        m = mdoc_meta(mdoc);


@@ -325,17 +305,15 @@ print_mdoc_node(DECL_ARGS)
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;
 
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;
 

-       if (MDOC_TEXT == n->type)
-               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) {
+       if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {

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


@@ -347,13 +325,59 @@ print_mdoc_node(DECL_ARGS)
                }
        }
 
                }
        }
 

+       /*
+        * Since SYNPRETTY sections aren't "turned off" with `Ek',
+        * we have to intuit whether we should disable formatting.
+        */
+
+       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);
+
+       /*
+        * After the keep flags have been set up, we may now
+        * produce output.  Note that some pre-handlers do so.
+        */
+
+       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, m, n);
+               break;
+       }
+

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

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


@@ -371,6 +395,7 @@ 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)
        }
 
        if (MDOC_EOS & n->flags)


@@ -384,7 +409,6 @@ print_mdoc_node(DECL_ARGS)
 static void
 print_mdoc_foot(struct termp *p, const void *arg)
 {
 static void
 print_mdoc_foot(struct termp *p, const void *arg)
 {

-       char            buf[DATESIZ], os[BUFSIZ];

        const struct mdoc_meta *m;
 
        m = (const struct mdoc_meta *)arg;
        const struct mdoc_meta *m;
 
        m = (const struct mdoc_meta *)arg;


@@ -399,24 +423,21 @@ print_mdoc_foot(struct termp *p, const void *arg)
         * SYSTEM                  DATE                    SYSTEM
         */
 
         * SYSTEM                  DATE                    SYSTEM
         */
 

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

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

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

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

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

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

-       p->rmargin = p->maxrmargin - term_strlen(p, os);
+       p->rmargin = p->maxrmargin - term_strlen(p, m->os);

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

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

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


@@ -424,7 +445,7 @@ print_mdoc_foot(struct termp *p, const void *arg)
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
 
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
 

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

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


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

+

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

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

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


@@ -557,9 +579,9 @@ print_bvspace(struct termp *p,
 
        term_newln(p);
 
 
        term_newln(p);
 

-       if (MDOC_Bd == bl->tok && bl->data.Bd->comp)
+       if (MDOC_Bd == bl->tok && bl->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. */


@@ -578,13 +600,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)


@@ -595,33 +617,6 @@ print_bvspace(struct termp *p,
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-termp_dq_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-
-       term_word(p, "\\(lq");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_dq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(rq");
-}
-
-

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


@@ -638,8 +633,7 @@ 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
 
        /* 
         * First calculate width and offset.  This is pretty easy unless


@@ -649,8 +643,8 @@ 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) {
        case (LIST_column):
 
        switch (type) {
        case (LIST_column):


@@ -666,7 +660,7 @@ 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;
+               ncols = bl->norm->Bl.ncols;

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


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

-                               (p, bl->data.Bl->cols[i]);
+                               (p, bl->norm->Bl.cols[i]);

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


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

-               width = a2width(p, bl->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;
 
                /* 


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

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

                break;
        }
 
                break;
        }
 


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

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

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


@@ -1144,10 +1138,10 @@ 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;
        }


@@ -1160,7 +1154,8 @@ static int
 termp_ns_pre(DECL_ARGS)
 {
 
 termp_ns_pre(DECL_ARGS)
 {
 

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

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


@@ -1182,25 +1177,30 @@ termp_rs_pre(DECL_ARGS)
 static int
 termp_rv_pre(DECL_ARGS)
 {
 static int
 termp_rv_pre(DECL_ARGS)
 {

-       const struct mdoc_node  *nn;
+       int              nchild;

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

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

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

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

                term_fontpop(p);
                term_fontpop(p);

+

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

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

        }
 
        }
 

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

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


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

-       const struct mdoc_node  *nn;
+       int              nchild;

 
 

+       term_newln(p);

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

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

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

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

                term_fontpop(p);
                term_fontpop(p);

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

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

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

        }
 
        }
 

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

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

-       p->flags |= TERMP_SENTENCE;

 
 

+       p->flags |= TERMP_SENTENCE;

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


@@ -1287,45 +1290,33 @@ termp_bl_post(DECL_ARGS)
                term_newln(p);
 }
 
                term_newln(p);
 }
 

-
-/* ARGSUSED */
-static void
-termp_op_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != n->type) 
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(rB");
-}
-
-

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

-       const struct mdoc_node *nn;

 
 

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

                return(0);
 
                return(0);
 

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

 
 

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

                return(0);
                return(0);

+

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

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

        p->flags |= TERMP_NOSPACE;
        term_word(p, ")");
 
        return(0);
 }
 
        p->flags |= TERMP_NOSPACE;
        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


@@ -1467,23 +1458,6 @@ termp_sh_post(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-termp_op_pre(DECL_ARGS)
-{
-
-       switch (n->type) {
-       case (MDOC_BODY):
-               term_word(p, "\\(lB");
-               p->flags |= TERMP_NOSPACE;
-               break;
-       default:
-               break;
-       }
-       return(1);
-}
-
-

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


@@ -1540,31 +1514,6 @@ termp_d1_post(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-termp_aq_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       term_word(p, "\\(la");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_aq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(ra");
-}
-
-

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


@@ -1581,30 +1530,43 @@ termp_ft_pre(DECL_ARGS)
 static int
 termp_fn_pre(DECL_ARGS)
 {
 static int
 termp_fn_pre(DECL_ARGS)
 {

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

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

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

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

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

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

+       p->flags |= TERMP_NOSPACE;

 
 

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

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

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

                term_fontpop(p);
 
                term_fontpop(p);
 

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

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

+               }

        }
 
        }
 

+       p->flags |= TERMP_NOSPACE;

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

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

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

+       }

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


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

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

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

+               }

        }
 
        }
 

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

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

+       }

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


@@ -1650,9 +1616,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


@@ -1662,18 +1627,46 @@ termp_bd_pre(DECL_ARGS)
         * lines are allowed.
         */
        
         * lines are allowed.
         */
        

-       if (DISP_literal != n->data.Bd->type && 
-                       DISP_unfilled != n->data.Bd->type)
+       if (DISP_literal != n->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) {
                print_mdoc_node(p, pair, m, nn);
        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);

+               /*
+                * If the printed node flushes its own line, then we
+                * needn't do it here as well.  This is hacky, but the
+                * notion of selective eoln whitespace is pretty dumb
+                * anyway, so don't sweat it.
+                */
+               switch (nn->tok) {
+               case (MDOC_Sm):
+                       /* FALLTHROUGH */
+               case (MDOC_br):
+                       /* FALLTHROUGH */
+               case (MDOC_sp):
+                       /* FALLTHROUGH */
+               case (MDOC_Bl):
+                       /* FALLTHROUGH */
+               case (MDOC_D1):
+                       /* FALLTHROUGH */
+               case (MDOC_Dl):
+                       /* FALLTHROUGH */
+               case (MDOC_Lp):
+                       /* FALLTHROUGH */
+               case (MDOC_Pp):
+                       continue;
+               default:
+                       break;
+               }

                if (nn->next && nn->next->line == nn->line)
                        continue;
                term_flushln(p);
                if (nn->next && nn->next->line == nn->line)
                        continue;
                term_flushln(p);


@@ -1699,9 +1692,8 @@ termp_bd_post(DECL_ARGS)
        rm = p->rmargin;
        rmax = p->maxrmargin;
 
        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;


@@ -1714,37 +1706,26 @@ termp_bd_post(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-termp_qq_pre(DECL_ARGS)
+termp_bx_pre(DECL_ARGS)

 {
 
 {
 

-       if (MDOC_BODY != n->type)
-               return(1);
-       term_word(p, "\"");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_qq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\"");
-}
-
-
-/* ARGSUSED */
-static void
-termp_bx_post(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 (n->child)
+       if (NULL != (n = n->next)) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, "-");

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

-       term_word(p, "BSD");
+               term_word(p, n->string);
+       }
+
+       return(0);

 }
 
 
 }
 
 


@@ -1753,11 +1734,12 @@ static int
 termp_xx_pre(DECL_ARGS)
 {
        const char      *pp;
 termp_xx_pre(DECL_ARGS)
 {
        const char      *pp;

+       int              flags;

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

-               pp = "BSDI BSD/OS";
+               pp = "BSD/OS";

                break;
        case (MDOC_Dx):
                pp = "DragonFly";
                break;
        case (MDOC_Dx):
                pp = "DragonFly";


@@ -1778,40 +1760,20 @@ termp_xx_pre(DECL_ARGS)
                break;
        }
 
                break;
        }
 

-       assert(pp);

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

-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_sq_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       term_word(p, "\\(oq");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_sq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(aq");
+       if (n->child) {
+               flags = p->flags;
+               p->flags |= TERMP_KEEP;
+               term_word(p, n->child->string);
+               p->flags = flags;
+       }
+       return(0);

 }
 
 
 /* ARGSUSED */
 static int
 }
 
 
 /* ARGSUSED */
 static int

-termp_pf_pre(DECL_ARGS)
+termp_igndelim_pre(DECL_ARGS)

 {
 
        p->flags |= TERMP_IGNDELIM;
 {
 
        p->flags |= TERMP_IGNDELIM;


@@ -1824,7 +1786,6 @@ static void
 termp_pf_post(DECL_ARGS)
 {
 
 termp_pf_post(DECL_ARGS)
 {
 

-       p->flags &= ~TERMP_IGNDELIM;

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


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

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

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


@@ -1944,37 +1900,61 @@ termp_sp_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-termp_brq_pre(DECL_ARGS)
+termp_quote_pre(DECL_ARGS)

 {
 
 {
 

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

                return(1);
                return(1);

-       term_word(p, "\\(lC");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_brq_post(DECL_ARGS)
-{

 
 

-       if (MDOC_BODY != n->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(rC");
-}
-
-
-/* ARGSUSED */
-static int
-termp_bq_pre(DECL_ARGS)
-{
+       switch (n->tok) {
+       case (MDOC_Ao):
+               /* FALLTHROUGH */
+       case (MDOC_Aq):
+               term_word(p, "<");
+               break;
+       case (MDOC_Bro):
+               /* FALLTHROUGH */
+       case (MDOC_Brq):
+               term_word(p, "{");
+               break;
+       case (MDOC_Oo):
+               /* FALLTHROUGH */
+       case (MDOC_Op):
+               /* FALLTHROUGH */
+       case (MDOC_Bo):
+               /* FALLTHROUGH */
+       case (MDOC_Bq):
+               term_word(p, "[");
+               break;
+       case (MDOC_Do):
+               /* FALLTHROUGH */
+       case (MDOC_Dq):
+               term_word(p, "``");
+               break;
+       case (MDOC_Po):
+               /* FALLTHROUGH */
+       case (MDOC_Pq):
+               term_word(p, "(");
+               break;
+       case (MDOC__T):
+               /* FALLTHROUGH */
+       case (MDOC_Qo):
+               /* FALLTHROUGH */
+       case (MDOC_Qq):
+               term_word(p, "\"");
+               break;
+       case (MDOC_Ql):
+               /* FALLTHROUGH */
+       case (MDOC_So):
+               /* FALLTHROUGH */
+       case (MDOC_Sq):
+               term_word(p, "`");
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }

 
 

-       if (MDOC_BODY != n->type)
-               return(1);
-       term_word(p, "\\(lB");

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


@@ -1982,37 +1962,62 @@ termp_bq_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static void
 
 /* ARGSUSED */
 static void

-termp_bq_post(DECL_ARGS)
+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;
-       term_word(p, "\\(rB");
-}
-

 
 

-/* ARGSUSED */
-static int
-termp_pq_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       term_word(p, "\\&(");

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

-       return(1);
-}
-

 
 

-/* ARGSUSED */
-static void
-termp_pq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       term_word(p, ")");
+       switch (n->tok) {
+       case (MDOC_Ao):
+               /* FALLTHROUGH */
+       case (MDOC_Aq):
+               term_word(p, ">");
+               break;
+       case (MDOC_Bro):
+               /* FALLTHROUGH */
+       case (MDOC_Brq):
+               term_word(p, "}");
+               break;
+       case (MDOC_Oo):
+               /* FALLTHROUGH */
+       case (MDOC_Op):
+               /* FALLTHROUGH */
+       case (MDOC_Bo):
+               /* FALLTHROUGH */
+       case (MDOC_Bq):
+               term_word(p, "]");
+               break;
+       case (MDOC_Do):
+               /* FALLTHROUGH */
+       case (MDOC_Dq):
+               term_word(p, "''");
+               break;
+       case (MDOC_Po):
+               /* FALLTHROUGH */
+       case (MDOC_Pq):
+               term_word(p, ")");
+               break;
+       case (MDOC__T):
+               /* FALLTHROUGH */
+       case (MDOC_Qo):
+               /* FALLTHROUGH */
+       case (MDOC_Qq):
+               term_word(p, "\"");
+               break;
+       case (MDOC_Ql):
+               /* FALLTHROUGH */
+       case (MDOC_So):
+               /* FALLTHROUGH */
+       case (MDOC_Sq):
+               term_word(p, "'");
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }

 }
 
 
 }
 
 


@@ -2071,11 +2076,9 @@ termp_bf_pre(DECL_ARGS)
        else if (MDOC_BLOCK != n->type)
                return(1);
 
        else if (MDOC_BLOCK != n->type)
                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);
        else 
                term_fontpush(p, TERMFONT_NONE);
                term_fontpush(p, TERMFONT_BOLD);
        else 
                term_fontpush(p, TERMFONT_NONE);


@@ -2107,7 +2110,7 @@ termp_ap_pre(DECL_ARGS)
 {
 
        p->flags |= TERMP_NOSPACE;
 {
 
        p->flags |= TERMP_NOSPACE;

-       term_word(p, "\\(aq");
+       term_word(p, "'");

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


@@ -2130,6 +2133,9 @@ termp____post(DECL_ARGS)
 
        /* TODO: %U. */
 
 
        /* TODO: %U. */
 

+       if (NULL == n->parent || MDOC_Rs != n->parent->tok)
+               return;
+

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


@@ -2159,7 +2165,7 @@ termp_lk_pre(DECL_ARGS)
 
        nn = sv = n->child;
 
 
        nn = sv = n->child;
 

-       if (NULL == nn->next)
+       if (NULL == nn || NULL == nn->next)

                return(1);
 
        for (nn = nn->next; nn; nn = nn->next) 
                return(1);
 
        for (nn = nn->next; nn; nn = nn->next) 


@@ -2189,7 +2195,8 @@ termp_bk_pre(DECL_ARGS)
        case (MDOC_HEAD):
                return(0);
        case (MDOC_BODY):
        case (MDOC_HEAD):
                return(0);
        case (MDOC_BODY):

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

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


@@ -2209,6 +2216,39 @@ 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, m, n);
+
+       termp____post(p, pair, m, n);
+}
+
+/* ARGSUSED */
+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, m, n));
+
+       term_fontpush(p, TERMFONT_UNDER);
+       return(1);
+}
+

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