Made `Cd' parseable (too many SYNOPSIS sections do this).

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 5f12c5d6d672e618ecf69f01f99f58bac564283a..5c49dd7d4a0ec6e262f22461c6d3152102778f05 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.14 2009/06/16 19:45:51 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.47 2009/07/19 08:24:16 kristaps Exp $ */

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


@@ -80,108 +80,101 @@ const     int ttypes[TTYPE_NMAX] = {
        TERMP_BOLD              /* TTYPE_LIST */
 };
 
        TERMP_BOLD              /* TTYPE_LIST */
 };
 

-/* XXX - clean this up. */
-

 struct termpair {
        struct termpair  *ppair;
 struct termpair {
        struct termpair  *ppair;

-       int               type;
-#define        TERMPAIR_FLAG    (1 << 0)
-       int               flag;         /* Whether being used. */
-       size_t            offset;       /* Left margin. */
-       size_t            rmargin;      /* Right margin. */
-       int               count;        /* Enum count. */
+       int               flag; 
+       int               count;

 };
 
 };
 

-#define        TERMPAIR_SETFLAG(termp, p, fl) \
-       do { \
-               assert(! (TERMPAIR_FLAG & (p)->type)); \
-               (termp)->flags |= (fl); \
-               (p)->flag = (fl); \
-               (p)->type |= TERMPAIR_FLAG; \
-       } while ( /* CONSTCOND */ 0)
-
-#define        DECL_ARGS \
-       struct termp *p, struct termpair *pair, \
-       const struct mdoc_meta *meta, \
-       const struct mdoc_node *node
-
-#define        DECL_PRE(name) \
-static int               name##_pre(DECL_ARGS)
-#define        DECL_POST(name) \
-static void              name##_post(DECL_ARGS)
-#define        DECL_PREPOST(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_brq);
-DECL_PREPOST(termp_d1);
-DECL_PREPOST(termp_dq);
-DECL_PREPOST(termp_fd);
-DECL_PREPOST(termp_fn);
-DECL_PREPOST(termp_fo);
-DECL_PREPOST(termp_ft);
-DECL_PREPOST(termp_in);
-DECL_PREPOST(termp_it);
-DECL_PREPOST(termp_lb);
-DECL_PREPOST(termp_op);
-DECL_PREPOST(termp_pf);
-DECL_PREPOST(termp_pq);
-DECL_PREPOST(termp_qq);
-DECL_PREPOST(termp_sh);
-DECL_PREPOST(termp_ss);
-DECL_PREPOST(termp_sq);
-DECL_PREPOST(termp_vt);
-
-DECL_PRE(termp__j);
-DECL_PRE(termp_ap);
-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_dx);
-DECL_PRE(termp_em);
-DECL_PRE(termp_ex);
-DECL_PRE(termp_fa);
-DECL_PRE(termp_fl);
-DECL_PRE(termp_fx);
-DECL_PRE(termp_ic);
-DECL_PRE(termp_lk);
-DECL_PRE(termp_ms);
-DECL_PRE(termp_mt);
-DECL_PRE(termp_nd);
-DECL_PRE(termp_nm);
-DECL_PRE(termp_ns);
-DECL_PRE(termp_nx);
-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_sx);
-DECL_PRE(termp_sy);
-DECL_PRE(termp_ud);
-DECL_PRE(termp_ux);
-DECL_PRE(termp_va);
-DECL_PRE(termp_xr);
-
-DECL_POST(termp___);
-DECL_POST(termp_bl);
-DECL_POST(termp_bx);
+#define        DECL_ARGS struct termp *p, \
+                 struct termpair *pair, \
+                 const struct mdoc_meta *meta, \
+                 const struct mdoc_node *node

 
 struct termact {
        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };
 
 
 struct termact {
        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };
 

+static void      termp____post(DECL_ARGS);
+static void      termp__t_post(DECL_ARGS);
+static void      termp_aq_post(DECL_ARGS);
+static void      termp_bd_post(DECL_ARGS);
+static void      termp_bl_post(DECL_ARGS);
+static void      termp_bq_post(DECL_ARGS);
+static void      termp_brq_post(DECL_ARGS);
+static void      termp_bx_post(DECL_ARGS);
+static void      termp_d1_post(DECL_ARGS);
+static void      termp_dq_post(DECL_ARGS);
+static void      termp_fd_post(DECL_ARGS);
+static void      termp_fn_post(DECL_ARGS);
+static void      termp_fo_post(DECL_ARGS);
+static void      termp_ft_post(DECL_ARGS);
+static void      termp_in_post(DECL_ARGS);
+static void      termp_it_post(DECL_ARGS);
+static void      termp_lb_post(DECL_ARGS);
+static void      termp_op_post(DECL_ARGS);
+static void      termp_pf_post(DECL_ARGS);
+static void      termp_pq_post(DECL_ARGS);
+static void      termp_qq_post(DECL_ARGS);
+static void      termp_sh_post(DECL_ARGS);
+static void      termp_sq_post(DECL_ARGS);
+static void      termp_ss_post(DECL_ARGS);
+static void      termp_vt_post(DECL_ARGS);
+
+static int       termp__j_pre(DECL_ARGS);
+static int       termp__t_pre(DECL_ARGS);
+static int       termp_ap_pre(DECL_ARGS);
+static int       termp_aq_pre(DECL_ARGS);
+static int       termp_ar_pre(DECL_ARGS);
+static int       termp_bd_pre(DECL_ARGS);
+static int       termp_bf_pre(DECL_ARGS);
+static int       termp_bq_pre(DECL_ARGS);
+static int       termp_br_pre(DECL_ARGS);
+static int       termp_brq_pre(DECL_ARGS);
+static int       termp_bt_pre(DECL_ARGS);
+static int       termp_cd_pre(DECL_ARGS);
+static int       termp_cm_pre(DECL_ARGS);
+static int       termp_d1_pre(DECL_ARGS);
+static int       termp_dq_pre(DECL_ARGS);
+static int       termp_em_pre(DECL_ARGS);
+static int       termp_ex_pre(DECL_ARGS);
+static int       termp_fa_pre(DECL_ARGS);
+static int       termp_fd_pre(DECL_ARGS);
+static int       termp_fl_pre(DECL_ARGS);
+static int       termp_fn_pre(DECL_ARGS);
+static int       termp_fo_pre(DECL_ARGS);
+static int       termp_ft_pre(DECL_ARGS);
+static int       termp_ic_pre(DECL_ARGS);
+static int       termp_in_pre(DECL_ARGS);
+static int       termp_it_pre(DECL_ARGS);
+static int       termp_lk_pre(DECL_ARGS);
+static int       termp_ms_pre(DECL_ARGS);
+static int       termp_mt_pre(DECL_ARGS);
+static int       termp_nd_pre(DECL_ARGS);
+static int       termp_nm_pre(DECL_ARGS);
+static int       termp_ns_pre(DECL_ARGS);
+static int       termp_op_pre(DECL_ARGS);
+static int       termp_pa_pre(DECL_ARGS);
+static int       termp_pf_pre(DECL_ARGS);
+static int       termp_pp_pre(DECL_ARGS);
+static int       termp_pq_pre(DECL_ARGS);
+static int       termp_qq_pre(DECL_ARGS);
+static int       termp_rs_pre(DECL_ARGS);
+static int       termp_rv_pre(DECL_ARGS);
+static int       termp_sh_pre(DECL_ARGS);
+static int       termp_sm_pre(DECL_ARGS);
+static int       termp_sp_pre(DECL_ARGS);
+static int       termp_sq_pre(DECL_ARGS);
+static int       termp_ss_pre(DECL_ARGS);
+static int       termp_sx_pre(DECL_ARGS);
+static int       termp_sy_pre(DECL_ARGS);
+static int       termp_ud_pre(DECL_ARGS);
+static int       termp_va_pre(DECL_ARGS);
+static int       termp_vt_pre(DECL_ARGS);
+static int       termp_xr_pre(DECL_ARGS);
+static int       termp_xx_pre(DECL_ARGS);
+

 static const struct termact termacts[MDOC_MAX] = {
        { termp_ap_pre, NULL }, /* Ap */
        { NULL, NULL }, /* Dd */
 static const struct termact termacts[MDOC_MAX] = {
        { termp_ap_pre, NULL }, /* Ap */
        { NULL, NULL }, /* Dd */


@@ -220,7 +213,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ot */
        { termp_pa_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* Ot */
        { termp_pa_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */

-       { termp_st_pre, NULL }, /* St */ 
+       { NULL, NULL }, /* St */ 

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


@@ -238,12 +231,12 @@ static const struct termact termacts[MDOC_MAX] = {
        { 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 */

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

        { NULL, NULL }, /* Bc */
        { termp_bf_pre, NULL }, /* Bf */ 
        { termp_bq_pre, termp_bq_post }, /* Bo */
        { termp_bq_pre, termp_bq_post }, /* Bq */
        { NULL, NULL }, /* Bc */
        { termp_bf_pre, NULL }, /* Bf */ 
        { termp_bq_pre, termp_bq_post }, /* Bo */
        { termp_bq_pre, termp_bq_post }, /* Bq */

-       { termp_bsx_pre, NULL }, /* Bsx */
+       { termp_xx_pre, NULL }, /* Bsx */

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


@@ -253,12 +246,12 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ef */
        { termp_em_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */
        { NULL, NULL }, /* Ef */
        { termp_em_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */

-       { termp_fx_pre, NULL }, /* Fx */
+       { termp_xx_pre, NULL }, /* Fx */

        { termp_ms_pre, NULL }, /* Ms */
        { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_ms_pre, NULL }, /* Ms */
        { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */

-       { termp_nx_pre, NULL }, /* Nx */
-       { termp_ox_pre, NULL }, /* Ox */
+       { termp_xx_pre, NULL }, /* Nx */
+       { termp_xx_pre, NULL }, /* Ox */

        { NULL, NULL }, /* Pc */
        { termp_pf_pre, termp_pf_post }, /* Pf */
        { termp_pq_pre, termp_pq_post }, /* Po */
        { NULL, NULL }, /* Pc */
        { termp_pf_pre, termp_pf_post }, /* Pf */
        { termp_pq_pre, termp_pq_post }, /* Po */


@@ -276,7 +269,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { 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 */

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

        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */
        { termp_fo_pre, termp_fo_post }, /* Fo */ 
        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */
        { termp_fo_pre, termp_fo_post }, /* Fo */ 


@@ -289,7 +282,7 @@ static 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 */

-       { termp_lb_pre, termp_lb_post }, /* Lb */
+       { NULL, termp_lb_post }, /* Lb */

        { termp_pp_pre, NULL }, /* Lp */ 
        { termp_lk_pre, NULL }, /* Lk */ 
        { termp_mt_pre, NULL }, /* Mt */ 
        { termp_pp_pre, NULL }, /* Lp */ 
        { termp_lk_pre, NULL }, /* Lk */ 
        { termp_mt_pre, NULL }, /* Mt */ 


@@ -299,8 +292,10 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* %C */ 
        { NULL, NULL }, /* Es */ 
        { NULL, NULL }, /* En */ 
        { NULL, NULL }, /* %C */ 
        { NULL, NULL }, /* Es */ 
        { NULL, NULL }, /* En */ 

-       { termp_dx_pre, NULL }, /* Dx */ 
+       { termp_xx_pre, NULL }, /* Dx */ 

        { NULL, NULL }, /* %Q */ 
        { NULL, NULL }, /* %Q */ 

+       { termp_br_pre, NULL }, /* br */
+       { termp_sp_pre, NULL }, /* sp */ 

 };
 
 #ifdef __linux__
 };
 
 #ifdef __linux__


@@ -333,7 +328,6 @@ mdoc_run(struct termp *p, const struct mdoc *m)
         * Main output function.  When this is called, assume that the
         * tree is properly formed.
         */
         * Main output function.  When this is called, assume that the
         * tree is properly formed.
         */

-

        print_head(p, mdoc_meta(m));
        assert(mdoc_node(m));
        assert(MDOC_ROOT == mdoc_node(m)->type);
        print_head(p, mdoc_meta(m));
        assert(mdoc_node(m));
        assert(MDOC_ROOT == mdoc_node(m)->type);


@@ -360,16 +354,23 @@ print_node(DECL_ARGS)
 {
        int              dochild;
        struct termpair  npair;
 {
        int              dochild;
        struct termpair  npair;

-
-       /* Pre-processing. */
+       size_t           offset, rmargin;

 
        dochild = 1;
 
        dochild = 1;

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

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

-       npair.type = 0;
-       npair.offset = npair.rmargin = 0;

        npair.flag = 0;
        npair.count = 0;
 
        npair.flag = 0;
        npair.count = 0;
 

+       /*
+        * Note on termpair.  This allows a pre function to set a termp
+        * flag that is automatically unset after the body, but before
+        * the post function.  Thus, if a pre uses a termpair flag, it
+        * must be reapplied in the post for use.
+        */
+

        if (MDOC_TEXT != node->type) {
                if (termacts[node->tok].pre)
                        if ( ! (*termacts[node->tok].pre)(p, &npair, meta, node))
        if (MDOC_TEXT != node->type) {
                if (termacts[node->tok].pre)
                        if ( ! (*termacts[node->tok].pre)(p, &npair, meta, node))


@@ -379,20 +380,21 @@ print_node(DECL_ARGS)
 
        /* Children. */
 
 
        /* Children. */
 

-       if (TERMPAIR_FLAG & npair.type)
-               p->flags |= npair.flag;
+       p->flags |= npair.flag;

 
        if (dochild && node->child)
                print_body(p, &npair, meta, node->child);
 
 
        if (dochild && node->child)
                print_body(p, &npair, meta, node->child);
 

-       if (TERMPAIR_FLAG & npair.type)
-               p->flags &= ~npair.flag;
+       p->flags &= ~npair.flag;

 
        /* Post-processing. */
 
        if (MDOC_TEXT != node->type)
                if (termacts[node->tok].post)
                        (*termacts[node->tok].post)(p, &npair, meta, node);
 
        /* Post-processing. */
 
        if (MDOC_TEXT != node->type)
                if (termacts[node->tok].post)
                        (*termacts[node->tok].post)(p, &npair, meta, node);

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

 }
 
 
 }
 
 


@@ -417,7 +419,7 @@ print_foot(struct termp *p, const struct mdoc_meta *meta)
 
        tm = localtime(&meta->date);
 
 
        tm = localtime(&meta->date);
 

-       if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
+       if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm))

                err(1, "strftime");
 
        (void)strlcpy(os, meta->os, p->rmargin);
                err(1, "strftime");
 
        (void)strlcpy(os, meta->os, p->rmargin);


@@ -527,31 +529,26 @@ print_head(struct termp *p, const struct mdoc_meta *meta)
 static size_t
 arg_width(const struct mdoc_argv *arg, int pos)
 {
 static size_t
 arg_width(const struct mdoc_argv *arg, int pos)
 {

-       size_t           v;

        int              i, len;
        int              i, len;

+       const char      *p;

 
        assert(pos < (int)arg->sz && pos >= 0);
        assert(arg->value[pos]);
 
        assert(pos < (int)arg->sz && pos >= 0);
        assert(arg->value[pos]);

-       if (0 == strcmp(arg->value[pos], "indent"))
-               return(INDENT);
-       if (0 == strcmp(arg->value[pos], "indent-two"))
-               return(INDENT * 2);

 
 

-       if (0 == (len = (int)strlen(arg->value[pos])))
+       p = arg->value[pos];
+
+       if (0 == (len = (int)strlen(p)))

                return(0);
 
        for (i = 0; i < len - 1; i++) 
                return(0);
 
        for (i = 0; i < len - 1; i++) 

-               if ( ! isdigit((u_char)arg->value[pos][i]))
+               if ( ! isdigit((u_char)p[i]))

                        break;
 
                        break;
 

-       if (i == len - 1) {
-               if ('n' == arg->value[pos][len - 1]) {
-                       v = (size_t)atoi(arg->value[pos]);
-                       return(v);
-               }
+       if (i == len - 1) 
+               if ('n' == p[len - 1] || 'm' == p[len - 1])
+                       return((size_t)atoi(p) + 2);

 
 

-       }
-       return(strlen(arg->value[pos]) + 1);
+       return((size_t)len + 2);

 }
 
 
 }
 
 


@@ -584,34 +581,46 @@ arg_listtype(const struct mdoc_node *n)
                        /* FALLTHROUGH */
                case (MDOC_Column):
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
                case (MDOC_Column):
                        /* FALLTHROUGH */

+               case (MDOC_Hang):
+                       /* FALLTHROUGH */

                case (MDOC_Ohang):
                        return(n->args->argv[i].arg);
                default:
                        break;
                }
 
                case (MDOC_Ohang):
                        return(n->args->argv[i].arg);
                default:
                        break;
                }
 

-       /* FIXME: mandated by parser. */
-
-       errx(1, "list type not supported");
-       /* NOTREACHED */
+       return(-1);

 }
 
 
 static size_t
 arg_offset(const struct mdoc_argv *arg)
 {
 }
 
 
 static size_t
 arg_offset(const struct mdoc_argv *arg)
 {

+       int              len, i;
+       const char      *p;

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

-       if (0 == strcmp(*arg->value, "left"))
+       p = *arg->value;
+
+       if (0 == strcmp(p, "left"))
+               return(0);
+       if (0 == strcmp(p, "indent"))
+               return(INDENT + 1);
+       if (0 == strcmp(p, "indent-two"))
+               return((INDENT + 1) * 2);
+
+       if (0 == (len = (int)strlen(p)))

                return(0);
                return(0);

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

 
 

-       /* FIXME: needs to support field-widths (10n, etc.). */
+       for (i = 0; i < len - 1; i++) 
+               if ( ! isdigit((u_char)p[i]))
+                       break;

 
 

-       return(strlen(*arg->value));
+       if (i == len - 1) 
+               if ('n' == p[len - 1] || 'm' == p[len - 1])
+                       return((size_t)atoi(p));
+
+       return((size_t)len);

 }
 
 
 }
 
 


@@ -724,8 +733,6 @@ termp_it_pre(DECL_ARGS)
 
        /* Save parent attributes. */
 
 
        /* Save parent attributes. */
 

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

        pair->flag = p->flags;
 
        /* Get list width and offset. */
        pair->flag = p->flags;
 
        /* Get list width and offset. */


@@ -741,6 +748,7 @@ termp_it_pre(DECL_ARGS)
        (void)arg_getattrs(keys, vals, 3, bl);
 
        type = arg_listtype(bl);
        (void)arg_getattrs(keys, vals, 3, bl);
 
        type = arg_listtype(bl);

+       assert(-1 != type);

 
        /* Calculate real width and offset. */
 
 
        /* Calculate real width and offset. */
 


@@ -760,14 +768,14 @@ termp_it_pre(DECL_ARGS)
                if (vals[0] >= 0) 
                        width = arg_width(&bl->args->argv[vals[0]], 0);
                if (vals[1] >= 0) 
                if (vals[0] >= 0) 
                        width = arg_width(&bl->args->argv[vals[0]], 0);
                if (vals[1] >= 0) 

-                       offset = arg_offset(&bl->args->argv[vals[1]]);
+                       offset += arg_offset(&bl->args->argv[vals[1]]);

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

-        * offset.
+        * offset.  FIXME: double-check that correct.

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


@@ -775,12 +783,18 @@ termp_it_pre(DECL_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Dash):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case (MDOC_Dash):
                /* FALLTHROUGH */

-       case (MDOC_Enum):
-               /* FALLTHROUGH */

        case (MDOC_Hyphen):
                if (width < 4)
                        width = 4;
                break;
        case (MDOC_Hyphen):
                if (width < 4)
                        width = 4;
                break;

+       case (MDOC_Enum):
+               if (width < 5)
+                       width = 5;
+               break;
+       case (MDOC_Hang):
+               if (0 == width)
+                       width = 8;
+               break;

        case (MDOC_Tag):
                if (0 == width)
                        width = 10;
        case (MDOC_Tag):
                if (0 == width)
                        width = 10;


@@ -790,12 +804,11 @@ termp_it_pre(DECL_ARGS)
        }
 
        /* 
        }
 
        /* 

-        * Whitespace control.  Inset bodies need an initial space.
+        * Whitespace control.  Inset bodies need an initial space,
+        * while diagonal bodies need two.

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

-       case (MDOC_Diag):
-               /* FALLTHROUGH */

        case (MDOC_Inset):
                if (MDOC_BODY == node->type) 
                        p->flags &= ~TERMP_NOSPACE;
        case (MDOC_Inset):
                if (MDOC_BODY == node->type) 
                        p->flags &= ~TERMP_NOSPACE;


@@ -836,16 +849,30 @@ termp_it_pre(DECL_ARGS)
        case (MDOC_Enum):
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
        case (MDOC_Enum):
                /* FALLTHROUGH */
        case (MDOC_Hyphen):

-               /* FALLTHROUGH */
+               if (MDOC_HEAD == node->type)
+                       p->flags |= TERMP_NOBREAK;
+               else
+                       p->flags |= TERMP_NOLPAD;
+               break;
+       case (MDOC_Hang):
+               if (MDOC_HEAD == node->type)
+                       p->flags |= TERMP_NOBREAK;
+               else
+                       p->flags |= TERMP_NOLPAD;
+
+               if (MDOC_HEAD == node->type)
+                       p->flags |= TERMP_HANG;
+               break;

        case (MDOC_Tag):
                if (MDOC_HEAD == node->type)
                        p->flags |= TERMP_NOBREAK;
                else
                        p->flags |= TERMP_NOLPAD;
        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;
+
+               if (MDOC_HEAD != node->type)
+                       break;
+               if (NULL == node->next || NULL == node->next->child)
+                       p->flags |= TERMP_DANGLE;

                break;
        case (MDOC_Column):
                if (MDOC_HEAD == node->type) {
                break;
        case (MDOC_Column):
                if (MDOC_HEAD == node->type) {


@@ -883,6 +910,8 @@ termp_it_pre(DECL_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
                /* FALLTHROUGH */

+       case (MDOC_Hang):
+               /* FALLTHROUGH */

        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;


@@ -898,18 +927,22 @@ termp_it_pre(DECL_ARGS)
 
        /* 
         * The dash, hyphen, bullet and enum lists all have a special
 
        /* 
         * The dash, hyphen, bullet and enum lists all have a special

-        * HEAD character.  Print it now.
+        * HEAD character (temporarily bold, in some cases).  

         */
 
        if (MDOC_HEAD == node->type)
                switch (type) {
                case (MDOC_Bullet):
         */
 
        if (MDOC_HEAD == node->type)
                switch (type) {
                case (MDOC_Bullet):

+                       p->flags |= TERMP_BOLD;

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

+                       p->flags &= ~TERMP_BOLD;

                        break;
                case (MDOC_Dash):
                        /* FALLTHROUGH */
                case (MDOC_Hyphen):
                        break;
                case (MDOC_Dash):
                        /* FALLTHROUGH */
                case (MDOC_Hyphen):

-                       term_word(p, "\\-");
+                       p->flags |= TERMP_BOLD;
+                       term_word(p, "\\(hy");
+                       p->flags &= ~TERMP_BOLD;

                        break;
                case (MDOC_Enum):
                        (pair->ppair->ppair->count)++;
                        break;
                case (MDOC_Enum):
                        (pair->ppair->ppair->count)++;


@@ -960,9 +993,11 @@ termp_it_post(DECL_ARGS)
                return;
 
        type = arg_listtype(node->parent->parent->parent);
                return;
 
        type = arg_listtype(node->parent->parent->parent);

+       assert(-1 != type);

 
        switch (type) {
        case (MDOC_Diag):
 
        switch (type) {
        case (MDOC_Diag):

+               term_word(p, "\\ ");

                /* FALLTHROUGH */
        case (MDOC_Item):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case (MDOC_Item):
                /* FALLTHROUGH */


@@ -979,8 +1014,6 @@ termp_it_post(DECL_ARGS)
                break;
        }
 
                break;
        }
 

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

        p->flags = pair->flag;
 }
 
        p->flags = pair->flag;
 }
 


@@ -993,7 +1026,9 @@ termp_nm_pre(DECL_ARGS)
        if (SEC_SYNOPSIS == node->sec)
                term_newln(p);
 
        if (SEC_SYNOPSIS == node->sec)
                term_newln(p);
 

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

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


@@ -1006,7 +1041,8 @@ static int
 termp_fl_pre(DECL_ARGS)
 {
 
 termp_fl_pre(DECL_ARGS)
 {
 

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

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


@@ -1018,7 +1054,7 @@ static int
 termp_ar_pre(DECL_ARGS)
 {
 
 termp_ar_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]);
+       pair->flag |= ttypes[TTYPE_CMD_ARG];

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


@@ -1043,18 +1079,6 @@ termp_pp_pre(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-termp_st_pre(DECL_ARGS)
-{
-       const char      *cp;
-
-       if (node->child && (cp = mdoc_a2st(node->child->string)))
-               term_word(p, cp);
-       return(0);
-}
-
-

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


@@ -1072,12 +1096,9 @@ termp_rv_pre(DECL_ARGS)
 {
        int              i;
 
 {
        int              i;
 

-       /* FIXME: mandated by parser. */
-
-       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");
+       i = arg_getattr(MDOC_Std, node);
+       assert(-1 != i);
+       assert(node->args->argv[i].sz);

 
        term_newln(p);
        term_word(p, "The");
 
        term_newln(p);
        term_word(p, "The");


@@ -1107,12 +1128,9 @@ termp_ex_pre(DECL_ARGS)
 {
        int              i;
 
 {
        int              i;
 

-       /* FIXME: mandated by parser? */
-
-       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");
+       i = arg_getattr(MDOC_Std, node);
+       assert(-1 != i);
+       assert(node->args->argv[i].sz);

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


@@ -1129,7 +1147,14 @@ static int
 termp_nd_pre(DECL_ARGS)
 {
 
 termp_nd_pre(DECL_ARGS)
 {
 

-       term_word(p, "\\-");
+       if (MDOC_BODY != node->type)
+               return(1);
+
+#if defined(__OpenBSD__) || defined(__linux__)
+       term_word(p, "\\(en");
+#else
+       term_word(p, "\\(em");
+#endif

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


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

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

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


@@ -1194,7 +1219,11 @@ static void
 termp_vt_post(DECL_ARGS)
 {
 
 termp_vt_post(DECL_ARGS)
 {
 

-       if (node->sec == SEC_SYNOPSIS)
+       if (node->sec != SEC_SYNOPSIS)
+               return;
+       if (node->next && MDOC_Vt == node->next->tok)
+               term_newln(p);
+       else if (node->next)

                term_vspace(p);
 }
 
                term_vspace(p);
 }
 


@@ -1204,11 +1233,7 @@ static int
 termp_fd_pre(DECL_ARGS)
 {
 
 termp_fd_pre(DECL_ARGS)
 {
 

-       /* 
-        * FIXME: this naming is bad.  This value is used, in general,
-        * for the #include header or other preprocessor statement.
-        */
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_DECL]);
+       pair->flag |= ttypes[TTYPE_FUNC_DECL];

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


@@ -1220,6 +1245,7 @@ termp_fd_post(DECL_ARGS)
 
        if (node->sec != SEC_SYNOPSIS)
                return;
 
        if (node->sec != SEC_SYNOPSIS)
                return;

+

        term_newln(p);
        if (node->next && MDOC_Fd != node->next->tok)
                term_vspace(p);
        term_newln(p);
        if (node->next && MDOC_Fd != node->next->tok)
                term_vspace(p);


@@ -1234,7 +1260,7 @@ termp_sh_pre(DECL_ARGS)
        switch (node->type) {
        case (MDOC_HEAD):
                term_vspace(p);
        switch (node->type) {
        case (MDOC_HEAD):
                term_vspace(p);

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

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


@@ -1292,22 +1318,6 @@ termp_bt_pre(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-termp_lb_pre(DECL_ARGS)
-{
-       const char      *lb;
-
-       assert(node->child && MDOC_TEXT == node->child->type);
-       if ((lb = mdoc_a2lib(node->child->string))) {
-               term_word(p, lb);
-               return(0);
-       }
-       term_word(p, "library");
-       return(1);
-}
-
-

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


@@ -1335,7 +1345,7 @@ termp_d1_pre(DECL_ARGS)
        if (MDOC_BLOCK != node->type)
                return(1);
        term_newln(p);
        if (MDOC_BLOCK != node->type)
                return(1);
        term_newln(p);

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

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


@@ -1348,7 +1358,6 @@ termp_d1_post(DECL_ARGS)
        if (MDOC_BLOCK != node->type) 
                return;
        term_newln(p);
        if (MDOC_BLOCK != node->type) 
                return;
        term_newln(p);

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

 }
 
 
 }
 
 


@@ -1385,7 +1394,7 @@ termp_ft_pre(DECL_ARGS)
        if (SEC_SYNOPSIS == node->sec)
                if (node->prev && MDOC_Fo == node->prev->tok)
                        term_vspace(p);
        if (SEC_SYNOPSIS == node->sec)
                if (node->prev && MDOC_Fo == node->prev->tok)
                        term_vspace(p);

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]);
+       pair->flag |= ttypes[TTYPE_FUNC_TYPE];

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


@@ -1441,7 +1450,6 @@ termp_fn_post(DECL_ARGS)
 
        if (node->sec == SEC_SYNOPSIS && node->next)
                term_vspace(p);
 
        if (node->sec == SEC_SYNOPSIS && node->next)
                term_vspace(p);

-

 }
 
 
 }
 
 


@@ -1450,7 +1458,7 @@ static int
 termp_sx_pre(DECL_ARGS)
 {
 
 termp_sx_pre(DECL_ARGS)
 {
 

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

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


@@ -1462,7 +1470,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(p, pair, ttypes[TTYPE_FUNC_ARG]);
+               pair->flag |= ttypes[TTYPE_FUNC_ARG];

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


@@ -1486,7 +1494,7 @@ static int
 termp_va_pre(DECL_ARGS)
 {
 
 termp_va_pre(DECL_ARGS)
 {
 

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

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


@@ -1518,8 +1526,6 @@ termp_bd_pre(DECL_ARGS)
        if (NULL == node->parent->args)
                errx(1, "missing display 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) {
        for (type = -1, i = 0; 
                        i < (int)node->parent->args->argc; i++) {
                switch (node->parent->args->argv[i].arg) {


@@ -1563,7 +1569,6 @@ termp_bd_pre(DECL_ARGS)
         * Ew.
         */
 
         * Ew.
         */
 

-       p->flags |= TERMP_LITERAL;

        ln = node->child ? node->child->line : 0;
 
        for (node = node->child; node; node = node->next) {
        ln = node->child ? node->child->line : 0;
 
        for (node = node->child; node; node = node->next) {


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

-

        term_flushln(p);
        term_flushln(p);

-       p->flags &= ~TERMP_LITERAL;
-       p->offset = pair->offset;
-       p->flags |= TERMP_NOSPACE;

 }
 
 
 }
 
 


@@ -1619,16 +1620,6 @@ termp_qq_post(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-termp_bsx_pre(DECL_ARGS)
-{
-
-       term_word(p, "BSDI BSD/OS");
-       return(1);
-}
-
-

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


@@ -1642,50 +1633,36 @@ termp_bx_post(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-termp_ox_pre(DECL_ARGS)
-{
-
-       term_word(p, "OpenBSD");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_dx_pre(DECL_ARGS)
-{
-
-       term_word(p, "DragonFly");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ux_pre(DECL_ARGS)
+termp_xx_pre(DECL_ARGS)

 {
 {

+       const char      *pp;

 
 

-       term_word(p, "UNIX");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fx_pre(DECL_ARGS)
-{
-
-       term_word(p, "FreeBSD");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_nx_pre(DECL_ARGS)
-{
+       pp = NULL;
+       switch (node->tok) {
+       case (MDOC_Bsx):
+               pp = "BSDI BSD/OS";
+               break;
+       case (MDOC_Dx):
+               pp = "DragonFlyBSD";
+               break;
+       case (MDOC_Fx):
+               pp = "FreeBSD";
+               break;
+       case (MDOC_Nx):
+               pp = "NetBSD";
+               break;
+       case (MDOC_Ox):
+               pp = "OpenBSD";
+               break;
+       case (MDOC_Ux):
+               pp = "UNIX";
+               break;
+       default:
+               break;
+       }

 
 

-       term_word(p, "NetBSD");
+       assert(pp);
+       term_word(p, pp);

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


@@ -1747,7 +1724,7 @@ termp_ss_pre(DECL_ARGS)
                        term_vspace(p);
                break;
        case (MDOC_HEAD):
                        term_vspace(p);
                break;
        case (MDOC_HEAD):

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

                p->offset = HALFINDENT;
                break;
        default:
                p->offset = HALFINDENT;
                break;
        default:


@@ -1763,14 +1740,8 @@ static void
 termp_ss_post(DECL_ARGS)
 {
 
 termp_ss_post(DECL_ARGS)
 {
 

-       switch (node->type) {
-       case (MDOC_HEAD):
+       if (MDOC_HEAD == node->type)

                term_newln(p);
                term_newln(p);

-               p->offset = INDENT;
-               break;
-       default:
-               break;
-       }

 }
 
 
 }
 
 


@@ -1779,7 +1750,7 @@ static int
 termp_pa_pre(DECL_ARGS)
 {
 
 termp_pa_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FILE]);
+       pair->flag |= ttypes[TTYPE_FILE];

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


@@ -1789,7 +1760,7 @@ static int
 termp_em_pre(DECL_ARGS)
 {
 
 termp_em_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+       pair->flag |= ttypes[TTYPE_EMPH];

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


@@ -1799,7 +1770,7 @@ static int
 termp_cd_pre(DECL_ARGS)
 {
 
 termp_cd_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CONFIG]);
+       pair->flag |= ttypes[TTYPE_CONFIG];

        term_newln(p);
        return(1);
 }
        term_newln(p);
        return(1);
 }


@@ -1810,7 +1781,7 @@ static int
 termp_cm_pre(DECL_ARGS)
 {
 
 termp_cm_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);
+       pair->flag |= ttypes[TTYPE_CMD_FLAG];

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


@@ -1820,7 +1791,7 @@ static int
 termp_ic_pre(DECL_ARGS)
 {
 
 termp_ic_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD]);
+       pair->flag |= ttypes[TTYPE_CMD];

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


@@ -1830,8 +1801,12 @@ static int
 termp_in_pre(DECL_ARGS)
 {
 
 termp_in_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]);
-       term_word(p, "#include");
+       pair->flag |= ttypes[TTYPE_INCLUDE];
+       p->flags |= ttypes[TTYPE_INCLUDE];
+
+       if (SEC_SYNOPSIS == node->sec)
+               term_word(p, "#include");
+

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


@@ -1843,12 +1818,20 @@ static void
 termp_in_post(DECL_ARGS)
 {
 
 termp_in_post(DECL_ARGS)
 {
 

-       p->flags |= TERMP_NOSPACE;
+       p->flags |= TERMP_NOSPACE | ttypes[TTYPE_INCLUDE];

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

+       p->flags &= ~ttypes[TTYPE_INCLUDE];

 
 

-       term_newln(p);

        if (SEC_SYNOPSIS != node->sec)
                return;
        if (SEC_SYNOPSIS != node->sec)
                return;

+
+       term_newln(p);
+       /* 
+        * XXX Not entirely correct.  If `.In foo bar' is specified in
+        * the SYNOPSIS section, then it produces a single break after
+        * the <foo>; mandoc asserts a vertical space.  Since this
+        * construction is rarely used, I think it's fine.
+        */

        if (node->next && MDOC_In != node->next->tok)
                term_vspace(p);
 }
        if (node->next && MDOC_In != node->next->tok)
                term_vspace(p);
 }


