Memory-corruption fix.

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index f44b7a51ebf4ea1ec4273c7f3144293c9cfbcf82..a4c75df634ca48554f1f48b66a48964b68cc5e6b 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.27 2009/02/27 09:39:40 kristaps Exp $ */
+/* $Id: term.c,v 1.43 2009/03/06 14:13:47 kristaps Exp $ */

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


@@ -25,14 +25,11 @@
 
 #include "term.h"
 
 
 #include "term.h"
 

-#define        INDENT            6
-

 /*
  * 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
 /* FIXME: macro arguments can be escaped. */
 
 #define        TTYPE_PROG        0


@@ -53,7 +50,8 @@
 #define        TTYPE_INCLUDE     15
 #define        TTYPE_SYMB        16
 #define        TTYPE_SYMBOL      17
 #define        TTYPE_INCLUDE     15
 #define        TTYPE_SYMB        16
 #define        TTYPE_SYMBOL      17

-#define        TTYPE_NMAX        18
+#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


@@ -61,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 */


@@ -79,7 +79,8 @@ const int ttypes[TTYPE_NMAX] = {
        TERMP_BOLD,             /* TTYPE_CMD */
        TERMP_BOLD,             /* TTYPE_INCLUDE */
        TERMP_BOLD,             /* TTYPE_SYMB */
        TERMP_BOLD,             /* TTYPE_CMD */
        TERMP_BOLD,             /* TTYPE_INCLUDE */
        TERMP_BOLD,             /* TTYPE_SYMB */

-       TERMP_BOLD              /* TTYPE_SYMBOL */
+       TERMP_BOLD,             /* TTYPE_SYMBOL */
+       TERMP_BOLD              /* TTYPE_DIAG */

 };
 
 static int               arg_hasattr(int, size_t, 
 };
 
 static int               arg_hasattr(int, size_t, 


@@ -88,6 +89,7 @@ static        int               arg_getattr(int, size_t,
                                const struct mdoc_arg *);
 static size_t            arg_offset(const struct mdoc_arg *);
 static size_t            arg_width(const struct mdoc_arg *);
                                const struct mdoc_arg *);
 static size_t            arg_offset(const struct mdoc_arg *);
 static size_t            arg_width(const struct mdoc_arg *);

+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


@@ -108,6 +110,7 @@ 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_bd);
 DECL_PREPOST(termp_bq);
 DECL_PREPOST(termp_aq);
 DECL_PREPOST(termp_bd);
 DECL_PREPOST(termp_bq);


@@ -117,6 +120,7 @@ DECL_PREPOST(termp_fd);
 DECL_PREPOST(termp_fn);
 DECL_PREPOST(termp_fo);
 DECL_PREPOST(termp_ft);
 DECL_PREPOST(termp_fn);
 DECL_PREPOST(termp_fo);
 DECL_PREPOST(termp_ft);

+DECL_PREPOST(termp_in);

 DECL_PREPOST(termp_it);
 DECL_PREPOST(termp_op);
 DECL_PREPOST(termp_pf);
 DECL_PREPOST(termp_it);
 DECL_PREPOST(termp_op);
 DECL_PREPOST(termp_pf);


@@ -132,7 +136,6 @@ DECL_PRE(termp_at);
 DECL_PRE(termp_bf);
 DECL_PRE(termp_bsx);
 DECL_PRE(termp_bt);
 DECL_PRE(termp_bf);
 DECL_PRE(termp_bsx);
 DECL_PRE(termp_bt);

-DECL_PRE(termp_bx);

 DECL_PRE(termp_cd);
 DECL_PRE(termp_cm);
 DECL_PRE(termp_em);
 DECL_PRE(termp_cd);
 DECL_PRE(termp_cm);
 DECL_PRE(termp_em);


@@ -141,7 +144,6 @@ DECL_PRE(termp_fa);
 DECL_PRE(termp_fl);
 DECL_PRE(termp_fx);
 DECL_PRE(termp_ic);
 DECL_PRE(termp_fl);
 DECL_PRE(termp_fx);
 DECL_PRE(termp_ic);

-DECL_PRE(termp_in);

 DECL_PRE(termp_ms);
 DECL_PRE(termp_nd);
 DECL_PRE(termp_nm);
 DECL_PRE(termp_ms);
 DECL_PRE(termp_nd);
 DECL_PRE(termp_nm);


