Fix two minibugs reported by Thomas Klausner <wiz at NetBSD>:

[mandoc.git] / mdoc_man.c

diff --git a/mdoc_man.c b/mdoc_man.c
index a953e75548f5bae7bb4115fd34f4125e7b226cad..75b68e62d6dec171e98e2b0ff5056424c25f7e03 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.60 2014/03/30 19:47:48 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.74 2014/11/19 22:00:37 schwarze Exp $ */

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


@@ -14,9 +14,9 @@
  * 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 <assert.h>
 #include <stdio.h>


@@ -46,11 +46,13 @@ 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_bl(DECL_ARGS);
 static void      post_dl(DECL_ARGS);
 static void      post_bd(DECL_ARGS);
 static void      post_bf(DECL_ARGS);
 static void      post_bk(DECL_ARGS);
 static void      post_bl(DECL_ARGS);
 static void      post_dl(DECL_ARGS);

+static void      post_en(DECL_ARGS);

 static void      post_enc(DECL_ARGS);
 static void      post_eo(DECL_ARGS);
 static void      post_fa(DECL_ARGS);
 static void      post_enc(DECL_ARGS);
 static void      post_eo(DECL_ARGS);
 static void      post_fa(DECL_ARGS);


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


@@ -78,8 +81,11 @@ 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_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_em(DECL_ARGS);
 static int       pre_enc(DECL_ARGS);
 static int       pre_em(DECL_ARGS);

+static int       pre_es(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);


@@ -96,6 +102,7 @@ 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_sm(DECL_ARGS);
 static int       pre_sp(DECL_ARGS);
 static int       pre_sect(DECL_ARGS);


@@ -107,7 +114,7 @@ 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_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_offs(const char *, int);

 static void      print_width(const char *,
                                const struct mdoc_node *, size_t);
 static void      print_count(int *);
 static void      print_width(const char *,
                                const struct mdoc_node *, size_t);
 static void      print_count(int *);


@@ -136,9 +143,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 */


@@ -150,13 +155,9 @@ static     const struct manact manacts[MDOC_MAX + 1] = {
        { cond_head, pre_enc, NULL, "\\- ", NULL }, /* Nd */
        { NULL, pre_nm, post_nm, NULL, NULL }, /* Nm */
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Op */
        { cond_head, pre_enc, NULL, "\\- ", NULL }, /* Nd */
        { NULL, pre_nm, post_nm, NULL, NULL }, /* Nm */
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Op */

-       { NULL, NULL, NULL, NULL, NULL }, /* Ot */
+       { NULL, pre_ft, post_font, NULL, NULL }, /* Ot */

        { NULL, pre_em, post_font, NULL, NULL }, /* Pa */
        { 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 */


@@ -173,8 +174,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 */


@@ -224,7 +225,7 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, NULL, NULL, NULL, NULL }, /* Ek */
        { NULL, pre_ux, NULL, "is currently in beta test.", NULL }, /* Bt */
        { NULL, NULL, NULL, NULL, NULL }, /* Hf */
        { NULL, NULL, NULL, NULL, NULL }, /* Ek */
        { NULL, pre_ux, NULL, "is currently in beta test.", NULL }, /* Bt */
        { NULL, NULL, NULL, NULL, NULL }, /* Hf */

-       { NULL, NULL, NULL, NULL, NULL }, /* Fr */
+       { NULL, pre_em, post_font, NULL, NULL }, /* Fr */

        { NULL, pre_ux, NULL, "currently under development.", NULL }, /* Ud */
        { NULL, NULL, post_lb, NULL, NULL }, /* Lb */
        { NULL, pre_pp, NULL, NULL, NULL }, /* Lp */
        { NULL, pre_ux, NULL, "currently under development.", NULL }, /* Ud */
        { NULL, NULL, post_lb, NULL, NULL }, /* Lb */
        { NULL, pre_pp, NULL, NULL, NULL }, /* Lp */


@@ -234,8 +235,8 @@ 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, NULL, NULL, NULL, NULL }, /* Es */
-       { NULL, NULL, NULL, NULL, NULL }, /* En */
+       { NULL, pre_es, 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 */
        { NULL, pre_br, NULL, NULL, NULL }, /* br */
        { NULL, pre_ux, NULL, "DragonFly", NULL }, /* Dx */
        { NULL, NULL, post_percent, NULL, NULL }, /* %Q */
        { NULL, pre_br, NULL, NULL, NULL }, /* br */


@@ -274,6 +275,7 @@ static      struct {
        size_t   size;
 }      fontqueue;
 
        size_t   size;
 }      fontqueue;
 

