Removed ambiguous TERMPAIR_SETFLAG from mdoc_term.c (pairs/flags must be manually...

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index c64eb5d1c06564fd1c2329528e6e814b58d6f034..c585ced6f9e5c53661118649791c80e840973402 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_term.c,v 1.6 2009/04/12 19:45:26 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.28 2009/07/12 17:25:07 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>

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


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

-/* XXX - clean this up. */
-
+/* 
+ * This is used to preserve a style of value across a macro, instead of
+ * losing it while the body is processed.
+ */

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

-       int               type;
-#define        TERMPAIR_FLAG    (1 << 0)
-       int               flag;
-       size_t            offset;
-       size_t            rmargin;
-       int               count;
+       int               flag;         /* Whether being used. */
+       size_t            offset;       /* Left margin. */
+       size_t            rmargin;      /* Right margin. */
+       int               count;        /* Enum 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, \
 #define        DECL_ARGS \
        struct termp *p, struct termpair *pair, \
        const struct mdoc_meta *meta, \


@@ -141,16 +133,13 @@ DECL_PRE(termp_ap);
 DECL_PRE(termp_ar);
 DECL_PRE(termp_at);
 DECL_PRE(termp_bf);
 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_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_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_ic);
 DECL_PRE(termp_lk);
 DECL_PRE(termp_ms);


@@ -158,8 +147,7 @@ DECL_PRE(termp_mt);
 DECL_PRE(termp_nd);
 DECL_PRE(termp_nm);
 DECL_PRE(termp_ns);
 DECL_PRE(termp_nd);
 DECL_PRE(termp_nm);
 DECL_PRE(termp_ns);

-DECL_PRE(termp_nx);
-DECL_PRE(termp_ox);
+DECL_PRE(termp_xx);

 DECL_PRE(termp_pa);
 DECL_PRE(termp_pp);
 DECL_PRE(termp_rs);
 DECL_PRE(termp_pa);
 DECL_PRE(termp_pp);
 DECL_PRE(termp_rs);


@@ -169,7 +157,6 @@ DECL_PRE(termp_st);
 DECL_PRE(termp_sx);
 DECL_PRE(termp_sy);
 DECL_PRE(termp_ud);
 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_PRE(termp_va);
 DECL_PRE(termp_xr);
 


@@ -183,7 +170,7 @@ struct      termact {
 };
 
 static const struct termact termacts[MDOC_MAX] = {
 };
 
 static const struct termact termacts[MDOC_MAX] = {

-       { NULL, NULL }, /* \" */
+       { termp_ap_pre, NULL }, /* Ap */

        { NULL, NULL }, /* Dd */
        { NULL, NULL }, /* Dt */
        { NULL, NULL }, /* Os */
        { NULL, NULL }, /* Dd */
        { NULL, NULL }, /* Dt */
        { NULL, NULL }, /* Os */


@@ -243,7 +230,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { termp_bf_pre, NULL }, /* Bf */ 
        { termp_bq_pre, termp_bq_post }, /* Bo */
        { termp_bq_pre, termp_bq_post }, /* Bq */
        { 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 +240,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 +263,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 */ 


@@ -290,8 +277,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Fr */
        { termp_ud_pre, NULL }, /* Ud */
        { termp_lb_pre, termp_lb_post }, /* Lb */
        { NULL, NULL }, /* Fr */
        { termp_ud_pre, NULL }, /* Ud */
        { termp_lb_pre, termp_lb_post }, /* Lb */

-       { termp_ap_pre, NULL }, /* Lb */
-       { termp_pp_pre, NULL }, /* Pp */ 
+       { termp_pp_pre, NULL }, /* Lp */ 

        { termp_lk_pre, NULL }, /* Lk */ 
        { termp_mt_pre, NULL }, /* Mt */ 
        { termp_brq_pre, termp_brq_post }, /* Brq */ 
        { termp_lk_pre, NULL }, /* Lk */ 
        { termp_mt_pre, NULL }, /* Mt */ 
        { termp_brq_pre, termp_brq_post }, /* Brq */ 


@@ -300,13 +286,13 @@ 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 */ 
 };
 
 #ifdef __linux__
        { NULL, NULL }, /* %Q */ 
 };
 
 #ifdef __linux__

-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
+extern size_t    strlcpy(char *, const char *, size_t);
+extern size_t    strlcat(char *, const char *, size_t);

 #endif
 
 static int       arg_hasattr(int, const struct mdoc_node *);
 #endif
 
 static int       arg_hasattr(int, const struct mdoc_node *);