@@ -150,6 +152,7 @@ DECL_PRE(termp_nx);
 DECL_PRE(termp_ox);
 DECL_PRE(termp_pa);
 DECL_PRE(termp_pp);
 DECL_PRE(termp_ox);
 DECL_PRE(termp_pa);
 DECL_PRE(termp_pp);

+DECL_PRE(termp_rs);

 DECL_PRE(termp_rv);
 DECL_PRE(termp_sm);
 DECL_PRE(termp_st);
 DECL_PRE(termp_rv);
 DECL_PRE(termp_sm);
 DECL_PRE(termp_st);


@@ -160,7 +163,10 @@ DECL_PRE(termp_ux);
 DECL_PRE(termp_va);
 DECL_PRE(termp_xr);
 
 DECL_PRE(termp_va);
 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 }, /* \" */


@@ -171,7 +177,7 @@ 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_d1_pre, termp_d1_post }, /* Dl */

        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */
        { NULL, termp_bl_post }, /* Bl */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */
        { NULL, termp_bl_post }, /* Bl */


@@ -192,7 +198,7 @@ const       struct termact __termacts[MDOC_MAX] = {
        { termp_fn_pre, termp_fn_post }, /* Fn */ 
        { termp_ft_pre, termp_ft_post }, /* Ft */ 
        { termp_ic_pre, NULL }, /* Ic */ 
        { termp_fn_pre, termp_fn_post }, /* Fn */ 
        { termp_ft_pre, termp_ft_post }, /* Ft */ 
        { termp_ic_pre, NULL }, /* Ic */ 

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

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


@@ -204,17 +210,17 @@ const     struct termact __termacts[MDOC_MAX] = {
        { termp_va_pre, NULL }, /* Va */
        { termp_vt_pre, termp_vt_post }, /* Vt */ 
        { termp_xr_pre, NULL }, /* Xr */
        { termp_va_pre, NULL }, /* Va */
        { 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 */
        { termp_aq_pre, termp_aq_post }, /* Ao */
        { termp_aq_pre, termp_aq_post }, /* Aq */
        { NULL, NULL }, /* Ac */
        { termp_aq_pre, termp_aq_post }, /* Ao */
        { termp_aq_pre, termp_aq_post }, /* Aq */


@@ -224,7 +230,7 @@ const       struct termact __termacts[MDOC_MAX] = {
        { termp_bq_pre, termp_bq_post }, /* Bo */
        { termp_bq_pre, termp_bq_post }, /* Bq */
        { termp_bsx_pre, NULL }, /* Bsx */
        { termp_bq_pre, termp_bq_post }, /* Bo */
        { termp_bq_pre, termp_bq_post }, /* Bq */
        { termp_bsx_pre, NULL }, /* Bsx */

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

        { NULL, NULL }, /* Db */
        { NULL, NULL }, /* Dc */
        { termp_dq_pre, termp_dq_post }, /* Do */
        { NULL, NULL }, /* Db */
        { NULL, NULL }, /* Dc */
        { termp_dq_pre, termp_dq_post }, /* Do */


@@ -248,7 +254,7 @@ const       struct termact __termacts[MDOC_MAX] = {
        { termp_qq_pre, termp_qq_post }, /* Qo */
        { termp_qq_pre, termp_qq_post }, /* Qq */
        { NULL, NULL }, /* Re */
        { termp_qq_pre, termp_qq_post }, /* Qo */
        { termp_qq_pre, termp_qq_post }, /* Qq */
        { NULL, NULL }, /* Re */

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

        { NULL, NULL }, /* Sc */
        { termp_sq_pre, termp_sq_post }, /* So */
        { termp_sq_pre, termp_sq_post }, /* Sq */
        { NULL, NULL }, /* Sc */
        { termp_sq_pre, termp_sq_post }, /* So */
        { termp_sq_pre, termp_sq_post }, /* Sq */


@@ -269,6 +275,7 @@ const       struct termact __termacts[MDOC_MAX] = {
        { 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;
 };
 
 const struct termact *termacts = __termacts;


@@ -290,7 +297,7 @@ arg_width(const struct mdoc_arg *arg)
        assert(len > 0);
 
        for (i = 0; i < len - 1; i++) 
        assert(len > 0);
 
        for (i = 0; i < len - 1; i++) 

-               if ( ! isdigit((int)(*arg->value)[i]))
+               if ( ! isdigit((u_char)(*arg->value)[i]))

                        break;
 
        if (i == len - 1) {
                        break;
 
        if (i == len - 1) {


@@ -300,7 +307,45 @@ arg_width(const struct mdoc_arg *arg)
                }
 
        }
                }
 
        }

-       return(strlen(*arg->value));
+       return(strlen(*arg->value) + 1);
+}
+
+
+static int
+arg_listtype(const struct mdoc_node *n)
+{
+       const struct mdoc_block *bl;
+       int              i, len;
+
+       bl = &n->data.block;
+       len = (int)bl->argc;
+
+       for (i = 0; i < len; i++) 
+               switch (bl->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(bl->argv[i].arg);
+               default:
+                       break;
+               }
+
+       errx(1, "list type not supported");
+       /* NOTREACHED */

 }
 
 
 }
 
 


@@ -367,67 +412,45 @@ termp_dq_post(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-termp_it_pre(DECL_ARGS)
+termp_it_pre_block(DECL_ARGS)

 {
 {

-       const struct mdoc_node *n, *it;
+       const struct mdoc_node  *n;

        const struct mdoc_block *bl;
        const struct mdoc_block *bl;

-       char             buf[7], *tp;
-       int              i, type;
-       size_t           width, offset;

 
 

-       switch (node->type) {
-       case (MDOC_BODY):
-               /* FALLTHROUGH */
-       case (MDOC_HEAD):
-               it = node->parent;
-               break;
-       case (MDOC_BLOCK):
-               it = node;
-               break;
-       default:
-               return(1);
-       }
-
-       n = it->parent->parent;
+       n = node->parent->parent;

        bl = &n->data.block;
 
        bl = &n->data.block;
 

-       if (MDOC_BLOCK == node->type) {
-               if (arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
-                       newln(p);
-               else
+       newln(p);
+       if ( ! arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
+               if (node->prev || n->prev)

                        vspace(p);
                        vspace(p);

-               return(1);
-       }

 
 

-       /* Get our list type. */
+       return(1);
+}

 
 

-       for (type = -1, i = 0; i < (int)bl->argc; i++) 
-               switch (bl->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_Ohang):
-                       type = bl->argv[i].arg;
-                       i = (int)bl->argc;
-                       break;
-               default:
-                       errx(1, "list type not supported");
-                       /* NOTREACHED */
-               }

 
 

-       assert(-1 != type);
+/* ARGSUSED */
+static int
+termp_it_pre(DECL_ARGS)
+{
+       const struct mdoc_block *bl;
+       char             buf[7];
+       int              i, type;
+       size_t           width, offset;
+
+       if (MDOC_BLOCK == node->type)
+               return(termp_it_pre_block(p, pair, meta, node));

 
 

-       /* Save our existing (inherited) margin and offset. */
+       /* Get ptr to list block, type, etc. */
+
+       bl = &node->parent->parent->parent->data.block;
+       type = arg_listtype(node->parent->parent->parent);
+
+       /* Save parent attributes. */

 
        pair->offset = p->offset;
        pair->rmargin = p->rmargin;
 
        pair->offset = p->offset;
        pair->rmargin = p->rmargin;

+       pair->flag = p->flags;

 
        /* Get list width and offset. */
 
 
        /* Get list width and offset. */
 


@@ -437,7 +460,11 @@ termp_it_pre(DECL_ARGS)
        i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
        offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0;
 
        i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
        offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0;
 

-       /* Override the width. */
+       /* 
+        * List-type can override the width in the case of fixed-head
+        * values (bullet, dash/hyphen, enum).  Tags need a non-zero
+        * offset.
+        */

 
        switch (type) {
        case (MDOC_Bullet):
 
        switch (type) {
        case (MDOC_Bullet):


@@ -447,20 +474,55 @@ termp_it_pre(DECL_ARGS)
        case (MDOC_Enum):
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
        case (MDOC_Enum):
                /* FALLTHROUGH */
        case (MDOC_Hyphen):

-               width = width > 6 ? width : 6;
+               width = width > 4 ? width : 4;

                break;
        case (MDOC_Tag):
                break;
        case (MDOC_Tag):

-               /* FIXME: auto-size. */
-               if (0 == width)
-                       errx(1, "need non-zero -width");
+               if (width)
+                       break;
+               errx(1, "need non-zero %s for list type", 
+                               mdoc_argnames[MDOC_Width]);
+       default:
+               break;
+       }
+
+       /* 
+        * Whitespace control.  Inset bodies need an initial space.
+        */
+
+       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:
                break;
        default:

+               p->flags |= TERMP_NOSPACE;

                break;
        }
 
                break;
        }
 

-       /* Word-wrap control. */
+       /*
+        * Style flags.  Diagnostic heads need TTYPE_DIAG.
+        */

 
 

-       p->flags |= TERMP_NOSPACE;
+       switch (type) {
+       case (MDOC_Diag):
+               if (MDOC_HEAD == node->type)
+                       p->flags |= ttypes[TTYPE_DIAG];
+               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.
+        */

 
        switch (type) {
        case (MDOC_Bullet):
 
        switch (type) {
        case (MDOC_Bullet):


@@ -474,37 +536,27 @@ termp_it_pre(DECL_ARGS)
        case (MDOC_Tag):
                if (MDOC_HEAD == node->type)
                        p->flags |= TERMP_NOBREAK;
        case (MDOC_Tag):
                if (MDOC_HEAD == node->type)
                        p->flags |= TERMP_NOBREAK;

-               else if (MDOC_BODY == node->type)
+               else

                        p->flags |= TERMP_NOLPAD;
                        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;
        }
 
        /* 
                break;
        default:
                break;
        }
 
        /* 

-        * Get a token to use as the HEAD lead-in.  If NULL, we use the
-        * HEAD child. 
+        * 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.

         */
 
         */
 

-       tp = NULL;
-
-       if (MDOC_HEAD == node->type) {
-               if (arg_hasattr(MDOC_Bullet, bl->argc, bl->argv))
-                       tp = "\\[bu]";
-               if (arg_hasattr(MDOC_Dash, bl->argc, bl->argv))
-                       tp = "\\-";
-               if (arg_hasattr(MDOC_Enum, bl->argc, bl->argv)) {
-                       (pair->ppair->ppair->count)++;
-                       (void)snprintf(buf, sizeof(buf), "%d.", 
-                                       pair->ppair->ppair->count);
-                       tp = buf;
-               }
-               if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv))
-                       tp = "\\-";
-       }
-
-       /* Margin control. */
-

        p->offset += offset;
 
        switch (type) {
        p->offset += offset;
 
        switch (type) {


@@ -519,18 +571,61 @@ termp_it_pre(DECL_ARGS)
        case (MDOC_Tag):
                if (MDOC_HEAD == node->type)
                        p->rmargin = p->offset + width;
        case (MDOC_Tag):
                if (MDOC_HEAD == node->type)
                        p->rmargin = p->offset + width;

-               else if (MDOC_BODY == node->type) 
+               else 

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

-               break;
+               /* FALLTHROUGH */

        default:
                break;
        }
 
        default:
                break;
        }
 

-       if (NULL == tp)
-               return(1);
+       /* 
+        * The dash, hyphen, bullet and enum lists all have a special
+        * HEAD character.  Print it now.
+        */

 
 

-       word(p, tp);
-       return(0);
+       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;
+               }
+
+       /* 
+        * 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);

 }
 
 
 }
 
 


@@ -538,20 +633,31 @@ termp_it_pre(DECL_ARGS)
 static void
 termp_it_post(DECL_ARGS)
 {
 static void
 termp_it_post(DECL_ARGS)
 {

+       int                type;

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

-       flushln(p);
+       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->offset = pair->offset;
        p->rmargin = pair->rmargin;

-
-       if (MDOC_HEAD == node->type) {
-               p->flags &= ~TERMP_NOBREAK;
-               p->flags &= ~TERMP_NORPAD;
-       } else if (MDOC_BODY == node->type)
-               p->flags &= ~TERMP_NOLPAD;
+       p->flags = pair->flag;

 }
 
 
 }
 
 


@@ -560,9 +666,13 @@ static int
 termp_nm_pre(DECL_ARGS)
 {
 
 termp_nm_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_PROG]);
+       if (SEC_SYNOPSIS == node->sec)
+               newln(p);
+
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_PROG]);

        if (NULL == node->child)
                word(p, meta->name);
        if (NULL == node->child)
                word(p, meta->name);

+

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


@@ -572,7 +682,7 @@ static int
 termp_fl_pre(DECL_ARGS)
 {
 
 termp_fl_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);

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


@@ -584,9 +694,7 @@ static int
 termp_ar_pre(DECL_ARGS)
 {
 
 termp_ar_pre(DECL_ARGS)
 {
 

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

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


@@ -615,13 +723,23 @@ termp_pp_pre(DECL_ARGS)
 static int
 termp_st_pre(DECL_ARGS)
 {
 static int
 termp_st_pre(DECL_ARGS)
 {

-       const char      *tp;
+       const char      *cp;

 
 

-       assert(1 == node->data.elem.argc);
+       /* XXX - if child isn't text? */
+       if (node->child) 
+               if ((cp = mdoc_a2st(node->child->data.text.string)))
+                       word(p, cp);
+       return(0);
+}

 
 

-       tp = mdoc_st2a(node->data.elem.argv[0].arg);
-       word(p, tp);

 
 

+/* ARGSUSED */
+static int
+termp_rs_pre(DECL_ARGS)
+{
+
+       if (MDOC_BLOCK == node->type && node->prev)
+               vspace(p);

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


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

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]);

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


@@ -766,7 +884,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.
         */

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_DECL]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_DECL]);

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


