Make SYNOPSIS sections and code having .nr nS enabled

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index cdad7fb5dfcb203a1172778e892217163fc92a60..98b4fa70e8e9f636a2356f23f1f6d72357fa5ee3 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.171 2010/07/04 22:04:04 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.197 2010/12/11 14:40:51 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>


@@ -31,7 +31,6 @@
 #include "mandoc.h"
 #include "out.h"
 #include "term.h"
 #include "mandoc.h"
 #include "out.h"
 #include "term.h"

-#include "regs.h"

 #include "mdoc.h"
 #include "chars.h"
 #include "main.h"
 #include "mdoc.h"
 #include "chars.h"
 #include "main.h"


@@ -70,49 +69,40 @@ static      void      synopsis_pre(struct termp *,
 
 static void      termp____post(DECL_ARGS);
 static void      termp_an_post(DECL_ARGS);
 
 static void      termp____post(DECL_ARGS);
 static void      termp_an_post(DECL_ARGS);

-static void      termp_aq_post(DECL_ARGS);

 static void      termp_bd_post(DECL_ARGS);
 static void      termp_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_bx_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 void      termp_ss_post(DECL_ARGS);
 

+static int       termp__a_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_cd_pre(DECL_ARGS);
 static int       termp_d1_pre(DECL_ARGS);
 static int       termp_bt_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 +110,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);


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

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

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


@@ -171,7 +157,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 */


@@ -179,7 +165,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_under_pre, NULL }, /* Va */
        { termp_vt_pre, NULL }, /* Vt */
        { termp_xr_pre, NULL }, /* Xr */
        { termp_under_pre, NULL }, /* Va */
        { termp_vt_pre, NULL }, /* Vt */
        { termp_xr_pre, NULL }, /* Xr */

-       { NULL, termp____post }, /* %A */
+       { termp__a_pre, termp____post }, /* %A */

        { termp_under_pre, termp____post }, /* %B */
        { NULL, termp____post }, /* %D */
        { termp_under_pre, termp____post }, /* %I */
        { termp_under_pre, termp____post }, /* %B */
        { NULL, termp____post }, /* %D */
        { termp_under_pre, termp____post }, /* %I */


@@ -191,42 +177,42 @@ static    const struct termact termacts[MDOC_MAX] = {
        { termp_under_pre, termp____post }, /* %T */
        { NULL, termp____post }, /* %V */
        { NULL, NULL }, /* Ac */
        { termp_under_pre, termp____post }, /* %T */
        { 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 */
        { NULL, termp_bx_post }, /* Bx */
        { NULL, NULL }, /* Db */
        { NULL, NULL }, /* Dc */
        { termp_xx_pre, NULL }, /* Bsx */
        { NULL, termp_bx_post }, /* Bx */
        { 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 */
        { 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 */ /* FIXME: convert to symbol? */
-       { NULL, NULL }, /* No */
+       { termp_bold_pre, NULL }, /* Ms */
+       { 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 +222,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 +234,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 */


@@ -330,6 +316,36 @@ print_mdoc_node(DECL_ARGS)
        else if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
                chld = (*termacts[n->tok].pre)(p, &npair, m, n);
 
        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.
+        *
+        * Also let SYNPRETTY sections behave as if they were wrapped
+        * in a `Bk' block.
+        */
+
+       if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {
+               if (n->prev && n->prev->line != n->line) {
+                       p->flags &= ~TERMP_KEEP;
+                       p->flags |= TERMP_PREKEEP;
+               } else if (NULL == n->prev) {
+                       if (n->parent && n->parent->line != n->line) {
+                               p->flags &= ~TERMP_KEEP;
+                               p->flags |= TERMP_PREKEEP;
+                       }
+               }
+       }
+
+       /*
+        * Since SYNPRETTY sections aren't "turned off" with `Ek',
+        * we have to intuit whether we should disable formatting.
+        */
+
+       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);
+

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


@@ -578,33 +594,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)


@@ -1010,15 +999,22 @@ termp_nm_pre(DECL_ARGS)
        if (NULL == n->child && NULL == m->name)
                return(0);
 
        if (NULL == n->child && NULL == m->name)
                return(0);
 

-       synopsis_pre(p, n);
+       if (MDOC_HEAD == n->type)
+               synopsis_pre(p, n->parent);

 
        if (MDOC_HEAD == n->type && n->next->child) {
 
        if (MDOC_HEAD == n->type && n->next->child) {

-               p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_HANG;
-               p->rmargin = p->offset + term_len(p, 1) +
-                   (NULL == n->child ? term_strlen(p, m->name) :
-                    MDOC_TEXT == n->child->type ?
-                       term_strlen(p, n->child->string) :
-                    term_len(p, 5));
+               p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
+               p->rmargin = p->offset + term_len(p, 1);
+               if (NULL == n->child) {
+                       p->rmargin += term_strlen(p, m->name);
+               } else if (MDOC_TEXT == n->child->type) {
+                       p->rmargin += term_strlen(p, n->child->string);
+                       if (n->child->next)
+                               p->flags |= TERMP_HANG;
+               } else {
+                       p->rmargin += term_len(p, 5);
+                       p->flags |= TERMP_HANG;
+               }

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


@@ -1060,6 +1056,19 @@ termp_fl_pre(DECL_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */
+static int
+termp__a_pre(DECL_ARGS)
+{
+
+       if (n->prev && MDOC__A == n->prev->tok)
+               if (NULL == n->next || MDOC__A != n->next->tok)
+                       term_word(p, "and");
+
+       return(1);
+}
+
+

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


@@ -1251,18 +1260,6 @@ termp_bl_post(DECL_ARGS)
 }
 
 
 }
 
 

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


@@ -1280,9 +1277,7 @@ termp_xr_pre(DECL_ARGS)
                return(0);
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
                return(0);
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");

-       p->flags |= TERMP_NOSPACE;

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

-       p->flags |= TERMP_NOSPACE;

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


@@ -1430,23 +1425,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)


@@ -1503,31 +1481,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)


@@ -1604,8 +1557,7 @@ termp_fa_pre(DECL_ARGS)
 static int
 termp_bd_pre(DECL_ARGS)
 {
 static int
 termp_bd_pre(DECL_ARGS)
 {

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

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


@@ -1637,12 +1589,37 @@ termp_bd_pre(DECL_ARGS)
        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        for (nn = n->child; nn; nn = nn->next) {
        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        for (nn = n->child; nn; nn = nn->next) {

-               p->flags |= TERMP_NOSPACE;

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

-               if (NULL == nn->prev ||
-                   nn->prev->line < nn->line ||
-                   NULL == nn->next)
-                       term_flushln(p);
+               /*
+                * If 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);
+               p->flags |= TERMP_NOSPACE;

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


@@ -1677,31 +1654,6 @@ termp_bd_post(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-termp_qq_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)
 /* ARGSUSED */
 static void
 termp_bx_post(DECL_ARGS)


@@ -1722,7 +1674,7 @@ termp_xx_pre(DECL_ARGS)
        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";


@@ -1751,32 +1703,7 @@ termp_xx_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* 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");
-}
-
-
-/* ARGSUSED */
-static int
-termp_pf_pre(DECL_ARGS)
+termp_igndelim_pre(DECL_ARGS)

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


@@ -1789,7 +1716,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;
 }
 


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

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

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


@@ -1904,37 +1835,59 @@ 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)
                return(1);
 {
 
        if (MDOC_BODY != n->type)
                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_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);
 }


@@ -1942,37 +1895,60 @@ 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)
                return;
 {
 
        if (MDOC_BODY != n->type)
                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_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 */
+       }

 }
 
 
 }
 
 