@@ -1856,22 +1839,35 @@ termp_in_post(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-termp_at_pre(DECL_ARGS)
+termp_sp_pre(DECL_ARGS)

 {
 {

-       const char      *att;
+       int              i, len;

 
 

-       att = NULL;
+       if (NULL == node->child) {
+               term_vspace(p);
+               return(0);
+       }

 
 

-       if (node->child)
-               att = mdoc_a2att(node->child->string);
-       if (NULL == att)
-               att = "AT&T UNIX";
+       len = atoi(node->child->string);
+       if (0 == len)
+               term_newln(p);
+       for (i = 0; i < len; i++)
+               term_vspace(p);

 
 

-       term_word(p, att);

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

+/* ARGSUSED */
+static int
+termp_br_pre(DECL_ARGS)
+{
+
+       term_newln(p);
+       return(1);
+}
+
+

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


@@ -1953,14 +1949,13 @@ termp_fo_pre(DECL_ARGS)
        const struct mdoc_node *n;
 
        if (MDOC_BODY == node->type) {
        const struct mdoc_node *n;
 
        if (MDOC_BODY == node->type) {

+               p->flags |= TERMP_NOSPACE;

                term_word(p, "(");
                p->flags |= TERMP_NOSPACE;
                return(1);
        } else if (MDOC_HEAD != node->type) 
                return(1);
 
                term_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) {
                assert(MDOC_TEXT == n->type);
        p->flags |= ttypes[TTYPE_FUNC_NAME];
        for (n = node->child; n; n = n->next) {
                assert(MDOC_TEXT == n->type);


@@ -1993,25 +1988,25 @@ termp_bf_pre(DECL_ARGS)
 {
        const struct mdoc_node  *n;
 
 {
        const struct mdoc_node  *n;
 

-       if (MDOC_HEAD == node->type) {
+       if (MDOC_HEAD == node->type)

                return(0);
                return(0);

-       } else if (MDOC_BLOCK != node->type)
+       else if (MDOC_BLOCK != node->type)

                return(1);
 
        if (NULL == (n = node->head->child)) {
                if (arg_hasattr(MDOC_Emphasis, node))
                return(1);
 
        if (NULL == (n = node->head->child)) {
                if (arg_hasattr(MDOC_Emphasis, node))

-                       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+                       pair->flag |= ttypes[TTYPE_EMPH];

                else if (arg_hasattr(MDOC_Symbolic, node))
                else if (arg_hasattr(MDOC_Symbolic, node))

-                       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);
+                       pair->flag |= ttypes[TTYPE_SYMB];

 
                return(1);
        } 
 
        assert(MDOC_TEXT == n->type);
        if (0 == strcmp("Em", n->string))
 
                return(1);
        } 
 
        assert(MDOC_TEXT == n->type);
        if (0 == strcmp("Em", n->string))

-               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+               pair->flag |= ttypes[TTYPE_EMPH];

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

-               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+               pair->flag |= ttypes[TTYPE_SYMB];

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


@@ -2022,7 +2017,7 @@ static int
 termp_sy_pre(DECL_ARGS)
 {
 
 termp_sy_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);
+       pair->flag |= ttypes[TTYPE_SYMB];

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


@@ -2032,7 +2027,7 @@ static int
 termp_ms_pre(DECL_ARGS)
 {
 
 termp_ms_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMBOL]);
+       pair->flag |= ttypes[TTYPE_SYMBOL];

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


@@ -2071,7 +2066,7 @@ static int
 termp__j_pre(DECL_ARGS)
 {
 
 termp__j_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_REF_JOURNAL]);
+       pair->flag |= ttypes[TTYPE_REF_JOURNAL];

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


@@ -2118,7 +2113,7 @@ termp_lk_pre(DECL_ARGS)
        n = node->child;
 
        if (NULL == n->next) {
        n = node->child;
 
        if (NULL == n->next) {

-               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK_ANCHOR]);
+               pair->flag |= ttypes[TTYPE_LINK_ANCHOR];

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


@@ -2142,7 +2137,7 @@ static int
 termp_mt_pre(DECL_ARGS)
 {
 
 termp_mt_pre(DECL_ARGS)
 {
 

-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK_ANCHOR]);
+       pair->flag |= ttypes[TTYPE_LINK_ANCHOR];

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