Added new old escape sequence \*[nn].

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 5fd868dda15b75911c2d814f99de9d6ec8456e88..8096238733bd82b7f638e9fa777f52cfb56ca76f 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.21 2009/02/25 15:12:26 kristaps Exp $ */
+/* $Id: term.c,v 1.35 2009/03/02 17:14:46 kristaps Exp $ */

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


@@ -17,13 +17,14 @@
  * 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.


@@ -105,6 +106,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);


@@ -114,6 +116,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);


@@ -129,7 +132,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);


@@ -138,7 +140,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);


@@ -147,7 +148,9 @@ 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_rv);

+DECL_PRE(termp_sm);

 DECL_PRE(termp_st);
 DECL_PRE(termp_sx);
 DECL_PRE(termp_sy);
 DECL_PRE(termp_st);
 DECL_PRE(termp_sx);
 DECL_PRE(termp_sy);


@@ -156,7 +159,9 @@ 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);

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


@@ -167,7 +172,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 */


@@ -188,7 +193,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 */ 


@@ -200,17 +205,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 */


@@ -220,7 +225,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 */


@@ -244,11 +249,11 @@ 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 */

-       { NULL, NULL }, /* Sm */
+       { termp_sm_pre, NULL }, /* Sm */

        { termp_sx_pre, NULL }, /* Sx */
        { termp_sy_pre, NULL }, /* Sy */
        { NULL, NULL }, /* Tn */
        { termp_sx_pre, NULL }, /* Sx */
        { termp_sy_pre, NULL }, /* Sy */
        { NULL, NULL }, /* Tn */


@@ -273,10 +278,30 @@ const struct termact *termacts = __termacts;
 static size_t
 arg_width(const struct mdoc_arg *arg)
 {
 static size_t
 arg_width(const struct mdoc_arg *arg)
 {

+       size_t           v;
+       int              i, len;

 
 

-       /* TODO */

        assert(*arg->value);
        assert(*arg->value);

-       return(strlen(*arg->value));
+       if (0 == strcmp(*arg->value, "indent"))
+               return(INDENT);
+       if (0 == strcmp(*arg->value, "indent-two"))
+               return(INDENT * 2);
+
+       len = (int)strlen(*arg->value);
+       assert(len > 0);
+
+       for (i = 0; i < len - 1; i++) 
+               if ( ! isdigit((int)(*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);

 }
 
 
 }
 
 


@@ -290,7 +315,6 @@ arg_offset(const struct mdoc_arg *arg)
                return(INDENT);
        if (0 == strcmp(*arg->value, "indent-two"))
                return(INDENT * 2);
                return(INDENT);
        if (0 == strcmp(*arg->value, "indent-two"))
                return(INDENT * 2);

-

        return(strlen(*arg->value));
 }
 
        return(strlen(*arg->value));
 }
 