@@ -1987,7 +1963,6 @@ termp_fo_pre(DECL_ARGS)
        } else if (MDOC_BODY == n->type) {
                p->flags |= TERMP_NOSPACE;
                term_word(p, "(");
        } else if (MDOC_BODY == n->type) {
                p->flags |= TERMP_NOSPACE;
                term_word(p, "(");

-               p->flags |= TERMP_NOSPACE;

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


@@ -2011,13 +1986,10 @@ termp_fo_post(DECL_ARGS)
        if (MDOC_BODY != n->type) 
                return;
 
        if (MDOC_BODY != n->type) 
                return;
 

-       p->flags |= TERMP_NOSPACE;

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

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

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

-       }

 }
 
 
 }
 
 


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

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

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

-       else
+       } else

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


@@ -2065,7 +2039,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);
 }


@@ -2076,10 +2050,26 @@ static void
 termp____post(DECL_ARGS)
 {
 
 termp____post(DECL_ARGS)
 {
 

+       /*
+        * Handle lists of authors.  In general, print each followed by
+        * a comma.  Don't print the comma if there are only two
+        * authors.
+        */
+       if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok)
+               if (NULL == n->next->next || MDOC__A != n->next->next->tok)
+                       if (NULL == n->prev || MDOC__A != n->prev->tok)
+                               return;
+

        /* TODO: %U. */
 
        /* TODO: %U. */
 

-       p->flags |= TERMP_NOSPACE;
-       term_word(p, n->next ? "," : ".");
+       if (NULL == n->parent || MDOC_Rs != n->parent->tok)
+               return;
+
+       if (NULL == n->next) {
+               term_word(p, ".");
+               p->flags |= TERMP_SENTENCE;
+       } else
+               term_word(p, ",");

 }
 
 
 }
 
 


@@ -2097,23 +2087,24 @@ termp_li_pre(DECL_ARGS)
 static int
 termp_lk_pre(DECL_ARGS)
 {
 static int
 termp_lk_pre(DECL_ARGS)
 {

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

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

-       nn = n->child;

 
 

-       if (NULL == nn->next)
+       nn = sv = n->child;
+
+       if (NULL == nn || NULL == nn->next)

                return(1);
 
                return(1);
 

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

        term_fontpop(p);
 
        term_fontpop(p);
 

-       p->flags |= TERMP_NOSPACE;

        term_word(p, ":");
 
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, ":");
 
        term_fontpush(p, TERMFONT_BOLD);

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

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