Segmentation-fault fix in mdocterm.

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 29a3593533075413ca0efcbd80fb8781d765177c..d99fbd29ffca3b0114787de72d0ff8f565c6320b 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.11 2009/02/23 09:46:59 kristaps Exp $ */
+/* $Id: term.c,v 1.45 2009/03/08 13:57:07 kristaps Exp $ */

 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -17,19 +17,20 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
  * PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>

+#include <ctype.h>
+#include <err.h>
+#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include "term.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "term.h"
 

-#define        INDENT            4
-

 /*
  * Performs actions on nodes of the abstract syntax tree.  Both pre- and
  * post-fix operations are defined here.
  */
 
 /*
  * Performs actions on nodes of the abstract syntax tree.  Both pre- and
  * post-fix operations are defined here.
  */
 

-/* FIXME: indent/tab. */
+/* FIXME: macro arguments can be escaped. */

 
 #define        TTYPE_PROG        0
 #define        TTYPE_CMD_FLAG    1
 
 #define        TTYPE_PROG        0
 #define        TTYPE_CMD_FLAG    1


@@ -44,7 +45,13 @@
 #define        TTYPE_SSECTION    10
 #define        TTYPE_FILE        11
 #define        TTYPE_EMPH        12
 #define        TTYPE_SSECTION    10
 #define        TTYPE_FILE        11
 #define        TTYPE_EMPH        12

-#define        TTYPE_NMAX        13
+#define        TTYPE_CONFIG      13
+#define        TTYPE_CMD         14
+#define        TTYPE_INCLUDE     15
+#define        TTYPE_SYMB        16
+#define        TTYPE_SYMBOL      17
+#define        TTYPE_DIAG        18
+#define        TTYPE_NMAX        19

 
 /* 
  * These define "styles" for element types, like command arguments or
 
 /* 
  * These define "styles" for element types, like command arguments or


@@ -52,6 +59,8 @@
  * the same thing (like .Ex -std cmd and .Nm cmd). 
  */
 
  * the same thing (like .Ex -std cmd and .Nm cmd). 
  */
 

