Removed TODO that was fixed by parsing escapes in offset strings.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 0e0d1f3910a0a3fa133f6dfbb0c1b756db292ab7..c2ba9eaf758573ef3bb32ec8d04b5773b8ca5fc8 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.91 2009/10/18 13:34:17 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.185 2010/09/23 20:40:00 schwarze Exp $ */

 /*
 /*

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

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,15 +15,21 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <err.h>
+#include <stdint.h>

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

+#include "mandoc.h"
+#include "out.h"

 #include "term.h"
 #include "mdoc.h"
 #include "chars.h"
 #include "term.h"
 #include "mdoc.h"
 #include "chars.h"


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

-       int               flag; 

        int               count;
 };
 
        int               count;
 };
 


@@ -47,23 +53,37 @@ struct      termact {
        void    (*post)(DECL_ARGS);
 };
 
        void    (*post)(DECL_ARGS);
 };
 

+static size_t    a2width(const struct termp *, const char *);
+static size_t    a2height(const struct termp *, const char *);
+static size_t    a2offs(const struct termp *, const char *);
+
+static void      print_bvspace(struct termp *,
+                       const struct mdoc_node *,
+                       const struct mdoc_node *);
+static void      print_mdoc_node(DECL_ARGS);
+static void      print_mdoc_nodelist(DECL_ARGS);
+static void      print_mdoc_head(struct termp *, const void *);
+static void      print_mdoc_foot(struct termp *, const void *);
+static void      synopsis_pre(struct termp *, 
+                       const struct mdoc_node *);
+

 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____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_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_dq_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_dq_post(DECL_ARGS);

-static void      termp_fd_post(DECL_ARGS);
-static void      termp_fn_post(DECL_ARGS);
+static int       termp_fd_pre(DECL_ARGS);

 static void      termp_fo_post(DECL_ARGS);
 static void      termp_fo_post(DECL_ARGS);

-static void      termp_ft_post(DECL_ARGS);

 static void      termp_in_post(DECL_ARGS);
 static void      termp_it_post(DECL_ARGS);
 static void      termp_lb_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);
 static void      termp_it_post(DECL_ARGS);
 static void      termp_lb_post(DECL_ARGS);

+static void      termp_nm_post(DECL_ARGS);

 static void      termp_op_post(DECL_ARGS);
 static void      termp_pf_post(DECL_ARGS);
 static void      termp_pq_post(DECL_ARGS);
 static void      termp_op_post(DECL_ARGS);
 static void      termp_pf_post(DECL_ARGS);
 static void      termp_pq_post(DECL_ARGS);


@@ -71,14 +91,15 @@ static      void      termp_qq_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_sh_post(DECL_ARGS);
 static void      termp_sq_post(DECL_ARGS);
 static void      termp_ss_post(DECL_ARGS);

-static void      termp_vt_post(DECL_ARGS);

 
 

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

 static int       termp_an_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);
 static int       termp_aq_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_bf_pre(DECL_ARGS);
 static int       termp_an_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);
 static int       termp_aq_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_bf_pre(DECL_ARGS);

+static int       termp_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_bold_pre(DECL_ARGS);
 static int       termp_bq_pre(DECL_ARGS);
 static int       termp_brq_pre(DECL_ARGS);


@@ -94,6 +115,7 @@ static       int       termp_fo_pre(DECL_ARGS);
 static int       termp_ft_pre(DECL_ARGS);
 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
 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_lk_pre(DECL_ARGS);
 static int       termp_nd_pre(DECL_ARGS);
 static int       termp_nm_pre(DECL_ARGS);
 static int       termp_lk_pre(DECL_ARGS);
 static int       termp_nd_pre(DECL_ARGS);
 static int       termp_nm_pre(DECL_ARGS);


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

+static int       termp_vt_pre(DECL_ARGS);

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


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

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

        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { NULL, NULL }, /* 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 */


@@ -139,24 +162,24 @@ static    const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ev */ 
        { termp_ex_pre, NULL }, /* Ex */
        { termp_fa_pre, NULL }, /* Fa */ 
        { NULL, NULL }, /* Ev */ 
        { termp_ex_pre, NULL }, /* Ex */
        { termp_fa_pre, NULL }, /* Fa */ 

-       { termp_bold_pre, termp_fd_post }, /* Fd */ 
+       { termp_fd_pre, NULL }, /* Fd */ 

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