@@ -776,7 +894,10 @@ static void
 termp_fd_post(DECL_ARGS)
 {
 
 termp_fd_post(DECL_ARGS)
 {
 

-       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);
 }
 


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

-               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SECTION]);
+               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SECTION]);

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


@@ -847,6 +968,15 @@ termp_bt_pre(DECL_ARGS)
 }
 
 
 }
 
 

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

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


@@ -889,7 +1019,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);
 }


@@ -903,7 +1033,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");

 }
 
 
 }
 
 


@@ -912,7 +1042,10 @@ static int
 termp_ft_pre(DECL_ARGS)
 {
 
 termp_ft_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, 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);
 }
 


@@ -922,7 +1055,7 @@ static void
 termp_ft_post(DECL_ARGS)
 {
 
 termp_ft_post(DECL_ARGS)
 {
 

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

                newln(p);
 }
 
                newln(p);
 }
 


@@ -968,7 +1101,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);
 
 }


@@ -979,7 +1112,7 @@ static int
 termp_sx_pre(DECL_ARGS)
 {
 
 termp_sx_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_LINK]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK]);

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


@@ -991,7 +1124,7 @@ termp_fa_pre(DECL_ARGS)
        struct mdoc_node *n;
 
        if (node->parent->tok != MDOC_Fo) {
        struct mdoc_node *n;
 
        if (node->parent->tok != MDOC_Fo) {

-               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_ARG]);
+               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_ARG]);

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


