]> git.cameronkatri.com Git - mandoc.git/blobdiff - mdoc_man.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Continue parser unification:
[mandoc.git] / mdoc_man.c
diff --git a/mdoc_man.c b/mdoc_man.c
index b72225862d3c1ae17a54b62ecd20103778124325..d1f903723c5eb260de7aa2ed4bc1851d9d88e1f4 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_man.c,v 1.91 2015/04/02 23:48:20 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.109 2017/04/24 23:06:18 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2017 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
@@ -44,6 +44,7 @@ static        int       cond_body(DECL_ARGS);
 static int       cond_head(DECL_ARGS);
 static  void     font_push(char);
 static void      font_pop(void);
 static int       cond_head(DECL_ARGS);
 static  void     font_push(char);
 static void      font_pop(void);
+static int       man_strlen(const char *);
 static void      mid_it(void);
 static void      post__t(DECL_ARGS);
 static void      post_aq(DECL_ARGS);
 static void      mid_it(void);
 static void      post__t(DECL_ARGS);
 static void      post_aq(DECL_ARGS);
@@ -79,7 +80,6 @@ static        int       pre_bf(DECL_ARGS);
 static int       pre_bk(DECL_ARGS);
 static int       pre_bl(DECL_ARGS);
 static int       pre_br(DECL_ARGS);
 static int       pre_bk(DECL_ARGS);
 static int       pre_bl(DECL_ARGS);
 static int       pre_br(DECL_ARGS);
-static int       pre_bx(DECL_ARGS);
 static int       pre_dl(DECL_ARGS);
 static int       pre_en(DECL_ARGS);
 static int       pre_enc(DECL_ARGS);
 static int       pre_dl(DECL_ARGS);
 static int       pre_en(DECL_ARGS);
 static int       pre_enc(DECL_ARGS);