+/* TODO: abstract this into mdocterm.c. */
+

 const  int ttypes[TTYPE_NMAX] = {
        TERMP_BOLD,             /* TTYPE_PROG */
        TERMP_BOLD,             /* TTYPE_CMD_FLAG */
 const  int ttypes[TTYPE_NMAX] = {
        TERMP_BOLD,             /* TTYPE_PROG */
        TERMP_BOLD,             /* TTYPE_CMD_FLAG */


@@ -65,14 +74,20 @@ const       int ttypes[TTYPE_NMAX] = {
        TERMP_UNDERLINE,        /* TTYPE_LINK */
        TERMP_BOLD,             /* TTYPE_SSECTION */
        TERMP_UNDERLINE,        /* TTYPE_FILE */
        TERMP_UNDERLINE,        /* TTYPE_LINK */
        TERMP_BOLD,             /* TTYPE_SSECTION */
        TERMP_UNDERLINE,        /* TTYPE_FILE */

-       TERMP_UNDERLINE         /* TTYPE_EMPH */
+       TERMP_UNDERLINE,        /* TTYPE_EMPH */
+       TERMP_BOLD,             /* TTYPE_CONFIG */
+       TERMP_BOLD,             /* TTYPE_CMD */
+       TERMP_BOLD,             /* TTYPE_INCLUDE */
+       TERMP_BOLD,             /* TTYPE_SYMB */
+       TERMP_BOLD,             /* TTYPE_SYMBOL */
+       TERMP_BOLD              /* TTYPE_DIAG */

 };
 
 };
 

-static int               arg_hasattr(int, size_t, 
-                               const struct mdoc_arg *);
-static int               arg_getattr(int, size_t, 
-                               const struct mdoc_arg *);
-static size_t            arg_offset(const char *);
+static int               arg_hasattr(int, const struct mdoc_node *);
+static int               arg_getattr(int, const struct mdoc_node *);
+static size_t            arg_offset(const struct mdoc_argv *);
+static size_t            arg_width(const struct mdoc_argv *);
+static int               arg_listtype(const struct mdoc_node *);

 
 /*
  * What follows describes prefix and postfix operations for the abstract
 
 /*
  * What follows describes prefix and postfix operations for the abstract


@@ -81,6 +96,7 @@ static        size_t            arg_offset(const char *);
 
 #define        DECL_ARGS \
        struct termp *p, \
 
 #define        DECL_ARGS \
        struct termp *p, \

+       struct termpair *pair, \

        const struct mdoc_meta *meta, \
        const struct mdoc_node *node
 
        const struct mdoc_meta *meta, \
        const struct mdoc_node *node
 


@@ -92,42 +108,63 @@ static     void              name##_post(DECL_ARGS)
 DECL_PRE(name); \
 DECL_POST(name);
 
 DECL_PRE(name); \
 DECL_POST(name);
 

+DECL_PREPOST(termp__t);

 DECL_PREPOST(termp_aq);
 DECL_PREPOST(termp_aq);

-DECL_PREPOST(termp_ar);
+DECL_PREPOST(termp_bd);
+DECL_PREPOST(termp_bq);

 DECL_PREPOST(termp_d1);
 DECL_PREPOST(termp_dq);
 DECL_PREPOST(termp_d1);
 DECL_PREPOST(termp_dq);

-DECL_PREPOST(termp_em);
-DECL_PREPOST(termp_fa);

 DECL_PREPOST(termp_fd);
 DECL_PREPOST(termp_fd);

-DECL_PREPOST(termp_fl);

 DECL_PREPOST(termp_fn);
 DECL_PREPOST(termp_fn);

+DECL_PREPOST(termp_fo);

 DECL_PREPOST(termp_ft);
 DECL_PREPOST(termp_ft);

+DECL_PREPOST(termp_in);

 DECL_PREPOST(termp_it);
 DECL_PREPOST(termp_it);

-DECL_PREPOST(termp_nm);

 DECL_PREPOST(termp_op);
 DECL_PREPOST(termp_op);

-DECL_PREPOST(termp_pa);

 DECL_PREPOST(termp_pf);
 DECL_PREPOST(termp_pf);

-DECL_PREPOST(termp_qo);
+DECL_PREPOST(termp_pq);

 DECL_PREPOST(termp_qq);
 DECL_PREPOST(termp_sh);
 DECL_PREPOST(termp_ss);
 DECL_PREPOST(termp_sq);
 DECL_PREPOST(termp_qq);
 DECL_PREPOST(termp_sh);
 DECL_PREPOST(termp_ss);
 DECL_PREPOST(termp_sq);

-DECL_PREPOST(termp_sx);
-DECL_PREPOST(termp_va);

 DECL_PREPOST(termp_vt);
 
 DECL_PREPOST(termp_vt);
 

-DECL_PRE(termp_bd);
-DECL_PRE(termp_bx);
+DECL_PRE(termp_ar);
+DECL_PRE(termp_at);
+DECL_PRE(termp_bf);
+DECL_PRE(termp_bsx);
+DECL_PRE(termp_bt);
+DECL_PRE(termp_cd);
+DECL_PRE(termp_cm);
+DECL_PRE(termp_em);

 DECL_PRE(termp_ex);
 DECL_PRE(termp_ex);

+DECL_PRE(termp_fa);
+DECL_PRE(termp_fl);
+DECL_PRE(termp_fx);
+DECL_PRE(termp_ic);
+DECL_PRE(termp_ms);

 DECL_PRE(termp_nd);
 DECL_PRE(termp_nd);

+DECL_PRE(termp_nm);

 DECL_PRE(termp_ns);
 DECL_PRE(termp_nx);
 DECL_PRE(termp_ox);
 DECL_PRE(termp_ns);
 DECL_PRE(termp_nx);
 DECL_PRE(termp_ox);

+DECL_PRE(termp_pa);

 DECL_PRE(termp_pp);
 DECL_PRE(termp_pp);

+DECL_PRE(termp_rs);
+DECL_PRE(termp_rv);
+DECL_PRE(termp_sm);
+DECL_PRE(termp_st);
+DECL_PRE(termp_sx);
+DECL_PRE(termp_sy);

 DECL_PRE(termp_ud);
 DECL_PRE(termp_ud);

+DECL_PRE(termp_ux);
+DECL_PRE(termp_va);

 DECL_PRE(termp_xr);
 
 DECL_PRE(termp_xr);
 

+DECL_POST(termp___);

 DECL_POST(termp_bl);
 DECL_POST(termp_bl);

+DECL_POST(termp_bx);
+DECL_POST(termp_lb);

 
 const  struct termact __termacts[MDOC_MAX] = {
        { NULL, NULL }, /* \" */
 
 const  struct termact __termacts[MDOC_MAX] = {
        { NULL, NULL }, /* \" */


@@ -138,137 +175,209 @@ const   struct termact __termacts[MDOC_MAX] = {
        { termp_ss_pre, termp_ss_post }, /* Ss */ 
        { termp_pp_pre, NULL }, /* Pp */ 
        { termp_d1_pre, termp_d1_post }, /* D1 */
        { termp_ss_pre, termp_ss_post }, /* Ss */ 
        { termp_pp_pre, NULL }, /* Pp */ 
        { termp_d1_pre, termp_d1_post }, /* D1 */

-       { NULL, NULL }, /* Dl */
-       { termp_bd_pre, NULL }, /* Bd */
+       { termp_d1_pre, termp_d1_post }, /* Dl */
+       { termp_bd_pre, termp_bd_post }, /* Bd */

        { NULL, NULL }, /* Ed */
        { NULL, termp_bl_post }, /* Bl */
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { NULL, NULL }, /* Ad */ 
        { NULL, NULL }, /* An */
        { NULL, NULL }, /* Ed */
        { NULL, termp_bl_post }, /* Bl */
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { NULL, NULL }, /* Ad */ 
        { NULL, NULL }, /* An */

-       { termp_ar_pre, termp_ar_post }, /* Ar */
-       { NULL, NULL }, /* Cd */
-       { NULL, NULL }, /* Cm */
+       { termp_ar_pre, NULL }, /* Ar */
+       { termp_cd_pre, NULL }, /* Cd */
+       { termp_cm_pre, NULL }, /* Cm */

        { NULL, NULL }, /* Dv */ 
        { NULL, NULL }, /* Er */ 
        { NULL, NULL }, /* Ev */ 
        { termp_ex_pre, NULL }, /* Ex */
        { NULL, NULL }, /* Dv */ 
        { NULL, NULL }, /* Er */ 
        { NULL, NULL }, /* Ev */ 
        { termp_ex_pre, NULL }, /* Ex */

-       { termp_fa_pre, termp_fa_post }, /* Fa */ 
+       { termp_fa_pre, NULL }, /* Fa */ 

        { termp_fd_pre, termp_fd_post }, /* Fd */ 
        { termp_fd_pre, termp_fd_post }, /* Fd */ 

-       { termp_fl_pre, termp_fl_post }, /* Fl */
+       { termp_fl_pre, NULL }, /* Fl */

        { termp_fn_pre, termp_fn_post }, /* Fn */ 
        { termp_ft_pre, termp_ft_post }, /* Ft */ 
        { termp_fn_pre, termp_fn_post }, /* Fn */ 
        { termp_ft_pre, termp_ft_post }, /* Ft */ 

-       { NULL, NULL }, /* Ic */ 
-       { NULL, NULL }, /* In */ 
+       { termp_ic_pre, NULL }, /* Ic */ 
+       { termp_in_pre, termp_in_post }, /* In */ 

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

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

        { termp_op_pre, termp_op_post }, /* Op */
        { NULL, NULL }, /* Ot */
        { termp_op_pre, termp_op_post }, /* Op */
        { NULL, NULL }, /* Ot */

-       { termp_pa_pre, termp_pa_post }, /* Pa */
-       { NULL, NULL }, /* Rv */
-       { NULL, NULL }, /* St */ 
-       { termp_va_pre, termp_va_post }, /* Va */
+       { termp_pa_pre, NULL }, /* Pa */
+       { termp_rv_pre, NULL }, /* Rv */
+       { termp_st_pre, NULL }, /* St */ 
+       { termp_va_pre, NULL }, /* Va */

        { termp_vt_pre, termp_vt_post }, /* Vt */ 
        { termp_xr_pre, NULL }, /* Xr */
        { termp_vt_pre, termp_vt_post }, /* Vt */ 
        { termp_xr_pre, NULL }, /* Xr */

-       { NULL, NULL }, /* %A */
-       { NULL, NULL }, /* %B */
-       { NULL, NULL }, /* %D */
-       { NULL, NULL }, /* %I */
-       { NULL, NULL }, /* %J */
-       { NULL, NULL }, /* %N */
-       { NULL, NULL }, /* %O */
-       { NULL, NULL }, /* %P */
-       { NULL, NULL }, /* %R */
-       { NULL, NULL }, /* %T */
-       { NULL, NULL }, /* %V */
+       { NULL, termp____post }, /* %A */
+       { NULL, termp____post }, /* %B */
+       { NULL, termp____post }, /* %D */
+       { NULL, termp____post }, /* %I */
+       { NULL, termp____post }, /* %J */
+       { NULL, termp____post }, /* %N */
+       { NULL, termp____post }, /* %O */
+       { NULL, termp____post }, /* %P */
+       { NULL, termp____post }, /* %R */
+       { termp__t_pre, termp__t_post }, /* %T */
+       { NULL, termp____post }, /* %V */

        { NULL, NULL }, /* Ac */
        { NULL, NULL }, /* Ac */

-       { NULL, NULL }, /* Ao */
+       { termp_aq_pre, termp_aq_post }, /* Ao */

        { termp_aq_pre, termp_aq_post }, /* Aq */
        { termp_aq_pre, termp_aq_post }, /* Aq */

-       { NULL, NULL }, /* At */
+       { termp_at_pre, NULL }, /* At */

        { NULL, NULL }, /* Bc */
        { NULL, NULL }, /* Bc */

-       { NULL, NULL }, /* Bf */ 
-       { NULL, NULL }, /* Bo */
-       { NULL, NULL }, /* Bq */
-       { NULL, NULL }, /* Bsx */
-       { termp_bx_pre, NULL }, /* Bx */
+       { termp_bf_pre, NULL }, /* Bf */ 
+       { termp_bq_pre, termp_bq_post }, /* Bo */
+       { termp_bq_pre, termp_bq_post }, /* Bq */
+       { termp_bsx_pre, NULL }, /* Bsx */
+       { NULL, termp_bx_post }, /* Bx */

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

-       { NULL, NULL }, /* Do */
+       { termp_dq_pre, termp_dq_post }, /* Do */

        { termp_dq_pre, termp_dq_post }, /* Dq */
        { NULL, NULL }, /* Ec */
        { NULL, NULL }, /* Ef */
        { termp_dq_pre, termp_dq_post }, /* Dq */
        { NULL, NULL }, /* Ec */
        { NULL, NULL }, /* Ef */

-       { termp_em_pre, termp_em_post }, /* Em */ 
+       { termp_em_pre, NULL }, /* Em */ 

        { NULL, NULL }, /* Eo */
        { NULL, NULL }, /* Eo */

-       { NULL, NULL }, /* Fx */
-       { NULL, NULL }, /* Ms */
+       { termp_fx_pre, NULL }, /* Fx */
+       { termp_ms_pre, NULL }, /* Ms */

        { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_nx_pre, NULL }, /* Nx */
        { termp_ox_pre, NULL }, /* Ox */
        { NULL, NULL }, /* Pc */
        { termp_pf_pre, termp_pf_post }, /* Pf */
        { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_nx_pre, NULL }, /* Nx */
        { termp_ox_pre, NULL }, /* Ox */
        { NULL, NULL }, /* Pc */
        { termp_pf_pre, termp_pf_post }, /* Pf */

-       { NULL, NULL }, /* Po */
-       { NULL, NULL }, /* Pq */
+       { termp_pq_pre, termp_pq_post }, /* Po */
+       { termp_pq_pre, termp_pq_post }, /* Pq */

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

-       { NULL, NULL }, /* Ql */
-       { termp_qo_pre, termp_qo_post }, /* Qo */
+       { termp_sq_pre, termp_sq_post }, /* Ql */
+       { termp_qq_pre, termp_qq_post }, /* Qo */

        { termp_qq_pre, termp_qq_post }, /* Qq */
        { NULL, NULL }, /* Re */
        { termp_qq_pre, termp_qq_post }, /* Qq */
        { NULL, NULL }, /* Re */

-       { NULL, NULL }, /* Rs */
+       { termp_rs_pre, NULL }, /* Rs */

        { NULL, NULL }, /* Sc */
        { NULL, NULL }, /* Sc */

-       { NULL, NULL }, /* So */
+       { termp_sq_pre, termp_sq_post }, /* So */

        { termp_sq_pre, termp_sq_post }, /* Sq */
        { termp_sq_pre, termp_sq_post }, /* Sq */

-       { NULL, NULL }, /* Sm */
-       { termp_sx_pre, termp_sx_post }, /* Sx */
-       { NULL, NULL }, /* Sy */
+       { termp_sm_pre, NULL }, /* Sm */
+       { termp_sx_pre, NULL }, /* Sx */
+       { termp_sy_pre, NULL }, /* Sy */

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

-       { NULL, NULL }, /* Ux */
+       { termp_ux_pre, NULL }, /* Ux */

        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */
        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */

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

        { NULL, NULL }, /* Fc */ 
        { NULL, NULL }, /* Fc */ 

-       { NULL, NULL }, /* Oo */
+       { termp_op_pre, termp_op_post }, /* Oo */

        { NULL, NULL }, /* Oc */
        { NULL, NULL }, /* Bk */
        { NULL, NULL }, /* Ek */
        { NULL, NULL }, /* Oc */
        { NULL, NULL }, /* Bk */
        { NULL, NULL }, /* Ek */

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

        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Fr */
        { termp_ud_pre, NULL }, /* Ud */
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Fr */
        { termp_ud_pre, NULL }, /* Ud */

+       { NULL, termp_lb_post }, /* lb */

 };
 
 const struct termact *termacts = __termacts;
 
 
 static size_t
 };
 
 const struct termact *termacts = __termacts;
 
 
 static size_t

-arg_offset(const char *v)
+arg_width(const struct mdoc_argv *arg)

 {
 {

-       if (0 == strcmp(v, "indent"))
+       size_t           v;
+       int              i, len;
+
+       assert(*arg->value);
+       if (0 == strcmp(*arg->value, "indent"))

                return(INDENT);
                return(INDENT);

-       if (0 == strcmp(v, "indent-two"))
+       if (0 == strcmp(*arg->value, "indent-two"))

                return(INDENT * 2);
 
                return(INDENT * 2);
 

+       len = (int)strlen(*arg->value);
+       assert(len > 0);
+
+       for (i = 0; i < len - 1; i++) 
+               if ( ! isdigit((u_char)(*arg->value)[i]))
+                       break;
+
+       if (i == len - 1) {
+               if ('n' == (*arg->value)[len - 1]) {
+                       v = (size_t)atoi(*arg->value);
+                       return(v);
+               }
+
+       }
+       return(strlen(*arg->value) + 1);
+}
+
+
+static int
+arg_listtype(const struct mdoc_node *n)
+{
+       int              i, len;
+
+       assert(MDOC_BLOCK == n->type);
+
+       len = 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_Ohang):
+                       return(n->args->argv[i].arg);
+               default:
+                       break;
+               }
+
+       errx(1, "list type not supported");
+       /* NOTREACHED */
+}
+
+
+static size_t
+arg_offset(const struct mdoc_argv *arg)
+{
+

        /* TODO */
        /* TODO */

-       return(0);
+       assert(*arg->value);
+       if (0 == strcmp(*arg->value, "indent"))
+               return(INDENT);
+       if (0 == strcmp(*arg->value, "indent-two"))
+               return(INDENT * 2);
+       return(strlen(*arg->value));

 }
 
 
 static int
 }
 
 
 static int

-arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv)
+arg_hasattr(int arg, const struct mdoc_node *n)

 {
 
 {
 

-       return(-1 != arg_getattr(arg, argc, argv));
+       return(-1 != arg_getattr(arg, n));

 }
 
 
 static int
 }
 
 
 static int

-arg_getattr(int arg, size_t argc, const struct mdoc_arg *argv)
+arg_getattr(int arg, const struct mdoc_node *n)

 {
        int              i;
 
 {
        int              i;
 

-       for (i = 0; i < (int)argc; i++) 
-               if (argv[i].arg == arg)
+       if (NULL == n->args)
+               return(-1);
+       for (i = 0; i < (int)n->args->argc; i++) 
+               if (n->args->argv[i].arg == arg)

                        return(i);
        return(-1);
 }
                        return(i);
        return(-1);
 }


@@ -302,73 +411,16 @@ termp_dq_post(DECL_ARGS)
 
 
 /* ARGSUSED */
 
 
 /* ARGSUSED */

-static void
-termp_it_post(DECL_ARGS)
+static int
+termp_it_pre_block(DECL_ARGS)

 {
 {

-       const struct mdoc_node *n, *it;
-       const struct mdoc_block *bl;
-       int              i;
-       size_t           width;
-
-       /*
-        * This (and termp_it_pre()) are the most complicated functions
-        * here.  They must account for a considerable number of
-        * switches that completely change the output behaviour, like
-        * -tag versus -column.  Yech.
-        */
-
-       switch (node->type) {
-       case (MDOC_BODY):
-               /* FALLTHROUGH */
-       case (MDOC_HEAD):
-               break;
-       default:
-               return;
-       }

 
 

-       it = node->parent;
-       assert(MDOC_BLOCK == it->type);
-       assert(MDOC_It == it->tok);
-
-       n = it->parent;
-       assert(MDOC_BODY == n->type);
-       assert(MDOC_Bl == n->tok);
-       n = n->parent;
-       bl = &n->data.block;
-
-       /* If `-tag', adjust our margins accordingly. */
-
-       if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) {
-               i = arg_getattr(MDOC_Width, bl->argc, bl->argv);
-               assert(i >= 0);
-               assert(1 == bl->argv[i].sz);
-               width = strlen(*bl->argv[i].value); /* XXX */
-
-               if (MDOC_HEAD == node->type) {
-                       flushln(p);
-                       /* FIXME: nested lists. */
-                       p->rmargin = p->maxrmargin;
-                       p->flags &= ~TERMP_NOBREAK;
-               } else {
-                       flushln(p);
-                       p->offset -= width + 1;
-                       p->flags &= ~TERMP_NOLPAD;
-               }
-               return;
-       }
-
-       if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) {
-               i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
-               width = 0;
-               if (i >= 0) {
-                       assert(1 == bl->argv[i].sz);
-                       width = arg_offset(*bl->argv[i].value);
-               }
+       newln(p);
+       if ( ! arg_hasattr(MDOC_Compact, node->parent->parent))
+               if (node->prev || node->parent->parent->prev)
+                       vspace(p);

 
 

-               flushln(p);
-               p->offset -= width;
-               return;
-       }
+       return(1);

 }
 
 
 }
 
 