@@ -1018,7 +1151,7 @@ static int
 termp_va_pre(DECL_ARGS)
 {
 
 termp_va_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]);

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


@@ -1028,20 +1161,37 @@ static int
 termp_bd_pre(DECL_ARGS)
 {
        const struct mdoc_block *bl;
 termp_bd_pre(DECL_ARGS)
 {
        const struct mdoc_block *bl;

-       const struct mdoc_node *n;
-       int              i;
+       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);

        pair->offset = p->offset;
        pair->offset = p->offset;

-

        bl = &node->parent->data.block;
 
        bl = &node->parent->data.block;
 

+       for (type = -1, i = 0; i < (int)bl->argc; i++) {
+               switch (bl->argv[i].arg) {
+               case (MDOC_Ragged):
+                       /* FALLTHROUGH */
+               case (MDOC_Filled):
+                       /* FALLTHROUGH */
+               case (MDOC_Unfilled):
+                       /* FALLTHROUGH */
+               case (MDOC_Literal):
+                       type = bl->argv[i].arg;
+                       i = (int)bl->argc;
+                       break;
+               default:
+                       errx(1, "display type not supported");
+               }
+       }
+
+       assert(-1 != type);

 
        i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
        if (-1 != i) {
 
        i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
        if (-1 != i) {


@@ -1049,22 +1199,27 @@ termp_bd_pre(DECL_ARGS)
                p->offset += arg_offset(&bl->argv[i]);
        }
 
                p->offset += arg_offset(&bl->argv[i]);
        }
 

-       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->data.text.string);
+               flushln(p);

        }
 
        }
 

