support more than one tag entry for the same search term;

[mandoc.git] / mdoc_man.c

diff --git a/mdoc_man.c b/mdoc_man.c
index 8dcfae743772c9d6082d90124c32d3e164f1ede6..ab245313492a452f3056a6ed262bc672079f3ed2 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_man.c,v 1.64 2014/07/02 03:48:07 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.96 2016/01/08 17:48:09 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2016 Ingo Schwarze <schwarze@openbsd.org>

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


@@ -14,23 +14,23 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 

-#include "mandoc.h"

 #include "mandoc_aux.h"
 #include "mandoc_aux.h"

-#include "out.h"
-#include "man.h"
+#include "mandoc.h"
+#include "roff.h"

 #include "mdoc.h"
 #include "mdoc.h"

+#include "man.h"
+#include "out.h"

 #include "main.h"
 
 #include "main.h"
 

-#define        DECL_ARGS const struct mdoc_meta *meta, \
-                 const struct mdoc_node *n
+#define        DECL_ARGS const struct roff_meta *meta, struct roff_node *n

 
 struct manact {
        int             (*cond)(DECL_ARGS); /* DON'T run actions */
 
 struct manact {
        int             (*cond)(DECL_ARGS); /* DON'T run actions */


@@ -46,6 +46,7 @@ static  void    font_push(char);
 static void      font_pop(void);
 static void      mid_it(void);
 static void      post__t(DECL_ARGS);
 static void      font_pop(void);
 static void      mid_it(void);
 static void      post__t(DECL_ARGS);

+static void      post_aq(DECL_ARGS);

 static void      post_bd(DECL_ARGS);
 static void      post_bf(DECL_ARGS);
 static void      post_bk(DECL_ARGS);
 static void      post_bd(DECL_ARGS);
 static void      post_bf(DECL_ARGS);
 static void      post_bk(DECL_ARGS);


@@ -72,6 +73,7 @@ static        void      post_vt(DECL_ARGS);
 static int       pre__t(DECL_ARGS);
 static int       pre_an(DECL_ARGS);
 static int       pre_ap(DECL_ARGS);
 static int       pre__t(DECL_ARGS);
 static int       pre_an(DECL_ARGS);
 static int       pre_ap(DECL_ARGS);

+static int       pre_aq(DECL_ARGS);

 static int       pre_bd(DECL_ARGS);
 static int       pre_bf(DECL_ARGS);
 static int       pre_bk(DECL_ARGS);
 static int       pre_bd(DECL_ARGS);
 static int       pre_bf(DECL_ARGS);
 static int       pre_bk(DECL_ARGS);


@@ -82,7 +84,9 @@ static        int       pre_dl(DECL_ARGS);
 static int       pre_en(DECL_ARGS);
 static int       pre_enc(DECL_ARGS);
 static int       pre_em(DECL_ARGS);
 static int       pre_en(DECL_ARGS);
 static int       pre_enc(DECL_ARGS);
 static int       pre_em(DECL_ARGS);

-static int       pre_es(DECL_ARGS);
+static int       pre_skip(DECL_ARGS);
+static int       pre_eo(DECL_ARGS);
+static int       pre_ex(DECL_ARGS);

 static int       pre_fa(DECL_ARGS);
 static int       pre_fd(DECL_ARGS);
 static int       pre_fl(DECL_ARGS);
 static int       pre_fa(DECL_ARGS);
 static int       pre_fd(DECL_ARGS);
 static int       pre_fl(DECL_ARGS);


@@ -99,20 +103,21 @@ static     int       pre_no(DECL_ARGS);
 static int       pre_ns(DECL_ARGS);
 static int       pre_pp(DECL_ARGS);
 static int       pre_rs(DECL_ARGS);
 static int       pre_ns(DECL_ARGS);
 static int       pre_pp(DECL_ARGS);
 static int       pre_rs(DECL_ARGS);

+static int       pre_rv(DECL_ARGS);

 static int       pre_sm(DECL_ARGS);
 static int       pre_sp(DECL_ARGS);
 static int       pre_sect(DECL_ARGS);
 static int       pre_sy(DECL_ARGS);
 static int       pre_sm(DECL_ARGS);
 static int       pre_sp(DECL_ARGS);
 static int       pre_sect(DECL_ARGS);
 static int       pre_sy(DECL_ARGS);

-static void      pre_syn(const struct mdoc_node *);
+static void      pre_syn(const struct roff_node *);

 static int       pre_vt(DECL_ARGS);
 static int       pre_ux(DECL_ARGS);
 static int       pre_xr(DECL_ARGS);
 static void      print_word(const char *);
 static void      print_line(const char *, int);
 static void      print_block(const char *, int);
 static int       pre_vt(DECL_ARGS);
 static int       pre_ux(DECL_ARGS);
 static int       pre_xr(DECL_ARGS);
 static void      print_word(const char *);
 static void      print_line(const char *, int);
 static void      print_block(const char *, int);

-static void      print_offs(const char *);
-static void      print_width(const char *,
-                               const struct mdoc_node *, size_t);
+static void      print_offs(const char *, int);
+static void      print_width(const struct mdoc_bl *,
+                       const struct roff_node *);

 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 
 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 


@@ -139,9 +144,7 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_li, post_font, NULL, NULL }, /* Dv */
        { NULL, pre_li, post_font, NULL, NULL }, /* Er */
        { NULL, pre_li, post_font, NULL, NULL }, /* Ev */
        { NULL, pre_li, post_font, NULL, NULL }, /* Dv */
        { NULL, pre_li, post_font, NULL, NULL }, /* Er */
        { NULL, pre_li, post_font, NULL, NULL }, /* Ev */

-       { NULL, pre_enc, post_enc, "The \\fB",
-           "\\fP\nutility exits 0 on success, and >0 if an error occurs."
-           }, /* Ex */
+       { NULL, pre_ex, NULL, NULL, NULL }, /* Ex */

        { NULL, pre_fa, post_fa, NULL, NULL }, /* Fa */
        { NULL, pre_fd, post_fd, NULL, NULL }, /* Fd */
        { NULL, pre_fl, post_fl, NULL, NULL }, /* Fl */
        { NULL, pre_fa, post_fa, NULL, NULL }, /* Fa */
        { NULL, pre_fd, post_fd, NULL, NULL }, /* Fd */
        { NULL, pre_fl, post_fl, NULL, NULL }, /* Fl */


@@ -155,11 +158,7 @@ static     const struct manact manacts[MDOC_MAX + 1] = {
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Op */
        { NULL, pre_ft, post_font, NULL, NULL }, /* Ot */
        { NULL, pre_em, post_font, NULL, NULL }, /* Pa */
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Op */
        { NULL, pre_ft, post_font, NULL, NULL }, /* Ot */
        { NULL, pre_em, post_font, NULL, NULL }, /* Pa */

-       { NULL, pre_enc, post_enc, "The \\fB",
-               "\\fP\nfunction returns the value 0 if successful;\n"
-               "otherwise the value -1 is returned and the global\n"
-               "variable \\fIerrno\\fP is set to indicate the error."
-               }, /* Rv */
+       { NULL, pre_rv, NULL, NULL, NULL }, /* Rv */

        { NULL, NULL, NULL, NULL, NULL }, /* St */
        { NULL, pre_em, post_font, NULL, NULL }, /* Va */
        { NULL, pre_vt, post_vt, NULL, NULL }, /* Vt */
        { NULL, NULL, NULL, NULL, NULL }, /* St */
        { NULL, pre_em, post_font, NULL, NULL }, /* Va */
        { NULL, pre_vt, post_vt, NULL, NULL }, /* Vt */


@@ -176,8 +175,8 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre__t, post__t, NULL, NULL }, /* %T */
        { NULL, NULL, post_percent, NULL, NULL }, /* %V */
        { NULL, NULL, NULL, NULL, NULL }, /* Ac */
        { NULL, pre__t, post__t, NULL, NULL }, /* %T */
        { NULL, NULL, post_percent, NULL, NULL }, /* %V */
        { NULL, NULL, NULL, NULL, NULL }, /* Ac */

-       { cond_body, pre_enc, post_enc, "<", ">" }, /* Ao */
-       { cond_body, pre_enc, post_enc, "<", ">" }, /* Aq */
+       { cond_body, pre_aq, post_aq, NULL, NULL }, /* Ao */
+       { cond_body, pre_aq, post_aq, NULL, NULL }, /* Aq */

        { NULL, NULL, NULL, NULL, NULL }, /* At */
        { NULL, NULL, NULL, NULL, NULL }, /* Bc */
        { NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */
        { NULL, NULL, NULL, NULL, NULL }, /* At */
        { NULL, NULL, NULL, NULL, NULL }, /* Bc */
        { NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */


@@ -185,14 +184,14 @@ static    const struct manact manacts[MDOC_MAX + 1] = {
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */
        { NULL, pre_ux, NULL, "BSD/OS", NULL }, /* Bsx */
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */
        { NULL, pre_ux, NULL, "BSD/OS", NULL }, /* Bsx */
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */

-       { NULL, NULL, NULL, NULL, NULL }, /* Db */
+       { NULL, pre_skip, NULL, NULL, NULL }, /* Db */

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

-       { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Do */
-       { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Dq */
+       { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Do */
+       { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Dq */

        { NULL, NULL, NULL, NULL, NULL }, /* Ec */
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */
        { NULL, NULL, NULL, NULL, NULL }, /* Ec */
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */

-       { NULL, NULL, post_eo, NULL, NULL }, /* Eo */
+       { cond_body, pre_eo, post_eo, NULL, NULL }, /* Eo */

        { NULL, pre_ux, NULL, "FreeBSD", NULL }, /* Fx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Ms */
        { NULL, pre_no, NULL, NULL, NULL }, /* No */
        { NULL, pre_ux, NULL, "FreeBSD", NULL }, /* Fx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Ms */
        { NULL, pre_no, NULL, NULL, NULL }, /* No */


@@ -237,7 +236,7 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { cond_body, pre_enc, post_enc, "{", "}" }, /* Bro */
        { NULL, NULL, NULL, NULL, NULL }, /* Brc */
        { NULL, NULL, post_percent, NULL, NULL }, /* %C */
        { cond_body, pre_enc, post_enc, "{", "}" }, /* Bro */
        { NULL, NULL, NULL, NULL, NULL }, /* Brc */
        { NULL, NULL, post_percent, NULL, NULL }, /* %C */

-       { NULL, pre_es, NULL, NULL, NULL }, /* Es */
+       { NULL, pre_skip, NULL, NULL, NULL }, /* Es */

        { cond_body, pre_en, post_en, NULL, NULL }, /* En */
        { NULL, pre_ux, NULL, "DragonFly", NULL }, /* Dx */
        { NULL, NULL, post_percent, NULL, NULL }, /* %Q */
        { cond_body, pre_en, post_en, NULL, NULL }, /* En */
        { NULL, pre_ux, NULL, "DragonFly", NULL }, /* Dx */
        { NULL, NULL, post_percent, NULL, NULL }, /* %Q */


@@ -266,7 +265,7 @@ static      int             outflags;
 
 #define        BL_STACK_MAX    32
 
 
 #define        BL_STACK_MAX    32
 

-static size_t          Bl_stack[BL_STACK_MAX];  /* offsets [chars] */
+static int             Bl_stack[BL_STACK_MAX];  /* offsets [chars] */

 static int             Bl_stack_post[BL_STACK_MAX];  /* add final .RE */
 static int             Bl_stack_len;  /* number of nested Bl blocks */
 static int             TPremain;  /* characters before tag is full */
 static int             Bl_stack_post[BL_STACK_MAX];  /* add final .RE */
 static int             Bl_stack_len;  /* number of nested Bl blocks */
 static int             TPremain;  /* characters before tag is full */


@@ -420,22 +419,22 @@ print_block(const char *s, int newflags)
 }
 
 static void
 }
 
 static void

-print_offs(const char *v)
+print_offs(const char *v, int keywords)

 {
        char              buf[24];
        struct roffsu     su;
 {
        char              buf[24];
        struct roffsu     su;

-       size_t            sz;
+       int               sz;

 
        print_line(".RS", MMAN_Bk_susp);
 
        /* Convert v into a number (of characters). */
 
        print_line(".RS", MMAN_Bk_susp);
 
        /* Convert v into a number (of characters). */

-       if (NULL == v || '\0' == *v || 0 == strcmp(v, "left"))
+       if (NULL == v || '\0' == *v || (keywords && !strcmp(v, "left")))

                sz = 0;
                sz = 0;

-       else if (0 == strcmp(v, "indent"))
+       else if (keywords && !strcmp(v, "indent"))

                sz = 6;
                sz = 6;

-       else if (0 == strcmp(v, "indent-two"))
+       else if (keywords && !strcmp(v, "indent-two"))

                sz = 12;
                sz = 12;

-       else if (a2roffsu(v, &su, SCALE_MAX)) {
+       else if (a2roffsu(v, &su, SCALE_EN) > 1) {

                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {
                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {


@@ -460,7 +459,7 @@ print_offs(const char *v)
        if (Bl_stack_len)
                sz += Bl_stack[Bl_stack_len - 1];
 
        if (Bl_stack_len)
                sz += Bl_stack[Bl_stack_len - 1];
 

-       (void)snprintf(buf, sizeof(buf), "%zun", sz);
+       (void)snprintf(buf, sizeof(buf), "%dn", sz);

        print_word(buf);
        outflags |= MMAN_nl;
 }
        print_word(buf);
        outflags |= MMAN_nl;
 }


@@ -469,20 +468,19 @@ print_offs(const char *v)
  * Set up the indentation for a list item; used from pre_it().
  */
 static void
  * Set up the indentation for a list item; used from pre_it().
  */
 static void

-print_width(const char *v, const struct mdoc_node *child, size_t defsz)
+print_width(const struct mdoc_bl *bl, const struct roff_node *child)

 {
        char              buf[24];
        struct roffsu     su;
 {
        char              buf[24];
        struct roffsu     su;

-       size_t            sz, chsz;
-       int               numeric, remain;
+       int               numeric, remain, sz, chsz;

 
        numeric = 1;
        remain = 0;
 
 
        numeric = 1;
        remain = 0;
 

-       /* Convert v into a number (of characters). */
-       if (NULL == v)
-               sz = defsz;
-       else if (a2roffsu(v, &su, SCALE_MAX)) {
+       /* Convert the width into a number (of characters). */
+       if (bl->width == NULL)
+               sz = (bl->type == LIST_hang) ? 6 : 0;
+       else if (a2roffsu(bl->width, &su, SCALE_MAX) > 1) {

                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {
                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {


@@ -490,11 +488,15 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
                        numeric = 0;
                }
        } else
                        numeric = 0;
                }
        } else

-               sz = strlen(v);
+               sz = strlen(bl->width);

 
        /* XXX Rough estimation, might have multiple parts. */
 
        /* XXX Rough estimation, might have multiple parts. */

-       chsz = (NULL != child && MDOC_TEXT == child->type) ?
-           strlen(child->string) : 0;
+       if (bl->type == LIST_enum)
+               chsz = (bl->count > 8) + 1;
+       else if (child != NULL && child->type == ROFFT_TEXT)
+               chsz = strlen(child->string);
+       else
+               chsz = 0;

 
        /* Maybe we are inside an enclosing list? */
        mid_it();
 
        /* Maybe we are inside an enclosing list? */
        mid_it();


@@ -506,17 +508,17 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
        Bl_stack[Bl_stack_len++] = sz + 2;
 
        /* Set up the current list. */
        Bl_stack[Bl_stack_len++] = sz + 2;
 
        /* Set up the current list. */

-       if (defsz && chsz > sz)
+       if (chsz > sz && bl->type != LIST_tag)

                print_block(".HP", 0);
        else {
                print_block(".TP", 0);
                remain = sz + 2;
        }
        if (numeric) {
                print_block(".HP", 0);
        else {
                print_block(".TP", 0);
                remain = sz + 2;
        }
        if (numeric) {

-               (void)snprintf(buf, sizeof(buf), "%zun", sz + 2);
+               (void)snprintf(buf, sizeof(buf), "%dn", sz + 2);

                print_word(buf);
        } else
                print_word(buf);
        } else

-               print_word(v);
+               print_word(bl->width);

        TPremain = remain;
 }
 
        TPremain = remain;
 }
 


@@ -525,12 +527,12 @@ print_count(int *count)
 {
        char              buf[24];
 
 {
        char              buf[24];
 

-       (void)snprintf(buf, sizeof(buf), "%d.", ++*count);
+       (void)snprintf(buf, sizeof(buf), "%d.\\&", ++*count);

        print_word(buf);
 }
 
 void
        print_word(buf);
 }
 
 void

-man_man(void *arg, const struct man *man)
+man_man(void *arg, const struct roff_man *man)

 {
 
        /*
 {
 
        /*


@@ -543,17 +545,14 @@ man_man(void *arg, const struct man *man)
 }
 
 void
 }
 
 void

-man_mdoc(void *arg, const struct mdoc *mdoc)
+man_mdoc(void *arg, const struct roff_man *mdoc)

 {
 {

-       const struct mdoc_meta *meta;
-       const struct mdoc_node *n;
-
-       meta = mdoc_meta(mdoc);
-       n = mdoc_node(mdoc);
+       struct roff_node *n;

 
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
 
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",

-           meta->title, meta->msec, meta->date,
-           meta->os, meta->vol);
+           mdoc->meta.title,
+           (mdoc->meta.msec == NULL ? "" : mdoc->meta.msec),
+           mdoc->meta.date, mdoc->meta.os, mdoc->meta.vol);

 
        /* Disable hyphenation and if nroff, disable justification. */
        printf(".nh\n.if n .ad l");
 
        /* Disable hyphenation and if nroff, disable justification. */
        printf(".nh\n.if n .ad l");


@@ -564,15 +563,16 @@ man_mdoc(void *arg, const struct mdoc *mdoc)
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }

-       print_node(meta, n);
+       for (n = mdoc->first->child; n != NULL; n = n->next)
+               print_node(&mdoc->meta, n);

        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {
        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {

-       const struct mdoc_node  *sub;

        const struct manact     *act;
        const struct manact     *act;

+       struct roff_node        *sub;

        int                      cond, do_sub;
 
        /*
        int                      cond, do_sub;
 
        /*


@@ -585,8 +585,9 @@ print_node(DECL_ARGS)
        act = NULL;
        cond = 0;
        do_sub = 1;
        act = NULL;
        cond = 0;
        do_sub = 1;

+       n->flags &= ~MDOC_ENDED;

 
 

-       if (MDOC_TEXT == n->type) {
+       if (n->type == ROFFT_TEXT) {

                /*
                 * Make sure that we don't happen to start with a
                 * control character at the start of a line.
                /*
                 * Make sure that we don't happen to start with a
                 * control character at the start of a line.


@@ -597,15 +598,20 @@ print_node(DECL_ARGS)
                        printf("\\&");
                        outflags &= ~MMAN_spc;
                }
                        printf("\\&");
                        outflags &= ~MMAN_spc;
                }

+               if (outflags & MMAN_Sm && ! (n->flags & MDOC_DELIMC))
+                       outflags |= MMAN_spc_force;

                print_word(n->string);
                print_word(n->string);

+               if (outflags & MMAN_Sm && ! (n->flags & MDOC_DELIMO))
+                       outflags |= MMAN_spc;

        } else {
                /*
                 * Conditionally run the pre-node action handler for a
                 * node.
                 */
                act = manacts + n->tok;
        } else {
                /*
                 * Conditionally run the pre-node action handler for a
                 * node.
                 */
                act = manacts + n->tok;

-               cond = NULL == act->cond || (*act->cond)(meta, n);
-               if (cond && act->pre && ENDBODY_NOT == n->end)
+               cond = act->cond == NULL || (*act->cond)(meta, n);
+               if (cond && act->pre != NULL &&
+                   (n->end == ENDBODY_NOT || n->child != NULL))

                        do_sub = (*act->pre)(meta, n);
        }
 
                        do_sub = (*act->pre)(meta, n);
        }
 


@@ -628,7 +634,7 @@ print_node(DECL_ARGS)
                (*act->post)(meta, n);
 
        if (ENDBODY_NOT != n->end)
                (*act->post)(meta, n);
 
        if (ENDBODY_NOT != n->end)

-               n->pending->flags |= MDOC_ENDED;
+               n->body->flags |= MDOC_ENDED;

 
        if (ENDBODY_NOSPACE == n->end)
                outflags &= ~(MMAN_spc | MMAN_nl);
 
        if (ENDBODY_NOSPACE == n->end)
                outflags &= ~(MMAN_spc | MMAN_nl);


@@ -638,14 +644,14 @@ static int
 cond_head(DECL_ARGS)
 {
 
 cond_head(DECL_ARGS)
 {
 

-       return(MDOC_HEAD == n->type);
+       return n->type == ROFFT_HEAD;

 }
 
 static int
 cond_body(DECL_ARGS)
 {
 
 }
 
 static int
 cond_body(DECL_ARGS)
 {
 

-       return(MDOC_BODY == n->type);
+       return n->type == ROFFT_BODY;

 }
 
 static int
 }
 
 static int


@@ -655,10 +661,10 @@ pre_enc(DECL_ARGS)
 
        prefix = manacts[n->tok].prefix;
        if (NULL == prefix)
 
        prefix = manacts[n->tok].prefix;
        if (NULL == prefix)

-               return(1);
+               return 1;

        print_word(prefix);
        outflags &= ~MMAN_spc;
        print_word(prefix);
        outflags &= ~MMAN_spc;

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -673,6 +679,41 @@ post_enc(DECL_ARGS)
        print_word(suffix);
 }
 
        print_word(suffix);
 }
 

+static int
+pre_ex(DECL_ARGS)
+{
+       struct roff_node *nch;
+
+       outflags |= MMAN_br | MMAN_nl;
+
+       print_word("The");
+
+       for (nch = n->child; nch != NULL; nch = nch->next) {
+               font_push('B');
+               print_word(nch->string);
+               font_pop();
+
+               if (nch->next == NULL)
+                       continue;
+
+               if (nch->prev != NULL || nch->next->next != NULL) {
+                       outflags &= ~MMAN_spc;
+                       print_word(",");
+               }
+               if (nch->next->next == NULL)
+                       print_word("and");
+       }
+
+       if (n->child != NULL && n->child->next != NULL)
+               print_word("utilities exit\\~0");
+       else
+               print_word("utility exits\\~0");
+
+       print_word("on success, and\\~>0 if an error occurs.");
+       outflags |= MMAN_nl;
+       return 0;
+}
+

 static void
 post_font(DECL_ARGS)
 {
 static void
 post_font(DECL_ARGS)
 {


@@ -708,7 +749,7 @@ pre__t(DECL_ARGS)
                outflags &= ~MMAN_spc;
        } else
                font_push('I');
                outflags &= ~MMAN_spc;
        } else
                font_push('I');

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -732,14 +773,14 @@ static int
 pre_sect(DECL_ARGS)
 {
 
 pre_sect(DECL_ARGS)
 {
 

-       if (MDOC_HEAD == n->type) {
+       if (n->type == ROFFT_HEAD) {

                outflags |= MMAN_sp;
                print_block(manacts[n->tok].prefix, 0);
                print_word("");
                putchar('\"');
                outflags &= ~MMAN_spc;
        }
                outflags |= MMAN_sp;
                print_block(manacts[n->tok].prefix, 0);
                print_word("");
                putchar('\"');
                outflags &= ~MMAN_spc;
        }

-       return(1);
+       return 1;

 }
 
 /*
 }
 
 /*


@@ -749,7 +790,7 @@ static void
 post_sect(DECL_ARGS)
 {
 
 post_sect(DECL_ARGS)
 {
 

-       if (MDOC_HEAD != n->type)
+       if (n->type != ROFFT_HEAD)

                return;
        outflags &= ~MMAN_spc;
        print_word("");
                return;
        outflags &= ~MMAN_spc;
        print_word("");


@@ -761,7 +802,7 @@ post_sect(DECL_ARGS)
 
 /* See mdoc_term.c, synopsis_pre() for comments. */
 static void
 
 /* See mdoc_term.c, synopsis_pre() for comments. */
 static void

-pre_syn(const struct mdoc_node *n)
+pre_syn(const struct roff_node *n)

 {
 
        if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
 {
 
        if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))


@@ -777,13 +818,9 @@ pre_syn(const struct mdoc_node *n)
 
        switch (n->prev->tok) {
        case MDOC_Fd:
 
        switch (n->prev->tok) {
        case MDOC_Fd:

-               /* FALLTHROUGH */

        case MDOC_Fn:
        case MDOC_Fn:

-               /* FALLTHROUGH */

        case MDOC_Fo:
        case MDOC_Fo:

-               /* FALLTHROUGH */

        case MDOC_In:
        case MDOC_In:

-               /* FALLTHROUGH */

        case MDOC_Vt:
                outflags |= MMAN_sp;
                break;
        case MDOC_Vt:
                outflags |= MMAN_sp;
                break;


@@ -807,18 +844,18 @@ pre_an(DECL_ARGS)
        case AUTH_split:
                outflags &= ~MMAN_An_nosplit;
                outflags |= MMAN_An_split;
        case AUTH_split:
                outflags &= ~MMAN_An_nosplit;
                outflags |= MMAN_An_split;

-               return(0);
+               return 0;

        case AUTH_nosplit:
                outflags &= ~MMAN_An_split;
                outflags |= MMAN_An_nosplit;
        case AUTH_nosplit:
                outflags &= ~MMAN_An_split;
                outflags |= MMAN_An_nosplit;

-               return(0);
+               return 0;

        default:
                if (MMAN_An_split & outflags)
                        outflags |= MMAN_br;
                else if (SEC_AUTHORS == n->sec &&
                    ! (MMAN_An_nosplit & outflags))
                        outflags |= MMAN_An_split;
        default:
                if (MMAN_An_split & outflags)
                        outflags |= MMAN_br;
                else if (SEC_AUTHORS == n->sec &&
                    ! (MMAN_An_nosplit & outflags))
                        outflags |= MMAN_An_split;

-               return(1);
+               return 1;

        }
 }
 
        }
 }
 


@@ -829,7 +866,26 @@ pre_ap(DECL_ARGS)
        outflags &= ~MMAN_spc;
        print_word("'");
        outflags &= ~MMAN_spc;
        outflags &= ~MMAN_spc;
        print_word("'");
        outflags &= ~MMAN_spc;

-       return(0);
+       return 0;
+}
+
+static int
+pre_aq(DECL_ARGS)
+{
+
+       print_word(n->child != NULL && n->child->next == NULL &&
+           n->child->tok == MDOC_Mt ?  "<" : "\\(la");
+       outflags &= ~MMAN_spc;
+       return 1;
+}
+
+static void
+post_aq(DECL_ARGS)
+{
+
+       outflags &= ~(MMAN_spc | MMAN_nl);
+       print_word(n->child != NULL && n->child->next == NULL &&
+           n->child->tok == MDOC_Mt ?  ">" : "\\(ra");

 }
 
 static int
 }
 
 static int


@@ -843,8 +899,8 @@ pre_bd(DECL_ARGS)
                print_line(".nf", 0);
        if (0 == n->norm->Bd.comp && NULL != n->parent->prev)
                outflags |= MMAN_sp;
                print_line(".nf", 0);
        if (0 == n->norm->Bd.comp && NULL != n->parent->prev)
                outflags |= MMAN_sp;

-       print_offs(n->norm->Bd.offs);
-       return(1);
+       print_offs(n->norm->Bd.offs, 1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -867,12 +923,12 @@ pre_bf(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
-               return(1);
-       case MDOC_BODY:
+       case ROFFT_BLOCK:
+               return 1;
+       case ROFFT_BODY:

                break;
        default:
                break;
        default:

-               return(0);
+               return 0;

        }
        switch (n->norm->Bf.font) {
        case FONT_Em:
        }
        switch (n->norm->Bf.font) {
        case FONT_Em:


@@ -885,14 +941,14 @@ pre_bf(DECL_ARGS)
                font_push('R');
                break;
        }
                font_push('R');
                break;
        }

-       return(1);
+       return 1;

 }
 
 static void
 post_bf(DECL_ARGS)
 {
 
 }
 
 static void
 post_bf(DECL_ARGS)
 {
 

-       if (MDOC_BODY == n->type)
+       if (n->type == ROFFT_BODY)

                font_pop();
 }
 
                font_pop();
 }
 


@@ -901,13 +957,13 @@ pre_bk(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
-               return(1);
-       case MDOC_BODY:
+       case ROFFT_BLOCK:
+               return 1;
+       case ROFFT_BODY:

                outflags |= MMAN_Bk;
                outflags |= MMAN_Bk;

-               return(1);
+               return 1;

        default:
        default:

-               return(0);
+               return 0;

        }
 }
 
        }
 }
 