@@ -325,15 +311,21 @@ static    void      print_head(struct termp *,
 static void      print_body(DECL_ARGS);
 static void      print_foot(struct termp *, 
                        const struct mdoc_meta *);
 static void      print_body(DECL_ARGS);
 static void      print_foot(struct termp *, 
                        const struct mdoc_meta *);

-static void      sanity(const struct mdoc_node *);

 
 
 int
 mdoc_run(struct termp *p, const struct mdoc *m)
 {
 
 
 int
 mdoc_run(struct termp *p, const struct mdoc *m)
 {

+       /*
+        * Main output function.  When this is called, assume that the
+        * tree is properly formed.
+        */

 
        print_head(p, mdoc_meta(m));
 
        print_head(p, mdoc_meta(m));

-       print_body(p, NULL, mdoc_meta(m), mdoc_node(m));
+       assert(mdoc_node(m));
+       assert(MDOC_ROOT == mdoc_node(m)->type);
+       if (mdoc_node(m)->child)
+               print_body(p, NULL, mdoc_meta(m), mdoc_node(m)->child);

        print_foot(p, mdoc_meta(m));
        return(1);
 }
        print_foot(p, mdoc_meta(m));
        return(1);
 }


@@ -356,15 +348,10 @@ print_node(DECL_ARGS)
        int              dochild;
        struct termpair  npair;
 
        int              dochild;
        struct termpair  npair;
 

-       /* Some quick sanity-checking. */
-
-       sanity(node);
-

        /* Pre-processing. */
 
        dochild = 1;
        npair.ppair = pair;
        /* Pre-processing. */
 
        dochild = 1;
        npair.ppair = pair;

-       npair.type = 0;

        npair.offset = npair.rmargin = 0;
        npair.flag = 0;
        npair.count = 0;
        npair.offset = npair.rmargin = 0;
        npair.flag = 0;
        npair.count = 0;


@@ -378,14 +365,12 @@ 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. */
 
 
        /* Post-processing. */
 


@@ -401,6 +386,14 @@ print_foot(struct termp *p, const struct mdoc_meta *meta)
        struct tm       *tm;
        char            *buf, *os;
 
        struct tm       *tm;
        char            *buf, *os;
 

+       /* 
+        * Output the footer in new-groff style, that is, three columns
+        * with the middle being the manual date and flanking columns
+        * being the operating system:
+        *
+        * SYSTEM                  DATE                    SYSTEM
+        */
+

        if (NULL == (buf = malloc(p->rmargin)))
                err(1, "malloc");
        if (NULL == (os = malloc(p->rmargin)))
        if (NULL == (buf = malloc(p->rmargin)))
                err(1, "malloc");
        if (NULL == (os = malloc(p->rmargin)))


@@ -408,39 +401,39 @@ print_foot(struct termp *p, const struct mdoc_meta *meta)
 
        tm = localtime(&meta->date);
 
 
        tm = localtime(&meta->date);
 

-#ifdef __OpenBSD__
-       if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#else

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

-#endif

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

-       /*
-        * This is /slightly/ different from regular groff output
-        * because we don't have page numbers.  Print the following:
-        *
-        * OS                                            MDOCDATE
-        */
-

        term_vspace(p);
 
        term_vspace(p);
 

-       p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
-       p->rmargin = p->maxrmargin - strlen(buf);

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

+       p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
+       p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;

 
        term_word(p, os);
        term_flushln(p);
 
 
        term_word(p, os);
        term_flushln(p);
 

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

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

+
+       term_word(p, buf);
+       term_flushln(p);
+

        p->offset = p->rmargin;
        p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOBREAK;
        p->offset = p->rmargin;
        p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOBREAK;

+       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;

 
 

-       term_word(p, buf);
+       term_word(p, os);

        term_flushln(p);
 
        term_flushln(p);
 

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

        free(buf);
        free(os);
 }
        free(buf);
        free(os);
 }


@@ -485,15 +478,15 @@ print_head(struct termp *p, const struct mdoc_meta *meta)
                        meta->title, meta->msec);
 
        p->offset = 0;
                        meta->title, meta->msec);
 
        p->offset = 0;

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

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

-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;

        p->offset = p->rmargin;
        p->rmargin = p->maxrmargin - strlen(title);
        p->offset = p->rmargin;
        p->rmargin = p->maxrmargin - strlen(title);

+       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;

 
        term_word(p, buf);
        term_flushln(p);
 
        term_word(p, buf);
        term_flushln(p);