-       p->flags &= ~TERMP_LITERAL;

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


@@ -1076,7 +1231,11 @@ termp_bd_post(DECL_ARGS)
 
        if (MDOC_BODY != node->type) 
                return;
 
        if (MDOC_BODY != node->type) 
                return;

-       newln(p);
+
+       if ( ! (p->flags & TERMP_LITERAL))
+               flushln(p);
+
+       p->flags &= ~TERMP_LITERAL;

        p->offset = pair->offset;
 }
 
        p->offset = pair->offset;
 }
 


@@ -1117,12 +1276,13 @@ termp_bsx_pre(DECL_ARGS)
 
 
 /* ARGSUSED */
 
 
 /* ARGSUSED */

-static int
-termp_bx_pre(DECL_ARGS)
+static void
+termp_bx_post(DECL_ARGS)

 {
 
 {
 

+       if (node->child)
+               p->flags |= TERMP_NOSPACE;

        word(p, "BSD");
        word(p, "BSD");

-       return(1);

 }
 
 
 }
 
 


@@ -1173,7 +1333,7 @@ termp_sq_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);
 }


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

-               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SSECTION]);
+               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SSECTION]);

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


@@ -1251,7 +1411,7 @@ static int
 termp_pa_pre(DECL_ARGS)
 {
 
 termp_pa_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FILE]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FILE]);

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