@@ -915,7 +971,7 @@ static void
 post_bk(DECL_ARGS)
 {
 
 post_bk(DECL_ARGS)
 {
 

-       if (MDOC_BODY == n->type)
+       if (n->type == ROFFT_BODY)

                outflags &= ~MMAN_Bk;
 }
 
                outflags &= ~MMAN_Bk;
 }
 


@@ -930,26 +986,28 @@ pre_bl(DECL_ARGS)
         * just nest and do not add up their indentation.
         */
        if (n->norm->Bl.offs) {
         * just nest and do not add up their indentation.
         */
        if (n->norm->Bl.offs) {

-               print_offs(n->norm->Bl.offs);
+               print_offs(n->norm->Bl.offs, 0);

                Bl_stack[Bl_stack_len++] = 0;
        }
 
        switch (n->norm->Bl.type) {
        case LIST_enum:
                n->norm->Bl.count = 0;
                Bl_stack[Bl_stack_len++] = 0;
        }
 
        switch (n->norm->Bl.type) {
        case LIST_enum:
                n->norm->Bl.count = 0;

-               return(1);
+               return 1;

        case LIST_column:
                break;
        default:
        case LIST_column:
                break;
        default:

-               return(1);
+               return 1;

        }
 
        }
 

-       print_line(".TS", MMAN_nl);
-       for (icol = 0; icol < n->norm->Bl.ncols; icol++)
-               print_word("l");
-       print_word(".");
+       if (n->child != NULL) {
+               print_line(".TS", MMAN_nl);
+               for (icol = 0; icol < n->norm->Bl.ncols; icol++)
+                       print_word("l");
+               print_word(".");
+       }

        outflags |= MMAN_nl;
        outflags |= MMAN_nl;

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -958,7 +1016,8 @@ post_bl(DECL_ARGS)
 
        switch (n->norm->Bl.type) {
        case LIST_column:
 
        switch (n->norm->Bl.type) {
        case LIST_column:

-               print_line(".TE", 0);
+               if (n->child != NULL)
+                       print_line(".TE", 0);

                break;
        case LIST_enum:
                n->norm->Bl.count = 0;
                break;
        case LIST_enum:
                n->norm->Bl.count = 0;


@@ -988,7 +1047,7 @@ pre_br(DECL_ARGS)
 {
 
        outflags |= MMAN_br;
 {
 
        outflags |= MMAN_br;

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1003,20 +1062,20 @@ pre_bx(DECL_ARGS)
        }
        print_word("BSD");
        if (NULL == n)
        }
        print_word("BSD");
        if (NULL == n)

-               return(0);
+               return 0;

        outflags &= ~MMAN_spc;
        print_word("-");
        outflags &= ~MMAN_spc;
        print_word(n->string);
        outflags &= ~MMAN_spc;
        print_word("-");
        outflags &= ~MMAN_spc;
        print_word(n->string);

-       return(0);
+       return 0;

 }
 
 static int
 pre_dl(DECL_ARGS)
 {
 
 }
 
 static int
 pre_dl(DECL_ARGS)
 {
 

-       print_offs("6n");
-       return(1);
+       print_offs("6n", 0);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1035,7 +1094,7 @@ pre_em(DECL_ARGS)
 {
 
        font_push('I');
 {
 
        font_push('I');

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1044,11 +1103,11 @@ pre_en(DECL_ARGS)
 
        if (NULL == n->norm->Es ||
            NULL == n->norm->Es->child)
 
        if (NULL == n->norm->Es ||
            NULL == n->norm->Es->child)

-               return(1);
+               return 1;

 
        print_word(n->norm->Es->child->string);
        outflags &= ~MMAN_spc;
 
        print_word(n->norm->Es->child->string);
        outflags &= ~MMAN_spc;

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1065,19 +1124,41 @@ post_en(DECL_ARGS)
        return;
 }
 
        return;
 }
 

-static void
-post_eo(DECL_ARGS)
+static int
+pre_eo(DECL_ARGS)

 {
 
 {
 

-       if (MDOC_HEAD == n->type || MDOC_BODY == n->type)
-               outflags &= ~MMAN_spc;
+       if (n->end == ENDBODY_NOT &&
+           n->parent->head->child == NULL &&
+           n->child != NULL &&
+           n->child->end != ENDBODY_NOT)
+               print_word("\\&");
+       else if (n->end != ENDBODY_NOT ? n->child != NULL :
+           n->parent->head->child != NULL && (n->child != NULL ||
+           (n->parent->tail != NULL && n->parent->tail->child != NULL)))
+               outflags &= ~(MMAN_spc | MMAN_nl);
+       return 1;

 }
 
 }
 

-static int
-pre_es(DECL_ARGS)
+static void
+post_eo(DECL_ARGS)

 {
 {

+       int      body, tail;
+
+       if (n->end != ENDBODY_NOT) {
+               outflags |= MMAN_spc;
+               return;
+       }
+
+       body = n->child != NULL || n->parent->head->child != NULL;
+       tail = n->parent->tail != NULL && n->parent->tail->child != NULL;

 
 

-       return(0);
+       if (body && tail)
+               outflags &= ~MMAN_spc;
+       else if ( ! (body || tail))
+               print_word("\\&");
+       else if ( ! tail)
+               outflags |= MMAN_spc;

 }
 
 static int
 }
 
 static int


@@ -1099,7 +1180,7 @@ pre_fa(DECL_ARGS)
                if (NULL != (n = n->next))
                        print_word(",");
        }
                if (NULL != (n = n->next))
                        print_word(",");
        }