@@ -348,8 +372,8 @@ termp_it_pre(DECL_ARGS)
 {
        const struct mdoc_node *n, *it;
        const struct mdoc_block *bl;
 {
        const struct mdoc_node *n, *it;
        const struct mdoc_block *bl;

-       char             buf[7];
-       int              i;
+       char             buf[7], *tp;
+       int              i, type;

        size_t           width, offset;
 
        switch (node->type) {
        size_t           width, offset;
 
        switch (node->type) {


@@ -369,86 +393,145 @@ termp_it_pre(DECL_ARGS)
        bl = &n->data.block;
 
        if (MDOC_BLOCK == node->type) {
        bl = &n->data.block;
 
        if (MDOC_BLOCK == node->type) {

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

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

+       /* Get our list type. */
+
+       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);
+
+       /* Save our existing (inherited) margin and offset. */
+

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

-       /* FIXME: auto-size. */
+       /* Get list width and offset. */
+

        i = arg_getattr(MDOC_Width, bl->argc, bl->argv);
        i = arg_getattr(MDOC_Width, bl->argc, bl->argv);

-       width = i >= 0 ? arg_width(&bl->argv[i]) : 10;
+       width = i >= 0 ? arg_width(&bl->argv[i]) : 0;

 
        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;
 

-       assert(MDOC_HEAD == node->type || 
-                       MDOC_BODY == node->type);
-
-       if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) {
-               p->flags |= TERMP_NOSPACE;
-               if (MDOC_BODY == node->type) {
-                       p->flags |= TERMP_NOLPAD;
-                       p->offset += width;
-               } else  {
-                       p->flags |= TERMP_NOBREAK;
-                       p->rmargin = p->offset + offset + width;
-               }
+       /* Override the width. */

 
 

-       } else if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) {
-               p->flags |= TERMP_NOSPACE;
+       switch (type) {
+       case (MDOC_Bullet):
+               /* FALLTHROUGH */
+       case (MDOC_Dash):
+               /* FALLTHROUGH */
+       case (MDOC_Enum):
+               /* FALLTHROUGH */
+       case (MDOC_Hyphen):
+               width = width > 6 ? width : 6;
+               break;
+       case (MDOC_Tag):
+               /* FIXME: auto-size. */
+               if (0 == width)
+                       errx(1, "need non-zero -width");
+               break;
+       default:
+               break;
+       }

 
 

-       } else if (arg_hasattr(MDOC_Diag, bl->argc, bl->argv)) {
-               /* TODO. */
+       /* Word-wrap control. */

 
 

-       } else if (arg_hasattr(MDOC_Hang, bl->argc, bl->argv)) {
-               /* TODO. */
+       p->flags |= TERMP_NOSPACE;

 
 

-       } else if (arg_hasattr(MDOC_Bullet, bl->argc, bl->argv)) {
-               p->flags |= TERMP_NOSPACE;
-               if (MDOC_BODY == node->type) {
-                       p->flags |= TERMP_NOLPAD;
-                       p->offset += 6;
-               } else {
-                       word(p, "\\[bu]");
+       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;
                        p->flags |= TERMP_NOBREAK;

-                       p->rmargin = p->offset + offset + 6;
-               }
-
-       } else if (arg_hasattr(MDOC_Enum, bl->argc, bl->argv)) {
-               p->flags |= TERMP_NOSPACE;
-               if (MDOC_BODY == node->type) {
+               else if (MDOC_BODY == node->type)

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

-                       p->offset += 6;
-               } else {
+               break;
+       default:
+               break;
+       }
+
+       /* 
+        * Get a token to use as the HEAD lead-in.  If NULL, we use the
+        * HEAD child. 
+        */
+
+       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);
                        (pair->ppair->ppair->count)++;
                        (void)snprintf(buf, sizeof(buf), "%d.", 
                                        pair->ppair->ppair->count);

-                       word(p, buf);
-                       p->flags |= TERMP_NOBREAK;
-                       p->rmargin = p->offset + offset + 6;
+                       tp = buf;

                }
                }

+               if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv))
+                       tp = "\\-";
+       }

 
 

-       } else if (arg_hasattr(MDOC_Dash, bl->argc, bl->argv) ||
-                       arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv)) {
-               p->flags |= TERMP_NOSPACE;
-               if (MDOC_BODY == node->type) {
-                       p->flags |= TERMP_NOLPAD;
-                       p->offset += 6;
-                       return(1);
-               } else {
-                       word(p, "\\-");
-                       p->flags |= TERMP_NOBREAK;
-                       p->rmargin = p->offset + offset + 6;
-               }
-       } 
+       /* Margin control. */

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

-       return(1);
+
+       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;
+               else if (MDOC_BODY == node->type) 
+                       p->offset += width;
+               break;
+       default:
+               break;
+       }
+
+       if (NULL == tp)
+               return(1);
+
+       word(p, tp);
+       return(0);

 }
 
 
 }
 
 