@@ -376,85 +428,196 @@ termp_it_post(DECL_ARGS)
 static int
 termp_it_pre(DECL_ARGS)
 {
 static int
 termp_it_pre(DECL_ARGS)
 {

-       const struct mdoc_node *n, *it;
-       const struct mdoc_block *bl;
-       int              i;
-       size_t           width;
+       const struct mdoc_node *bl;
+       char             buf[7];
+       int              i, type;
+       size_t           width, offset;

 
 

-       /*
-        * Also see termp_it_post() for general comments.
+       if (MDOC_BLOCK == node->type)
+               return(termp_it_pre_block(p, pair, meta, node));
+
+       /* Get ptr to list block, type, etc. */
+
+       bl = node->parent->parent->parent;
+       type = arg_listtype(bl);
+
+       /* Save parent attributes. */
+
+       pair->offset = p->offset;
+       pair->rmargin = p->rmargin;
+       pair->flag = p->flags;
+
+       /* Get list width and offset. */
+
+       i = arg_getattr(MDOC_Width, bl);
+       width = i >= 0 ? arg_width(&bl->args->argv[i]) : 0;
+
+       i = arg_getattr(MDOC_Offset, bl);
+       offset = i >= 0 ? arg_offset(&bl->args->argv[i]) : 0;
+
+       /* 
+        * List-type can override the width in the case of fixed-head
+        * values (bullet, dash/hyphen, enum).  Tags need a non-zero
+        * offset.

         */
 
         */
 

-       switch (node->type) {
-       case (MDOC_BODY):
+       switch (type) {
+       case (MDOC_Bullet):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_HEAD):
-               it = node->parent;
-               break;
-       case (MDOC_BLOCK):
-               it = node;
+       case (MDOC_Dash):
+               /* FALLTHROUGH */
+       case (MDOC_Enum):
+               /* FALLTHROUGH */
+       case (MDOC_Hyphen):
+               width = width > 4 ? width : 4;

                break;
                break;

+       case (MDOC_Tag):
+               if (width)
+                       break;
+               errx(1, "need non-zero %s for list type", 
+                               mdoc_argnames[MDOC_Width]);

        default:
        default:

-               return(1);
+               break;

        }
 
        }
 

-       assert(MDOC_BLOCK == it->type);
-       assert(MDOC_It == it->tok);
+       /* 
+        * Whitespace control.  Inset bodies need an initial space.
+        */

 
 

-       n = it->parent;
-       assert(MDOC_BODY == n->type);
-       assert(MDOC_Bl == n->tok);
-       n = n->parent;
-       bl = &n->data.block;
+       switch (type) {
+       case (MDOC_Diag):
+               /* FALLTHROUGH */
+       case (MDOC_Inset):
+               if (MDOC_BODY == node->type) 
+                       p->flags &= ~TERMP_NOSPACE;
+               else
+                       p->flags |= TERMP_NOSPACE;
+               break;
+       default:
+               p->flags |= TERMP_NOSPACE;
+               break;
+       }

 
 

-       /* If `-compact', don't assert vertical space. */
+       /*
+        * Style flags.  Diagnostic heads need TTYPE_DIAG.
+        */

 
 

-       if (MDOC_BLOCK == node->type) {
-               if (arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
-                       newln(p);
-               else
-                       vspace(p);
-               return(1);
+       switch (type) {
+       case (MDOC_Diag):
+               if (MDOC_HEAD == node->type)
+                       p->flags |= ttypes[TTYPE_DIAG];
+               break;
+       default:
+               break;

        }
 
        }
 

-       assert(MDOC_HEAD == node->type 
-                       || MDOC_BODY == node->type);
+       /*
+        * 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.
+        */

 
 

-       /* If `-tag', adjust our margins accordingly. */
+       switch (type) {
+       case (MDOC_Bullet):
+               /* FALLTHROUGH */
+       case (MDOC_Dash):
+               /* FALLTHROUGH */
+       case (MDOC_Enum):
+               /* FALLTHROUGH */
+       case (MDOC_Hyphen):
+               /* FALLTHROUGH */
+       case (MDOC_Tag):
+               if (MDOC_HEAD == node->type)
+                       p->flags |= TERMP_NOBREAK;
+               else
+                       p->flags |= TERMP_NOLPAD;
+               if (MDOC_HEAD == node->type && MDOC_Tag == type)
+                       if (NULL == node->next ||
+                                       NULL == node->next->child)
+                               p->flags |= TERMP_NONOBREAK;
+               break;
+       case (MDOC_Diag):
+               if (MDOC_HEAD == node->type)
+                       p->flags |= TERMP_NOBREAK;
+               break;
+       default:
+               break;
+       }

 
 

-       if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) {
-               i = arg_getattr(MDOC_Width, bl->argc, bl->argv);
-               assert(i >= 0); /* XXX */
-               assert(1 == bl->argv[i].sz);
-               width = strlen(*bl->argv[i].value); /* XXX */
+       /* 
+        * Margin control.  Set-head-width lists have their right
+        * margins shortened.  The body for these lists has the offset
+        * necessarily lengthened.  Everybody gets the offset.
+        */

 
 

-               /* FIXME: nested lists. */
+       p->offset += offset;

 
 

-               if (MDOC_HEAD == node->type) {
-                       p->flags |= TERMP_NOBREAK;
-                       p->flags |= TERMP_NOSPACE;
+       switch (type) {
+       case (MDOC_Bullet):
+               /* FALLTHROUGH */
+       case (MDOC_Dash):
+               /* FALLTHROUGH */
+       case (MDOC_Enum):
+               /* FALLTHROUGH */
+       case (MDOC_Hyphen):
+               /* FALLTHROUGH */
+       case (MDOC_Tag):
+               if (MDOC_HEAD == node->type)

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

-               } else {
-                       p->flags |= TERMP_NOSPACE;
-                       p->flags |= TERMP_NOLPAD;
-                       p->offset += width + 1;
-               }
-               return(1);
+               else 
+                       p->offset += width;
+               /* FALLTHROUGH */
+       default:
+               break;

        }
 
        }
 

-       /* If `-ohang', adjust left-margin. */
+       /* 
+        * The dash, hyphen, bullet and enum lists all have a special
+        * HEAD character.  Print it now.
+        */

 
 

-       if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) {
-               width = 0;
-               i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
-               if (i >= 0) {
-                       assert(1 == bl->argv[i].sz);
-                       width = arg_offset(*bl->argv[i].value);
-               } 
+       if (MDOC_HEAD == node->type)
+               switch (type) {
+               case (MDOC_Bullet):
+                       word(p, "\\[bu]");
+                       break;
+               case (MDOC_Dash):
+                       /* FALLTHROUGH */
+               case (MDOC_Hyphen):
+                       word(p, "\\-");
+                       break;
+               case (MDOC_Enum):
+                       /* TODO: have a wordfmt or something. */
+                       (pair->ppair->ppair->count)++;
+                       (void)snprintf(buf, sizeof(buf), "%d.", 
+                                       pair->ppair->ppair->count);
+                       word(p, buf);
+                       break;
+               default:
+                       break;
+               }

 
 

-               p->flags |= TERMP_NOSPACE;
-               p->offset += width;
-               return(1);
+       /* 
+        * If we're not going to process our header children, indicate
+        * so here.
+        */
+
+       if (MDOC_HEAD == node->type) 
+               switch (type) {
+               case (MDOC_Bullet):
+                       /* FALLTHROUGH */
+               case (MDOC_Item):
+                       /* FALLTHROUGH */
+               case (MDOC_Dash):
+                       /* FALLTHROUGH */
+               case (MDOC_Hyphen):
+                       /* FALLTHROUGH */
+               case (MDOC_Enum):
+                       return(0);
+               default:
+                       break;

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


@@ -463,42 +626,70 @@ termp_it_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static void
 
 /* ARGSUSED */
 static void

-termp_nm_post(DECL_ARGS)
+termp_it_post(DECL_ARGS)

 {
 {

+       int                type;

 
 

-       p->flags &= ~ttypes[TTYPE_PROG];
+       if (MDOC_BODY != node->type && MDOC_HEAD != node->type)
+               return;
+
+       type = arg_listtype(node->parent->parent->parent);
+
+       switch (type) {
+       case (MDOC_Diag):
+               /* FALLTHROUGH */
+       case (MDOC_Item):
+               /* FALLTHROUGH */
+       case (MDOC_Inset):
+               if (MDOC_BODY != node->type)
+                       break;
+               flushln(p);
+               break;
+       default:
+               flushln(p);
+               break;
+       }
+
+       p->offset = pair->offset;
+       p->rmargin = pair->rmargin;
+       p->flags = pair->flag;

 }
 
 
 /* ARGSUSED */
 }
 
 
 /* ARGSUSED */

-static void
-termp_fl_post(DECL_ARGS)
+static int
+termp_nm_pre(DECL_ARGS)

 {
 
 {
 

-       p->flags &= ~ttypes[TTYPE_CMD_FLAG];
+       if (SEC_SYNOPSIS == node->sec)
+               newln(p);
+
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_PROG]);
+       if (NULL == node->child)
+               word(p, meta->name);
+
+       return(1);

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

-termp_ar_pre(DECL_ARGS)
+termp_fl_pre(DECL_ARGS)

 {
 
 {
 

-       p->flags |= ttypes[TTYPE_CMD_ARG];
-       if (NULL == node->child)
-               word(p, "...");
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);
+       word(p, "\\-");
+       p->flags |= TERMP_NOSPACE;

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

-termp_nm_pre(DECL_ARGS)
+termp_ar_pre(DECL_ARGS)

 {
 
 {
 

-       p->flags |= ttypes[TTYPE_PROG];
-       if (NULL == node->child)
-               word(p, meta->name);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]);

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


@@ -524,11 +715,61 @@ termp_pp_pre(DECL_ARGS)
 
 
 /* ARGSUSED */
 
 
 /* ARGSUSED */

-static void
-termp_ar_post(DECL_ARGS)
+static int
+termp_st_pre(DECL_ARGS)
+{
+       const char      *cp;
+
+       if (node->child) {
+               if (MDOC_TEXT != node->child->type)
+                       errx(1, "expected text line arguments");
+               if ((cp = mdoc_a2st(node->child->string)))
+                       word(p, cp);
+       }
+       return(0);
+}
+
+
+/* ARGSUSED */
+static int
+termp_rs_pre(DECL_ARGS)
+{
+
+       if (MDOC_BLOCK == node->type && node->prev)
+               vspace(p);
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_rv_pre(DECL_ARGS)

 {
 {

+       int              i;
+
+       if (-1 == (i = arg_getattr(MDOC_Std, node)))
+               errx(1, "expected -std argument");
+       if (1 != node->args->argv[i].sz)
+               errx(1, "expected -std argument");
+
+       newln(p);
+       word(p, "The");
+
+       p->flags |= ttypes[TTYPE_FUNC_NAME];
+       word(p, *node->args->argv[i].value);
+       p->flags &= ~ttypes[TTYPE_FUNC_NAME];
+
+               word(p, "() function returns the value 0 if successful;");
+               word(p, "otherwise the value -1 is returned and the");
+               word(p, "global variable");
+
+       p->flags |= ttypes[TTYPE_VAR_DECL];
+       word(p, "errno");
+       p->flags &= ~ttypes[TTYPE_VAR_DECL];

 
 

-       p->flags &= ~ttypes[TTYPE_CMD_ARG];
+               word(p, "is set to indicate the error.");
+
+       return(1);

 }
 
 
 }
 
 


@@ -538,13 +779,14 @@ termp_ex_pre(DECL_ARGS)
 {
        int              i;
 
 {
        int              i;
 

-       i = arg_getattr(MDOC_Std, node->data.elem.argc, 
-                       node->data.elem.argv);
-       assert(i >= 0);
+       if (-1 == (i = arg_getattr(MDOC_Std, node)))
+               errx(1, "expected -std argument");
+       if (1 != node->args->argv[i].sz)
+               errx(1, "expected -std argument");

 
        word(p, "The");
        p->flags |= ttypes[TTYPE_PROG];
 
        word(p, "The");
        p->flags |= ttypes[TTYPE_PROG];

-       word(p, *node->data.elem.argv[i].value);
+       word(p, *node->args->argv[i].value);

        p->flags &= ~ttypes[TTYPE_PROG];
                word(p, "utility exits 0 on success, and >0 if an error occurs.");
 
        p->flags &= ~ttypes[TTYPE_PROG];
                word(p, "utility exits 0 on success, and >0 if an error occurs.");
 


@@ -584,46 +826,28 @@ termp_op_post(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static void
-termp_sh_post(DECL_ARGS)
-{
-
-       switch (node->type) {
-       case (MDOC_HEAD):
-               p->flags &= ~ttypes[TTYPE_SECTION];
-               newln(p);
-               break;
-       case (MDOC_BODY):
-               newln(p);
-               p->offset = 0;
-               break;
-       default:
-               break;
-       }
-}
-
-

 /* ARGSUSED */
 static int
 termp_xr_pre(DECL_ARGS)
 {
        const struct mdoc_node *n;
 
 /* ARGSUSED */
 static int
 termp_xr_pre(DECL_ARGS)
 {
        const struct mdoc_node *n;
 

-       n = node->child;
-       assert(n);
+       if (NULL == (n = node->child))
+               errx(1, "expected text line argument");
+       if (MDOC_TEXT != n->type)
+               errx(1, "expected text line argument");

 
 

-       assert(MDOC_TEXT == n->type);
-       word(p, n->data.text.string);
+       word(p, n->string);

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

+       if (MDOC_TEXT != n->type)
+               errx(1, "expected text line argument");

 
 

-       assert(MDOC_TEXT == n->type);

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

-       word(p, n->data.text.string);
+       word(p, n->string);

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


@@ -637,7 +861,7 @@ termp_vt_pre(DECL_ARGS)
 {
 
        /* FIXME: this can be "type name". */
 {
 
        /* FIXME: this can be "type name". */

-       p->flags |= ttypes[TTYPE_VAR_DECL];
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]);

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


@@ -647,7 +871,6 @@ static void
 termp_vt_post(DECL_ARGS)
 {
 
 termp_vt_post(DECL_ARGS)
 {
 

-       p->flags &= ~ttypes[TTYPE_VAR_DECL];

        if (node->sec == SEC_SYNOPSIS)
                vspace(p);
 }
        if (node->sec == SEC_SYNOPSIS)
                vspace(p);
 }


@@ -662,7 +885,7 @@ termp_fd_pre(DECL_ARGS)
         * FIXME: this naming is bad.  This value is used, in general,
         * for the #include header or other preprocessor statement.
         */
         * FIXME: this naming is bad.  This value is used, in general,
         * for the #include header or other preprocessor statement.
         */

-       p->flags |= ttypes[TTYPE_FUNC_DECL];
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_DECL]);

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


@@ -672,10 +895,11 @@ static void
 termp_fd_post(DECL_ARGS)
 {
 
 termp_fd_post(DECL_ARGS)
 {
 

-       p->flags &= ~ttypes[TTYPE_FUNC_DECL];
-       if (node->sec == SEC_SYNOPSIS)
+       if (node->sec != SEC_SYNOPSIS)
+               return;
+       newln(p);
+       if (node->next && MDOC_Fd != node->next->tok)

                vspace(p);
                vspace(p);

-

 }
 
 
 }
 
 


@@ -687,7 +911,7 @@ termp_sh_pre(DECL_ARGS)
        switch (node->type) {
        case (MDOC_HEAD):
                vspace(p);
        switch (node->type) {
        case (MDOC_HEAD):
                vspace(p);

-               p->flags |= ttypes[TTYPE_SECTION];
+               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SECTION]);

                break;
        case (MDOC_BODY):
                p->offset = INDENT;
                break;
        case (MDOC_BODY):
                p->offset = INDENT;


@@ -699,6 +923,25 @@ termp_sh_pre(DECL_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */
+static void
+termp_sh_post(DECL_ARGS)
+{
+
+       switch (node->type) {
+       case (MDOC_HEAD):
+               newln(p);
+               break;
+       case (MDOC_BODY):
+               newln(p);
+               p->offset = 0;
+               break;
+       default:
+               break;
+       }
+}
+
+

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


@@ -718,22 +961,29 @@ termp_op_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-termp_ud_pre(DECL_ARGS)
+termp_bt_pre(DECL_ARGS)

 {
 
 {
 

-       word(p, "currently under development.");
+       word(p, "is currently in beta test.");

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

+/* ARGSUSED */
+static void
+termp_lb_post(DECL_ARGS)
+{
+
+       newln(p);
+}
+
+

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

-termp_fl_pre(DECL_ARGS)
+termp_ud_pre(DECL_ARGS)

 {
 
 {
 

-       p->flags |= ttypes[TTYPE_CMD_FLAG];
-       word(p, "\\-");
-       p->flags |= TERMP_NOSPACE;
+       word(p, "currently under development.");

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


@@ -746,7 +996,7 @@ termp_d1_pre(DECL_ARGS)
        if (MDOC_BODY != node->type)
                return(1);
        newln(p);
        if (MDOC_BODY != node->type)
                return(1);
        newln(p);

-       p->offset += INDENT;
+       p->offset += (pair->offset = INDENT);

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


@@ -759,7 +1009,7 @@ termp_d1_post(DECL_ARGS)
        if (MDOC_BODY != node->type) 
                return;
        newln(p);
        if (MDOC_BODY != node->type) 
                return;
        newln(p);

-       p->offset -= INDENT;
+       p->offset -= pair->offset;

 }
 
 
 }
 
 


@@ -770,7 +1020,7 @@ termp_aq_pre(DECL_ARGS)
 
        if (MDOC_BODY != node->type)
                return(1);
 
        if (MDOC_BODY != node->type)
                return(1);

-       word(p, "<");
+       word(p, "\\(la");

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


@@ -784,7 +1034,7 @@ termp_aq_post(DECL_ARGS)
        if (MDOC_BODY != node->type)
                return;
        p->flags |= TERMP_NOSPACE;
        if (MDOC_BODY != node->type)
                return;
        p->flags |= TERMP_NOSPACE;

-       word(p, ">");
+       word(p, "\\(ra");

 }
 
 
 }
 
 


@@ -793,7 +1043,10 @@ static int
 termp_ft_pre(DECL_ARGS)
 {
 
 termp_ft_pre(DECL_ARGS)
 {
 

-       p->flags |= ttypes[TTYPE_FUNC_TYPE];
+       if (SEC_SYNOPSIS == node->sec)
+               if (node->prev && MDOC_Fo == node->prev->tok)
+                       vspace(p);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]);

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


@@ -803,10 +1056,8 @@ static void
 termp_ft_post(DECL_ARGS)
 {
 
 termp_ft_post(DECL_ARGS)
 {
 

-       p->flags &= ~ttypes[TTYPE_FUNC_TYPE];
-       if (node->sec == SEC_SYNOPSIS)
+       if (SEC_SYNOPSIS == node->sec)

                newln(p);
                newln(p);

-

 }
 
 
 }
 
 


@@ -816,29 +1067,30 @@ termp_fn_pre(DECL_ARGS)
 {
        const struct mdoc_node *n;
 
 {
        const struct mdoc_node *n;
 

-       assert(node->child);
-       assert(MDOC_TEXT == node->child->type);
+       if (NULL == node->child)
+               errx(1, "expected text line arguments");
+       if (MDOC_TEXT != node->child->type)
+               errx(1, "expected text line arguments");

 
        /* FIXME: can be "type funcname" "type varname"... */
 
        p->flags |= ttypes[TTYPE_FUNC_NAME];
 
        /* FIXME: can be "type funcname" "type varname"... */
 
        p->flags |= ttypes[TTYPE_FUNC_NAME];

-       word(p, node->child->data.text.string);
+       word(p, node->child->string);

        p->flags &= ~ttypes[TTYPE_FUNC_NAME];
 
        p->flags &= ~ttypes[TTYPE_FUNC_NAME];
 

-       p->flags |= TERMP_NOSPACE;

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

-               assert(MDOC_TEXT == n->type);
+               if (MDOC_TEXT != n->type)
+                       errx(1, "expected text line arguments");

                p->flags |= ttypes[TTYPE_FUNC_ARG];
                p->flags |= ttypes[TTYPE_FUNC_ARG];

-               word(p, n->data.text.string);
+               word(p, n->string);

                p->flags &= ~ttypes[TTYPE_FUNC_ARG];
                p->flags &= ~ttypes[TTYPE_FUNC_ARG];

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

                        word(p, ",");
        }
 
                        word(p, ",");
        }
 

-       p->flags |= TERMP_NOSPACE;

        word(p, ")");
 
        if (SEC_SYNOPSIS == node->sec)
        word(p, ")");
 
        if (SEC_SYNOPSIS == node->sec)


@@ -853,7 +1105,7 @@ static void
 termp_fn_post(DECL_ARGS)
 {
 
 termp_fn_post(DECL_ARGS)
 {
 

-       if (node->sec == SEC_SYNOPSIS)
+       if (node->sec == SEC_SYNOPSIS && node->next)

                vspace(p);
 
 }
                vspace(p);
 
 }


@@ -864,36 +1116,38 @@ static int
 termp_sx_pre(DECL_ARGS)
 {
 
 termp_sx_pre(DECL_ARGS)
 {
 

-       p->flags |= ttypes[TTYPE_LINK];
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK]);

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

-/* ARGSUSED */
-static void
-termp_sx_post(DECL_ARGS)
-{
-
-       p->flags &= ~ttypes[TTYPE_LINK];
-}
-
-

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

+       struct mdoc_node *n;

 
 

-       p->flags |= ttypes[TTYPE_FUNC_ARG];
-       return(1);
-}
+       if (node->parent->tok != MDOC_Fo) {
+               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_ARG]);
+               return(1);
+       }

 
 

+       for (n = node->child; n; n = n->next) {
+               if (MDOC_TEXT != n->type)
+                       errx(1, "expected text line arguments");

 
 

-/* ARGSUSED */
-static void
-termp_fa_post(DECL_ARGS)
-{
+               p->flags |= ttypes[TTYPE_FUNC_ARG];
+               word(p, n->string);
+               p->flags &= ~ttypes[TTYPE_FUNC_ARG];
+
+               if (n->next)
+                       word(p, ",");
+       }
+
+       if (node->next && node->next->tok == MDOC_Fa)
+               word(p, ",");

 
 

-       p->flags &= ~ttypes[TTYPE_FUNC_ARG];
+       return(0);

 }
 
 
 }
 
 


@@ -902,56 +1156,98 @@ static int
 termp_va_pre(DECL_ARGS)
 {
 
 termp_va_pre(DECL_ARGS)
 {
 

-       p->flags |= ttypes[TTYPE_VAR_DECL];
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]);

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

-/* ARGSUSED */
-static void
-termp_va_post(DECL_ARGS)
-{
-
-       p->flags &= ~ttypes[TTYPE_VAR_DECL];
-}
-
-

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

-       const struct mdoc_block *bl;
-       const struct mdoc_node *n;
+       const struct mdoc_node  *n;
+       int                      i, type;

 
        if (MDOC_BLOCK == node->type) {
 
        if (MDOC_BLOCK == node->type) {

-               vspace(p);
+               if (node->prev)
+                       vspace(p);

                return(1);
        } else if (MDOC_BODY != node->type)
                return(1);
 
                return(1);
        } else if (MDOC_BODY != node->type)
                return(1);
 

-       assert(MDOC_BLOCK == node->parent->type);
+       if (NULL == node->parent->args)
+               errx(1, "missing display type");
+
+       pair->offset = p->offset;
+
+       for (type = -1, i = 0; 
+                       i < (int)node->parent->args->argc; i++) {
+               switch (node->parent->args->argv[i].arg) {
+               case (MDOC_Ragged):
+                       /* FALLTHROUGH */
+               case (MDOC_Filled):
+                       /* FALLTHROUGH */
+               case (MDOC_Unfilled):
+                       /* FALLTHROUGH */
+               case (MDOC_Literal):
+                       type = node->parent->args->argv[i].arg;
+                       i = (int)node->parent->args->argc;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       if (NULL == node->parent->args)
+               errx(1, "missing display type");
+
+       i = arg_getattr(MDOC_Offset, node->parent);
+       if (-1 != i) {
+               if (1 != node->parent->args->argv[i].sz)
+                       errx(1, "expected single value");
+               p->offset += arg_offset(&node->parent->args->argv[i]);
+       }

 
 

-       bl = &node->parent->data.block;
-       if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv))
+       switch (type) {
+       case (MDOC_Literal):
+               /* FALLTHROUGH */
+       case (MDOC_Unfilled):
+               break;
+       default:

                return(1);
                return(1);

+       }

 
        p->flags |= TERMP_LITERAL;
 
        for (n = node->child; n; n = n->next) {
 
        p->flags |= TERMP_LITERAL;
 
        for (n = node->child; n; n = n->next) {

-               assert(MDOC_TEXT == n->type); /* FIXME */
-               if ((*n->data.text.string)) {
-                       word(p, n->data.text.string);
-                       flushln(p);
-               } else
-                       vspace(p);
-
+               if (MDOC_TEXT != n->type) {
+                       warnx("non-text children not yet allowed");
+                       continue;
+               }
+               word(p, n->string);
+               flushln(p);

        }
 
        }
 

-       p->flags &= ~TERMP_LITERAL;

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

+/* ARGSUSED */
+static void
+termp_bd_post(DECL_ARGS)
+{
+
+       if (MDOC_BODY != node->type) 
+               return;
+
+       if ( ! (p->flags & TERMP_LITERAL))
+               flushln(p);
+
+       p->flags &= ~TERMP_LITERAL;
+       p->offset = pair->offset;
+}
+
+

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


@@ -979,14 +1275,25 @@ termp_qq_post(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-termp_bx_pre(DECL_ARGS)
+termp_bsx_pre(DECL_ARGS)

 {
 
 {
 

-       word(p, "BSD");
+       word(p, "BSDI BSD/OS");

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

+/* ARGSUSED */
+static void
+termp_bx_post(DECL_ARGS)
+{
+
+       if (node->child)
+               p->flags |= TERMP_NOSPACE;
+       word(p, "BSD");
+}
+
+

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


@@ -997,6 +1304,26 @@ termp_ox_pre(DECL_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */
+static int
+termp_ux_pre(DECL_ARGS)
+{
+
+       word(p, "UNIX");
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_fx_pre(DECL_ARGS)
+{
+
+       word(p, "FreeBSD");
+       return(1);
+}
+
+

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


@@ -1060,7 +1387,7 @@ termp_ss_pre(DECL_ARGS)
        switch (node->type) {
        case (MDOC_HEAD):
                vspace(p);
        switch (node->type) {
        case (MDOC_HEAD):
                vspace(p);

-               p->flags |= ttypes[TTYPE_SSECTION];
+               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SSECTION]);

                p->offset = INDENT / 2;
                break;
        default:
                p->offset = INDENT / 2;
                break;
        default:


@@ -1078,7 +1405,6 @@ termp_ss_post(DECL_ARGS)
 
        switch (node->type) {
        case (MDOC_HEAD):
 
        switch (node->type) {
        case (MDOC_HEAD):

-               p->flags &= ~ttypes[TTYPE_SSECTION];

                newln(p);
                p->offset = INDENT;
                break;
                newln(p);
                p->offset = INDENT;
                break;


@@ -1093,28 +1419,111 @@ static int
 termp_pa_pre(DECL_ARGS)
 {
 
 termp_pa_pre(DECL_ARGS)
 {
 

-       p->flags |= ttypes[TTYPE_FILE];
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FILE]);
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_em_pre(DECL_ARGS)
+{
+
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_cd_pre(DECL_ARGS)
+{
+
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CONFIG]);
+       newln(p);
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_cm_pre(DECL_ARGS)
+{
+
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_ic_pre(DECL_ARGS)
+{
+
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD]);
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_in_pre(DECL_ARGS)
+{
+
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]);
+       word(p, "#include");
+       word(p, "<");
+       p->flags |= TERMP_NOSPACE;

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

-termp_pa_post(DECL_ARGS)
+termp_in_post(DECL_ARGS)
+{
+
+       p->flags |= TERMP_NOSPACE;
+       word(p, ">");
+
+       newln(p);
+       if (SEC_SYNOPSIS != node->sec)
+               return;
+       if (node->next && MDOC_In != node->next->tok)
+               vspace(p);
+}
+
+
+/* ARGSUSED */
+static int
+termp_at_pre(DECL_ARGS)

 {
 {

+       const char      *att;

 
 

-       p->flags &= ~ttypes[TTYPE_FILE];
+       att = NULL;
+
+       if (node->child) {
+               if (MDOC_TEXT != node->child->type)
+                       errx(1, "expected text line argument");
+               att = mdoc_a2att(node->child->string);
+       }
+
+       if (NULL == att)
+               att = "AT&T UNIX";
+
+       word(p, att);
+       return(0);

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

-termp_qo_pre(DECL_ARGS)
+termp_bq_pre(DECL_ARGS)

 {
 
        if (MDOC_BODY != node->type)
                return(1);
 {
 
        if (MDOC_BODY != node->type)
                return(1);

-       word(p, "\"");
+       word(p, "[");

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


@@ -1122,30 +1531,181 @@ termp_qo_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static void
 
 /* ARGSUSED */
 static void

-termp_qo_post(DECL_ARGS)
+termp_bq_post(DECL_ARGS)

 {
 
        if (MDOC_BODY != node->type)
                return;
 {
 
        if (MDOC_BODY != node->type)
                return;

+       word(p, "]");
+}
+
+
+/* ARGSUSED */
+static int
+termp_pq_pre(DECL_ARGS)
+{
+
+       if (MDOC_BODY != node->type)
+               return(1);
+       word(p, "\\&(");

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

-       word(p, "\"");
+       return(1);
+}
+
+
+/* ARGSUSED */
+static void
+termp_pq_post(DECL_ARGS)
+{
+
+       if (MDOC_BODY != node->type)
+               return;
+       word(p, ")");

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

-termp_em_pre(DECL_ARGS)
+termp_fo_pre(DECL_ARGS)
+{
+       const struct mdoc_node *n;
+
+       if (MDOC_BODY == node->type) {
+               word(p, "(");
+               p->flags |= TERMP_NOSPACE;
+               return(1);
+       } else if (MDOC_HEAD != node->type) 
+               return(1);
+
+       /* XXX - groff shows only first parameter */
+
+       p->flags |= ttypes[TTYPE_FUNC_NAME];
+       for (n = node->child; n; n = n->next) {
+               if (MDOC_TEXT != n->type)
+                       errx(1, "expected text line argument");
+               word(p, n->string);
+       }
+       p->flags &= ~ttypes[TTYPE_FUNC_NAME];
+
+       return(0);
+}
+
+
+/* ARGSUSED */
+static void
+termp_fo_post(DECL_ARGS)

 {
 
 {
 

-       p->flags |= ttypes[TTYPE_EMPH];
+       if (MDOC_BODY != node->type)
+               return;
+       word(p, ")");
+       word(p, ";");
+       newln(p);
+}
+
+
+/* ARGSUSED */
+static int
+termp_bf_pre(DECL_ARGS)
+{
+       const struct mdoc_node  *n;
+
+       if (MDOC_HEAD == node->type) {
+               return(0);
+       } else if (MDOC_BLOCK != node->type)
+               return(1);
+
+       if (NULL == (n = node->head->child)) {
+               if (arg_hasattr(MDOC_Emphasis, node))
+                       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+               else if (arg_hasattr(MDOC_Symbolic, node))
+                       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);
+
+               return(1);
+       } 
+
+       if (MDOC_TEXT != n->type)
+               errx(1, "expected text line arguments");
+
+       if (0 == strcmp("Em", n->string))
+               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+       else if (0 == strcmp("Sy", n->string))
+               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_sy_pre(DECL_ARGS)
+{
+
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);

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

+/* ARGSUSED */
+static int
+termp_ms_pre(DECL_ARGS)
+{
+
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMBOL]);
+       return(1);
+}
+
+
+
+/* ARGSUSED */
+static int
+termp_sm_pre(DECL_ARGS)
+{
+
+#if notyet
+       assert(node->child);
+       if (0 == strcmp("off", node->child->data.text.string)) {
+               p->flags &= ~TERMP_NONOSPACE;
+               p->flags &= ~TERMP_NOSPACE;
+       } else {
+               p->flags |= TERMP_NONOSPACE;
+               p->flags |= TERMP_NOSPACE;
+       }
+#endif
+
+       return(0);
+}
+
+
+/* ARGSUSED */
+static int
+termp__t_pre(DECL_ARGS)
+{
+
+       /* FIXME: titles are underlined. */
+       word(p, "\"");
+       p->flags |= TERMP_NOSPACE;
+       return(1);
+}
+
+
+/* ARGSUSED */
+static void
+termp__t_post(DECL_ARGS)
+{
+
+       p->flags |= TERMP_NOSPACE;
+       /* FIXME: titles are underlined. */
+       word(p, "\"");
+       word(p, node->next ? "," : ".");
+}
+
+

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

-termp_em_post(DECL_ARGS)
+termp____post(DECL_ARGS)

 {
 
 {
 

-       p->flags &= ~ttypes[TTYPE_EMPH];
+       p->flags |= TERMP_NOSPACE;
+       word(p, node->next ? "," : ".");

 }
 }