-       return(0);
+       return 0;

 }
 
 static void
 }
 
 static void


@@ -1116,7 +1197,7 @@ pre_fd(DECL_ARGS)
 
        pre_syn(n);
        font_push('B');
 
        pre_syn(n);
        font_push('B');

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1133,8 +1214,9 @@ pre_fl(DECL_ARGS)
 
        font_push('B');
        print_word("\\-");
 
        font_push('B');
        print_word("\\-");

-       outflags &= ~MMAN_spc;
-       return(1);
+       if (n->child != NULL)
+               outflags &= ~MMAN_spc;
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1142,8 +1224,10 @@ post_fl(DECL_ARGS)
 {
 
        font_pop();
 {
 
        font_pop();

-       if (0 == n->nchild && NULL != n->next &&
-                       n->next->line == n->line)
+       if (!(n->child != NULL ||
+           n->next == NULL ||
+           n->next->type == ROFFT_TEXT ||
+           n->next->flags & MDOC_LINE))

                outflags &= ~MMAN_spc;
 }
 
                outflags &= ~MMAN_spc;
 }
 


@@ -1155,7 +1239,7 @@ pre_fn(DECL_ARGS)
 
        n = n->child;
        if (NULL == n)
 
        n = n->child;
        if (NULL == n)

-               return(0);
+               return 0;

 
        if (MDOC_SYNPRETTY & n->flags)
                print_block(".HP 4n", MMAN_nl);
 
        if (MDOC_SYNPRETTY & n->flags)
                print_block(".HP 4n", MMAN_nl);