@@ -103,14 +103,12 @@ 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 void      pre_syn(const struct roff_node *);
 static int       pre_vt(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 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 int       pre_xr(DECL_ARGS);
 static void      print_word(const char *);
 static void      print_line(const char *, int);
@@ -121,8 +119,7 @@ static      void      print_width(const struct mdoc_bl *,
 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 
 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 
-static const struct manact manacts[MDOC_MAX + 1] = {
-       { NULL, pre_ap, NULL, NULL, NULL }, /* Ap */
+static const struct manact __manacts[MDOC_MAX - MDOC_Dd] = {
        { NULL, NULL, NULL, NULL, NULL }, /* Dd */
        { NULL, NULL, NULL, NULL, NULL }, /* Dt */
        { NULL, NULL, NULL, NULL, NULL }, /* Os */
        { NULL, NULL, NULL, NULL, NULL }, /* Dd */
        { NULL, NULL, NULL, NULL, NULL }, /* Dt */
        { NULL, NULL, NULL, NULL, NULL }, /* Os */
@@ -138,6 +135,7 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_it, post_it, NULL, NULL }, /* It */
        { NULL, pre_em, post_font, NULL, NULL }, /* Ad */
        { NULL, pre_an, NULL, NULL, NULL }, /* An */
        { NULL, pre_it, post_it, NULL, NULL }, /* It */
        { NULL, pre_em, post_font, NULL, NULL }, /* Ad */
        { NULL, pre_an, NULL, NULL, NULL }, /* An */
+       { NULL, pre_ap, NULL, NULL, NULL }, /* Ap */
        { NULL, pre_em, post_font, NULL, NULL }, /* Ar */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Cd */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Cm */
        { NULL, pre_em, post_font, NULL, NULL }, /* Ar */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Cd */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Cm */
@@ -158,7 +156,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_rv, NULL, NULL, NULL }, /* Rv */
+       { NULL, pre_ex, 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 */
@@ -182,8 +180,8 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Bo */
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */
        { NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Bo */
        { 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 }, /* Bsx */
+       { NULL, NULL, NULL, NULL, NULL }, /* Bx */
        { NULL, pre_skip, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */
        { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Do */
        { NULL, pre_skip, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */
        { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Do */
@@ -192,12 +190,12 @@ static    const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */
        { cond_body, pre_eo, post_eo, NULL, NULL }, /* Eo */
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */
        { cond_body, pre_eo, post_eo, NULL, NULL }, /* Eo */
-       { NULL, pre_ux, NULL, "FreeBSD", NULL }, /* Fx */
+       { NULL, NULL, NULL, NULL, NULL }, /* Fx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Ms */
        { NULL, pre_no, NULL, NULL, NULL }, /* No */
        { NULL, pre_ns, NULL, NULL, NULL }, /* Ns */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Ms */
        { NULL, pre_no, NULL, NULL, NULL }, /* No */
        { NULL, pre_ns, NULL, NULL, NULL }, /* Ns */
-       { NULL, pre_ux, NULL, "NetBSD", NULL }, /* Nx */
-       { NULL, pre_ux, NULL, "OpenBSD", NULL }, /* Ox */
+       { NULL, NULL, NULL, NULL, NULL }, /* Nx */
+       { NULL, NULL, NULL, NULL, NULL }, /* Ox */
        { NULL, NULL, NULL, NULL, NULL }, /* Pc */
        { NULL, NULL, post_pf, NULL, NULL }, /* Pf */
        { cond_body, pre_enc, post_enc, "(", ")" }, /* Po */
        { NULL, NULL, NULL, NULL, NULL }, /* Pc */
        { NULL, NULL, post_pf, NULL, NULL }, /* Pf */
        { cond_body, pre_enc, post_enc, "(", ")" }, /* Po */
@@ -215,7 +213,7 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_em, post_font, NULL, NULL }, /* Sx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Sy */
        { NULL, pre_li, post_font, NULL, NULL }, /* Tn */
        { NULL, pre_em, post_font, NULL, NULL }, /* Sx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Sy */
        { NULL, pre_li, post_font, NULL, NULL }, /* Tn */
-       { NULL, pre_ux, NULL, "UNIX", NULL }, /* Ux */
+       { NULL, NULL, NULL, NULL, NULL }, /* Ux */
        { NULL, NULL, NULL, NULL, NULL }, /* Xc */
        { NULL, NULL, NULL, NULL, NULL }, /* Xo */
        { NULL, pre_fo, post_fo, NULL, NULL }, /* Fo */
        { NULL, NULL, NULL, NULL, NULL }, /* Xc */
        { NULL, NULL, NULL, NULL, NULL }, /* Xo */
        { NULL, pre_fo, post_fo, NULL, NULL }, /* Fo */
@@ -224,10 +222,10 @@ static    const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, NULL, NULL, NULL, NULL }, /* Oc */
        { NULL, pre_bk, post_bk, NULL, NULL }, /* Bk */
        { NULL, NULL, NULL, NULL, NULL }, /* Ek */
        { NULL, NULL, NULL, NULL, NULL }, /* Oc */
        { NULL, pre_bk, post_bk, NULL, NULL }, /* Bk */
        { NULL, NULL, NULL, NULL, NULL }, /* Ek */
-       { NULL, pre_ux, NULL, "is currently in beta test.", NULL }, /* Bt */
+       { NULL, NULL, NULL, NULL, NULL }, /* Bt */
        { NULL, NULL, NULL, NULL, NULL }, /* Hf */
        { NULL, pre_em, post_font, NULL, NULL }, /* Fr */
        { NULL, NULL, NULL, NULL, NULL }, /* Hf */
        { NULL, pre_em, post_font, NULL, NULL }, /* Fr */
-       { NULL, pre_ux, NULL, "currently under development.", NULL }, /* Ud */
+       { NULL, NULL, NULL, NULL, NULL }, /* Ud */
        { NULL, NULL, post_lb, NULL, NULL }, /* Lb */
        { NULL, pre_pp, NULL, NULL, NULL }, /* Lp */
        { NULL, pre_lk, NULL, NULL, NULL }, /* Lk */
        { NULL, NULL, post_lb, NULL, NULL }, /* Lb */
        { NULL, pre_pp, NULL, NULL, NULL }, /* Lp */
        { NULL, pre_lk, NULL, NULL, NULL }, /* Lk */
@@ -238,15 +236,15 @@ static    const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, NULL, post_percent, NULL, NULL }, /* %C */
        { NULL, pre_skip, NULL, NULL, NULL }, /* Es */
        { cond_body, pre_en, post_en, NULL, NULL }, /* En */
        { NULL, NULL, post_percent, NULL, NULL }, /* %C */
        { 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, NULL, NULL, NULL }, /* Dx */
        { NULL, NULL, post_percent, NULL, NULL }, /* %Q */
        { NULL, pre_br, NULL, NULL, NULL }, /* br */
        { NULL, pre_sp, post_sp, NULL, NULL }, /* sp */
        { NULL, NULL, post_percent, NULL, NULL }, /* %U */
        { NULL, NULL, NULL, NULL, NULL }, /* Ta */
        { NULL, pre_ll, post_sp, NULL, NULL }, /* ll */
        { NULL, NULL, post_percent, NULL, NULL }, /* %Q */
        { NULL, pre_br, NULL, NULL, NULL }, /* br */
        { NULL, pre_sp, post_sp, NULL, NULL }, /* sp */
        { NULL, NULL, post_percent, NULL, NULL }, /* %U */
        { NULL, NULL, NULL, NULL, NULL }, /* Ta */
        { NULL, pre_ll, post_sp, NULL, NULL }, /* ll */
-       { NULL, NULL, NULL, NULL, NULL }, /* ROOT */
 };
 };
+static const struct manact *const manacts = __manacts - MDOC_Dd;
 
 static int             outflags;
 #define        MMAN_spc        (1 << 0)  /* blank character before next word */
 
 static int             outflags;
 #define        MMAN_spc        (1 << 0)  /* blank character before next word */
@@ -277,6 +275,49 @@ static     struct {
 }      fontqueue;
 
 
 }      fontqueue;
 
 
+static int
+man_strlen(const char *cp)
+{
+       size_t   rsz;
+       int      skip, sz;
+
+       sz = 0;
+       skip = 0;
+       for (;;) {
+               rsz = strcspn(cp, "\\");
+               if (rsz) {
+                       cp += rsz;
+                       if (skip) {
+                               skip = 0;
+                               rsz--;
+                       }
+                       sz += rsz;
+               }
+               if ('\0' == *cp)
+                       break;
+               cp++;
+               switch (mandoc_escape(&cp, NULL, NULL)) {
+               case ESCAPE_ERROR:
+                       return sz;
+               case ESCAPE_UNICODE:
+               case ESCAPE_NUMBERED:
+               case ESCAPE_SPECIAL:
+               case ESCAPE_OVERSTRIKE:
+                       if (skip)
+                               skip = 0;
+                       else
+                               sz++;
+                       break;
+               case ESCAPE_SKIPCHAR:
+                       skip = 1;
+                       break;
+               default:
+                       break;
+               }
+       }
+       return sz;
+}
+
 static void
 font_push(char newfont)
 {
 static void
 font_push(char newfont)
 {
@@ -450,7 +491,7 @@ print_offs(const char *v, int keywords)
                        return;
                }
        } else
                        return;
                }
        } else