-       { termp_fn_pre, termp_fn_post }, /* Fn */ 
-       { termp_ft_pre, termp_ft_post }, /* Ft */ 
+       { termp_fn_pre, NULL }, /* Fn */ 
+       { termp_ft_pre, NULL }, /* Ft */ 

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

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

        { termp_nd_pre, NULL }, /* Nd */ 
        { termp_nd_pre, NULL }, /* Nd */ 

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

        { termp_op_pre, termp_op_post }, /* Op */
        { NULL, NULL }, /* Ot */
        { termp_under_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */ 
        { termp_under_pre, NULL }, /* Va */
        { termp_op_pre, termp_op_post }, /* Op */
        { NULL, NULL }, /* Ot */
        { termp_under_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */ 
        { termp_under_pre, NULL }, /* Va */

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

        { termp_xr_pre, NULL }, /* Xr */
        { 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 */


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

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

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


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

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

        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */
        { termp_xx_pre, NULL }, /* Fx */
        { 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? */
+       { termp_bold_pre, NULL }, /* Ms */

        { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */
        { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */


@@ -215,7 +238,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Fc */ 
        { termp_op_pre, termp_op_post }, /* Oo */
        { NULL, NULL }, /* Oc */
        { NULL, NULL }, /* Fc */ 
        { termp_op_pre, termp_op_post }, /* Oo */
        { NULL, NULL }, /* Oc */

-       { NULL, NULL }, /* Bk */
+       { termp_bk_pre, termp_bk_post }, /* Bk */

        { NULL, NULL }, /* Ek */
        { termp_bt_pre, NULL }, /* Bt */
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Ek */
        { termp_bt_pre, NULL }, /* Bt */
        { NULL, NULL }, /* Hf */


@@ -235,30 +258,10 @@ static    const struct termact termacts[MDOC_MAX] = {
        { NULL, termp____post }, /* %Q */ 
        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* sp */ 
        { NULL, termp____post }, /* %Q */ 
        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* sp */ 

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

 };
 
 };
 

-#ifdef __linux__
-extern size_t    strlcpy(char *, const char *, size_t);
-extern size_t    strlcat(char *, const char *, size_t);
-#endif
-
-static size_t    arg2width(const struct mdoc_argv *, int);
-static size_t    arg2height(const struct mdoc_node *);
-static size_t    arg2offs(const struct mdoc_argv *);
-
-static int       arg_hasattr(int, const struct mdoc_node *);
-static int       arg_getattrs(const int *, int *, size_t,
-                       const struct mdoc_node *);
-static int       arg_getattr(int, const struct mdoc_node *);
-static int       arg_listtype(const struct mdoc_node *);
-static void      print_bvspace(struct termp *,
-                       const struct mdoc_node *,
-                       const struct mdoc_node *);
-static void      print_node(DECL_ARGS);
-static void      print_head(DECL_ARGS);
-static void      print_body(DECL_ARGS);
-static void      print_foot(DECL_ARGS);
-

 
 void
 terminal_mdoc(void *arg, const struct mdoc *mdoc)
 
 void
 terminal_mdoc(void *arg, const struct mdoc *mdoc)


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

+       p->overstep = 0;
+       p->maxrmargin = p->defrmargin;
+       p->tabwidth = term_len(p, 5);
+

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


@@ -282,72 +289,107 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
        n = mdoc_node(mdoc);
        m = mdoc_meta(mdoc);
 
        n = mdoc_node(mdoc);
        m = mdoc_meta(mdoc);
 

-       print_head(p, NULL, m, n);
+       term_begin(p, print_mdoc_head, print_mdoc_foot, m);
+

        if (n->child)
        if (n->child)

-               print_body(p, NULL, m, n->child);
-       print_foot(p, NULL, m, n);
+               print_mdoc_nodelist(p, NULL, m, n->child);
+
+       term_end(p);

 }
 
 
 static void
 }
 
 
 static void

-print_body(DECL_ARGS)
+print_mdoc_nodelist(DECL_ARGS)

 {
 
 {
 

-       print_node(p, pair, m, n);
+       print_mdoc_node(p, pair, m, n);

        if (n->next)
        if (n->next)

-               print_body(p, pair, m, n->next);
+               print_mdoc_nodelist(p, pair, m, n->next);

 }
 
 
 /* ARGSUSED */
 static void
 }
 
 
 /* ARGSUSED */
 static void

-print_node(DECL_ARGS)
+print_mdoc_node(DECL_ARGS)

 {
 {

-       int              chld, bold, under;
+       int              chld;
+       const void      *font;

        struct termpair  npair;
        size_t           offset, rmargin;
 
        chld = 1;
        offset = p->offset;
        rmargin = p->rmargin;
        struct termpair  npair;
        size_t           offset, rmargin;
 
        chld = 1;
        offset = p->offset;
        rmargin = p->rmargin;

-       bold = p->bold;
-       under = p->under;
+       font = term_fontq(p);

 
 

-       bzero(&npair, sizeof(struct termpair));
+       memset(&npair, 0, sizeof(struct termpair));

        npair.ppair = pair;
 
        npair.ppair = pair;
 

-       if (MDOC_TEXT != n->type) {
-               if (termacts[n->tok].pre)
-                       chld = (*termacts[n->tok].pre)(p, &npair, m, n);
-       } else 
+       if (MDOC_TEXT == n->type)

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

-       if (chld && n->child)
-               print_body(p, &npair, m, n->child);
+       else if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
+               chld = (*termacts[n->tok].pre)(p, &npair, m, n);

 
        /*
 
        /*

-        * XXX - if bold/under were to span scopes, this wouldn't be
-        * possible, but because decoration is always in-scope, we can
-        * get away with this.
+        * Keeps only work until the end of a line.  If a keep was
+        * invoked in a prior line, revert it to PREKEEP.

         */
 
         */
 

-       p->bold = bold;
-       p->under = under;
+       if (TERMP_KEEP & p->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;
+                       }
+               }
+       }

 
 

-       if (MDOC_TEXT != n->type)
-               if (termacts[n->tok].post)
-                       (*termacts[n->tok].post)(p, &npair, m, n);
+       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)) {
+               (void)(*termacts[n->tok].post)(p, &npair, m, n);
+
+               /*
+                * Explicit end tokens not only call the post
+                * handler, but also tell the respective block
+                * that it must not call the post handler again.
+                */
+               if (ENDBODY_NOT != n->end)
+                       n->pending->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;
+       }
+
+       if (MDOC_EOS & n->flags)
+               p->flags |= TERMP_SENTENCE;

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

-/* ARGSUSED */

 static void
 static void

-print_foot(DECL_ARGS)
+print_mdoc_foot(struct termp *p, const void *arg)

 {
 {

-       struct tm       *tm;
-       char            *buf, *os;
+       char            buf[DATESIZ], os[BUFSIZ];
+       const struct mdoc_meta *m;
+
+       m = (const struct mdoc_meta *)arg;
+
+       term_fontrepl(p, TERMFONT_NONE);

 
        /* 
         * Output the footer in new-groff style, that is, three columns
 
        /* 
         * Output the footer in new-groff style, that is, three columns


@@ -357,29 +399,21 @@ print_foot(DECL_ARGS)
         * SYSTEM                  DATE                    SYSTEM
         */
 
         * SYSTEM                  DATE                    SYSTEM
         */
 

-       if (NULL == (buf = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-       if (NULL == (os = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-
-       tm = localtime(&m->date);
-
-       if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm))
-               err(EXIT_FAILURE, "strftime");
-
-       (void)strlcpy(os, m->os, p->rmargin);
+       time2a(m->date, buf, DATESIZ);
+       strlcpy(os, m->os, BUFSIZ);

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

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

        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
 
        term_word(p, os);
        term_flushln(p);
 
        p->offset = p->rmargin;
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
 
        term_word(p, os);
        term_flushln(p);
 
        p->offset = p->rmargin;

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

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


@@ -396,27 +430,20 @@ print_foot(DECL_ARGS)
        p->offset = 0;
        p->rmargin = p->maxrmargin;
        p->flags = 0;
        p->offset = 0;
        p->rmargin = p->maxrmargin;
        p->flags = 0;

-
-       free(buf);
-       free(os);

 }
 
 
 }
 
 

-/* FIXME: put in utility library. */
-/* ARGSUSED */

 static void
 static void

-print_head(DECL_ARGS)
+print_mdoc_head(struct termp *p, const void *arg)

 {
 {

-       char            *buf, *title;
+       char            buf[BUFSIZ], title[BUFSIZ];
+       const struct mdoc_meta *m;
+
+       m = (const struct mdoc_meta *)arg;

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

-       if (NULL == (buf = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-       if (NULL == (title = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-

        /*
         * The header is strange.  It has three components, which are
         * really two with the first duplicated.  It goes like this:
        /*
         * The header is strange.  It has three components, which are
         * really two with the first duplicated.  It goes like this:


@@ -431,25 +458,26 @@ print_head(DECL_ARGS)
         */
 
        assert(m->vol);
         */
 
        assert(m->vol);

-       (void)strlcpy(buf, m->vol, p->rmargin);
+       strlcpy(buf, m->vol, BUFSIZ);

 
        if (m->arch) {
 
        if (m->arch) {

-               (void)strlcat(buf, " (", p->rmargin);
-               (void)strlcat(buf, m->arch, p->rmargin);
-               (void)strlcat(buf, ")", p->rmargin);
+               strlcat(buf, " (", BUFSIZ);
+               strlcat(buf, m->arch, BUFSIZ);
+               strlcat(buf, ")", BUFSIZ);

        }
 
        }
 

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

 
        p->offset = 0;
 
        p->offset = 0;

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

        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
 
        term_word(p, title);
        term_flushln(p);
 
        p->offset = p->rmargin;
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
 
        term_word(p, title);
        term_flushln(p);
 
        p->offset = p->rmargin;

-       p->rmargin = p->maxrmargin - strlen(title);
+       p->rmargin = p->maxrmargin - term_strlen(p, title);

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


@@ -466,141 +494,60 @@ print_head(DECL_ARGS)
        p->offset = 0;
        p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOSPACE;
        p->offset = 0;
        p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOSPACE;

-
-       free(title);
-       free(buf);

 }
 
 
 static size_t
 }
 
 
 static size_t

-arg2height(const struct mdoc_node *n)
+a2height(const struct termp *p, const char *v)

 {
 {

-       int              r;
+       struct roffsu    su;

 
 

-       assert(MDOC_TEXT == n->type);
-       assert(n->string);
-
-       if ((r = a2height(n->string)) < 0)
-               return(1);
+       assert(v);
+       if ( ! a2roffsu(v, &su, SCALE_VS))
+               SCALE_VS_INIT(&su, term_len(p, 1));

 
 

-       return((size_t)r);
+       return(term_vspan(p, &su));

 }
 
 
 static size_t
 }
 
 
 static size_t

-arg2width(const struct mdoc_argv *arg, int pos)
+a2width(const struct termp *p, const char *v)

 {
 {

-       int              r;
+       struct roffsu    su;

 
 

-       assert(arg->value[pos]);
-       if ('\0' == arg->value[pos][0])
-               return(2);
+       assert(v);
+       if ( ! a2roffsu(v, &su, SCALE_MAX))
+               SCALE_HS_INIT(&su, term_strlen(p, v));

 
 

-       if ((r = a2width(arg->value[pos])) >= 0)
-               return((size_t)r);
-
-       return(strlen(arg->value[pos]) + 2);
-}
-
-
-/* FIXME: put in utility file for front-ends. */
-static int
-arg_listtype(const struct mdoc_node *n)
-{
-       int              i, len;
-
-       assert(MDOC_BLOCK == n->type);
-
-       len = (int)(n->args ? n->args->argc : 0);
-
-       for (i = 0; i < len; i++) 
-               switch (n->args->argv[i].arg) {
-               case (MDOC_Bullet):
-                       /* FALLTHROUGH */
-               case (MDOC_Dash):
-                       /* FALLTHROUGH */
-               case (MDOC_Enum):
-                       /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       /* FALLTHROUGH */
-               case (MDOC_Tag):
-                       /* FALLTHROUGH */
-               case (MDOC_Inset):
-                       /* FALLTHROUGH */
-               case (MDOC_Diag):
-                       /* FALLTHROUGH */
-               case (MDOC_Item):
-                       /* FALLTHROUGH */
-               case (MDOC_Column):
-                       /* FALLTHROUGH */
-               case (MDOC_Hang):
-                       /* FALLTHROUGH */
-               case (MDOC_Ohang):
-                       return(n->args->argv[i].arg);
-               default:
-                       break;
-               }
-
-       return(-1);
+       return(term_hspan(p, &su));

 }
 
 
 static size_t
 }
 
 
 static size_t

-arg2offs(const struct mdoc_argv *arg)
+a2offs(const struct termp *p, const char *v)

 {
 {

-       int              r;
+       struct roffsu    su;

 
 

-       if ('\0' == arg->value[0][0])
+       if ('\0' == *v)

                return(0);
                return(0);

-       else if (0 == strcmp(arg->value[0], "left"))
+       else if (0 == strcmp(v, "left"))

                return(0);
                return(0);

-       else if (0 == strcmp(arg->value[0], "indent"))
-               return(INDENT + 1);
-       else if (0 == strcmp(arg->value[0], "indent-two"))
-               return((INDENT + 1) * 2);
-       else if ((r = a2width(arg->value[0])) >= 0)
-               return((size_t)r);
+       else if (0 == strcmp(v, "indent"))
+               return(term_len(p, INDENT + 1));
+       else if (0 == strcmp(v, "indent-two"))
+               return(term_len(p, (INDENT + 1) * 2));
+       else if ( ! a2roffsu(v, &su, SCALE_MAX))
+               SCALE_HS_INIT(&su, term_strlen(p, v));

 
 

-       return(strlen(arg->value[0]));
-}
-
-
-static int
-arg_hasattr(int arg, const struct mdoc_node *n)
-{
-
-       return(-1 != arg_getattr(arg, n));
-}
-
-
-static int
-arg_getattr(int v, const struct mdoc_node *n)
-{
-       int              val;
-
-       return(arg_getattrs(&v, &val, 1, n) ? val : -1);
-}
-
-
-static int
-arg_getattrs(const int *keys, int *vals, 
-               size_t sz, const struct mdoc_node *n)
-{
-       int              i, j, k;
-
-       if (NULL == n->args)
-               return(0);
-
-       for (k = i = 0; i < (int)n->args->argc; i++) 
-               for (j = 0; j < (int)sz; j++)
-                       if (n->args->argv[i].arg == keys[j]) {
-                               vals[j] = i;
-                               k++;
-                       }
-       return(k);
+       return(term_hspan(p, &su));

 }
 
 
 }
 
 

+/*
+ * Determine how much space to print out before block elements of `It'
+ * (and thus `Bl') and `Bd'.  And then go ahead and print that space,
+ * too.
+ */

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


@@ -609,7 +556,10 @@ print_bvspace(struct termp *p,
        const struct mdoc_node  *nn;
 
        term_newln(p);
        const struct mdoc_node  *nn;
 
        term_newln(p);

-       if (arg_hasattr(MDOC_Compact, bl))
+
+       if (MDOC_Bd == bl->tok && bl->data.Bd->comp)
+               return;
+       if (MDOC_Bl == bl->tok && bl->data.Bl->comp)

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


@@ -628,13 +578,13 @@ print_bvspace(struct termp *p,
 
        /* A `-column' does not assert vspace within the list. */
 
 
        /* A `-column' does not assert vspace within the list. */
 

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


@@ -678,8 +628,9 @@ termp_it_pre(DECL_ARGS)
 {
        const struct mdoc_node *bl, *nn;
        char                    buf[7];
 {
        const struct mdoc_node *bl, *nn;
        char                    buf[7];

-       int                     i, type, keys[3], vals[3];
-       size_t                  width, offset;
+       int                     i;
+       size_t                  width, offset, ncols, dcol;
+       enum mdoc_list          type;

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


@@ -687,61 +638,77 @@ termp_it_pre(DECL_ARGS)
        }
 
        bl = n->parent->parent->parent;
        }
 
        bl = n->parent->parent->parent;

+       assert(bl->data.Bl);
+       type = bl->data.Bl->type;

 
 

-       /* Save parent attributes. */
-
-       pair->flag = p->flags;
-
-       /* Get list width and offset. */
-
-       keys[0] = MDOC_Width;
-       keys[1] = MDOC_Offset;
-       keys[2] = MDOC_Column;
-
-       vals[0] = vals[1] = vals[2] = -1;
+       /* 
+        * First calculate width and offset.  This is pretty easy unless
+        * we're a -column list, in which case all prior columns must
+        * be accounted for.
+        */

 
        width = offset = 0;
 
 
        width = offset = 0;
 

-       (void)arg_getattrs(keys, vals, 3, bl);
-
-       type = arg_listtype(bl);
-       assert(-1 != type);
-
-       /* Calculate real width and offset. */
+       if (bl->data.Bl->offs)
+               offset = a2offs(p, bl->data.Bl->offs);

 
        switch (type) {
 
        switch (type) {

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

                        break;
                        break;

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

                 */
                 */

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

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

-                       offset += arg2width 
-                               (&bl->args->argv[vals[2]], i);
+                       offset += dcol + a2width
+                               (p, bl->data.Bl->cols[i]);

 
 

-               /* Whether exceeds maximum column. */
-               if (i < (int)bl->args->argv[vals[2]].sz)
-                       width = arg2width(&bl->args->argv[vals[2]], i);
-               else
-                       width = 0;
+               /*
+                * When exceeding the declared number of columns, leave
+                * the remaining widths at 0.  This will later be
+                * adjusted to the default width of 10, or, for the last
+                * column, stretched to the right margin.
+                */
+               if (i >= (int)ncols)
+                       break;

 
 

-               if (vals[1] >= 0) 
-                       offset += arg2offs(&bl->args->argv[vals[1]]);
+               /*
+                * Use the declared column widths, extended as explained
+                * in the preceding paragraph.
+                */
+               width = a2width(p, bl->data.Bl->cols[i]) + dcol;

                break;
        default:
                break;
        default:

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

                break;
        }
 
                break;
        }
 


@@ -752,27 +719,27 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
         */
 
        switch (type) {

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
-               if (width < 4)
-                       width = 4;
+       case (LIST_hyphen):
+               if (width < term_len(p, 4))
+                       width = term_len(p, 4);

                break;
                break;

-       case (MDOC_Enum):
-               if (width < 5)
-                       width = 5;
+       case (LIST_enum):
+               if (width < term_len(p, 5))
+                       width = term_len(p, 5);

                break;
                break;

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

                if (0 == width)
                if (0 == width)

-                       width = 8;
+                       width = term_len(p, 8);

                break;
                break;

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                if (0 == width)
                if (0 == width)

-                       width = 10;
+                       width = term_len(p, 10);

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


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

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

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

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

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


@@ -801,36 +768,35 @@ termp_it_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {
        p->flags |= TERMP_NOSPACE;
 
        switch (type) {

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

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

-                       p->bold++;
+                       term_fontpush(p, TERMFONT_BOLD);

                break;
        default:
                break;
        }
 
        /*
                break;
        default:
                break;
        }
 
        /*

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

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

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

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

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

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


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

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

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


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

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

                break;
                break;

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

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


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

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

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


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

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

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

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

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

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

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


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

-               case (MDOC_Bullet):
-                       p->bold++;
+               case (LIST_bullet):
+                       term_fontpush(p, TERMFONT_BOLD);

                        term_word(p, "\\[bu]");
                        term_word(p, "\\[bu]");

-                       p->bold--;
+                       term_fontpop(p);

                        break;
                        break;

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

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MDOC_Hyphen):
-                       p->bold++;
+               case (LIST_hyphen):
+                       term_fontpush(p, TERMFONT_BOLD);

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

-                       p->bold--;
+                       term_fontpop(p);

                        break;
                        break;

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

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

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

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


@@ -967,20 +937,20 @@ termp_it_pre(DECL_ARGS)
         */
 
        switch (type) {
         */
 
        switch (type) {

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

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

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

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


@@ -995,33 +965,42 @@ termp_it_pre(DECL_ARGS)
 static void
 termp_it_post(DECL_ARGS)
 {
 static void
 termp_it_post(DECL_ARGS)
 {

-       int                type;
+       enum mdoc_list     type;

 
 

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

                return;
 
                return;
 

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

 
        switch (type) {
 
        switch (type) {

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

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

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

                break;
                break;

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

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

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

                break;
        }
 
                break;
        }
 

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

 }
 
 
 }
 
 


@@ -1030,23 +1009,90 @@ static int
 termp_nm_pre(DECL_ARGS)
 {
 
 termp_nm_pre(DECL_ARGS)
 {
 

-       if (SEC_SYNOPSIS == n->sec)
-               term_newln(p);
-       p->bold++;
+       if (MDOC_BLOCK == n->type)
+               return(1);
+
+       if (MDOC_BODY == n->type) {
+               if (NULL == n->child)
+                       return(0);
+               p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+               p->offset += term_len(p, 1) +
+                   (NULL == n->prev->child ? term_strlen(p, m->name) :
+                    MDOC_TEXT == n->prev->child->type ?
+                       term_strlen(p, n->prev->child->string) :
+                    term_len(p, 5));
+               return(1);
+       }
+
+       if (NULL == n->child && NULL == m->name)
+               return(0);
+
+       if (MDOC_HEAD == n->type)
+               synopsis_pre(p, n->parent);
+
+       if (MDOC_HEAD == n->type && n->next->child) {
+               p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
+               p->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);

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

+/* ARGSUSED */
+static void
+termp_nm_post(DECL_ARGS)
+{
+
+       if (MDOC_HEAD == n->type && n->next->child) {
+               term_flushln(p);
+               p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
+       } else if (MDOC_BODY == n->type && n->child) {
+               term_flushln(p);
+               p->flags &= ~TERMP_NOLPAD;
+       }
+}
+
+               

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

-       p->bold++;
+       term_fontpush(p, TERMFONT_BOLD);

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

-       p->flags |= TERMP_NOSPACE;
+
+       if (n->child)
+               p->flags |= TERMP_NOSPACE;
+       else if (n->next && n->next->line == n->line)
+               p->flags |= TERMP_NOSPACE;
+
+       return(1);
+}
+
+
+/* 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);
 }
 
        return(1);
 }
 


@@ -1098,10 +1144,10 @@ termp_an_post(DECL_ARGS)
                return;
        }
 
                return;
        }
 

-       if (arg_getattr(MDOC_Split, n) > -1) {
+       if (AUTH_split == n->data.An.auth) {

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

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

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


@@ -1142,9 +1188,9 @@ termp_rv_pre(DECL_ARGS)
        term_word(p, "The");
 
        for (nn = n->child; nn; nn = nn->next) {
        term_word(p, "The");
 
        for (nn = n->child; nn; nn = nn->next) {

-               p->bold++;
+               term_fontpush(p, TERMFONT_BOLD);

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

-               p->bold--;
+               term_fontpop(p);

                p->flags |= TERMP_NOSPACE;
                if (nn->next && NULL == nn->next->next)
                        term_word(p, "(), and");
                p->flags |= TERMP_NOSPACE;
                if (nn->next && NULL == nn->next->next)
                        term_word(p, "(), and");


@@ -1154,7 +1200,7 @@ termp_rv_pre(DECL_ARGS)
                        term_word(p, "()");
        }
 
                        term_word(p, "()");
        }
 

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

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


@@ -1162,11 +1208,12 @@ termp_rv_pre(DECL_ARGS)
                term_word(p, "the value 0 if successful; otherwise the value "
                        "-1 is returned and the global variable");
 
                term_word(p, "the value 0 if successful; otherwise the value "
                        "-1 is returned and the global variable");
 

-       p->under++;
+       term_fontpush(p, TERMFONT_UNDER);

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

-       p->under--;
+       term_fontpop(p);

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

+       p->flags |= TERMP_SENTENCE;

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


@@ -1181,9 +1228,9 @@ termp_ex_pre(DECL_ARGS)
        term_word(p, "The");
 
        for (nn = n->child; nn; nn = nn->next) {
        term_word(p, "The");
 
        for (nn = n->child; nn; nn = nn->next) {

-               p->bold++;
+               term_fontpush(p, TERMFONT_BOLD);

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

-               p->bold--;
+               term_fontpop(p);

                p->flags |= TERMP_NOSPACE;
                if (nn->next && NULL == nn->next->next)
                        term_word(p, ", and");
                p->flags |= TERMP_NOSPACE;
                if (nn->next && NULL == nn->next->next)
                        term_word(p, ", and");


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

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

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

+       p->flags |= TERMP_SENTENCE;

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


@@ -1221,6 +1269,15 @@ termp_nd_pre(DECL_ARGS)
 }
 
 
 }
 
 

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

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


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

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

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


@@ -1266,17 +1326,78 @@ termp_xr_pre(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
+/*
+ * 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
+ * macro combos).
+ */

 static void
 static void

-termp_vt_post(DECL_ARGS)
+synopsis_pre(struct termp *p, const struct mdoc_node *n)

 {
 {

-
-       if (n->sec != SEC_SYNOPSIS)
+       /* 
+        * Obviously, if we're not in a SYNOPSIS or no prior macros
+        * exist, do nothing.
+        */
+       if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))

                return;
                return;

-       if (n->next && MDOC_Vt == n->next->tok)
+
+       /*
+        * If we're the second in a pair of like elements, emit our
+        * newline and return.  UNLESS we're `Fo', `Fn', `Fn', in which
+        * case we soldier on.
+        */
+       if (n->prev->tok == n->tok && 
+                       MDOC_Ft != n->tok && 
+                       MDOC_Fo != n->tok && 
+                       MDOC_Fn != n->tok) {

                term_newln(p);
                term_newln(p);

-       else if (n->next)
+               return;
+       }
+
+       /*
+        * If we're one of the SYNOPSIS set and non-like pair-wise after
+        * another (or Fn/Fo, which we've let slip through) then assert
+        * vertical space, else only newline and move on.
+        */
+       switch (n->prev->tok) {
+       case (MDOC_Fd):
+               /* FALLTHROUGH */
+       case (MDOC_Fn):
+               /* FALLTHROUGH */
+       case (MDOC_Fo):
+               /* FALLTHROUGH */
+       case (MDOC_In):
+               /* FALLTHROUGH */
+       case (MDOC_Vt):

                term_vspace(p);
                term_vspace(p);

+               break;
+       case (MDOC_Ft):
+               if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
+                       term_vspace(p);
+                       break;
+               }
+               /* FALLTHROUGH */
+       default:
+               term_newln(p);
+               break;
+       }
+}
+
+
+static int
+termp_vt_pre(DECL_ARGS)
+{
+
+       if (MDOC_ELEM == n->type) {
+               synopsis_pre(p, n);
+               return(termp_under_pre(p, pair, m, n));
+       } else if (MDOC_BLOCK == n->type) {
+               synopsis_pre(p, n);
+               return(1);
+       } else if (MDOC_HEAD == n->type)
+               return(0);
+
+       return(termp_under_pre(p, pair, m, n));

 }
 
 
 }
 
 


@@ -1285,22 +1406,18 @@ static int
 termp_bold_pre(DECL_ARGS)
 {
 
 termp_bold_pre(DECL_ARGS)
 {
 

-       p->bold++;
+       term_fontpush(p, TERMFONT_BOLD);

        return(1);
 }
 
 
 /* ARGSUSED */
        return(1);
 }
 
 
 /* ARGSUSED */

-static void
-termp_fd_post(DECL_ARGS)
+static int
+termp_fd_pre(DECL_ARGS)

 {
 
 {
 

-       if (n->sec != SEC_SYNOPSIS)
-               return;
-
-       term_newln(p);
-       if (n->next && MDOC_Fd != n->next->tok)
-               term_vspace(p);
+       synopsis_pre(p, n);
+       return(termp_bold_pre(p, pair, m, n));

 }
 
 
 }
 
 


@@ -1319,10 +1436,10 @@ termp_sh_pre(DECL_ARGS)
                term_vspace(p);
                break;
        case (MDOC_HEAD):
                term_vspace(p);
                break;
        case (MDOC_HEAD):

-               p->bold++;
+               term_fontpush(p, TERMFONT_BOLD);

                break;
        case (MDOC_BODY):
                break;
        case (MDOC_BODY):

-               p->offset = INDENT;
+               p->offset = term_len(p, INDENT);

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


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

+       p->flags |= TERMP_SENTENCE;

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


@@ -1382,7 +1500,7 @@ static void
 termp_lb_post(DECL_ARGS)
 {
 
 termp_lb_post(DECL_ARGS)
 {
 

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

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


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

+       p->flags |= TERMP_SENTENCE;

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


@@ -1405,7 +1524,7 @@ termp_d1_pre(DECL_ARGS)
        if (MDOC_BLOCK != n->type)
                return(1);
        term_newln(p);
        if (MDOC_BLOCK != n->type)
                return(1);
        term_newln(p);

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

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


@@ -1451,64 +1570,46 @@ static int
 termp_ft_pre(DECL_ARGS)
 {
 
 termp_ft_pre(DECL_ARGS)
 {
 

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

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

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

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

-       p->bold++;
+       synopsis_pre(p, n);
+
+       term_fontpush(p, TERMFONT_BOLD);

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

-       p->bold--;
+       term_fontpop(p);

 
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
 
        for (nn = n->child->next; nn; nn = nn->next) {
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
 
        for (nn = n->child->next; nn; nn = nn->next) {

-               p->under++;
+               term_fontpush(p, TERMFONT_UNDER);

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

-               p->under--;
+               term_fontpop(p);
+

                if (nn->next)
                        term_word(p, ",");
        }
 
        term_word(p, ")");
 
                if (nn->next)
                        term_word(p, ",");
        }
 
        term_word(p, ")");
 

-       if (SEC_SYNOPSIS == n->sec)
+       if (MDOC_SYNPRETTY & n->flags)

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

-/* ARGSUSED */
-static void
-termp_fn_post(DECL_ARGS)
-{
-
-       if (n->sec == SEC_SYNOPSIS && n->next)
-               term_vspace(p);
-}
-
-

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


@@ -1516,14 +1617,15 @@ termp_fa_pre(DECL_ARGS)
        const struct mdoc_node  *nn;
 
        if (n->parent->tok != MDOC_Fo) {
        const struct mdoc_node  *nn;
 
        if (n->parent->tok != MDOC_Fo) {

-               p->under++;
+               term_fontpush(p, TERMFONT_UNDER);

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

-               p->under++;
+               term_fontpush(p, TERMFONT_UNDER);

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

-               p->under--;
+               term_fontpop(p);
+

                if (nn->next)
                        term_word(p, ",");
        }
                if (nn->next)
                        term_word(p, ",");
        }


@@ -1539,37 +1641,18 @@ termp_fa_pre(DECL_ARGS)
 static int
 termp_bd_pre(DECL_ARGS)
 {
 static int
 termp_bd_pre(DECL_ARGS)
 {

-       int                      i, type;
+       size_t                   tabwidth, rm, rmax;

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

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

 
 

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

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


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

-       assert(type > -1);
-       if (MDOC_Literal != type && MDOC_Unfilled != type)
+       if (DISP_literal != n->data.Bd->type && 
+                       DISP_unfilled != n->data.Bd->type)

                return(1);
 
                return(1);
 

+       tabwidth = p->tabwidth;
+       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) {
        for (nn = n->child; nn; nn = nn->next) {

-               p->flags |= TERMP_NOSPACE;
-               print_node(p, pair, m, nn);
-               if (NULL == nn->next)
+               print_mdoc_node(p, pair, m, nn);
+               if (nn->next && nn->next->line == nn->line)

                        continue;
                        continue;

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

        }
 
        }
 

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

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


@@ -1602,11 +1691,24 @@ termp_bd_pre(DECL_ARGS)
 static void
 termp_bd_post(DECL_ARGS)
 {
 static void
 termp_bd_post(DECL_ARGS)
 {

+       size_t           rm, rmax;

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

+
+       rm = p->rmargin;
+       rmax = p->maxrmargin;
+
+       assert(n->data.Bd);
+       if (DISP_literal == n->data.Bd->type || 
+                       DISP_unfilled == n->data.Bd->type)
+               p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
+

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

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

 }
 
 
 }
 
 


@@ -1658,7 +1760,7 @@ termp_xx_pre(DECL_ARGS)
                pp = "BSDI BSD/OS";
                break;
        case (MDOC_Dx):
                pp = "BSDI BSD/OS";
                break;
        case (MDOC_Dx):

-               pp = "DragonFlyBSD";
+               pp = "DragonFly";

                break;
        case (MDOC_Fx):
                pp = "FreeBSD";
                break;
        case (MDOC_Fx):
                pp = "FreeBSD";


@@ -1739,8 +1841,8 @@ termp_ss_pre(DECL_ARGS)
                        term_vspace(p);
                break;
        case (MDOC_HEAD):
                        term_vspace(p);
                break;
        case (MDOC_HEAD):

-               p->bold++;
-               p->offset = HALFINDENT;
+               term_fontpush(p, TERMFONT_BOLD);
+               p->offset = term_len(p, HALFINDENT);

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


@@ -1765,8 +1867,8 @@ static int
 termp_cd_pre(DECL_ARGS)
 {
 
 termp_cd_pre(DECL_ARGS)
 {
 

-       p->bold++;
-       term_newln(p);
+       synopsis_pre(p, n);
+       term_fontpush(p, TERMFONT_BOLD);

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


@@ -1776,11 +1878,17 @@ static int
 termp_in_pre(DECL_ARGS)
 {
 
 termp_in_pre(DECL_ARGS)
 {
 

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

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

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

 
 

-       term_word(p, "<");

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


@@ -1791,23 +1899,14 @@ static void
 termp_in_post(DECL_ARGS)
 {
 
 termp_in_post(DECL_ARGS)
 {
 

-       p->bold++;
+       if (MDOC_SYNPRETTY & n->flags)
+               term_fontpush(p, TERMFONT_BOLD);
+

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

-       p->bold--;

 
 

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

 }
 
 
 }
 
 


@@ -1819,12 +1918,17 @@ termp_sp_pre(DECL_ARGS)
 
        switch (n->tok) {
        case (MDOC_sp):
 
        switch (n->tok) {
        case (MDOC_sp):

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

                break;
        case (MDOC_br):
                len = 0;
                break;
        default:
                break;
        case (MDOC_br):
                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;
        }


@@ -1916,23 +2020,25 @@ termp_pq_post(DECL_ARGS)
 static int
 termp_fo_pre(DECL_ARGS)
 {
 static int
 termp_fo_pre(DECL_ARGS)
 {

-       const struct mdoc_node *nn;

 
 

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

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

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

 
 

-       p->bold++;
-       for (nn = n->child; nn; nn = nn->next) {
-               assert(MDOC_TEXT == nn->type);
-               term_word(p, nn->string);
-       }
-       p->bold--;
+       if (NULL == n->child)
+               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);

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


@@ -1942,13 +2048,16 @@ static void
 termp_fo_post(DECL_ARGS)
 {
 
 termp_fo_post(DECL_ARGS)
 {
 

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

                return;
                return;

+

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

-       p->flags |= TERMP_NOSPACE;
-       term_word(p, ";");
-       term_newln(p);
+
+       if (MDOC_SYNPRETTY & n->flags) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, ";");
+       }

 }
 
 
 }
 
 


@@ -1956,27 +2065,20 @@ termp_fo_post(DECL_ARGS)
 static int
 termp_bf_pre(DECL_ARGS)
 {
 static int
 termp_bf_pre(DECL_ARGS)
 {

-       const struct mdoc_node  *nn;

 
        if (MDOC_HEAD == n->type)
                return(0);
        else if (MDOC_BLOCK != n->type)
                return(1);
 
 
        if (MDOC_HEAD == n->type)
                return(0);
        else if (MDOC_BLOCK != n->type)
                return(1);
 

-       if (NULL == (nn = n->head->child)) {
-               if (arg_hasattr(MDOC_Emphasis, n))
-                       p->under++;
-               else if (arg_hasattr(MDOC_Symbolic, n))
-                       p->bold++;
-
-               return(1);
-       } 
+       assert(n->data.Bf);

 
 

-       assert(MDOC_TEXT == nn->type);
-       if (0 == strcmp("Em", nn->string))
-               p->under++;
-       else if (0 == strcmp("Sy", nn->string))
-               p->bold++;
+       if (FONT_Em == n->data.Bf->font) 
+               term_fontpush(p, TERMFONT_UNDER);
+       else if (FONT_Sy == n->data.Bf->font) 
+               term_fontpush(p, TERMFONT_BOLD);
+       else 
+               term_fontpush(p, TERMFONT_NONE);

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


@@ -1989,8 +2091,9 @@ termp_sm_pre(DECL_ARGS)
 
        assert(n->child && MDOC_TEXT == n->child->type);
        if (0 == strcmp("on", n->child->string)) {
 
        assert(n->child && MDOC_TEXT == n->child->type);
        if (0 == strcmp("on", n->child->string)) {

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

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

-               p->flags &= ~TERMP_NOSPACE;

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


@@ -2015,40 +2118,57 @@ 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. */
+

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

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

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

+/* ARGSUSED */
+static int
+termp_li_pre(DECL_ARGS)
+{
+
+       term_fontpush(p, TERMFONT_NONE);
+       return(1);
+}
+
+

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

-       const struct mdoc_node *nn;
+       const struct mdoc_node *nn, *sv;
+
+       term_fontpush(p, TERMFONT_UNDER);
+
+       nn = sv = n->child;

 
 

-       if (NULL == (nn = n->child->next)) {
-               p->under++;
+       if (NULL == nn->next)

                return(1);
                return(1);

-       }

 
 

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

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

-       p->under--;

 
 

-       p->bold++;
-       for (nn = nn->next; nn; nn = nn->next) 
-               term_word(p, nn->string);
-       p->bold--;
+       term_fontpush(p, TERMFONT_BOLD);
+       term_word(p, sv->string);
+       term_fontpop(p);

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


@@ -2056,20 +2176,40 @@ termp_lk_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-termp_under_pre(DECL_ARGS)
+termp_bk_pre(DECL_ARGS)

 {
 
 {
 

-       p->under++;
+       switch (n->type) {
+       case (MDOC_BLOCK):
+               break;
+       case (MDOC_HEAD):
+               return(0);
+       case (MDOC_BODY):
+               p->flags |= TERMP_PREKEEP;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+

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

+/* ARGSUSED */
+static void
+termp_bk_post(DECL_ARGS)
+{
+
+       if (MDOC_BODY == n->type)
+               p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
+}
+

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

-termp__t_pre(DECL_ARGS)
+termp_under_pre(DECL_ARGS)

 {
 
 {
 

-       term_word(p, "\\(lq");
-       p->flags |= TERMP_NOSPACE;
+       term_fontpush(p, TERMFONT_UNDER);

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