]> 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
Vastly simplify man(7) block unwinding, similar to mdoc_macro.c 1.171.
[mandoc.git] / mdoc_man.c
diff --git a/mdoc_man.c b/mdoc_man.c
index 960e9ea85ef6b256d415e3b6b4c940dbab858c61..b72225862d3c1ae17a54b62ecd20103778124325 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_man.c,v 1.44 2012/11/18 19:34:19 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.91 2015/04/02 23:48:20 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,22 +14,23 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "mandoc_aux.h"
 #include "mandoc.h"
 #include "mandoc.h"
-#include "out.h"
-#include "man.h"
+#include "roff.h"
 #include "mdoc.h"
 #include "mdoc.h"
+#include "man.h"
+#include "out.h"
 #include "main.h"
 
 #include "main.h"
 
-#define        DECL_ARGS const struct mdoc_meta *meta, \
-                 const struct mdoc_node *n
+#define        DECL_ARGS const struct roff_meta *meta, struct roff_node *n
 
 struct manact {
        int             (*cond)(DECL_ARGS); /* DON'T run actions */
 
 struct manact {
        int             (*cond)(DECL_ARGS); /* DON'T run actions */
@@ -43,12 +44,15 @@ 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 void      mid_it(void);
 static void      post__t(DECL_ARGS);
 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);
@@ -69,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);
@@ -76,8 +81,12 @@ 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_skip(DECL_ARGS);
+static int       pre_eo(DECL_ARGS);
+static int       pre_ex(DECL_ARGS);
 static int       pre_fa(DECL_ARGS);
 static int       pre_fd(DECL_ARGS);
 static int       pre_fl(DECL_ARGS);
 static int       pre_fa(DECL_ARGS);
 static int       pre_fd(DECL_ARGS);
 static int       pre_fl(DECL_ARGS);
@@ -88,25 +97,27 @@ static      int       pre_in(DECL_ARGS);
 static int       pre_it(DECL_ARGS);
 static int       pre_lk(DECL_ARGS);
 static int       pre_li(DECL_ARGS);
 static int       pre_it(DECL_ARGS);
 static int       pre_lk(DECL_ARGS);
 static int       pre_li(DECL_ARGS);
+static int       pre_ll(DECL_ARGS);
 static int       pre_nm(DECL_ARGS);
 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_nm(DECL_ARGS);
 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_rv(DECL_ARGS);
 static int       pre_sm(DECL_ARGS);
 static int       pre_sp(DECL_ARGS);
 static int       pre_sect(DECL_ARGS);
 static int       pre_sy(DECL_ARGS);
 static int       pre_sm(DECL_ARGS);
 static int       pre_sp(DECL_ARGS);
 static int       pre_sect(DECL_ARGS);
 static int       pre_sy(DECL_ARGS);
-static void      pre_syn(const struct mdoc_node *);
+static void      pre_syn(const struct roff_node *);
 static int       pre_vt(DECL_ARGS);
 static int       pre_ux(DECL_ARGS);
 static int       pre_xr(DECL_ARGS);
 static void      print_word(const char *);
 static void      print_line(const char *, int);
 static void      print_block(const char *, int);
 static int       pre_vt(DECL_ARGS);
 static int       pre_ux(DECL_ARGS);
 static int       pre_xr(DECL_ARGS);
 static void      print_word(const char *);
 static void      print_line(const char *, int);
 static void      print_block(const char *, int);
-static void      print_offs(const char *);
-static void      print_width(const char *,
-                               const struct mdoc_node *, size_t);
+static void      print_offs(const char *, int);
+static void      print_width(const struct mdoc_bl *,
+                       const struct roff_node *);
 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 
 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 
@@ -133,9 +144,7 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_li, post_font, NULL, NULL }, /* Dv */
        { NULL, pre_li, post_font, NULL, NULL }, /* Er */
        { NULL, pre_li, post_font, NULL, NULL }, /* Ev */
        { NULL, pre_li, post_font, NULL, NULL }, /* Dv */
        { NULL, pre_li, post_font, NULL, NULL }, /* Er */
        { NULL, pre_li, post_font, NULL, NULL }, /* Ev */
-       { NULL, pre_enc, post_enc, "The \\fB",
-           "\\fP\nutility exits 0 on success, and >0 if an error occurs."
-           }, /* Ex */
+       { NULL, pre_ex, NULL, NULL, NULL }, /* Ex */
        { NULL, pre_fa, post_fa, NULL, NULL }, /* Fa */
        { NULL, pre_fd, post_fd, NULL, NULL }, /* Fd */
        { NULL, pre_fl, post_fl, NULL, NULL }, /* Fl */
        { NULL, pre_fa, post_fa, NULL, NULL }, /* Fa */
        { NULL, pre_fd, post_fd, NULL, NULL }, /* Fd */
        { NULL, pre_fl, post_fl, NULL, NULL }, /* Fl */
@@ -147,13 +156,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 */
@@ -170,8 +175,8 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre__t, post__t, NULL, NULL }, /* %T */
        { NULL, NULL, post_percent, NULL, NULL }, /* %V */
        { NULL, NULL, NULL, NULL, NULL }, /* Ac */
        { NULL, pre__t, post__t, NULL, NULL }, /* %T */
        { NULL, NULL, post_percent, NULL, NULL }, /* %V */
        { NULL, NULL, NULL, NULL, NULL }, /* Ac */