-               sz = strlen(v);
+               sz = man_strlen(v);
 
        /*
         * We are inside an enclosing list.
 
        /*
         * We are inside an enclosing list.
@@ -488,13 +529,13 @@ print_width(const struct mdoc_bl *bl, const struct roff_node *child)
                        numeric = 0;
                }
        } else
                        numeric = 0;
                }
        } else
-               sz = strlen(bl->width);
+               sz = man_strlen(bl->width);
 
        /* XXX Rough estimation, might have multiple parts. */
        if (bl->type == LIST_enum)
                chsz = (bl->count > 8) + 1;
        else if (child != NULL && child->type == ROFFT_TEXT)
 
        /* XXX Rough estimation, might have multiple parts. */
        if (bl->type == LIST_enum)
                chsz = (bl->count > 8) + 1;
        else if (child != NULL && child->type == ROFFT_TEXT)
-               chsz = strlen(child->string);
+               chsz = man_strlen(child->string);
        else
                chsz = 0;
 
        else
                chsz = 0;
 
@@ -532,7 +573,7 @@ print_count(int *count)
 }
 
 void
 }
 
 void
-man_man(void *arg, const struct man *man)
+man_man(void *arg, const struct roff_man *man)
 {
 
        /*
 {
 
        /*
@@ -545,18 +586,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 roff_meta *meta;
        struct roff_node *n;
 
        struct roff_node *n;
 
-       meta = mdoc_meta(mdoc);
-       n = mdoc_node(mdoc)->child;
-
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
-           meta->title,
-           (meta->msec == NULL ? "" : 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");
@@ -567,10 +604,8 @@ 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';
        }
-       while (n != NULL) {
-               print_node(meta, n);
-               n = n->next;
-       }
+       for (n = mdoc->first->child; n != NULL; n = n->next)
+               print_node(&mdoc->meta, n);
        putchar('\n');
 }
 
        putchar('\n');
 }
 
@@ -581,17 +616,20 @@ print_node(DECL_ARGS)
        struct roff_node        *sub;
        int                      cond, do_sub;
 
        struct roff_node        *sub;
        int                      cond, do_sub;
 
+       if (n->flags & NODE_NOPRT)
+               return;
+
        /*
         * Break the line if we were parsed subsequent the current node.
         * This makes the page structure be more consistent.
         */
        /*
         * Break the line if we were parsed subsequent the current node.
         * This makes the page structure be more consistent.
         */
-       if (MMAN_spc & outflags && MDOC_LINE & n->flags)
+       if (MMAN_spc & outflags && NODE_LINE & n->flags)
                outflags |= MMAN_nl;
 
        act = NULL;
        cond = 0;
        do_sub = 1;
                outflags |= MMAN_nl;
 
        act = NULL;
        cond = 0;
        do_sub = 1;
-       n->flags &= ~MDOC_ENDED;
+       n->flags &= ~NODE_ENDED;
 
        if (n->type == ROFFT_TEXT) {
                /*
 
        if (n->type == ROFFT_TEXT) {
                /*
@@ -604,10 +642,14 @@ print_node(DECL_ARGS)
                        printf("\\&");
                        outflags &= ~MMAN_spc;
                }
                        printf("\\&");
                        outflags &= ~MMAN_spc;
                }
-               if (outflags & MMAN_Sm && ! (n->flags & MDOC_DELIMC))
+               if (n->flags & NODE_DELIMC)
+                       outflags &= ~(MMAN_spc | MMAN_spc_force);
+               else if (outflags & MMAN_Sm)
                        outflags |= MMAN_spc_force;
                print_word(n->string);
                        outflags |= MMAN_spc_force;
                print_word(n->string);
-               if (outflags & MMAN_Sm && ! (n->flags & MDOC_DELIMO))
+               if (n->flags & NODE_DELIMO)
+                       outflags &= ~(MMAN_spc | MMAN_spc_force);
+               else if (outflags & MMAN_Sm)
                        outflags |= MMAN_spc;
        } else {
                /*
                        outflags |= MMAN_spc;
        } else {
                /*
@@ -616,7 +658,8 @@ print_node(DECL_ARGS)
                 */
                act = manacts + n->tok;
                cond = act->cond == NULL || (*act->cond)(meta, n);
                 */
                act = manacts + n->tok;
                cond = act->cond == NULL || (*act->cond)(meta, n);
-               if (cond && act->pre && (n->end == ENDBODY_NOT || n->nchild))
+               if (cond && act->pre != NULL &&
+                   (n->end == ENDBODY_NOT || n->child != NULL))
                        do_sub = (*act->pre)(meta, n);
        }
 
                        do_sub = (*act->pre)(meta, n);
        }
 