@@ -456,41 +539,19 @@ termp_it_pre(DECL_ARGS)
 static void
 termp_it_post(DECL_ARGS)
 {
 static void
 termp_it_post(DECL_ARGS)
 {

-       const struct mdoc_node *n, *it;
-       const struct mdoc_block *bl;

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

-       it = node->parent;
-       n = it->parent->parent;
-       bl = &n->data.block;
-
-       if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv) ||
-                       arg_hasattr(MDOC_Bullet, bl->argc, bl->argv) ||
-                       arg_hasattr(MDOC_Dash, bl->argc, bl->argv) ||
-                       arg_hasattr(MDOC_Enum, bl->argc, bl->argv) ||
-                       arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv)) {
-               flushln(p);
-               if (MDOC_HEAD == node->type) {
-                       p->rmargin = pair->rmargin;
-                       p->flags &= ~TERMP_NOBREAK;
-               } else
-                       p->flags &= ~TERMP_NOLPAD;
-
-       } else if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) {
-               flushln(p);
-
-       } else if (arg_hasattr(MDOC_Inset, bl->argc, bl->argv)) {
-               if (MDOC_BODY == node->type)
-                       flushln(p);
-
-       } else if (arg_hasattr(MDOC_Item, bl->argc, bl->argv)) {
-               if (MDOC_BODY == node->type)
-                       flushln(p);
-       }
+       flushln(p);

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

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

 }
 
 
 }
 
 


@@ -499,9 +560,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);
 }
 


@@ -511,7 +576,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);


@@ -523,9 +588,11 @@ static int
 termp_ar_pre(DECL_ARGS)
 {
 
 termp_ar_pre(DECL_ARGS)
 {
 

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

                word(p, "...");
                word(p, "...");

+       }

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


@@ -565,6 +632,17 @@ termp_st_pre(DECL_ARGS)
 }
 
 
 }
 
 

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


@@ -681,7 +759,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);
 }
 


@@ -705,7 +783,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);
 }
 


@@ -715,7 +793,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);
 }
 


@@ -728,7 +809,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;


@@ -851,7 +932,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);
 }
 


@@ -861,7 +945,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);
 }
 


@@ -907,7 +991,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);
 
 }


@@ -918,7 +1002,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);
 }
 


@@ -930,7 +1014,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);
        }
 


@@ -957,7 +1041,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);
 }
 


@@ -967,20 +1051,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) {


@@ -988,22 +1089,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);
 }
 


@@ -1015,7 +1121,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;
 }
 


@@ -1056,12 +1166,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);

 }
 
 
 }
 
 


@@ -1112,7 +1223,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);
 }


@@ -1158,7 +1269,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:


@@ -1190,7 +1301,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);
 }
 


@@ -1200,7 +1311,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);
 }
 


@@ -1210,7 +1321,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);
 }
 


@@ -1220,7 +1332,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);
 }
 


@@ -1230,7 +1342,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);
 }
 


@@ -1240,11 +1352,30 @@ 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)


@@ -1293,7 +1424,7 @@ termp_pq_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);
 }


@@ -1367,9 +1498,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);
        } 


@@ -1377,9 +1508,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);
 }


@@ -1390,7 +1521,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);
 }
 


@@ -1400,7 +1531,59 @@ 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);
+}
+
+
+
+/* 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)
+{
+
+       word(p, "\"");
+       p->flags |= TERMP_NOSPACE;

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

+
+/* ARGSUSED */
+static void
+termp__t_post(DECL_ARGS)
+{
+
+       p->flags |= TERMP_NOSPACE;
+       word(p, "\"");
+       word(p, node->next ? "," : ".");
+}
+
+
+/* ARGSUSED */
+static void
+termp____post(DECL_ARGS)
+{
+
+       p->flags |= TERMP_NOSPACE;
+       word(p, node->next ? "," : ".");
+}