+

 static void
 font_push(char newfont)
 {
 static void
 font_push(char newfont)
 {


@@ -281,7 +283,7 @@ font_push(char newfont)
        if (fontqueue.head + fontqueue.size <= ++fontqueue.tail) {
                fontqueue.size += 8;
                fontqueue.head = mandoc_realloc(fontqueue.head,
        if (fontqueue.head + fontqueue.size <= ++fontqueue.tail) {
                fontqueue.size += 8;
                fontqueue.head = mandoc_realloc(fontqueue.head,

-                               fontqueue.size);
+                   fontqueue.size);

        }
        *fontqueue.tail = newfont;
        print_word("");
        }
        *fontqueue.tail = newfont;
        print_word("");


@@ -307,7 +309,7 @@ print_word(const char *s)
 {
 
        if ((MMAN_PP | MMAN_sp | MMAN_br | MMAN_nl) & outflags) {
 {
 
        if ((MMAN_PP | MMAN_sp | MMAN_br | MMAN_nl) & outflags) {

-               /* 
+               /*

                 * If we need a newline, print it now and start afresh.
                 */
                if (MMAN_PP & outflags) {
                 * If we need a newline, print it now and start afresh.
                 */
                if (MMAN_PP & outflags) {


@@ -362,16 +364,16 @@ print_word(const char *s)
 
        for ( ; *s; s++) {
                switch (*s) {
 
        for ( ; *s; s++) {
                switch (*s) {

-               case (ASCII_NBRSP):
+               case ASCII_NBRSP:

                        printf("\\ ");
                        break;
                        printf("\\ ");
                        break;

-               case (ASCII_HYPH):
+               case ASCII_HYPH:

                        putchar('-');
                        break;
                        putchar('-');
                        break;

-               case (ASCII_BREAK):
+               case ASCII_BREAK:

                        printf("\\:");
                        break;
                        printf("\\:");
                        break;

-               case (' '):
+               case ' ':

                        if (MMAN_nbrword & outflags) {
                                printf("\\ ");
                                break;
                        if (MMAN_nbrword & outflags) {
                                printf("\\ ");
                                break;


@@ -416,7 +418,7 @@ 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;


@@ -425,11 +427,11 @@ print_offs(const char *v)
        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;
        else if (a2roffsu(v, &su, SCALE_MAX)) {
                if (SCALE_EN == su.unit)
                sz = 12;
        else if (a2roffsu(v, &su, SCALE_MAX)) {
                if (SCALE_EN == su.unit)


@@ -456,7 +458,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];
 

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

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


@@ -490,7 +492,7 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
 
        /* XXX Rough estimation, might have multiple parts. */
        chsz = (NULL != child && MDOC_TEXT == child->type) ?
 
        /* XXX Rough estimation, might have multiple parts. */
        chsz = (NULL != child && MDOC_TEXT == child->type) ?

-                       strlen(child->string) : 0;
+           strlen(child->string) : 0;

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


@@ -509,7 +511,7 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
                remain = sz + 2;
        }
        if (numeric) {
                remain = sz + 2;
        }
        if (numeric) {

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

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


@@ -519,9 +521,9 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
 static void
 print_count(int *count)
 {
 static void
 print_count(int *count)
 {

-       char              buf[12];
+       char              buf[24];

 
 

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

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


@@ -548,8 +550,9 @@ man_mdoc(void *arg, const struct mdoc *mdoc)
        n = mdoc_node(mdoc);
 
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
        n = mdoc_node(mdoc);
 
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",

-                       meta->title, meta->msec, meta->date,
-                       meta->os, meta->vol);
+           meta->title,
+           (meta->msec == NULL ? "" : meta->msec),
+           meta->date, meta->os, 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");


@@ -587,13 +590,17 @@ print_node(DECL_ARGS)
                 * 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.
                 */

-               if (MMAN_nl & outflags && ('.' == *n->string || 
-                                       '\'' == *n->string)) {
+               if (MMAN_nl & outflags &&
+                   ('.' == *n->string || '\'' == *n->string)) {

                        print_word("");
                        printf("\\&");
                        outflags &= ~MMAN_spc;
                }
                        print_word("");
                        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
        } else {
                /*
                 * Conditionally run the pre-node action handler for a


@@ -601,11 +608,11 @@ print_node(DECL_ARGS)
                 */
                act = manacts + n->tok;
                cond = NULL == act->cond || (*act->cond)(meta, n);
                 */
                act = manacts + n->tok;
                cond = NULL == act->cond || (*act->cond)(meta, n);

-               if (cond && act->pre)
+               if (cond && act->pre && ENDBODY_NOT == n->end)

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

-       /* 
+       /*

         * Conditionally run all child nodes.
         * Note that this iterates over children instead of using
         * recursion.  This prevents unnecessary depth in the stack.
         * Conditionally run all child nodes.
         * Note that this iterates over children instead of using
         * recursion.  This prevents unnecessary depth in the stack.


@@ -617,8 +624,17 @@ print_node(DECL_ARGS)
        /*
         * Lastly, conditionally run the post-node handler.
         */
        /*
         * Lastly, conditionally run the post-node handler.
         */

+       if (MDOC_ENDED & n->flags)
+               return;
+

        if (cond && act->post)
                (*act->post)(meta, n);
        if (cond && act->post)
                (*act->post)(meta, n);

+
+       if (ENDBODY_NOT != n->end)
+               n->pending->flags |= MDOC_ENDED;
+
+       if (ENDBODY_NOSPACE == n->end)
+               outflags &= ~(MMAN_spc | MMAN_nl);

 }
 
 static int
 }
 
 static int


@@ -656,10 +672,46 @@ post_enc(DECL_ARGS)
        suffix = manacts[n->tok].suffix;
        if (NULL == suffix)
                return;
        suffix = manacts[n->tok].suffix;
        if (NULL == suffix)
                return;

-       outflags &= ~MMAN_spc;
+       outflags &= ~(MMAN_spc | MMAN_nl);

        print_word(suffix);
 }
 
        print_word(suffix);
 }
 

+static int
+pre_ex(DECL_ARGS)
+{
+       int      nchild;
+
+       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);
+}
+

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


@@ -688,8 +740,8 @@ static int
 pre__t(DECL_ARGS)
 {
 
 pre__t(DECL_ARGS)
 {
 

-        if (n->parent && MDOC_Rs == n->parent->tok &&
-                        n->parent->norm->Rs.quote_T) {
+       if (n->parent && MDOC_Rs == n->parent->tok &&
+           n->parent->norm->Rs.quote_T) {

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


@@ -702,8 +754,8 @@ static void
 post__t(DECL_ARGS)
 {
 
 post__t(DECL_ARGS)
 {
 

-        if (n->parent && MDOC_Rs == n->parent->tok &&
-                        n->parent->norm->Rs.quote_T) {
+       if (n->parent && MDOC_Rs == n->parent->tok &&
+           n->parent->norm->Rs.quote_T) {

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


@@ -755,26 +807,26 @@ pre_syn(const struct mdoc_node *n)
                return;
 
        if (n->prev->tok == n->tok &&
                return;
 
        if (n->prev->tok == n->tok &&

-                       MDOC_Ft != n->tok &&
-                       MDOC_Fo != n->tok &&
-                       MDOC_Fn != n->tok) {
+           MDOC_Ft != n->tok &&
+           MDOC_Fo != n->tok &&
+           MDOC_Fn != n->tok) {

                outflags |= MMAN_br;
                return;
        }
 
        switch (n->prev->tok) {
                outflags |= MMAN_br;
                return;
        }
 
        switch (n->prev->tok) {

-       case (MDOC_Fd):
+       case MDOC_Fd:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Fn):
+       case MDOC_Fn:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Fo):
+       case MDOC_Fo:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_In):
+       case MDOC_In:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Vt):
+       case MDOC_Vt:

                outflags |= MMAN_sp;
                break;
                outflags |= MMAN_sp;
                break;

-       case (MDOC_Ft):
+       case MDOC_Ft:

                if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
                        outflags |= MMAN_sp;
                        break;
                if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
                        outflags |= MMAN_sp;
                        break;


@@ -791,11 +843,11 @@ pre_an(DECL_ARGS)
 {
 
        switch (n->norm->An.auth) {
 {
 
        switch (n->norm->An.auth) {

-       case (AUTH_split):
+       case AUTH_split:

                outflags &= ~MMAN_An_nosplit;
                outflags |= MMAN_An_split;
                return(0);
                outflags &= ~MMAN_An_nosplit;
                outflags |= MMAN_An_split;
                return(0);

-       case (AUTH_nosplit):
+       case AUTH_nosplit:

                outflags &= ~MMAN_An_split;
                outflags |= MMAN_An_nosplit;
                return(0);
                outflags &= ~MMAN_An_split;
                outflags |= MMAN_An_nosplit;
                return(0);


@@ -819,6 +871,25 @@ pre_ap(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

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

 static int
 pre_bd(DECL_ARGS)
 {
 static int
 pre_bd(DECL_ARGS)
 {


@@ -830,7 +901,7 @@ 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);
+       print_offs(n->norm->Bd.offs, 1);

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


@@ -854,18 +925,18 @@ pre_bf(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case (MDOC_BLOCK):
+       case MDOC_BLOCK:

                return(1);
                return(1);

-       case (MDOC_BODY):
+       case MDOC_BODY:

                break;
        default:
                return(0);
        }
        switch (n->norm->Bf.font) {
                break;
        default:
                return(0);
        }
        switch (n->norm->Bf.font) {

-       case (FONT_Em):
+       case FONT_Em:

                font_push('I');
                break;
                font_push('I');
                break;

-       case (FONT_Sy):
+       case FONT_Sy:

                font_push('B');
                break;
        default:
                font_push('B');
                break;
        default:


@@ -888,9 +959,9 @@ pre_bk(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case (MDOC_BLOCK):
+       case MDOC_BLOCK:

                return(1);
                return(1);

-       case (MDOC_BODY):
+       case MDOC_BODY:

                outflags |= MMAN_Bk;
                return(1);
        default:
                outflags |= MMAN_Bk;
                return(1);
        default:


@@ -917,15 +988,15 @@ 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) {
                Bl_stack[Bl_stack_len++] = 0;
        }
 
        switch (n->norm->Bl.type) {

-       case (LIST_enum):
+       case LIST_enum:

                n->norm->Bl.count = 0;
                return(1);
                n->norm->Bl.count = 0;
                return(1);

-       case (LIST_column):
+       case LIST_column:

                break;
        default:
                return(1);
                break;
        default:
                return(1);


@@ -944,10 +1015,10 @@ post_bl(DECL_ARGS)
 {
 
        switch (n->norm->Bl.type) {
 {
 
        switch (n->norm->Bl.type) {

-       case (LIST_column):
+       case LIST_column:

                print_line(".TE", 0);
                break;
                print_line(".TE", 0);
                break;

-       case (LIST_enum):
+       case LIST_enum:

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


@@ -1002,7 +1073,7 @@ static int
 pre_dl(DECL_ARGS)
 {
 
 pre_dl(DECL_ARGS)
 {
 

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

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


@@ -1025,6 +1096,33 @@ pre_em(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

+static int
+pre_en(DECL_ARGS)
+{
+
+       if (NULL == n->norm->Es ||
+           NULL == n->norm->Es->child)
+               return(1);
+
+       print_word(n->norm->Es->child->string);
+       outflags &= ~MMAN_spc;
+       return(1);
+}
+
+static void
+post_en(DECL_ARGS)
+{
+
+       if (NULL == n->norm->Es ||
+           NULL == n->norm->Es->child ||
+           NULL == n->norm->Es->child->next)
+               return;
+
+       outflags &= ~MMAN_spc;
+       print_word(n->norm->Es->child->next->string);
+       return;
+}
+

 static void
 post_eo(DECL_ARGS)
 {
 static void
 post_eo(DECL_ARGS)
 {


@@ -1033,6 +1131,13 @@ post_eo(DECL_ARGS)
                outflags &= ~MMAN_spc;
 }
 
                outflags &= ~MMAN_spc;
 }
 

+static int
+pre_es(DECL_ARGS)
+{
+
+       return(0);
+}
+

 static int
 pre_fa(DECL_ARGS)
 {
 static int
 pre_fa(DECL_ARGS)
 {


@@ -1086,7 +1191,8 @@ pre_fl(DECL_ARGS)
 
        font_push('B');
        print_word("\\-");
 
        font_push('B');
        print_word("\\-");

-       outflags &= ~MMAN_spc;
+       if (n->nchild)
+               outflags &= ~MMAN_spc;

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


@@ -1095,8 +1201,10 @@ post_fl(DECL_ARGS)
 {
 
        font_pop();
 {
 
        font_pop();

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

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


@@ -1142,15 +1250,15 @@ pre_fo(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case (MDOC_BLOCK):
+       case MDOC_BLOCK:

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

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                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):
+       case MDOC_BODY:

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


@@ -1166,10 +1274,10 @@ post_fo(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                font_pop();
                break;
                font_pop();
                break;

-       case (MDOC_BODY):
+       case MDOC_BODY:

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


@@ -1225,7 +1333,7 @@ pre_it(DECL_ARGS)
        const struct mdoc_node *bln;
 
        switch (n->type) {
        const struct mdoc_node *bln;
 
        switch (n->type) {

-       case (MDOC_HEAD):
+       case MDOC_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 ||


@@ -1234,45 +1342,48 @@ pre_it(DECL_ARGS)
                        outflags |= MMAN_sp;
                outflags &= ~MMAN_br;
                switch (bln->norm->Bl.type) {
                        outflags |= MMAN_sp;
                outflags &= ~MMAN_br;
                switch (bln->norm->Bl.type) {

-               case (LIST_item):
+               case LIST_item:

                        return(0);
                        return(0);

-               case (LIST_inset):
+               case LIST_inset:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (LIST_diag):
+               case LIST_diag:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (LIST_ohang):
+               case LIST_ohang:

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

-               case (LIST_bullet):
+               case LIST_bullet:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (LIST_dash):
+               case LIST_dash:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (LIST_hyphen):
+               case LIST_hyphen:

                        print_width(bln->norm->Bl.width, NULL, 0);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        font_push('B');
                        if (LIST_bullet == bln->norm->Bl.type)
                        print_width(bln->norm->Bl.width, NULL, 0);
                        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;
-               case (LIST_enum):
+                       outflags |= MMAN_nl;
+                       return(0);
+               case LIST_enum:

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

-                       break;
-               case (LIST_hang):
+                       outflags |= MMAN_nl;
+                       return(0);
+               case LIST_hang:

                        print_width(bln->norm->Bl.width, n->child, 6);
                        TPremain = 0;
                        print_width(bln->norm->Bl.width, n->child, 6);
                        TPremain = 0;

-                       break;
-               case (LIST_tag):
+                       outflags |= MMAN_nl;
+                       return(1);
+               case LIST_tag:

                        print_width(bln->norm->Bl.width, n->child, 0);
                        putchar('\n');
                        outflags &= ~MMAN_spc;
                        print_width(bln->norm->Bl.width, n->child, 0);
                        putchar('\n');
                        outflags &= ~MMAN_spc;


@@ -1280,7 +1391,6 @@ pre_it(DECL_ARGS)
                default:
                        return(1);
                }
                default:
                        return(1);
                }

-               outflags |= MMAN_nl;

        default:
                break;
        }
        default:
                break;
        }


@@ -1306,7 +1416,8 @@ 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);

-       snprintf(buf, sizeof(buf), "%zun", Bl_stack[Bl_stack_len - 1]);
+       (void)snprintf(buf, sizeof(buf), "%zun",
+           Bl_stack[Bl_stack_len - 1]);

        print_word(buf);
 
        /* Remeber to close out this .RS block later. */
        print_word(buf);
 
        /* Remeber to close out this .RS block later. */


@@ -1321,32 +1432,32 @@ post_it(DECL_ARGS)
        bln = n->parent->parent;
 
        switch (n->type) {
        bln = n->parent->parent;
 
        switch (n->type) {

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                switch (bln->norm->Bl.type) {
                switch (bln->norm->Bl.type) {

-               case (LIST_diag):
+               case LIST_diag:

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

-               case (LIST_ohang):
+               case LIST_ohang:

                        outflags |= MMAN_br;
                        break;
                default:
                        break;
                }
                break;
                        outflags |= MMAN_br;
                        break;
                default:
                        break;
                }
                break;

-       case (MDOC_BODY):
+       case MDOC_BODY:

                switch (bln->norm->Bl.type) {
                switch (bln->norm->Bl.type) {

-               case (LIST_bullet):
+               case LIST_bullet:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (LIST_dash):
+               case LIST_dash:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (LIST_hyphen):
+               case LIST_hyphen:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (LIST_enum):
+               case LIST_enum:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (LIST_hang):
+               case LIST_hang:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (LIST_tag):
+               case LIST_tag:

                        assert(Bl_stack_len);
                        Bl_stack[--Bl_stack_len] = 0;
 
                        assert(Bl_stack_len);
                        Bl_stack[--Bl_stack_len] = 0;
 


@@ -1360,7 +1471,7 @@ post_it(DECL_ARGS)
                                Bl_stack_post[Bl_stack_len] = 0;
                        }
                        break;
                                Bl_stack_post[Bl_stack_len] = 0;
                        }
                        break;

-               case (LIST_column):
+               case LIST_column:

                        if (NULL != n->next) {
                                putchar('\t');
                                outflags &= ~MMAN_spc;
                        if (NULL != n->next) {
                                putchar('\t');
                                outflags &= ~MMAN_spc;


@@ -1455,13 +1566,14 @@ post_nm(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case (MDOC_BLOCK):
+       case MDOC_BLOCK:

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

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_ELEM):
-               font_pop();
+       case MDOC_ELEM:
+               if (n->child != NULL || meta->name != NULL)
+                       font_pop();

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


@@ -1513,15 +1625,72 @@ pre_rs(DECL_ARGS)
        return(1);
 }
 
        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);
+}
+

 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;

+
+       if (MMAN_Sm & outflags)
+               outflags |= MMAN_spc;
+

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


@@ -1558,10 +1727,10 @@ pre_vt(DECL_ARGS)
 
        if (MDOC_SYNPRETTY & n->flags) {
                switch (n->type) {
 
        if (MDOC_SYNPRETTY & n->flags) {
                switch (n->type) {

-               case (MDOC_BLOCK):
+               case MDOC_BLOCK:

                        pre_syn(n);
                        return(1);
                        pre_syn(n);
                        return(1);

-               case (MDOC_BODY):
+               case MDOC_BODY:

                        break;
                default:
                        return(0);
                        break;
                default:
                        return(0);