@@ -632,31 +675,28 @@ print_node(DECL_ARGS)
        /*
         * Lastly, conditionally run the post-node handler.
         */
        /*
         * Lastly, conditionally run the post-node handler.
         */
-       if (MDOC_ENDED & n->flags)
+       if (NODE_ENDED & n->flags)
                return;
 
        if (cond && act->post)
                (*act->post)(meta, n);
 
        if (ENDBODY_NOT != n->end)
                return;
 
        if (cond && act->post)
                (*act->post)(meta, n);
 
        if (ENDBODY_NOT != n->end)
-               n->body->flags |= MDOC_ENDED;
-
-       if (ENDBODY_NOSPACE == n->end)
-               outflags &= ~(MMAN_spc | MMAN_nl);
+               n->body->flags |= NODE_ENDED;
 }
 
 static int
 cond_head(DECL_ARGS)
 {
 
 }
 
 static int
 cond_head(DECL_ARGS)
 {
 
-       return(n->type == ROFFT_HEAD);
+       return n->type == ROFFT_HEAD;
 }
 
 static int
 cond_body(DECL_ARGS)
 {
 
 }
 
 static int
 cond_body(DECL_ARGS)
 {
 
-       return(n->type == ROFFT_BODY);
+       return n->type == ROFFT_BODY;
 }
 
 static int
 }
 
 static int