@@ -506,8 +499,8 @@ print_head(struct termp *p, const struct mdoc_meta *meta)
        term_word(p, title);
        term_flushln(p);
 
        term_word(p, title);
        term_flushln(p);
 

-       p->rmargin = p->maxrmargin;

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

+       p->rmargin = p->maxrmargin;

        p->flags &= ~TERMP_NOSPACE;
 
        free(title);
        p->flags &= ~TERMP_NOSPACE;
 
        free(title);


@@ -515,119 +508,6 @@ print_head(struct termp *p, const struct mdoc_meta *meta)
 }
 
 
 }
 
 

-static void
-sanity(const struct mdoc_node *n)
-{
-       char            *p;
-
-       p = "regular form violated";
-
-       switch (n->type) {
-       case (MDOC_TEXT):
-               if (n->child) 
-                       errx(1, p);
-               if (NULL == n->parent) 
-                       errx(1, p);
-               if (NULL == n->string)
-                       errx(1, p);
-               switch (n->parent->type) {
-               case (MDOC_TEXT):
-                       /* FALLTHROUGH */
-               case (MDOC_ROOT):
-                       errx(1, p);
-                       /* NOTREACHED */
-               default:
-                       break;
-               }
-               break;
-       case (MDOC_ELEM):
-               if (NULL == n->parent)
-                       errx(1, p);
-               switch (n->parent->type) {
-               case (MDOC_TAIL):
-                       /* FALLTHROUGH */
-               case (MDOC_BODY):
-                       /* FALLTHROUGH */
-               case (MDOC_HEAD):
-                       break;
-               default:
-                       errx(1, p);
-                       /* NOTREACHED */
-               }
-               if (n->child) switch (n->child->type) {
-               case (MDOC_TEXT):
-                       break;
-               default:
-                       errx(1, p);
-                       /* NOTREACHED */
-               }
-               break;
-       case (MDOC_HEAD):
-               /* FALLTHROUGH */
-       case (MDOC_BODY):
-               /* FALLTHROUGH */
-       case (MDOC_TAIL):
-               if (NULL == n->parent)
-                       errx(1, p);
-               if (MDOC_BLOCK != n->parent->type)
-                       errx(1, p);
-               if (n->child) switch (n->child->type) {
-               case (MDOC_BLOCK):
-                       /* FALLTHROUGH */
-               case (MDOC_ELEM):
-                       /* FALLTHROUGH */
-               case (MDOC_TEXT):
-                       break;
-               default:
-                       errx(1, p);
-                       /* NOTREACHED */
-               }
-               break;
-       case (MDOC_BLOCK):
-               if (NULL == n->parent)
-                       errx(1, p);
-               if (NULL == n->child)
-                       errx(1, p);
-               switch (n->parent->type) {
-               case (MDOC_ROOT):
-                       /* FALLTHROUGH */
-               case (MDOC_HEAD):
-                       /* FALLTHROUGH */
-               case (MDOC_BODY):
-                       /* FALLTHROUGH */
-               case (MDOC_TAIL):
-                       break;
-               default:
-                       errx(1, p);
-                       /* NOTREACHED */
-               }
-               switch (n->child->type) {
-               case (MDOC_ROOT):
-                       /* FALLTHROUGH */
-               case (MDOC_ELEM):
-                       errx(1, p);
-                       /* NOTREACHED */
-               default:
-                       break;
-               }
-               break;
-       case (MDOC_ROOT):
-               if (n->parent)
-                       errx(1, p);
-               if (NULL == n->child)
-                       errx(1, p);
-               switch (n->child->type) {
-               case (MDOC_BLOCK):
-                       break;
-               default:
-                       errx(1, p);
-                       /* NOTREACHED */
-               }
-               break;
-       }
-}
-
-

 static size_t
 arg_width(const struct mdoc_argv *arg, int pos)
 {
 static size_t
 arg_width(const struct mdoc_argv *arg, int pos)
 {


@@ -636,10 +516,6 @@ arg_width(const struct mdoc_argv *arg, int pos)
 
        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])))
                return(0);
 
        if (0 == (len = (int)strlen(arg->value[pos])))
                return(0);


@@ -649,13 +525,14 @@ arg_width(const struct mdoc_argv *arg, int pos)
                        break;
 
        if (i == len - 1) {
                        break;
 
        if (i == len - 1) {

-               if ('n' == arg->value[pos][len - 1]) {
+               if ('n' == arg->value[pos][len - 1] ||
+                               'm' == arg->value[pos][len - 1]) {

                        v = (size_t)atoi(arg->value[pos]);
                        v = (size_t)atoi(arg->value[pos]);

-                       return(v);
+                       return(v + 2);

                }
 
        }
                }
 
        }

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

 }
 
 
 }
 
 