-       { cond_body, pre_enc, post_enc, "<", ">" }, /* Ao */
-       { cond_body, pre_enc, post_enc, "<", ">" }, /* Aq */
+       { cond_body, pre_aq, post_aq, NULL, NULL }, /* Ao */
+       { cond_body, pre_aq, post_aq, NULL, NULL }, /* Aq */
        { NULL, NULL, NULL, NULL, NULL }, /* At */
        { NULL, NULL, NULL, NULL, NULL }, /* Bc */
        { NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */
        { NULL, NULL, NULL, NULL, NULL }, /* At */
        { NULL, NULL, NULL, NULL, NULL }, /* Bc */
        { NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */
@@ -179,14 +184,14 @@ static    const struct manact manacts[MDOC_MAX + 1] = {
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */
        { NULL, pre_ux, NULL, "BSD/OS", NULL }, /* Bsx */
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */
        { NULL, pre_ux, NULL, "BSD/OS", NULL }, /* Bsx */
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
-       { NULL, NULL, NULL, NULL, NULL }, /* Db */
+       { NULL, pre_skip, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */
-       { cond_body, pre_enc, post_enc, "``", "''" }, /* Do */
-       { cond_body, pre_enc, post_enc, "``", "''" }, /* Dq */
+       { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Do */
+       { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Dq */
        { NULL, NULL, NULL, NULL, NULL }, /* Ec */
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */
        { NULL, NULL, NULL, NULL, NULL }, /* Ec */
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */
-       { NULL, NULL, post_eo, NULL, NULL }, /* Eo */
+       { cond_body, pre_eo, post_eo, NULL, NULL }, /* Eo */
        { NULL, pre_ux, NULL, "FreeBSD", NULL }, /* Fx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Ms */
        { NULL, pre_no, NULL, NULL, NULL }, /* No */
        { NULL, pre_ux, NULL, "FreeBSD", NULL }, /* Fx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Ms */
        { NULL, pre_no, NULL, NULL, NULL }, /* No */
@@ -198,14 +203,14 @@ static    const struct manact manacts[MDOC_MAX + 1] = {
        { cond_body, pre_enc, post_enc, "(", ")" }, /* Po */
        { cond_body, pre_enc, post_enc, "(", ")" }, /* Pq */
        { NULL, NULL, NULL, NULL, NULL }, /* Qc */
        { cond_body, pre_enc, post_enc, "(", ")" }, /* Po */
        { cond_body, pre_enc, post_enc, "(", ")" }, /* Pq */
        { NULL, NULL, NULL, NULL, NULL }, /* Qc */
-       { cond_body, pre_enc, post_enc, "`", "'" }, /* Ql */
+       { cond_body, pre_enc, post_enc, "\\(oq", "\\(cq" }, /* Ql */
        { cond_body, pre_enc, post_enc, "\"", "\"" }, /* Qo */
        { cond_body, pre_enc, post_enc, "\"", "\"" }, /* Qq */
        { NULL, NULL, NULL, NULL, NULL }, /* Re */
        { cond_body, pre_rs, NULL, NULL, NULL }, /* Rs */
        { NULL, NULL, NULL, NULL, NULL }, /* Sc */
        { cond_body, pre_enc, post_enc, "\"", "\"" }, /* Qo */
        { cond_body, pre_enc, post_enc, "\"", "\"" }, /* Qq */
        { NULL, NULL, NULL, NULL, NULL }, /* Re */
        { cond_body, pre_rs, NULL, NULL, NULL }, /* Rs */
        { NULL, NULL, NULL, NULL, NULL }, /* Sc */
-       { cond_body, pre_enc, post_enc, "`", "'" }, /* So */
-       { cond_body, pre_enc, post_enc, "`", "'" }, /* Sq */
+       { cond_body, pre_enc, post_enc, "\\(oq", "\\(cq" }, /* So */
+       { cond_body, pre_enc, post_enc, "\\(oq", "\\(cq" }, /* Sq */
        { NULL, pre_sm, NULL, NULL, NULL }, /* Sm */
        { NULL, pre_em, post_font, NULL, NULL }, /* Sx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Sy */
        { NULL, pre_sm, NULL, NULL, NULL }, /* Sm */
        { NULL, pre_em, post_font, NULL, NULL }, /* Sx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Sy */
@@ -221,7 +226,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 */
@@ -231,14 +236,15 @@ 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_skip, NULL, NULL, NULL }, /* Es */
+       { cond_body, pre_en, post_en, NULL, NULL }, /* En */
        { NULL, pre_ux, NULL, "DragonFly", NULL }, /* Dx */
        { NULL, NULL, post_percent, NULL, NULL }, /* %Q */
        { 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_ux, NULL, "DragonFly", 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, NULL, NULL, NULL }, /* ROOT */
 };
 
        { NULL, NULL, NULL, NULL, NULL }, /* ROOT */
 };
 
@@ -251,13 +257,15 @@ static    int             outflags;
 #define        MMAN_PP         (1 << 5)  /* reset indentation etc. */
 #define        MMAN_Sm         (1 << 6)  /* horizontal spacing mode */
 #define        MMAN_Bk         (1 << 7)  /* word keep mode */
 #define        MMAN_PP         (1 << 5)  /* reset indentation etc. */
 #define        MMAN_Sm         (1 << 6)  /* horizontal spacing mode */
 #define        MMAN_Bk         (1 << 7)  /* word keep mode */
-#define        MMAN_An_split   (1 << 8)  /* author mode is "split" */
-#define        MMAN_An_nosplit (1 << 9)  /* author mode is "nosplit" */
-#define        MMAN_PD         (1 << 10) /* inter-paragraph spacing disabled */
+#define        MMAN_Bk_susp    (1 << 8)  /* suspend this (after a macro) */
+#define        MMAN_An_split   (1 << 9)  /* author mode is "split" */
+#define        MMAN_An_nosplit (1 << 10) /* author mode is "nosplit" */
+#define        MMAN_PD         (1 << 11) /* inter-paragraph spacing disabled */
+#define        MMAN_nbrword    (1 << 12) /* do not break the next word */
 
 #define        BL_STACK_MAX    32
 
 
 #define        BL_STACK_MAX    32
 
-static size_t          Bl_stack[BL_STACK_MAX];  /* offsets [chars] */
+static int             Bl_stack[BL_STACK_MAX];  /* offsets [chars] */
 static int             Bl_stack_post[BL_STACK_MAX];  /* add final .RE */
 static int             Bl_stack_len;  /* number of nested Bl blocks */
 static int             TPremain;  /* characters before tag is full */
 static int             Bl_stack_post[BL_STACK_MAX];  /* add final .RE */
 static int             Bl_stack_len;  /* number of nested Bl blocks */
 static int             TPremain;  /* characters before tag is full */
@@ -268,6 +276,7 @@ static      struct {
        size_t   size;
 }      fontqueue;
 
        size_t   size;
 }      fontqueue;
 
+
 static void
 font_push(char newfont)
 {
 static void
 font_push(char newfont)
 {
@@ -275,7 +284,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("");
@@ -301,7 +310,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) {
@@ -334,11 +343,10 @@ print_word(const char *s)
                 */
                if (MMAN_spc_force & outflags || '\0' == s[0] ||
                    NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) {
                 */
                if (MMAN_spc_force & outflags || '\0' == s[0] ||
                    NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) {
-                       if (MMAN_Bk & outflags) {
+                       if (MMAN_Bk & outflags &&
+                           ! (MMAN_Bk_susp & outflags))
                                putchar('\\');
                                putchar('\\');
-                               putchar('~');
-                       } else 
-                               putchar(' ');
+                       putchar(' ');
                        if (TPremain)
                                TPremain--;
                }
                        if (TPremain)
                                TPremain--;
                }
@@ -353,16 +361,25 @@ print_word(const char *s)
                outflags |= MMAN_spc;
        else
                outflags &= ~MMAN_spc;
                outflags |= MMAN_spc;
        else
                outflags &= ~MMAN_spc;
-       outflags &= ~MMAN_spc_force;
+       outflags &= ~(MMAN_spc_force | MMAN_Bk_susp);
 
        for ( ; *s; s++) {
                switch (*s) {
 
        for ( ; *s; s++) {
                switch (*s) {
-               case (ASCII_NBRSP):
-                       printf("\\~");
+               case ASCII_NBRSP:
+                       printf("\\ ");
                        break;
                        break;
-               case (ASCII_HYPH):
+               case ASCII_HYPH:
                        putchar('-');
                        break;
                        putchar('-');
                        break;
+               case ASCII_BREAK:
+                       printf("\\:");
+                       break;
+               case ' ':
+                       if (MMAN_nbrword & outflags) {
+                               printf("\\ ");
+                               break;
+                       }
+                       /* FALLTHROUGH */
                default:
                        putchar((unsigned char)*s);
                        break;
                default:
                        putchar((unsigned char)*s);
                        break;
@@ -370,6 +387,7 @@ print_word(const char *s)
                if (TPremain)
                        TPremain--;
        }
                if (TPremain)
                        TPremain--;
        }
+       outflags &= ~MMAN_nbrword;
 }
 
 static void
 }
 
 static void
@@ -393,30 +411,30 @@ print_block(const char *s, int newflags)
                        print_line(".PD", 0);
                        outflags &= ~MMAN_PD;
                }
                        print_line(".PD", 0);
                        outflags &= ~MMAN_PD;
                }
-       } else if (! (MMAN_PD & outflags)) {
-               print_line(".PD 0", 0);
-               outflags |= MMAN_PD;
-       }
+       } else if (! (MMAN_PD & outflags))
+               print_line(".PD 0", MMAN_PD);
        outflags |= MMAN_nl;
        print_word(s);
        outflags |= MMAN_nl;
        print_word(s);
-       outflags |= newflags;
+       outflags |= MMAN_Bk_susp | newflags;
 }
 
 static void
 }
 
 static void