@@ -666,10 +706,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
@@ -687,37 +727,8 @@ post_enc(DECL_ARGS)
 static int
 pre_ex(DECL_ARGS)
 {
 static int
 pre_ex(DECL_ARGS)
 {
-       int      nchild;
-
        outflags |= MMAN_br | MMAN_nl;
        outflags |= MMAN_br | MMAN_nl;
-
-       print_word("The");
-
-       nchild = n->nchild;
-       for (n = n->child; n; n = n->next) {
-               font_push('B');
-               print_word(n->string);
-               font_pop();
-
-               if (n->next == NULL)
-                       continue;
-
-               if (nchild > 2) {
-                       outflags &= ~MMAN_spc;
-                       print_word(",");
-               }
-               if (n->next->next == NULL)
-                       print_word("and");
-       }
-
-       if (nchild > 1)
-               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);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -748,25 +759,21 @@ static int
 pre__t(DECL_ARGS)
 {
 
 pre__t(DECL_ARGS)
 {
 
-       if (n->parent && MDOC_Rs == n->parent->tok &&
-           n->parent->norm->Rs.quote_T) {
-               print_word("");
-               putchar('\"');
+       if (n->parent->tok == MDOC_Rs && n->parent->norm->Rs.quote_T) {
+               print_word("\\(lq");
                outflags &= ~MMAN_spc;
        } else
                font_push('I');
                outflags &= ~MMAN_spc;
        } else
                font_push('I');
-       return(1);
+       return 1;
 }
 
 static void
 post__t(DECL_ARGS)
 {
 
 }
 
 static void
 post__t(DECL_ARGS)
 {
 
-       if (n->parent && MDOC_Rs == n->parent->tok &&
-           n->parent->norm->Rs.quote_T) {
+       if (n->parent->tok  == MDOC_Rs && n->parent->norm->Rs.quote_T) {
                outflags &= ~MMAN_spc;
                outflags &= ~MMAN_spc;
-               print_word("");
-               putchar('\"');
+               print_word("\\(rq");
        } else
                font_pop();
        post_percent(meta, n);
        } else
                font_pop();
        post_percent(meta, n);
@@ -786,7 +793,7 @@ pre_sect(DECL_ARGS)
                putchar('\"');
                outflags &= ~MMAN_spc;
        }
                putchar('\"');
                outflags &= ~MMAN_spc;
        }
-       return(1);
+       return 1;
 }
 
 /*
 }
 
 /*
@@ -811,7 +818,7 @@ static void
 pre_syn(const struct roff_node *n)
 {
 
 pre_syn(const struct roff_node *n)
 {
 
-       if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
+       if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags))
                return;
 
        if (n->prev->tok == n->tok &&
                return;
 
        if (n->prev->tok == n->tok &&
@@ -824,13 +831,9 @@ pre_syn(const struct roff_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;
@@ -854,18 +857,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;
        }
 }
 
        }
 }
 
@@ -876,17 +879,17 @@ 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)
 {
 
 }
 
 static int
 pre_aq(DECL_ARGS)
 {
 
-       print_word(n->nchild == 1 &&
+       print_word(n->child != NULL && n->child->next == NULL &&
            n->child->tok == MDOC_Mt ?  "<" : "\\(la");
        outflags &= ~MMAN_spc;
            n->child->tok == MDOC_Mt ?  "<" : "\\(la");
        outflags &= ~MMAN_spc;
-       return(1);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -894,7 +897,7 @@ post_aq(DECL_ARGS)
 {
 
        outflags &= ~(MMAN_spc | MMAN_nl);
 {
 
        outflags &= ~(MMAN_spc | MMAN_nl);
-       print_word(n->nchild == 1 &&
+       print_word(n->child != NULL && n->child->next == NULL &&
            n->child->tok == MDOC_Mt ?  ">" : "\\(ra");
 }
 
            n->child->tok == MDOC_Mt ?  ">" : "\\(ra");
 }
 
@@ -910,7 +913,7 @@ pre_bd(DECL_ARGS)
        if (0 == n->norm->Bd.comp && NULL != n->parent->prev)
                outflags |= MMAN_sp;
        print_offs(n->norm->Bd.offs, 1);
        if (0 == n->norm->Bd.comp && NULL != n->parent->prev)
                outflags |= MMAN_sp;
        print_offs(n->norm->Bd.offs, 1);
-       return(1);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -934,11 +937,11 @@ pre_bf(DECL_ARGS)
 
        switch (n->type) {
        case ROFFT_BLOCK:
 
        switch (n->type) {
        case ROFFT_BLOCK:
-               return(1);
+               return 1;
        case ROFFT_BODY:
                break;
        default:
        case ROFFT_BODY:
                break;
        default:
-               return(0);
+               return 0;
        }
        switch (n->norm->Bf.font) {
        case FONT_Em:
        }
        switch (n->norm->Bf.font) {
        case FONT_Em:
@@ -951,7 +954,7 @@ pre_bf(DECL_ARGS)
                font_push('R');
                break;
        }
                font_push('R');
                break;
        }
-       return(1);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -968,12 +971,12 @@ pre_bk(DECL_ARGS)
 
        switch (n->type) {
        case ROFFT_BLOCK:
 
        switch (n->type) {
        case ROFFT_BLOCK:
-               return(1);
+               return 1;
        case ROFFT_BODY:
                outflags |= MMAN_Bk;
        case ROFFT_BODY:
                outflags |= MMAN_Bk;
-               return(1);
+               return 1;
        default:
        default:
-               return(0);
+               return 0;
        }
 }
 
        }
 }
 
@@ -1003,21 +1006,21 @@ pre_bl(DECL_ARGS)
        switch (n->norm->Bl.type) {
        case LIST_enum:
                n->norm->Bl.count = 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;
        }
 
        }
 
-       if (n->nchild) {
+       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;
                print_line(".TS", MMAN_nl);
                for (icol = 0; icol < n->norm->Bl.ncols; icol++)
                        print_word("l");
                print_word(".");
        }
        outflags |= MMAN_nl;
-       return(1);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -1026,7 +1029,7 @@ post_bl(DECL_ARGS)
 
        switch (n->norm->Bl.type) {
        case LIST_column:
 
        switch (n->norm->Bl.type) {
        case LIST_column:
-               if (n->nchild)
+               if (n->child != NULL)
                        print_line(".TE", 0);
                break;
        case LIST_enum:
                        print_line(".TE", 0);
                break;
        case LIST_enum:
@@ -1057,27 +1060,7 @@ pre_br(DECL_ARGS)
 {
 
        outflags |= MMAN_br;
 {
 
        outflags |= MMAN_br;
-       return(0);
-}
-
-static int
-pre_bx(DECL_ARGS)
-{
-
-       n = n->child;
-       if (n) {
-               print_word(n->string);
-               outflags &= ~MMAN_spc;
-               n = n->next;
-       }
-       print_word("BSD");
-       if (NULL == n)
-               return(0);
-       outflags &= ~MMAN_spc;
-       print_word("-");
-       outflags &= ~MMAN_spc;
-       print_word(n->string);
-       return(0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -1085,7 +1068,7 @@ pre_dl(DECL_ARGS)
 {
 
        print_offs("6n", 0);
 {
 
        print_offs("6n", 0);
-       return(1);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -1104,7 +1087,7 @@ pre_em(DECL_ARGS)
 {
 
        font_push('I');
 {
 
        font_push('I');
-       return(1);
+       return 1;
 }
 
 static int
 }
 
 static int
@@ -1113,11 +1096,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
@@ -1147,7 +1130,7 @@ pre_eo(DECL_ARGS)
            n->parent->head->child != NULL && (n->child != NULL ||
            (n->parent->tail != NULL && n->parent->tail->child != NULL)))
                outflags &= ~(MMAN_spc | MMAN_nl);
            n->parent->head->child != NULL && (n->child != NULL ||
            (n->parent->tail != NULL && n->parent->tail->child != NULL)))
                outflags &= ~(MMAN_spc | MMAN_nl);
-       return(1);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -1183,14 +1166,14 @@ pre_fa(DECL_ARGS)
 
        while (NULL != n) {
                font_push('I');
 
        while (NULL != n) {
                font_push('I');
-               if (am_Fa || MDOC_SYNPRETTY & n->flags)
+               if (am_Fa || NODE_SYNPRETTY & n->flags)
                        outflags |= MMAN_nbrword;
                print_node(meta, n);
                font_pop();
                if (NULL != (n = n->next))
                        print_word(",");
        }
                        outflags |= MMAN_nbrword;
                print_node(meta, n);
                font_pop();
                if (NULL != (n = n->next))
                        print_word(",");
        }
-       return(0);
+       return 0;
 }
 
 static void
 }
 
 static void
@@ -1207,7 +1190,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
@@ -1224,9 +1207,9 @@ pre_fl(DECL_ARGS)
 
        font_push('B');
        print_word("\\-");
 
        font_push('B');
        print_word("\\-");
-       if (n->nchild)
+       if (n->child != NULL)
                outflags &= ~MMAN_spc;
                outflags &= ~MMAN_spc;
-       return(1);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -1234,10 +1217,10 @@ post_fl(DECL_ARGS)
 {
 
        font_pop();
 {
 
        font_pop();
-       if ( ! (n->nchild ||
+       if (!(n->child != NULL ||
            n->next == NULL ||
            n->next->type == ROFFT_TEXT ||
            n->next == NULL ||
            n->next->type == ROFFT_TEXT ||
-           n->next->flags & MDOC_LINE))
+           n->next->flags & NODE_LINE))
                outflags &= ~MMAN_spc;
 }
 
                outflags &= ~MMAN_spc;
 }
 
@@ -1249,9 +1232,9 @@ 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)
+       if (NODE_SYNPRETTY & n->flags)
                print_block(".HP 4n", MMAN_nl);
 
        font_push('B');
                print_block(".HP 4n", MMAN_nl);
 
        font_push('B');
@@ -1264,7 +1247,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
@@ -1272,7 +1255,7 @@ post_fn(DECL_ARGS)
 {
 
        print_word(")");
 {
 
        print_word(")");
-       if (MDOC_SYNPRETTY & n->flags) {
+       if (NODE_SYNPRETTY & n->flags) {
                print_word(";");
                outflags |= MMAN_PP;
        }
                print_word(";");
                outflags |= MMAN_PP;
        }
@@ -1288,8 +1271,8 @@ pre_fo(DECL_ARGS)
                break;
        case ROFFT_HEAD:
                if (n->child == NULL)
                break;
        case ROFFT_HEAD:
                if (n->child == NULL)
-                       return(0);
-               if (MDOC_SYNPRETTY & n->flags)
+                       return 0;
+               if (NODE_SYNPRETTY & n->flags)
                        print_block(".HP 4n", MMAN_nl);
                font_push('B');
                break;
                        print_block(".HP 4n", MMAN_nl);
                font_push('B');
                break;
@@ -1301,7 +1284,7 @@ pre_fo(DECL_ARGS)
        default:
                break;
        }
        default:
                break;
        }
-       return(1);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -1327,14 +1310,14 @@ pre_ft(DECL_ARGS)
 
        pre_syn(n);
        font_push('I');
 
        pre_syn(n);
        font_push('I');
-       return(1);
+       return 1;
 }
 
 static int
 pre_in(DECL_ARGS)
 {
 
 }
 
 static int
 pre_in(DECL_ARGS)
 {
 
-       if (MDOC_SYNPRETTY & n->flags) {
+       if (NODE_SYNPRETTY & n->flags) {
                pre_syn(n);
                font_push('B');
                print_word("#include <");
                pre_syn(n);
                font_push('B');
                print_word("#include <");
@@ -1344,14 +1327,14 @@ pre_in(DECL_ARGS)
                outflags &= ~MMAN_spc;
                font_push('I');
        }
                outflags &= ~MMAN_spc;
                font_push('I');
        }
-       return(1);
+       return 1;
 }
 
 static void
 post_in(DECL_ARGS)
 {
 
 }
 
 static void
 post_in(DECL_ARGS)
 {
 
-       if (MDOC_SYNPRETTY & n->flags) {
+       if (NODE_SYNPRETTY & n->flags) {
                outflags &= ~MMAN_spc;
                print_word(">");
                font_pop();
                outflags &= ~MMAN_spc;
                print_word(">");
                font_pop();
@@ -1379,22 +1362,18 @@ 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:
                        print_width(&bln->norm->Bl, NULL);
                        TPremain = 0;
                case LIST_hyphen:
                        print_width(&bln->norm->Bl, NULL);
                        TPremain = 0;
@@ -1406,31 +1385,31 @@ pre_it(DECL_ARGS)
                                print_word("-");
                        font_pop();
                        outflags |= MMAN_nl;
                                print_word("-");
                        font_pop();
                        outflags |= MMAN_nl;
-                       return(0);
+                       return 0;
                case LIST_enum:
                        print_width(&bln->norm->Bl, NULL);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        print_count(&bln->norm->Bl.count);
                        outflags |= MMAN_nl;
                case LIST_enum:
                        print_width(&bln->norm->Bl, NULL);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        print_count(&bln->norm->Bl.count);
                        outflags |= MMAN_nl;
-                       return(0);
+                       return 0;
                case LIST_hang:
                        print_width(&bln->norm->Bl, n->child);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                case LIST_hang:
                        print_width(&bln->norm->Bl, n->child);
                        TPremain = 0;
                        outflags |= MMAN_nl;
-                       return(1);
+                       return 1;
                case LIST_tag:
                        print_width(&bln->norm->Bl, n->child);
                        putchar('\n');
                        outflags &= ~MMAN_spc;
                case LIST_tag:
                        print_width(&bln->norm->Bl, n->child);
                        putchar('\n');
                        outflags &= ~MMAN_spc;
-                       return(1);
+                       return 1;
                default:
                default:
-                       return(1);
+                       return 1;
                }
        default:
                break;
        }
                }
        default:
                break;
        }
-       return(1);
+       return 1;
 }
 
 /*
 }
 
 /*
@@ -1484,15 +1463,10 @@ post_it(DECL_ARGS)
        case ROFFT_BODY:
                switch (bln->norm->Bl.type) {
                case LIST_bullet:
        case ROFFT_BODY:
                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;
@@ -1534,24 +1508,41 @@ static int
 pre_lk(DECL_ARGS)
 {
        const struct roff_node *link, *descr;
 pre_lk(DECL_ARGS)
 {
        const struct roff_node *link, *descr;
+       int display;
 
 
-       if (NULL == (link = n->child))
-               return(0);
+       if ((link = n->child) == NULL)
+               return 0;
 
 
-       if (NULL != (descr = link->next)) {
+       /* Link text. */
+       if ((descr = link->next) != NULL && !(descr->flags & NODE_DELIMC)) {
                font_push('I');
                font_push('I');
-               while (NULL != descr) {
+               while (descr != NULL && !(descr->flags & NODE_DELIMC)) {
                        print_word(descr->string);
                        descr = descr->next;
                }
                        print_word(descr->string);
                        descr = descr->next;
                }
-               print_word(":");
                font_pop();
                font_pop();
+               print_word(":");
        }
 
        }
 