@@ -694,6 +571,8 @@ arg_listtype(const struct mdoc_node *n)
                        break;
                }
 
                        break;
                }
 

+       /* FIXME: mandated by parser. */
+

        errx(1, "list type not supported");
        /* NOTREACHED */
 }
        errx(1, "list type not supported");
        /* NOTREACHED */
 }


@@ -704,10 +583,15 @@ arg_offset(const struct mdoc_argv *arg)
 {
 
        assert(*arg->value);
 {
 
        assert(*arg->value);

+       if (0 == strcmp(*arg->value, "left"))
+               return(0);

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

-               return(INDENT);
+               return(INDENT + 1);

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

-               return(INDENT * 2);
+               return((INDENT + 1) * 2);
+
+       /* FIXME: needs to support field-widths (10n, etc.). */
+

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


@@ -811,7 +695,7 @@ termp_it_pre(DECL_ARGS)
 {
        const struct mdoc_node *bl, *n;
        char                    buf[7];
 {
        const struct mdoc_node *bl, *n;
        char                    buf[7];

-       int                     i, type, keys[3], vals[3];
+       int                     i, type, keys[3], vals[3], sv;

        size_t                  width, offset;
 
        if (MDOC_BLOCK == node->type)
        size_t                  width, offset;
 
        if (MDOC_BLOCK == node->type)


@@ -857,7 +741,7 @@ 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;
        }
 
                break;
        }
 


@@ -872,12 +756,14 @@ 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_Tag):
                if (0 == width)
                        width = 10;
        case (MDOC_Tag):
                if (0 == width)
                        width = 10;


@@ -887,11 +773,13 @@ 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) {
        case (MDOC_Diag):
         */
 
        switch (type) {
        case (MDOC_Diag):

+               term_word(p, "\\ ");

                /* FALLTHROUGH */
        case (MDOC_Inset):
                if (MDOC_BODY == node->type) 
                /* FALLTHROUGH */
        case (MDOC_Inset):
                if (MDOC_BODY == node->type) 


@@ -995,18 +883,21 @@ 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).  

         */
 
         */
 

+       sv = p->flags;

        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]");
                        break;
                case (MDOC_Dash):
                        /* FALLTHROUGH */
                case (MDOC_Hyphen):
                        term_word(p, "\\[bu]");
                        break;
                case (MDOC_Dash):
                        /* FALLTHROUGH */
                case (MDOC_Hyphen):

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

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


@@ -1018,6 +909,8 @@ termp_it_pre(DECL_ARGS)
                        break;
                }
 
                        break;
                }
 

+       p->flags = sv; /* Restore saved flags. */
+

        /* 
         * If we're not going to process our children, indicate so here.
         */
        /* 
         * If we're not going to process our children, indicate so here.
         */


@@ -1090,7 +983,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);
 


@@ -1103,7 +998,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);


@@ -1115,7 +1011,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);
 }
 


@@ -1169,6 +1065,8 @@ 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)
        if (-1 == (i = arg_getattr(MDOC_Std, node)))
                errx(1, "expected -std argument");
        if (1 != node->args->argv[i].sz)


@@ -1202,6 +1100,8 @@ 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)
        if (-1 == (i = arg_getattr(MDOC_Std, node)))
                errx(1, "expected -std argument");
        if (1 != node->args->argv[i].sz)