-print_offs(const char *v)
+print_offs(const char *v, int keywords)
 {
        char              buf[24];
        struct roffsu     su;
 {
        char              buf[24];
        struct roffsu     su;
-       size_t            sz;
+       int               sz;
+
+       print_line(".RS", MMAN_Bk_susp);
 
        /* Convert v into a number (of characters). */
 
        /* Convert v into a number (of characters). */
-       if (NULL == v || '\0' == *v || 0 == strcmp(v, "left"))
+       if (NULL == v || '\0' == *v || (keywords && !strcmp(v, "left")))
                sz = 0;
                sz = 0;
-       else if (0 == strcmp(v, "indent"))
+       else if (keywords && !strcmp(v, "indent"))
                sz = 6;
                sz = 6;
-       else if (0 == strcmp(v, "indent-two"))
+       else if (keywords && !strcmp(v, "indent-two"))
                sz = 12;
                sz = 12;
-       else if (a2roffsu(v, &su, SCALE_MAX)) {
+       else if (a2roffsu(v, &su, SCALE_EN) > 1) {
                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {
                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {
@@ -428,6 +446,7 @@ print_offs(const char *v)
                         * in terms of different units.
                         */
                        print_word(v);
                         * in terms of different units.
                         */
                        print_word(v);
+                       outflags |= MMAN_nl;
                        return;
                }
        } else
                        return;
                }
        } else
@@ -440,25 +459,28 @@ 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), "%ldn", sz);
+       (void)snprintf(buf, sizeof(buf), "%dn", sz);
        print_word(buf);
        print_word(buf);
+       outflags |= MMAN_nl;
 }
 
 }
 