+       /* Link target. */
+       display = man_strlen(link->string) >= 26;
+       if (display) {
+               print_line(".RS", MMAN_Bk_susp);
+               print_word("6n");
+               outflags |= MMAN_nl;
+       }
        font_push('B');
        print_word(link->string);
        font_pop();
        font_push('B');
        print_word(link->string);
        font_pop();
-       return(0);
+
+       /* Trailing punctuation. */
+       while (descr != NULL) {
+               print_word(descr->string);
+               descr = descr->next;
+       }
+       if (display)
+               print_line(".RE", MMAN_nl);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -1559,7 +1550,7 @@ pre_ll(DECL_ARGS)
 {
 
        print_line(".ll", 0);
 {
 
        print_line(".ll", 0);
-       return(1);
+       return 1;
 }
 
 static int
 }
 
 static int
@@ -1567,7 +1558,7 @@ pre_li(DECL_ARGS)
 {
 
        font_push('R');
 {
 
        font_push('R');
-       return(1);
+       return 1;
 }
 
 static int
 }
 
 static int
@@ -1580,21 +1571,19 @@ pre_nm(DECL_ARGS)
                pre_syn(n);
        }
        if (n->type != ROFFT_ELEM && n->type != ROFFT_HEAD)
                pre_syn(n);
        }
        if (n->type != ROFFT_ELEM && n->type != ROFFT_HEAD)