@@ -1170,7 +1254,7 @@ pre_fn(DECL_ARGS)
        n = n->next;
        if (NULL != n)
                pre_fa(meta, n);
        n = n->next;
        if (NULL != n)
                pre_fa(meta, n);

-       return(0);
+       return 0;

 }
 
 static void
 }
 
 static void


@@ -1189,23 +1273,25 @@ pre_fo(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

                pre_syn(n);
                break;
                pre_syn(n);
                break;

-       case MDOC_HEAD:
+       case ROFFT_HEAD:
+               if (n->child == NULL)
+                       return 0;

                if (MDOC_SYNPRETTY & n->flags)
                        print_block(".HP 4n", MMAN_nl);
                font_push('B');
                break;
                if (MDOC_SYNPRETTY & n->flags)
                        print_block(".HP 4n", MMAN_nl);
                font_push('B');
                break;

-       case MDOC_BODY:
-               outflags &= ~MMAN_spc;
+       case ROFFT_BODY:
+               outflags &= ~(MMAN_spc | MMAN_nl);

                print_word("(");
                outflags &= ~MMAN_spc;
                break;
        default:
                break;
        }
                print_word("(");
                outflags &= ~MMAN_spc;
                break;
        default:
                break;
        }

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1213,10 +1299,11 @@ post_fo(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_HEAD:
-               font_pop();
+       case ROFFT_HEAD:
+               if (n->child != NULL)
+                       font_pop();

                break;
                break;

-       case MDOC_BODY:
+       case ROFFT_BODY:

                post_fn(meta, n);
                break;
        default:
                post_fn(meta, n);
                break;
        default:


@@ -1230,7 +1317,7 @@ pre_ft(DECL_ARGS)
 
        pre_syn(n);
        font_push('I');
 
        pre_syn(n);
        font_push('I');

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1247,7 +1334,7 @@ pre_in(DECL_ARGS)
                outflags &= ~MMAN_spc;
                font_push('I');
        }
                outflags &= ~MMAN_spc;
                font_push('I');
        }

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1269,10 +1356,10 @@ post_in(DECL_ARGS)
 static int
 pre_it(DECL_ARGS)
 {
 static int
 pre_it(DECL_ARGS)
 {

-       const struct mdoc_node *bln;
+       const struct roff_node *bln;

 
        switch (n->type) {
 
        switch (n->type) {

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                outflags |= MMAN_PP | MMAN_nl;
                bln = n->parent->parent;
                if (0 == bln->norm->Bl.comp ||
                outflags |= MMAN_PP | MMAN_nl;
                bln = n->parent->parent;
                if (0 == bln->norm->Bl.comp ||


@@ -1282,56 +1369,54 @@ pre_it(DECL_ARGS)
                outflags &= ~MMAN_br;
                switch (bln->norm->Bl.type) {
                case LIST_item:
                outflags &= ~MMAN_br;
                switch (bln->norm->Bl.type) {
                case LIST_item:

-                       return(0);
+                       return 0;

                case LIST_inset:
                case LIST_inset:

-                       /* FALLTHROUGH */

                case LIST_diag:
                case LIST_diag:

-                       /* FALLTHROUGH */

                case LIST_ohang:
                        if (bln->norm->Bl.type == LIST_diag)
                                print_line(".B \"", 0);
                        else
                                print_line(".R \"", 0);
                        outflags &= ~MMAN_spc;
                case LIST_ohang:
                        if (bln->norm->Bl.type == LIST_diag)
                                print_line(".B \"", 0);
                        else
                                print_line(".R \"", 0);
                        outflags &= ~MMAN_spc;

-                       return(1);
+                       return 1;

                case LIST_bullet:
                case LIST_bullet:

-                       /* FALLTHROUGH */

                case LIST_dash:
                case LIST_dash:

-                       /* FALLTHROUGH */

                case LIST_hyphen:
                case LIST_hyphen:

-                       print_width(bln->norm->Bl.width, NULL, 0);
+                       print_width(&bln->norm->Bl, NULL);

                        TPremain = 0;
                        outflags |= MMAN_nl;
                        font_push('B');
                        if (LIST_bullet == bln->norm->Bl.type)
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        font_push('B');
                        if (LIST_bullet == bln->norm->Bl.type)

-                               print_word("o");
+                               print_word("\\(bu");

                        else
                                print_word("-");
                        font_pop();
                        else
                                print_word("-");
                        font_pop();

-                       break;
+                       outflags |= MMAN_nl;
+                       return 0;

                case LIST_enum:
                case LIST_enum:

-                       print_width(bln->norm->Bl.width, NULL, 0);
+                       print_width(&bln->norm->Bl, NULL);

                        TPremain = 0;
                        outflags |= MMAN_nl;
                        print_count(&bln->norm->Bl.count);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        print_count(&bln->norm->Bl.count);

-                       break;
+                       outflags |= MMAN_nl;
+                       return 0;

                case LIST_hang:
                case LIST_hang:

-                       print_width(bln->norm->Bl.width, n->child, 6);
+                       print_width(&bln->norm->Bl, n->child);

                        TPremain = 0;
                        TPremain = 0;

-                       break;
+                       outflags |= MMAN_nl;
+                       return 1;

                case LIST_tag:
                case LIST_tag:

-                       print_width(bln->norm->Bl.width, n->child, 0);
+                       print_width(&bln->norm->Bl, n->child);

                        putchar('\n');
                        outflags &= ~MMAN_spc;
                        putchar('\n');
                        outflags &= ~MMAN_spc;

-                       return(1);
+                       return 1;

                default:
                default:

-                       return(1);
+                       return 1;

                }
                }

-               outflags |= MMAN_nl;

        default:
                break;
        }
        default:
                break;
        }

-       return(1);
+       return 1;

 }
 
 /*
 }
 
 /*


@@ -1353,7 +1438,7 @@ mid_it(void)
 
        /* Restore the indentation of the enclosing list. */
        print_line(".RS", MMAN_Bk_susp);
 
        /* Restore the indentation of the enclosing list. */
        print_line(".RS", MMAN_Bk_susp);

-       (void)snprintf(buf, sizeof(buf), "%zun",
+       (void)snprintf(buf, sizeof(buf), "%dn",

            Bl_stack[Bl_stack_len - 1]);
        print_word(buf);
 
            Bl_stack[Bl_stack_len - 1]);
        print_word(buf);
 


@@ -1364,12 +1449,12 @@ mid_it(void)
 static void
 post_it(DECL_ARGS)
 {
 static void
 post_it(DECL_ARGS)
 {

-       const struct mdoc_node *bln;
+       const struct roff_node *bln;

 
        bln = n->parent->parent;
 
        switch (n->type) {
 
        bln = n->parent->parent;
 
        switch (n->type) {

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                switch (bln->norm->Bl.type) {
                case LIST_diag:
                        outflags &= ~MMAN_spc;
                switch (bln->norm->Bl.type) {
                case LIST_diag:
                        outflags &= ~MMAN_spc;


@@ -1382,18 +1467,13 @@ post_it(DECL_ARGS)
                        break;
                }
                break;
                        break;
                }
                break;

-       case MDOC_BODY:
+       case ROFFT_BODY:

                switch (bln->norm->Bl.type) {
                case LIST_bullet:
                switch (bln->norm->Bl.type) {
                case LIST_bullet:

-                       /* FALLTHROUGH */

                case LIST_dash:
                case LIST_dash:

-                       /* FALLTHROUGH */

                case LIST_hyphen:
                case LIST_hyphen:

-                       /* FALLTHROUGH */

                case LIST_enum:
                case LIST_enum:

-                       /* FALLTHROUGH */

                case LIST_hang:
                case LIST_hang:

-                       /* FALLTHROUGH */

                case LIST_tag:
                        assert(Bl_stack_len);
                        Bl_stack[--Bl_stack_len] = 0;
                case LIST_tag:
                        assert(Bl_stack_len);
                        Bl_stack[--Bl_stack_len] = 0;


@@ -1434,10 +1514,10 @@ post_lb(DECL_ARGS)
 static int
 pre_lk(DECL_ARGS)
 {
 static int
 pre_lk(DECL_ARGS)
 {

-       const struct mdoc_node *link, *descr;
+       const struct roff_node *link, *descr;

 
        if (NULL == (link = n->child))
 
        if (NULL == (link = n->child))

-               return(0);
+               return 0;

 
        if (NULL != (descr = link->next)) {
                font_push('I');
 
        if (NULL != (descr = link->next)) {
                font_push('I');


@@ -1452,7 +1532,7 @@ pre_lk(DECL_ARGS)
        font_push('B');
        print_word(link->string);
        font_pop();
        font_push('B');
        print_word(link->string);
        font_pop();

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1460,7 +1540,7 @@ pre_ll(DECL_ARGS)
 {
 
        print_line(".ll", 0);
 {
 
        print_line(".ll", 0);

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1468,7 +1548,7 @@ pre_li(DECL_ARGS)
 {
 
        font_push('R');
 {
 
        font_push('R');

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1476,16 +1556,16 @@ pre_nm(DECL_ARGS)
 {
        char    *name;
 
 {
        char    *name;
 

-       if (MDOC_BLOCK == n->type) {
+       if (n->type == ROFFT_BLOCK) {

                outflags |= MMAN_Bk;
                pre_syn(n);
        }
                outflags |= MMAN_Bk;
                pre_syn(n);
        }

-       if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
-               return(1);
+       if (n->type != ROFFT_ELEM && n->type != ROFFT_HEAD)
+               return 1;

        name = n->child ? n->child->string : meta->name;
        if (NULL == name)
        name = n->child ? n->child->string : meta->name;
        if (NULL == name)

-               return(0);
-       if (MDOC_HEAD == n->type) {
+               return 0;
+       if (n->type == ROFFT_HEAD) {

                if (NULL == n->parent->prev)
                        outflags |= MMAN_sp;
                print_block(".HP", 0);
                if (NULL == n->parent->prev)
                        outflags |= MMAN_sp;
                print_block(".HP", 0);


@@ -1495,7 +1575,7 @@ pre_nm(DECL_ARGS)
        font_push('B');
        if (NULL == n->child)
                print_word(meta->name);
        font_push('B');
        if (NULL == n->child)
                print_word(meta->name);

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1503,13 +1583,13 @@ post_nm(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

                outflags &= ~MMAN_Bk;
                break;
                outflags &= ~MMAN_Bk;
                break;

-       case MDOC_HEAD:
-               /* FALLTHROUGH */
-       case MDOC_ELEM:
-               font_pop();
+       case ROFFT_HEAD:
+       case ROFFT_ELEM:
+               if (n->child != NULL || meta->name != NULL)
+                       font_pop();

                break;
        default:
                break;
                break;
        default:
                break;


@@ -1521,7 +1601,7 @@ pre_no(DECL_ARGS)
 {
 
        outflags |= MMAN_spc_force;
 {
 
        outflags |= MMAN_spc_force;

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1529,14 +1609,15 @@ pre_ns(DECL_ARGS)
 {
 
        outflags &= ~MMAN_spc;
 {
 
        outflags &= ~MMAN_spc;

-       return(0);
+       return 0;

 }
 
 static void
 post_pf(DECL_ARGS)
 {
 
 }
 
 static void
 post_pf(DECL_ARGS)
 {
 

-       outflags &= ~MMAN_spc;
+       if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+               outflags &= ~MMAN_spc;

 }
 
 static int
 }
 
 static int


@@ -1547,7 +1628,7 @@ pre_pp(DECL_ARGS)
                outflags |= MMAN_PP;
        outflags |= MMAN_sp | MMAN_nl;
        outflags &= ~MMAN_br;
                outflags |= MMAN_PP;
        outflags |= MMAN_sp | MMAN_nl;
        outflags &= ~MMAN_br;

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1558,19 +1639,82 @@ pre_rs(DECL_ARGS)
                outflags |= MMAN_PP | MMAN_sp | MMAN_nl;
                outflags &= ~MMAN_br;
        }
                outflags |= MMAN_PP | MMAN_sp | MMAN_nl;
                outflags &= ~MMAN_br;
        }

-       return(1);
+       return 1;
+}
+
+static int
+pre_rv(DECL_ARGS)
+{
+       struct roff_node *nch;
+
+       outflags |= MMAN_br | MMAN_nl;
+
+       if (n->child != NULL) {
+               print_word("The");
+
+               for (nch = n->child; nch != NULL; nch = nch->next) {
+                       font_push('B');
+                       print_word(nch->string);
+                       font_pop();
+
+                       outflags &= ~MMAN_spc;
+                       print_word("()");
+
+                       if (nch->next == NULL)
+                               continue;
+
+                       if (nch->prev != NULL || nch->next->next != NULL) {
+                               outflags &= ~MMAN_spc;
+                               print_word(",");
+                       }
+                       if (nch->next->next == NULL)
+                               print_word("and");
+               }
+
+               if (n->child != NULL && n->child->next != NULL)
+                       print_word("functions return");
+               else
+                       print_word("function returns");
+
+               print_word("the value\\~0 if successful;");
+       } else
+               print_word("Upon successful completion, "
+                   "the value\\~0 is returned;");
+
+       print_word("otherwise the value\\~\\-1 is returned"
+           " and the global variable");
+
+       font_push('I');
+       print_word("errno");
+       font_pop();
+
+       print_word("is set to indicate the error.");
+       outflags |= MMAN_nl;
+       return 0;
+}
+
+static int
+pre_skip(DECL_ARGS)
+{
+
+       return 0;

 }
 
 static int
 pre_sm(DECL_ARGS)
 {
 
 }
 
 static int
 pre_sm(DECL_ARGS)
 {
 

-       assert(n->child && MDOC_TEXT == n->child->type);
-       if (0 == strcmp("on", n->child->string))
-               outflags |= MMAN_Sm | MMAN_spc;
+       if (NULL == n->child)
+               outflags ^= MMAN_Sm;
+       else if (0 == strcmp("on", n->child->string))
+               outflags |= MMAN_Sm;

        else
                outflags &= ~MMAN_Sm;
        else
                outflags &= ~MMAN_Sm;

-       return(0);
+
+       if (MMAN_Sm & outflags)
+               outflags |= MMAN_spc;
+
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1582,7 +1726,7 @@ pre_sp(DECL_ARGS)
                print_line(".PP", 0);
        } else
                print_line(".sp", 0);
                print_line(".PP", 0);
        } else
                print_line(".sp", 0);

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -1597,7 +1741,7 @@ pre_sy(DECL_ARGS)
 {
 
        font_push('B');
 {
 
        font_push('B');

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -1606,24 +1750,24 @@ pre_vt(DECL_ARGS)
 
        if (MDOC_SYNPRETTY & n->flags) {
                switch (n->type) {
 
        if (MDOC_SYNPRETTY & n->flags) {
                switch (n->type) {

-               case MDOC_BLOCK:
+               case ROFFT_BLOCK:

                        pre_syn(n);
                        pre_syn(n);

-                       return(1);
-               case MDOC_BODY:
+                       return 1;
+               case ROFFT_BODY:

                        break;
                default:
                        break;
                default:

-                       return(0);
+                       return 0;

                }
        }
        font_push('I');
                }
        }
        font_push('I');

-       return(1);
+       return 1;

 }
 
 static void
 post_vt(DECL_ARGS)
 {
 
 }
 
 static void
 post_vt(DECL_ARGS)
 {
 

-       if (MDOC_SYNPRETTY & n->flags && MDOC_BODY != n->type)
+       if (n->flags & MDOC_SYNPRETTY && n->type != ROFFT_BODY)

                return;
        font_pop();
 }
                return;
        font_pop();
 }


@@ -1634,16 +1778,16 @@ pre_xr(DECL_ARGS)
 
        n = n->child;
        if (NULL == n)
 
        n = n->child;
        if (NULL == n)

-               return(0);
+               return 0;

        print_node(meta, n);
        n = n->next;
        if (NULL == n)
        print_node(meta, n);
        n = n->next;
        if (NULL == n)

-               return(0);
+               return 0;

        outflags &= ~MMAN_spc;
        print_word("(");
        print_node(meta, n);
        print_word(")");
        outflags &= ~MMAN_spc;
        print_word("(");
        print_node(meta, n);
        print_word(")");

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1652,9 +1796,9 @@ pre_ux(DECL_ARGS)
 
        print_word(manacts[n->tok].prefix);
        if (NULL == n->child)
 
        print_word(manacts[n->tok].prefix);
        if (NULL == n->child)

-               return(0);
+               return 0;

        outflags &= ~MMAN_spc;
        print_word("\\ ");
        outflags &= ~MMAN_spc;
        outflags &= ~MMAN_spc;
        print_word("\\ ");
        outflags &= ~MMAN_spc;

-       return(1);
+       return 1;

 }
 }