@@ -1261,7 +1421,7 @@ static int
 termp_em_pre(DECL_ARGS)
 {
 
 termp_em_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);

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


@@ -1271,7 +1431,8 @@ static int
 termp_cd_pre(DECL_ARGS)
 {
 
 termp_cd_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CONFIG]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CONFIG]);
+       newln(p);

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


@@ -1281,7 +1442,7 @@ static int
 termp_cm_pre(DECL_ARGS)
 {
 
 termp_cm_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);

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


@@ -1291,7 +1452,7 @@ static int
 termp_ic_pre(DECL_ARGS)
 {
 
 termp_ic_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD]);

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


@@ -1301,24 +1462,47 @@ static int
 termp_in_pre(DECL_ARGS)
 {
 
 termp_in_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_INCLUDE]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]);
+       word(p, "#include");
+       word(p, "<");
+       p->flags |= TERMP_NOSPACE;

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

+/* ARGSUSED */
+static void
+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)
 {
 /* ARGSUSED */
 static int
 termp_at_pre(DECL_ARGS)
 {

-       enum mdoc_att    c;
+       const char      *att;
+
+       att = NULL;

 
 

-       c = ATT_DEFAULT;

        if (node->child) {
                assert(MDOC_TEXT == node->child->type);
        if (node->child) {
                assert(MDOC_TEXT == node->child->type);

-               c = mdoc_atoatt(node->child->data.text.string);
+               att = mdoc_a2att(node->child->data.text.string);

        }
 
        }
 

-       word(p, mdoc_att2a(c));
+       if (NULL == att)
+               att = "AT&T UNIX";
+
+       word(p, att);

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


@@ -1330,7 +1514,7 @@ 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);
 }


@@ -1428,9 +1612,9 @@ termp_bf_pre(DECL_ARGS)
 
        if (NULL == (n = b->head->child)) {
                if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv))
 
        if (NULL == (n = b->head->child)) {
                if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv))

-                       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
+                       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);

                else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv))
                else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv))

-                       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]);
+                       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);

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


@@ -1438,9 +1622,9 @@ termp_bf_pre(DECL_ARGS)
        assert(MDOC_TEXT == n->type);
 
        if (0 == strcmp("Em", n->data.text.string))
        assert(MDOC_TEXT == n->type);
 
        if (0 == strcmp("Em", n->data.text.string))

-               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
+               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);

        else if (0 == strcmp("Sy", n->data.text.string))
        else if (0 == strcmp("Sy", n->data.text.string))

-               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
+               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);

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


@@ -1451,7 +1635,7 @@ static int
 termp_sy_pre(DECL_ARGS)
 {
 
 termp_sy_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);

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


@@ -1461,7 +1645,7 @@ static int
 termp_ms_pre(DECL_ARGS)
 {
 
 termp_ms_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMBOL]);
+       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMBOL]);

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


@@ -1485,3 +1669,37 @@ termp_sm_pre(DECL_ARGS)
 
        return(0);
 }
 
        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
+termp____post(DECL_ARGS)
+{
+
+       p->flags |= TERMP_NOSPACE;
+       word(p, node->next ? "," : ".");
+}