-               return(1);
-       name = n->child ? n->child->string : meta->name;
+               return 1;
+       name = n->child == NULL ? NULL : n->child->string;
        if (NULL == name)
        if (NULL == name)
-               return(0);
+               return 0;
        if (n->type == ROFFT_HEAD) {
                if (NULL == n->parent->prev)
                        outflags |= MMAN_sp;
                print_block(".HP", 0);
        if (n->type == ROFFT_HEAD) {
                if (NULL == n->parent->prev)
                        outflags |= MMAN_sp;
                print_block(".HP", 0);
-               printf(" %zun", strlen(name) + 1);
+               printf(" %dn", man_strlen(name) + 1);
                outflags |= MMAN_nl;
        }
        font_push('B');
                outflags |= MMAN_nl;
        }
        font_push('B');
-       if (NULL == n->child)
-               print_word(meta->name);
-       return(1);
+       return 1;
 }
 
 static void
 }
 
 static void
@@ -1606,9 +1595,8 @@ post_nm(DECL_ARGS)
                outflags &= ~MMAN_Bk;
                break;
        case ROFFT_HEAD:
                outflags &= ~MMAN_Bk;
                break;
        case ROFFT_HEAD:
-               /* FALLTHROUGH */
        case ROFFT_ELEM:
        case ROFFT_ELEM:
-               if (n->child != NULL || meta->name != NULL)
+               if (n->child != NULL && n->child->string != NULL)
                        font_pop();
                break;
        default:
                        font_pop();
                break;
        default:
@@ -1621,7 +1609,7 @@ pre_no(DECL_ARGS)
 {
 
        outflags |= MMAN_spc_force;
 {
 
        outflags |= MMAN_spc_force;
-       return(1);
+       return 1;
 }
 
 static int
 }
 
 static int
@@ -1629,14 +1617,14 @@ 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)
 {
 
-       if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+       if ( ! (n->next == NULL || n->next->flags & NODE_LINE))
                outflags &= ~MMAN_spc;
 }
 
                outflags &= ~MMAN_spc;
 }
 
@@ -1648,7 +1636,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
@@ -1659,66 +1647,14 @@ 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);
-}
-
-static int
-pre_rv(DECL_ARGS)
-{
-       int      nchild;
-
-       outflags |= MMAN_br | MMAN_nl;
-
-       nchild = n->nchild;
-       if (nchild > 0) {
-               print_word("The");
-
-               for (n = n->child; n; n = n->next) {
-                       font_push('B');
-                       print_word(n->string);
-                       font_pop();
-
-                       outflags &= ~MMAN_spc;
-                       print_word("()");
-
-                       if (n->next == NULL)
-                               continue;
-
-                       if (nchild > 2) {
-                               outflags &= ~MMAN_spc;
-                               print_word(",");
-                       }
-                       if (n->next->next == NULL)
-                               print_word("and");
-               }
-
-               if (nchild > 1)
-                       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);
+       return 1;
 }
 
 static int
 pre_skip(DECL_ARGS)
 {
 
 }
 
 static int
 pre_skip(DECL_ARGS)
 {
 
-       return(0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -1735,7 +1671,7 @@ pre_sm(DECL_ARGS)
        if (MMAN_Sm & outflags)
                outflags |= MMAN_spc;
 
        if (MMAN_Sm & outflags)
                outflags |= MMAN_spc;
 
-       return(0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -1747,7 +1683,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
@@ -1762,33 +1698,33 @@ pre_sy(DECL_ARGS)
 {
 
        font_push('B');
 {
 
        font_push('B');
-       return(1);
+       return 1;
 }
 
 static int
 pre_vt(DECL_ARGS)
 {
 
 }
 
 static int
 pre_vt(DECL_ARGS)
 {
 
-       if (MDOC_SYNPRETTY & n->flags) {
+       if (NODE_SYNPRETTY & n->flags) {
                switch (n->type) {
                case ROFFT_BLOCK:
                        pre_syn(n);
                switch (n->type) {
                case ROFFT_BLOCK:
                        pre_syn(n);
-                       return(1);
+                       return 1;
                case ROFFT_BODY:
                        break;
                default:
                case ROFFT_BODY:
                        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 (n->flags & MDOC_SYNPRETTY && n->type != ROFFT_BODY)
+       if (n->flags & NODE_SYNPRETTY && n->type != ROFFT_BODY)
                return;
        font_pop();
 }
                return;
        font_pop();
 }
@@ -1799,27 +1735,14 @@ 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);
-}
-
-static int
-pre_ux(DECL_ARGS)
-{
-
-       print_word(manacts[n->tok].prefix);
-       if (NULL == n->child)
-               return(0);
-       outflags &= ~MMAN_spc;
-       print_word("\\ ");
-       outflags &= ~MMAN_spc;
-       return(1);
+       return 0;
 }
 }
A git conversion mirror of mandoc.bsd.lv