@@ -1222,7 +1122,18 @@ static int
 termp_nd_pre(DECL_ARGS)
 {
 
 termp_nd_pre(DECL_ARGS)
 {
 

+       if (MDOC_BODY != node->type)
+               return(1);
+       /* 
+        * XXX: signed off by jmc@openbsd.org.  This technically
+        * produces a minus sign after the Nd, which is wrong, but is
+        * consistent with the historic OpenBSD tmac file.
+        */
+#if defined(__OpenBSD__) || defined(__linux__)

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

+#else
+       term_word(p, "\\(em");
+#endif

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


@@ -1255,8 +1166,9 @@ termp_xr_pre(DECL_ARGS)
 {
        const struct mdoc_node *n;
 
 {
        const struct mdoc_node *n;
 

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

        term_word(p, n->string);
        if (NULL == (n = n->next)) 
                return(0);
        term_word(p, n->string);
        if (NULL == (n = n->next)) 
                return(0);


@@ -1276,7 +1188,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 |= TTYPE_VAR_DECL;

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


@@ -1296,11 +1208,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 |= TTYPE_FUNC_DECL;

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


@@ -1326,7 +1234,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;


@@ -1390,9 +1298,9 @@ termp_lb_pre(DECL_ARGS)
 {
        const char      *lb;
 
 {
        const char      *lb;
 

-       if (NULL == node->child)
-               errx(1, "expected text line argument");
-       if ((lb = mdoc_a2lib(node->child->string))) {
+       assert(node->child && MDOC_TEXT == node->child->type);
+       lb = mdoc_a2lib(node->child->string);
+       if (lb) {

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


@@ -1428,7 +1336,8 @@ 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);
+       pair->offset = INDENT + 1;
+       p->offset += pair->offset;

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


@@ -1478,7 +1387,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);
 }
 


@@ -1499,8 +1408,7 @@ termp_fn_pre(DECL_ARGS)
 {
        const struct mdoc_node *n;
 
 {
        const struct mdoc_node *n;
 

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

 
        /* FIXME: can be "type funcname" "type varname"... */
 
 
        /* FIXME: can be "type funcname" "type varname"... */
 


@@ -1535,7 +1443,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);

-

 }
 
 
 }
 
 


@@ -1544,7 +1451,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);
 }
 


@@ -1556,7 +1463,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);
        }
 


@@ -1580,7 +1487,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);
 }
 


@@ -1607,6 +1514,8 @@ termp_bd_pre(DECL_ARGS)
        else if (MDOC_BODY != node->type)
                return(1);
 
        else if (MDOC_BODY != node->type)
                return(1);
 

+       /* FIXME: display type should be mandated by parser. */
+

        if (NULL == node->parent->args)
                errx(1, "missing display type");
 
        if (NULL == node->parent->args)
                errx(1, "missing display type");
 


@@ -1711,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)


@@ -1734,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);
 }
 


@@ -1839,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:


@@ -1871,7 +1756,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);
 }
 


@@ -1881,7 +1766,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);
 }
 


@@ -1891,7 +1776,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);
 }


@@ -1902,7 +1787,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);
 }
 


@@ -1912,7 +1797,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);
 }
 


@@ -1922,8 +1807,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);


@@ -1938,9 +1827,16 @@ termp_in_post(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
        term_word(p, ">");
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, ">");
 

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


@@ -2055,8 +1951,7 @@ termp_fo_pre(DECL_ARGS)
 
        p->flags |= ttypes[TTYPE_FUNC_NAME];
        for (n = node->child; n; n = n->next) {
 
        p->flags |= ttypes[TTYPE_FUNC_NAME];
        for (n = node->child; n; n = n->next) {

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

                term_word(p, n->string);
        }
        p->flags &= ~ttypes[TTYPE_FUNC_NAME];
                term_word(p, n->string);
        }
        p->flags &= ~ttypes[TTYPE_FUNC_NAME];


@@ -2086,27 +1981,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);
        } 
 
 
                return(1);
        } 
 

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

        if (0 == strcmp("Em", n->string))
        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);
 }


@@ -2117,7 +2010,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);
 }
 


@@ -2127,7 +2020,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);
 }
 


@@ -2138,9 +2031,7 @@ static int
 termp_sm_pre(DECL_ARGS)
 {
 
 termp_sm_pre(DECL_ARGS)
 {
 

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

        if (0 == strcmp("on", node->child->string)) {
                p->flags &= ~TERMP_NONOSPACE;
                p->flags &= ~TERMP_NOSPACE;
        if (0 == strcmp("on", node->child->string)) {
                p->flags &= ~TERMP_NONOSPACE;
                p->flags &= ~TERMP_NOSPACE;


@@ -2168,7 +2059,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);
 }
 


@@ -2211,21 +2102,25 @@ termp_lk_pre(DECL_ARGS)
 {
        const struct mdoc_node *n;
 
 {
        const struct mdoc_node *n;
 

-       if (NULL == (n = node->child))
-               errx(1, "expected line argument");
+       assert(node->child);
+       n = node->child;
+
+       if (NULL == n->next) {
+               pair->flag |= ttypes[TTYPE_LINK_ANCHOR];
+               return(1);
+       }

 
        p->flags |= ttypes[TTYPE_LINK_ANCHOR];
        term_word(p, n->string);
 
        p->flags |= ttypes[TTYPE_LINK_ANCHOR];
        term_word(p, n->string);

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

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

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

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

-       for ( ; n; n = n->next) {
+       for (n = n->next; n; n = n->next) 

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

-       }
-       p->flags &= ~ttypes[TTYPE_LINK_TEXT];

 
 

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

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


@@ -2235,7 +2130,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);
 }