-void
-print_width(const char *v, const struct mdoc_node *child, size_t defsz)
+/*
+ * Set up the indentation for a list item; used from pre_it().
+ */
+static void
+print_width(const struct mdoc_bl *bl, const struct roff_node *child)
 {
        char              buf[24];
        struct roffsu     su;
 {
        char              buf[24];
        struct roffsu     su;
-       size_t            sz, chsz;
-       int               numeric, remain;
+       int               numeric, remain, sz, chsz;
 
        numeric = 1;
        remain = 0;
 
 
        numeric = 1;
        remain = 0;
 
-       /* Convert v into a number (of characters). */
-       if (NULL == v)
-               sz = defsz;
-       else if (a2roffsu(v, &su, SCALE_MAX)) {
+       /* Convert the width into a number (of characters). */
+       if (bl->width == NULL)
+               sz = (bl->type == LIST_hang) ? 6 : 0;
+       else if (a2roffsu(bl->width, &su, SCALE_MAX) > 1) {
                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {
                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {
@@ -466,22 +488,18 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
                        numeric = 0;
                }
        } else
                        numeric = 0;
                }
        } else
-               sz = strlen(v);
+               sz = strlen(bl->width);
 
        /* XXX Rough estimation, might have multiple parts. */
 
        /* XXX Rough estimation, might have multiple parts. */
-       chsz = (NULL != child && MDOC_TEXT == child->type) ?
-                       strlen(child->string) : 0;
+       if (bl->type == LIST_enum)
+               chsz = (bl->count > 8) + 1;
+       else if (child != NULL && child->type == ROFFT_TEXT)
+               chsz = strlen(child->string);
+       else
+               chsz = 0;
 
 
-       /*
-        * If we are inside an enclosing list,
-        * preserve its indentation.
-        */
-       if (Bl_stack_len && Bl_stack[Bl_stack_len - 1]) {
-               print_line(".RS", 0);
-               snprintf(buf, sizeof(buf), "%ldn",
-                               Bl_stack[Bl_stack_len - 1]);
-               print_word(buf);
-       }
+       /* Maybe we are inside an enclosing list? */
+       mid_it();
 
        /*
         * Save our own indentation,
 
        /*
         * Save our own indentation,
@@ -490,26 +508,26 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
        Bl_stack[Bl_stack_len++] = sz + 2;
 
        /* Set up the current list. */
        Bl_stack[Bl_stack_len++] = sz + 2;
 
        /* Set up the current list. */
-       if (defsz && chsz > sz)
+       if (chsz > sz && bl->type != LIST_tag)
                print_block(".HP", 0);
        else {
                print_block(".TP", 0);
                remain = sz + 2;
        }
        if (numeric) {
                print_block(".HP", 0);
        else {
                print_block(".TP", 0);
                remain = sz + 2;
        }
        if (numeric) {
-               snprintf(buf, sizeof(buf), "%ldn", sz + 2);
+               (void)snprintf(buf, sizeof(buf), "%dn", sz + 2);
                print_word(buf);
        } else
                print_word(buf);
        } else
-               print_word(v);
+               print_word(bl->width);
        TPremain = remain;
 }
 
        TPremain = remain;
 }
 
-void
+static void
 print_count(int *count)
 {
 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);
 }
 
@@ -529,15 +547,19 @@ man_man(void *arg, const struct man *man)
 void
 man_mdoc(void *arg, const struct mdoc *mdoc)
 {
 void
 man_mdoc(void *arg, const struct mdoc *mdoc)
 {
-       const struct mdoc_meta *meta;
-       const struct mdoc_node *n;
+       const struct roff_meta *meta;
+       struct roff_node *n;
 
        meta = mdoc_meta(mdoc);
 
        meta = mdoc_meta(mdoc);
-       n = mdoc_node(mdoc);
+       n = mdoc_node(mdoc)->child;
 
 
-       printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"",
-                       meta->title, meta->msec, meta->date,
-                       meta->os, meta->vol);
+       printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
+           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");
 
        outflags = MMAN_nl | MMAN_Sm;
        if (0 == fontqueue.size) {
 
        outflags = MMAN_nl | MMAN_Sm;
        if (0 == fontqueue.size) {
@@ -545,53 +567,60 @@ man_mdoc(void *arg, const struct mdoc *mdoc)
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }
-       print_node(meta, n);
+       while (n != NULL) {
+               print_node(meta, n);
+               n = n->next;
+       }
        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {
        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {
-       const struct mdoc_node  *prev, *sub;
        const struct manact     *act;
        const struct manact     *act;
+       struct roff_node        *sub;
        int                      cond, do_sub;
        int                      cond, do_sub;
-       
+
        /*
         * 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.
         */
-       prev = n->prev ? n->prev : n->parent;
-       if (MMAN_spc & outflags && prev && prev->line < n->line)
+       if (MMAN_spc & outflags && MDOC_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;
 
 
-       if (MDOC_TEXT == n->type) {
+       if (n->type == ROFFT_TEXT) {
                /*
                 * Make sure that we don't happen to start with a
                 * control character at the start of a line.
                 */
                /*
                 * Make sure that we don't happen to start with a
                 * control character at the start of a line.
                 */
-               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
                 * node.
                 */
                act = manacts + n->tok;
        } else {
                /*
                 * Conditionally run the pre-node action handler for a
                 * node.
                 */
                act = manacts + n->tok;
-               cond = NULL == act->cond || (*act->cond)(meta, n);
-               if (cond && act->pre)
+               cond = act->cond == NULL || (*act->cond)(meta, n);
+               if (cond && act->pre && (n->end == ENDBODY_NOT || n->nchild))
                        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.
@@ -603,22 +632,31 @@ 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->body->flags |= MDOC_ENDED;
+
+       if (ENDBODY_NOSPACE == n->end)
+               outflags &= ~(MMAN_spc | MMAN_nl);
 }
 
 static int
 cond_head(DECL_ARGS)
 {
 
 }
 
 static int
 cond_head(DECL_ARGS)
 {
 
-       return(MDOC_HEAD == n->type);
+       return(n->type == ROFFT_HEAD);
 }
 
 static int
 cond_body(DECL_ARGS)
 {
 
 }
 
 static int
 cond_body(DECL_ARGS)
 {
 
-       return(MDOC_BODY == n->type);
+       return(n->type == ROFFT_BODY);
 }
 
 static int
 }
 
 static int
@@ -642,10 +680,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)
 {
@@ -674,8 +748,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;
@@ -688,8 +762,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('\"');
@@ -705,13 +779,13 @@ static int
 pre_sect(DECL_ARGS)
 {
 
 pre_sect(DECL_ARGS)
 {
 
-       if (MDOC_HEAD != n->type)
-               return(1);
-       outflags |= MMAN_sp;
-       print_block(manacts[n->tok].prefix, 0);
-       print_word("");
-       putchar('\"');
-       outflags &= ~MMAN_spc;
+       if (n->type == ROFFT_HEAD) {
+               outflags |= MMAN_sp;
+               print_block(manacts[n->tok].prefix, 0);
+               print_word("");
+               putchar('\"');
+               outflags &= ~MMAN_spc;
+       }
        return(1);
 }
 
        return(1);
 }
 
@@ -722,7 +796,7 @@ static void
 post_sect(DECL_ARGS)
 {
 
 post_sect(DECL_ARGS)
 {
 
-       if (MDOC_HEAD != n->type)
+       if (n->type != ROFFT_HEAD)
                return;
        outflags &= ~MMAN_spc;
        print_word("");
                return;
        outflags &= ~MMAN_spc;
        print_word("");
@@ -734,33 +808,33 @@ post_sect(DECL_ARGS)
 
 /* See mdoc_term.c, synopsis_pre() for comments. */
 static void
 
 /* See mdoc_term.c, synopsis_pre() for comments. */
 static void
-pre_syn(const struct mdoc_node *n)
+pre_syn(const struct roff_node *n)
 {
 
        if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
                return;
 
        if (n->prev->tok == n->tok &&
 {
 
        if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
                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;
@@ -777,11 +851,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);
@@ -805,6 +879,25 @@ pre_ap(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 
+static int
+pre_aq(DECL_ARGS)
+{
+
+       print_word(n->nchild == 1 &&
+           n->child->tok == MDOC_Mt ?  "<" : "\\(la");
+       outflags &= ~MMAN_spc;
+       return(1);
+}
+
+static void
+post_aq(DECL_ARGS)
+{
+
+       outflags &= ~(MMAN_spc | MMAN_nl);
+       print_word(n->nchild == 1 &&
+           n->child->tok == MDOC_Mt ?  ">" : "\\(ra");
+}
+
 static int
 pre_bd(DECL_ARGS)
 {
 static int
 pre_bd(DECL_ARGS)
 {
@@ -816,16 +909,13 @@ 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_line(".RS", 0);
-       print_offs(n->norm->Bd.offs);
-       outflags |= MMAN_nl;
+       print_offs(n->norm->Bd.offs, 1);
        return(1);
 }
 
 static void
 post_bd(DECL_ARGS)
 {
        return(1);
 }
 
 static void
 post_bd(DECL_ARGS)
 {
-       char             buf[24];
 
        /* Close out this display. */
        print_line(".RE", MMAN_nl);
 
        /* Close out this display. */
        print_line(".RE", MMAN_nl);
@@ -833,20 +923,9 @@ post_bd(DECL_ARGS)
            DISP_literal  == n->norm->Bd.type)
                print_line(".fi", MMAN_nl);
 
            DISP_literal  == n->norm->Bd.type)
                print_line(".fi", MMAN_nl);
 
-       /*
-        * If we are inside an enclosing list and the current
-        * list item is not yet finished, restore the correct
-        * indentation for what remains of that item.
-        */
-       if (NULL != n->parent->next &&
-           Bl_stack_len && Bl_stack[Bl_stack_len - 1]) {
-               print_line(".RS", 0);
-               snprintf(buf, sizeof(buf), "%ldn",
-                               Bl_stack[Bl_stack_len - 1]);
-               print_word(buf);
-               /* Remeber to close out this .RS block later. */
-               Bl_stack_post[Bl_stack_len - 1] = 1;
-       }
+       /* Maybe we are inside an enclosing list? */
+       if (NULL != n->parent->next)
+               mid_it();
 }
 
 static int
 }
 
 static int
@@ -854,18 +933,18 @@ pre_bf(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {
-       case (MDOC_BLOCK):
+       case ROFFT_BLOCK:
                return(1);
                return(1);
-       case (MDOC_BODY):
+       case ROFFT_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:
@@ -879,7 +958,7 @@ static void
 post_bf(DECL_ARGS)
 {
 
 post_bf(DECL_ARGS)
 {
 
-       if (MDOC_BODY == n->type)
+       if (n->type == ROFFT_BODY)
                font_pop();
 }
 
                font_pop();
 }
 
@@ -888,9 +967,9 @@ pre_bk(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {
-       case (MDOC_BLOCK):
+       case ROFFT_BLOCK:
                return(1);
                return(1);
-       case (MDOC_BODY):
+       case ROFFT_BODY:
                outflags |= MMAN_Bk;
                return(1);
        default:
                outflags |= MMAN_Bk;
                return(1);
        default:
@@ -902,7 +981,7 @@ static void
 post_bk(DECL_ARGS)
 {
 
 post_bk(DECL_ARGS)
 {
 
-       if (MDOC_BODY == n->type)
+       if (n->type == ROFFT_BODY)
                outflags &= ~MMAN_Bk;
 }
 
                outflags &= ~MMAN_Bk;
 }
 
@@ -911,20 +990,32 @@ pre_bl(DECL_ARGS)
 {
        size_t           icol;
 
 {
        size_t           icol;
 
+       /*
+        * print_offs() will increase the -offset to account for
+        * a possible enclosing .It, but any enclosed .It blocks
+        * just nest and do not add up their indentation.
+        */
+       if (n->norm->Bl.offs) {
+               print_offs(n->norm->Bl.offs, 0);
+               Bl_stack[Bl_stack_len++] = 0;
+       }
+
        switch (n->norm->Bl.type) {
        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);
        }
 
-       print_line(".TS", MMAN_nl);
-       for (icol = 0; icol < n->norm->Bl.ncols; icol++)
-               print_word("l");
-       print_word(".");
+       if (n->nchild) {
+               print_line(".TS", MMAN_nl);
+               for (icol = 0; icol < n->norm->Bl.ncols; icol++)
+                       print_word("l");
+               print_word(".");
+       }
        outflags |= MMAN_nl;
        return(1);
 }
        outflags |= MMAN_nl;
        return(1);
 }
@@ -934,17 +1025,31 @@ post_bl(DECL_ARGS)
 {
 
        switch (n->norm->Bl.type) {
 {
 
        switch (n->norm->Bl.type) {
-       case (LIST_column):
-               print_line(".TE", 0);
+       case LIST_column:
+               if (n->nchild)
+                       print_line(".TE", 0);
                break;
                break;
-       case (LIST_enum):
+       case LIST_enum:
                n->norm->Bl.count = 0;
                break;
        default:
                break;
        }
                n->norm->Bl.count = 0;
                break;
        default:
                break;
        }
-       outflags |= MMAN_PP | MMAN_nl;
-       outflags &= ~(MMAN_sp | MMAN_br);
+
+       if (n->norm->Bl.offs) {
+               print_line(".RE", MMAN_nl);
+               assert(Bl_stack_len);
+               Bl_stack_len--;
+               assert(0 == Bl_stack[Bl_stack_len]);
+       } else {
+               outflags |= MMAN_PP | MMAN_nl;
+               outflags &= ~(MMAN_sp | MMAN_br);
+       }
+
+       /* Maybe we are inside an enclosing list? */
+       if (NULL != n->parent->next)
+               mid_it();
+
 }
 
 static int
 }
 
 static int
@@ -979,7 +1084,7 @@ static int
 pre_dl(DECL_ARGS)
 {
 
 pre_dl(DECL_ARGS)
 {
 
-       print_line(".RS 6n", MMAN_nl);
+       print_offs("6n", 0);
        return(1);
 }
 
        return(1);
 }
 
@@ -988,6 +1093,10 @@ post_dl(DECL_ARGS)
 {
 
        print_line(".RE", MMAN_nl);
 {
 
        print_line(".RE", MMAN_nl);
+
+       /* Maybe we are inside an enclosing list? */
+       if (NULL != n->parent->next)
+               mid_it();
 }
 
 static int
 }
 
 static int
@@ -998,23 +1107,84 @@ 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 int
+pre_eo(DECL_ARGS)
+{
+
+       if (n->end == ENDBODY_NOT &&
+           n->parent->head->child == NULL &&
+           n->child != NULL &&
+           n->child->end != ENDBODY_NOT)
+               print_word("\\&");
+       else if (n->end != ENDBODY_NOT ? n->child != NULL :
+           n->parent->head->child != NULL && (n->child != NULL ||
+           (n->parent->tail != NULL && n->parent->tail->child != NULL)))
+               outflags &= ~(MMAN_spc | MMAN_nl);
+       return(1);
+}
+
 static void
 post_eo(DECL_ARGS)
 {
 static void
 post_eo(DECL_ARGS)
 {
+       int      body, tail;
+
+       if (n->end != ENDBODY_NOT) {
+               outflags |= MMAN_spc;
+               return;
+       }
 
 
-       if (MDOC_HEAD == n->type || MDOC_BODY == n->type)
+       body = n->child != NULL || n->parent->head->child != NULL;
+       tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+       if (body && tail)
                outflags &= ~MMAN_spc;
                outflags &= ~MMAN_spc;
+       else if ( ! (body || tail))
+               print_word("\\&");
+       else if ( ! tail)
+               outflags |= MMAN_spc;
 }
 
 static int
 pre_fa(DECL_ARGS)
 {
 }
 
 static int
 pre_fa(DECL_ARGS)
 {
+       int      am_Fa;
 
 
-       if (MDOC_Fa == n->tok)
+       am_Fa = MDOC_Fa == n->tok;
+
+       if (am_Fa)
                n = n->child;
 
        while (NULL != n) {
                font_push('I');
                n = n->child;
 
        while (NULL != n) {
                font_push('I');
+               if (am_Fa || MDOC_SYNPRETTY & n->flags)
+                       outflags |= MMAN_nbrword;
                print_node(meta, n);
                font_pop();
                if (NULL != (n = n->next))
                print_node(meta, n);
                font_pop();
                if (NULL != (n = n->next))
@@ -1053,8 +1223,9 @@ pre_fl(DECL_ARGS)
 {
 
        font_push('B');
 {
 
        font_push('B');
-       print_word("-");
-       outflags &= ~MMAN_spc;
+       print_word("\\-");
+       if (n->nchild)
+               outflags &= ~MMAN_spc;
        return(1);
 }
 
        return(1);
 }
 
@@ -1063,8 +1234,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 == ROFFT_TEXT ||
+           n->next->flags & MDOC_LINE))
                outflags &= ~MMAN_spc;
 }
 
                outflags &= ~MMAN_spc;
 }
 
@@ -1078,6 +1251,9 @@ pre_fn(DECL_ARGS)
        if (NULL == n)
                return(0);
 
        if (NULL == n)
                return(0);
 
+       if (MDOC_SYNPRETTY & n->flags)
+               print_block(".HP 4n", MMAN_nl);
+
        font_push('B');
        print_node(meta, n);
        font_pop();
        font_push('B');
        print_node(meta, n);
        font_pop();
@@ -1098,7 +1274,7 @@ post_fn(DECL_ARGS)
        print_word(")");
        if (MDOC_SYNPRETTY & n->flags) {
                print_word(";");
        print_word(")");
        if (MDOC_SYNPRETTY & n->flags) {
                print_word(";");
-               outflags |= MMAN_br;
+               outflags |= MMAN_PP;
        }
 }
 
        }
 }
 
@@ -1107,14 +1283,18 @@ pre_fo(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {
-       case (MDOC_BLOCK):
+       case ROFFT_BLOCK:
                pre_syn(n);
                break;
                pre_syn(n);
                break;
-       case (MDOC_HEAD):
+       case ROFFT_HEAD:
+               if (n->child == NULL)
+                       return(0);
+               if (MDOC_SYNPRETTY & n->flags)
+                       print_block(".HP 4n", MMAN_nl);
                font_push('B');
                break;
                font_push('B');
                break;
-       case (MDOC_BODY):
-               outflags &= ~MMAN_spc;
+       case ROFFT_BODY:
+               outflags &= ~(MMAN_spc | MMAN_nl);
                print_word("(");
                outflags &= ~MMAN_spc;
                break;
                print_word("(");
                outflags &= ~MMAN_spc;
                break;
@@ -1123,16 +1303,17 @@ pre_fo(DECL_ARGS)
        }
        return(1);
 }
        }
        return(1);
 }
-               
+
 static void
 post_fo(DECL_ARGS)
 {
 
        switch (n->type) {
 static void
 post_fo(DECL_ARGS)
 {
 
        switch (n->type) {
-       case (MDOC_HEAD):
-               font_pop();
+       case ROFFT_HEAD:
+               if (n->child != NULL)
+                       font_pop();
                break;
                break;
-       case (MDOC_BODY):
+       case ROFFT_BODY:
                post_fn(meta, n);
                break;
        default:
                post_fn(meta, n);
                break;
        default:
@@ -1185,10 +1366,10 @@ post_in(DECL_ARGS)
 static int
 pre_it(DECL_ARGS)
 {
 static int
 pre_it(DECL_ARGS)
 {
-       const struct mdoc_node *bln;
+       const struct roff_node *bln;
 
        switch (n->type) {
 
        switch (n->type) {
-       case (MDOC_HEAD):
+       case ROFFT_HEAD:
                outflags |= MMAN_PP | MMAN_nl;
                bln = n->parent->parent;
                if (0 == bln->norm->Bl.comp ||
                outflags |= MMAN_PP | MMAN_nl;
                bln = n->parent->parent;
                if (0 == bln->norm->Bl.comp ||
@@ -1197,114 +1378,136 @@ 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):
-                       print_width(bln->norm->Bl.width, NULL, 0);
+               case LIST_hyphen:
+                       print_width(&bln->norm->Bl, NULL);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        font_push('B');
                        if (LIST_bullet == bln->norm->Bl.type)
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        font_push('B');
                        if (LIST_bullet == bln->norm->Bl.type)
-                               print_word("o");
+                               print_word("\\(bu");
                        else
                                print_word("-");
                        font_pop();
                        else
                                print_word("-");
                        font_pop();
-                       break;
-               case (LIST_enum):
-                       print_width(bln->norm->Bl.width, NULL, 0);
+                       outflags |= MMAN_nl;
+                       return(0);
+               case LIST_enum:
+                       print_width(&bln->norm->Bl, NULL);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        print_count(&bln->norm->Bl.count);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        print_count(&bln->norm->Bl.count);
-                       break;
-               case (LIST_hang):
-                       print_width(bln->norm->Bl.width, n->child, 6);
+                       outflags |= MMAN_nl;
+                       return(0);
+               case LIST_hang:
+                       print_width(&bln->norm->Bl, n->child);
                        TPremain = 0;
                        TPremain = 0;
-                       break;
-               case (LIST_tag):
-                       print_width(bln->norm->Bl.width, n->child, 0);
+                       outflags |= MMAN_nl;
+                       return(1);
+               case LIST_tag:
+                       print_width(&bln->norm->Bl, n->child);
                        putchar('\n');
                        outflags &= ~MMAN_spc;
                        return(1);
                default:
                        return(1);
                }
                        putchar('\n');
                        outflags &= ~MMAN_spc;
                        return(1);
                default:
                        return(1);
                }
-               outflags |= MMAN_nl;
        default:
                break;
        }
        return(1);
 }
 
        default:
                break;
        }
        return(1);
 }
 
+/*
+ * This function is called after closing out an indented block.
+ * If we are inside an enclosing list, restore its indentation.
+ */
+static void
+mid_it(void)
+{
+       char             buf[24];
+
+       /* Nothing to do outside a list. */
+       if (0 == Bl_stack_len || 0 == Bl_stack[Bl_stack_len - 1])
+               return;
+
+       /* The indentation has already been set up. */
+       if (Bl_stack_post[Bl_stack_len - 1])
+               return;
+
+       /* Restore the indentation of the enclosing list. */
+       print_line(".RS", MMAN_Bk_susp);
+       (void)snprintf(buf, sizeof(buf), "%dn",
+           Bl_stack[Bl_stack_len - 1]);
+       print_word(buf);
+
+       /* Remeber to close out this .RS block later. */
+       Bl_stack_post[Bl_stack_len - 1] = 1;
+}
+
 static void
 post_it(DECL_ARGS)
 {
 static void
 post_it(DECL_ARGS)
 {
-       const struct mdoc_node *bln;
+       const struct roff_node *bln;
 
        bln = n->parent->parent;
 
        switch (n->type) {
 
        bln = n->parent->parent;
 
        switch (n->type) {
-       case (MDOC_HEAD):
+       case ROFFT_HEAD:
                switch (bln->norm->Bl.type) {
                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 ROFFT_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;
 
                        /*
                         * Our indentation had to be restored
                        assert(Bl_stack_len);
                        Bl_stack[--Bl_stack_len] = 0;
 
                        /*
                         * Our indentation had to be restored
-                        * after a child display.
+                        * after a child display or child list.
                         * Close out that indentation block now.
                         */
                        if (Bl_stack_post[Bl_stack_len]) {
                                print_line(".RE", MMAN_nl);
                                Bl_stack_post[Bl_stack_len] = 0;
                        }
                         * Close out that indentation block now.
                         */
                        if (Bl_stack_post[Bl_stack_len]) {
                                print_line(".RE", MMAN_nl);
                                Bl_stack_post[Bl_stack_len] = 0;
                        }
-
-                       /*
-                        * We are inside an enclosing list.
-                        * Restore the indentation of that list.
-                        */
-                       if (Bl_stack_len && Bl_stack[Bl_stack_len - 1])
-                               print_line(".RE", MMAN_nl);
                        break;
                        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;
@@ -1330,7 +1533,7 @@ post_lb(DECL_ARGS)
 static int
 pre_lk(DECL_ARGS)
 {
 static int
 pre_lk(DECL_ARGS)
 {
-       const struct mdoc_node *link, *descr;
+       const struct roff_node *link, *descr;
 
        if (NULL == (link = n->child))
                return(0);
 
        if (NULL == (link = n->child))
                return(0);
@@ -1351,6 +1554,14 @@ pre_lk(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 
+static int
+pre_ll(DECL_ARGS)
+{
+
+       print_line(".ll", 0);
+       return(1);
+}
+
 static int
 pre_li(DECL_ARGS)
 {
 static int
 pre_li(DECL_ARGS)
 {
@@ -1364,18 +1575,20 @@ pre_nm(DECL_ARGS)
 {
        char    *name;
 
 {
        char    *name;
 
-       if (MDOC_BLOCK == n->type)
+       if (n->type == ROFFT_BLOCK) {
+               outflags |= MMAN_Bk;
                pre_syn(n);
                pre_syn(n);
-       if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
+       }
+       if (n->type != ROFFT_ELEM && n->type != ROFFT_HEAD)
                return(1);
        name = n->child ? n->child->string : meta->name;
        if (NULL == name)
                return(0);
                return(1);
        name = n->child ? n->child->string : meta->name;
        if (NULL == name)
                return(0);
-       if (MDOC_HEAD == n->type) {
+       if (n->type == ROFFT_HEAD) {
                if (NULL == n->parent->prev)
                        outflags |= MMAN_sp;
                print_block(".HP", 0);
                if (NULL == n->parent->prev)
                        outflags |= MMAN_sp;
                print_block(".HP", 0);
-               printf(" %ldn", strlen(name) + 1);
+               printf(" %zun", strlen(name) + 1);
                outflags |= MMAN_nl;
        }
        font_push('B');
                outflags |= MMAN_nl;
        }
        font_push('B');
@@ -1388,9 +1601,19 @@ static void
 post_nm(DECL_ARGS)
 {
 
 post_nm(DECL_ARGS)
 {
 
-       if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
-               return;
-       font_pop();
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               outflags &= ~MMAN_Bk;
+               break;
+       case ROFFT_HEAD:
+               /* FALLTHROUGH */
+       case ROFFT_ELEM:
+               if (n->child != NULL || meta->name != NULL)
+                       font_pop();
+               break;
+       default:
+               break;
+       }
 }
 
 static int
 }
 
 static int
@@ -1413,7 +1636,8 @@ static void
 post_pf(DECL_ARGS)
 {
 
 post_pf(DECL_ARGS)
 {
 
-       outflags &= ~MMAN_spc;
+       if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+               outflags &= ~MMAN_spc;
 }
 
 static int
 }
 
 static int
@@ -1438,15 +1662,79 @@ 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_skip(DECL_ARGS)
+{
+
+       return(0);
+}
+
 static int
 pre_sm(DECL_ARGS)
 {
 
 static int
 pre_sm(DECL_ARGS)
 {
 
-       assert(n->child && MDOC_TEXT == n->child->type);
-       if (0 == strcmp("on", n->child->string))
-               outflags |= MMAN_Sm | MMAN_spc;
+       if (NULL == n->child)
+               outflags ^= MMAN_Sm;
+       else if (0 == strcmp("on", n->child->string))
+               outflags |= MMAN_Sm;
        else
                outflags &= ~MMAN_Sm;
        else
                outflags &= ~MMAN_Sm;
+
+       if (MMAN_Sm & outflags)
+               outflags |= MMAN_spc;
+
        return(0);
 }
 
        return(0);
 }
 
@@ -1483,10 +1771,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 ROFFT_BLOCK:
                        pre_syn(n);
                        return(1);
                        pre_syn(n);
                        return(1);
-               case (MDOC_BODY):
+               case ROFFT_BODY:
                        break;
                default:
                        return(0);
                        break;
                default:
                        return(0);
@@ -1500,7 +1788,7 @@ static void
 post_vt(DECL_ARGS)
 {
 
 post_vt(DECL_ARGS)
 {
 
-       if (MDOC_SYNPRETTY & n->flags && MDOC_BODY != n->type)
+       if (n->flags & MDOC_SYNPRETTY && n->type != ROFFT_BODY)
                return;
        font_pop();
 }
                return;
        font_pop();
 }
@@ -1531,7 +1819,7 @@ pre_ux(DECL_ARGS)
        if (NULL == n->child)
                return(0);
        outflags &= ~MMAN_spc;
        if (NULL == n->child)
                return(0);
        outflags &= ~MMAN_spc;
-       print_word("\\~");
+       print_word("\\ ");
        outflags &= ~MMAN_spc;
        return(1);
 }
        outflags &= ~MMAN_spc;
        return(1);
 }
A git conversion mirror of mandoc.bsd.lv