]> 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
document -Q and -T; from OpenBSD
[mandoc.git] / mdoc_man.c
diff --git a/mdoc_man.c b/mdoc_man.c
index 0af2f9b33a0cb9723219c11bd202d6bd8a1ccd60..3830e558bca9456d8f241b198f7a6ccbbca7d723 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_man.c,v 1.35 2012/07/12 08:55:48 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.61 2014/03/30 23:34:32 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2012, 2013, 2014 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
@@ -23,12 +23,13 @@
 #include <string.h>
 
 #include "mandoc.h"
 #include <string.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "out.h"
 #include "man.h"
 #include "mdoc.h"
 #include "main.h"
 
 #include "out.h"
 #include "man.h"
 #include "mdoc.h"
 #include "main.h"
 
-#define        DECL_ARGS const struct mdoc_meta *m, \
+#define        DECL_ARGS const struct mdoc_meta *meta, \
                  const struct mdoc_node *n
 
 struct manact {
                  const struct mdoc_node *n
 
 struct manact {
@@ -43,6 +44,7 @@ static        int       cond_body(DECL_ARGS);
 static int       cond_head(DECL_ARGS);
 static  void     font_push(char);
 static void      font_pop(void);
 static int       cond_head(DECL_ARGS);
 static  void     font_push(char);
 static void      font_pop(void);
+static void      mid_it(void);
 static void      post__t(DECL_ARGS);
 static void      post_bd(DECL_ARGS);
 static void      post_bf(DECL_ARGS);
 static void      post__t(DECL_ARGS);
 static void      post_bd(DECL_ARGS);
 static void      post_bf(DECL_ARGS);
@@ -88,6 +90,7 @@ 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_nm(DECL_ARGS);
 static int       pre_no(DECL_ARGS);
 static int       pre_ns(DECL_ARGS);
@@ -102,6 +105,8 @@ 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 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 *);
 static void      print_width(const char *,
                                const struct mdoc_node *, size_t);
@@ -179,8 +184,8 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
        { NULL, NULL, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
        { NULL, NULL, NULL, NULL, NULL }, /* Db */
        { 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 */
@@ -196,14 +201,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 */
@@ -237,19 +242,31 @@ static    const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_sp, post_sp, NULL, NULL }, /* sp */
        { NULL, NULL, post_percent, NULL, NULL }, /* %U */
        { NULL, NULL, NULL, NULL, NULL }, /* Ta */
        { NULL, pre_sp, post_sp, NULL, NULL }, /* sp */
        { NULL, NULL, post_percent, NULL, NULL }, /* %U */
        { NULL, NULL, NULL, NULL, NULL }, /* Ta */
+       { NULL, pre_ll, post_sp, NULL, NULL }, /* ll */
        { NULL, NULL, NULL, NULL, NULL }, /* ROOT */
 };
 
 static int             outflags;
        { NULL, NULL, NULL, NULL, NULL }, /* ROOT */
 };
 
 static int             outflags;
-#define        MMAN_spc        (1 << 0)
-#define        MMAN_spc_force  (1 << 1)
-#define        MMAN_nl         (1 << 2)
-#define        MMAN_br         (1 << 3)
-#define        MMAN_sp         (1 << 4)
-#define        MMAN_Sm         (1 << 5)
-#define        MMAN_Bk         (1 << 6)
-#define        MMAN_An_split   (1 << 7)
-#define        MMAN_An_nosplit (1 << 8)
+#define        MMAN_spc        (1 << 0)  /* blank character before next word */
+#define        MMAN_spc_force  (1 << 1)  /* even before trailing punctuation */
+#define        MMAN_nl         (1 << 2)  /* break man(7) code line */
+#define        MMAN_br         (1 << 3)  /* break output line */
+#define        MMAN_sp         (1 << 4)  /* insert a blank output line */
+#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_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
+
+static size_t          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 struct {
        char    *head;
 
 static struct {
        char    *head;
@@ -267,7 +284,8 @@ font_push(char newfont)
                                fontqueue.size);
        }
        *fontqueue.tail = newfont;
                                fontqueue.size);
        }
        *fontqueue.tail = newfont;
-       print_word("\\f");
+       print_word("");
+       printf("\\f");
        putchar(newfont);
        outflags &= ~MMAN_spc;
 }
        putchar(newfont);
        outflags &= ~MMAN_spc;
 }
@@ -279,7 +297,8 @@ font_pop(void)
        if (fontqueue.tail > fontqueue.head)
                fontqueue.tail--;
        outflags &= ~MMAN_spc;
        if (fontqueue.tail > fontqueue.head)
                fontqueue.tail--;
        outflags &= ~MMAN_spc;
-       print_word("\\f");
+       print_word("");
+       printf("\\f");
        putchar(*fontqueue.tail);
 }
 
        putchar(*fontqueue.tail);
 }
 
@@ -287,57 +306,113 @@ static void
 print_word(const char *s)
 {
 
 print_word(const char *s)
 {
 
-       if ((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 we need a newline, print it now and start afresh.
                 */
-               if (MMAN_sp & outflags)
+               if (MMAN_PP & outflags) {
+                       if (MMAN_sp & outflags) {
+                               if (MMAN_PD & outflags) {
+                                       printf("\n.PD");
+                                       outflags &= ~MMAN_PD;
+                               }
+                       } else if ( ! (MMAN_PD & outflags)) {
+                               printf("\n.PD 0");
+                               outflags |= MMAN_PD;
+                       }
+                       printf("\n.PP\n");
+               } else if (MMAN_sp & outflags)
                        printf("\n.sp\n");
                else if (MMAN_br & outflags)
                        printf("\n.br\n");
                else if (MMAN_nl & outflags)
                        putchar('\n');
                        printf("\n.sp\n");
                else if (MMAN_br & outflags)
                        printf("\n.br\n");
                else if (MMAN_nl & outflags)
                        putchar('\n');
-               outflags &= ~(MMAN_sp|MMAN_br|MMAN_nl|MMAN_spc);
-       } else if (MMAN_spc & outflags && '\0' != s[0])
+               outflags &= ~(MMAN_PP|MMAN_sp|MMAN_br|MMAN_nl|MMAN_spc);
+               if (1 == TPremain)
+                       printf(".br\n");
+               TPremain = 0;
+       } else if (MMAN_spc & outflags) {
                /*
                 * If we need a space, only print it if
                 * (1) it is forced by `No' or
                 * (2) what follows is not terminating punctuation or
                 * (3) what follows is longer than one character.
                 */
                /*
                 * If we need a space, only print it if
                 * (1) it is forced by `No' or
                 * (2) what follows is not terminating punctuation or
                 * (3) what follows is longer than one character.
                 */
-               if (MMAN_spc_force & outflags ||
+               if (MMAN_spc_force & outflags || '\0' == s[0] ||
                    NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) {
                    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--;
                }
                }
+       }
 
        /*
         * Reassign needing space if we're not following opening
         * punctuation.
         */
 
        /*
         * Reassign needing space if we're not following opening
         * punctuation.
         */
-       if (MMAN_Sm & outflags &&
-           (('(' != s[0] && '[' != s[0]) || '\0' != s[1]))
+       if (MMAN_Sm & outflags && ('\0' == s[0] ||
+           (('(' != s[0] && '[' != s[0]) || '\0' != s[1])))
                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) {
                case (ASCII_NBRSP):
 
        for ( ; *s; s++) {
                switch (*s) {
                case (ASCII_NBRSP):
-                       printf("\\~");
+                       printf("\\ ");
                        break;
                case (ASCII_HYPH):
                        putchar('-');
                        break;
                        break;
                case (ASCII_HYPH):
                        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;
                }
+               if (TPremain)
+                       TPremain--;
        }
        }
+       outflags &= ~MMAN_nbrword;
+}
+
+static void
+print_line(const char *s, int newflags)
+{
+
+       outflags &= ~MMAN_br;
+       outflags |= MMAN_nl;
+       print_word(s);
+       outflags |= newflags;
+}
+
+static void
+print_block(const char *s, int newflags)
+{
+
+       outflags &= ~MMAN_PP;
+       if (MMAN_sp & outflags) {
+               outflags &= ~(MMAN_sp | MMAN_br);
+               if (MMAN_PD & outflags) {
+                       print_line(".PD", 0);
+                       outflags &= ~MMAN_PD;
+               }
+       } else if (! (MMAN_PD & outflags))
+               print_line(".PD 0", MMAN_PD);
+       outflags |= MMAN_nl;
+       print_word(s);
+       outflags |= MMAN_Bk_susp | newflags;
 }
 
 static void
 }
 
 static void
@@ -347,6 +422,9 @@ print_offs(const char *v)
        struct roffsu     su;
        size_t            sz;
 
        struct roffsu     su;
        size_t            sz;
 
+       print_line(".RS", MMAN_Bk_susp);
+
+       /* Convert v into a number (of characters). */
        if (NULL == v || '\0' == *v || 0 == strcmp(v, "left"))
                sz = 0;
        else if (0 == strcmp(v, "indent"))
        if (NULL == v || '\0' == *v || 0 == strcmp(v, "left"))
                sz = 0;
        else if (0 == strcmp(v, "indent"))
@@ -354,51 +432,91 @@ print_offs(const char *v)
        else if (0 == strcmp(v, "indent-two"))
                sz = 12;
        else if (a2roffsu(v, &su, SCALE_MAX)) {
        else if (0 == strcmp(v, "indent-two"))
                sz = 12;
        else if (a2roffsu(v, &su, SCALE_MAX)) {
-               print_word(v);
-               return;
+               if (SCALE_EN == su.unit)
+                       sz = su.scale;
+               else {
+                       /*
+                        * XXX
+                        * If we are inside an enclosing list,
+                        * there is no easy way to add the two
+                        * indentations because they are provided
+                        * in terms of different units.
+                        */
+                       print_word(v);
+                       outflags |= MMAN_nl;
+                       return;
+               }
        } else
                sz = strlen(v);
 
        } else
                sz = strlen(v);
 
-       snprintf(buf, sizeof(buf), "%ldn", sz);
+       /*
+        * We are inside an enclosing list.
+        * Add the two indentations.
+        */
+       if (Bl_stack_len)
+               sz += Bl_stack[Bl_stack_len - 1];
+
+       snprintf(buf, sizeof(buf), "%zun", sz);
        print_word(buf);
        print_word(buf);
+       outflags |= MMAN_nl;
 }
 
 }
 
-void
+/*
+ * Set up the indentation for a list item; used from pre_it().
+ */
+static void
 print_width(const char *v, const struct mdoc_node *child, size_t defsz)
 {
        char              buf[24];
        struct roffsu     su;
        size_t            sz, chsz;
 print_width(const char *v, const struct mdoc_node *child, size_t defsz)
 {
        char              buf[24];
        struct roffsu     su;
        size_t            sz, chsz;
+       int               numeric, remain;
 
 
-       /* XXX Rough estimation, might have multiple parts. */
-       chsz = (NULL != child && MDOC_TEXT == child->type) ?
-                       strlen(child->string) : 0;
+       numeric = 1;
+       remain = 0;
 
 
+       /* Convert v into a number (of characters). */
        if (NULL == v)
                sz = defsz;
        else if (a2roffsu(v, &su, SCALE_MAX)) {
                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {
        if (NULL == v)
                sz = defsz;
        else if (a2roffsu(v, &su, SCALE_MAX)) {
                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {
-                       if (chsz)
-                               print_word(".HP");
-                       else
-                               print_word(".TP");
-                       print_word(v);
-                       return;
+                       sz = 0;
+                       numeric = 0;
                }
        } else
                sz = strlen(v);
 
                }
        } else
                sz = strlen(v);
 
-       if (chsz > sz)
-               print_word(".HP");
-       else
-               print_word(".TP");
-       snprintf(buf, sizeof(buf), "%ldn", sz + 2);
-       print_word(buf);
+       /* XXX Rough estimation, might have multiple parts. */
+       chsz = (NULL != child && MDOC_TEXT == child->type) ?
+                       strlen(child->string) : 0;
+
+       /* Maybe we are inside an enclosing list? */
+       mid_it();
+
+       /*
+        * Save our own indentation,
+        * such that child lists can use it.
+        */
+       Bl_stack[Bl_stack_len++] = sz + 2;
+
+       /* Set up the current list. */
+       if (defsz && chsz > sz)
+               print_block(".HP", 0);
+       else {
+               print_block(".TP", 0);
+               remain = sz + 2;
+       }
+       if (numeric) {
+               snprintf(buf, sizeof(buf), "%zun", sz + 2);
+               print_word(buf);
+       } else
+               print_word(v);
+       TPremain = remain;
 }
 
 }
 
-void
+static void
 print_count(int *count)
 {
        char              buf[12];
 print_count(int *count)
 {
        char              buf[12];
@@ -423,14 +541,18 @@ 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 *m;
+       const struct mdoc_meta *meta;
        const struct mdoc_node *n;
 
        const struct mdoc_node *n;
 
-       m = mdoc_meta(mdoc);
+       meta = mdoc_meta(mdoc);
        n = mdoc_node(mdoc);
 
        n = mdoc_node(mdoc);
 
-       printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"",
-                       m->title, m->msec, m->date, m->os, m->vol);
+       printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
+                       meta->title, 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) {
@@ -438,23 +560,22 @@ 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(m, n);
+       print_node(meta, n);
        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {
        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {
-       const struct mdoc_node  *prev, *sub;
+       const struct mdoc_node  *sub;
        const struct manact     *act;
        int                      cond, do_sub;
        const struct manact     *act;
        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;
                outflags |= MMAN_nl;
 
        act = NULL;
@@ -468,7 +589,8 @@ print_node(DECL_ARGS)
                 */
                if (MMAN_nl & outflags && ('.' == *n->string || 
                                        '\'' == *n->string)) {
                 */
                if (MMAN_nl & outflags && ('.' == *n->string || 
                                        '\'' == *n->string)) {
-                       print_word("\\&");
+                       print_word("");
+                       printf("\\&");
                        outflags &= ~MMAN_spc;
                }
                print_word(n->string);
                        outflags &= ~MMAN_spc;
                }
                print_word(n->string);
@@ -478,9 +600,9 @@ print_node(DECL_ARGS)
                 * node.
                 */
                act = manacts + n->tok;
                 * node.
                 */
                act = manacts + n->tok;
-               cond = NULL == act->cond || (*act->cond)(m, n);
-               if (cond && act->pre)
-                       do_sub = (*act->pre)(m, n);
+               cond = NULL == act->cond || (*act->cond)(meta, n);
+               if (cond && act->pre && ENDBODY_NOT == n->end)
+                       do_sub = (*act->pre)(meta, n);
        }
 
        /* 
        }
 
        /* 
@@ -490,13 +612,22 @@ print_node(DECL_ARGS)
         */
        if (do_sub)
                for (sub = n->child; sub; sub = sub->next)
         */
        if (do_sub)
                for (sub = n->child; sub; sub = sub->next)
-                       print_node(m, sub);
+                       print_node(meta, sub);
 
        /*
         * Lastly, conditionally run the post-node handler.
         */
 
        /*
         * Lastly, conditionally run the post-node handler.
         */
+       if (MDOC_ENDED & n->flags)
+               return;
+
        if (cond && act->post)
        if (cond && act->post)
-               (*act->post)(m, n);
+               (*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
@@ -534,7 +665,7 @@ 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);
 }
 
@@ -568,7 +699,8 @@ 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("\"");
+               print_word("");
+               putchar('\"');
                outflags &= ~MMAN_spc;
        } else
                font_push('I');
                outflags &= ~MMAN_spc;
        } else
                font_push('I');
@@ -582,10 +714,11 @@ post__t(DECL_ARGS)
         if (n->parent && MDOC_Rs == n->parent->tok &&
                         n->parent->norm->Rs.quote_T) {
                outflags &= ~MMAN_spc;
         if (n->parent && MDOC_Rs == n->parent->tok &&
                         n->parent->norm->Rs.quote_T) {
                outflags &= ~MMAN_spc;
-               print_word("\"");
+               print_word("");
+               putchar('\"');
        } else
                font_pop();
        } else
                font_pop();
-       post_percent(m, n);
+       post_percent(meta, n);
 }
 
 /*
 }
 
 /*
@@ -595,12 +728,13 @@ static int
 pre_sect(DECL_ARGS)
 {
 
 pre_sect(DECL_ARGS)
 {
 
-       if (MDOC_HEAD != n->type)
-               return(1);
-       outflags |= MMAN_nl;
-       print_word(manacts[n->tok].prefix);
-       print_word("\"");
-       outflags &= ~MMAN_spc;
+       if (MDOC_HEAD == n->type) {
+               outflags |= MMAN_sp;
+               print_block(manacts[n->tok].prefix, 0);
+               print_word("");
+               putchar('\"');
+               outflags &= ~MMAN_spc;
+       }
        return(1);
 }
 
        return(1);
 }
 
@@ -614,7 +748,8 @@ post_sect(DECL_ARGS)
        if (MDOC_HEAD != n->type)
                return;
        outflags &= ~MMAN_spc;
        if (MDOC_HEAD != n->type)
                return;
        outflags &= ~MMAN_spc;
-       print_word("\"");
+       print_word("");
+       putchar('\"');
        outflags |= MMAN_nl;
        if (MDOC_Sh == n->tok && SEC_AUTHORS == n->sec)
                outflags &= ~(MMAN_An_split | MMAN_An_nosplit);
        outflags |= MMAN_nl;
        if (MDOC_Sh == n->tok && SEC_AUTHORS == n->sec)
                outflags &= ~(MMAN_An_split | MMAN_An_nosplit);
@@ -697,17 +832,14 @@ static int
 pre_bd(DECL_ARGS)
 {
 
 pre_bd(DECL_ARGS)
 {
 
-       if (0 == n->norm->Bd.comp)
-               outflags |= MMAN_sp;
+       outflags &= ~(MMAN_PP | MMAN_sp | MMAN_br);
+
        if (DISP_unfilled == n->norm->Bd.type ||
        if (DISP_unfilled == n->norm->Bd.type ||
-           DISP_literal  == n->norm->Bd.type) {
-               outflags |= MMAN_nl;
-               print_word(".nf");
-       }
-       outflags |= MMAN_nl;
-       print_word(".RS");
+           DISP_literal  == n->norm->Bd.type)
+               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);
-       outflags |= MMAN_nl;
        return(1);
 }
 
        return(1);
 }
 
@@ -715,14 +847,15 @@ static void
 post_bd(DECL_ARGS)
 {
 
 post_bd(DECL_ARGS)
 {
 
-       outflags |= MMAN_nl;
-       print_word(".RE");
+       /* Close out this display. */
+       print_line(".RE", MMAN_nl);
        if (DISP_unfilled == n->norm->Bd.type ||
        if (DISP_unfilled == n->norm->Bd.type ||
-           DISP_literal  == n->norm->Bd.type) {
-               outflags |= MMAN_nl;
-               print_word(".fi");
-       }
-       outflags |= MMAN_nl;
+           DISP_literal  == n->norm->Bd.type)
+               print_line(".fi", MMAN_nl);
+
+       /* Maybe we are inside an enclosing list? */
+       if (NULL != n->parent->next)
+               mid_it();
 }
 
 static int
 }
 
 static int
@@ -787,6 +920,16 @@ 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);
+               Bl_stack[Bl_stack_len++] = 0;
+       }
+
        switch (n->norm->Bl.type) {
        case (LIST_enum):
                n->norm->Bl.count = 0;
        switch (n->norm->Bl.type) {
        case (LIST_enum):
                n->norm->Bl.count = 0;
@@ -797,12 +940,11 @@ pre_bl(DECL_ARGS)
                return(1);
        }
 
                return(1);
        }
 
-       outflags |= MMAN_nl;
-       print_word(".TS");
-       outflags |= MMAN_nl;
+       print_line(".TS", MMAN_nl);
        for (icol = 0; icol < n->norm->Bl.ncols; icol++)
                print_word("l");
        print_word(".");
        for (icol = 0; icol < n->norm->Bl.ncols; icol++)
                print_word("l");
        print_word(".");
+       outflags |= MMAN_nl;
        return(1);
 }
 
        return(1);
 }
 
@@ -811,17 +953,30 @@ post_bl(DECL_ARGS)
 {
 
        switch (n->norm->Bl.type) {
 {
 
        switch (n->norm->Bl.type) {
+       case (LIST_column):
+               print_line(".TE", 0);
+               break;
        case (LIST_enum):
                n->norm->Bl.count = 0;
                break;
        case (LIST_enum):
                n->norm->Bl.count = 0;
                break;
-       case (LIST_column):
-               outflags |= MMAN_nl;
-               print_word(".TE");
-               break;
        default:
                break;
        }
        default:
                break;
        }
-       outflags |= 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
@@ -856,9 +1011,7 @@ static int
 pre_dl(DECL_ARGS)
 {
 
 pre_dl(DECL_ARGS)
 {
 
-       outflags |= MMAN_nl;
-       print_word(".RS 6n");
-       outflags |= MMAN_nl;
+       print_offs("6n");
        return(1);
 }
 
        return(1);
 }
 
@@ -866,9 +1019,11 @@ static void
 post_dl(DECL_ARGS)
 {
 
 post_dl(DECL_ARGS)
 {
 
-       outflags |= MMAN_nl;
-       print_word(".RE");
-       outflags |= 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
@@ -890,13 +1045,18 @@ post_eo(DECL_ARGS)
 static int
 pre_fa(DECL_ARGS)
 {
 static int
 pre_fa(DECL_ARGS)
 {
+       int      am_Fa;
+
+       am_Fa = MDOC_Fa == n->tok;
 
 
-       if (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');
-               print_node(m, n);
+               if (am_Fa || MDOC_SYNPRETTY & n->flags)
+                       outflags |= MMAN_nbrword;
+               print_node(meta, n);
                font_pop();
                if (NULL != (n = n->next))
                        print_word(",");
                font_pop();
                if (NULL != (n = n->next))
                        print_word(",");
@@ -934,7 +1094,7 @@ pre_fl(DECL_ARGS)
 {
 
        font_push('B');
 {
 
        font_push('B');
-       print_word("-");
+       print_word("\\-");
        outflags &= ~MMAN_spc;
        return(1);
 }
        outflags &= ~MMAN_spc;
        return(1);
 }
@@ -959,8 +1119,11 @@ 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');
        font_push('B');
-       print_node(m, n);
+       print_node(meta, n);
        font_pop();
        outflags &= ~MMAN_spc;
        print_word("(");
        font_pop();
        outflags &= ~MMAN_spc;
        print_word("(");
@@ -968,7 +1131,7 @@ pre_fn(DECL_ARGS)
 
        n = n->next;
        if (NULL != n)
 
        n = n->next;
        if (NULL != n)
-               pre_fa(m, n);
+               pre_fa(meta, n);
        return(0);
 }
 
        return(0);
 }
 
@@ -979,7 +1142,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;
        }
 }
 
        }
 }
 
@@ -992,6 +1155,8 @@ pre_fo(DECL_ARGS)
                pre_syn(n);
                break;
        case (MDOC_HEAD):
                pre_syn(n);
                break;
        case (MDOC_HEAD):
+               if (MDOC_SYNPRETTY & n->flags)
+                       print_block(".HP 4n", MMAN_nl);
                font_push('B');
                break;
        case (MDOC_BODY):
                font_push('B');
                break;
        case (MDOC_BODY):
@@ -1004,7 +1169,7 @@ pre_fo(DECL_ARGS)
        }
        return(1);
 }
        }
        return(1);
 }
-               
+
 static void
 post_fo(DECL_ARGS)
 {
 static void
 post_fo(DECL_ARGS)
 {
@@ -1014,7 +1179,7 @@ post_fo(DECL_ARGS)
                font_pop();
                break;
        case (MDOC_BODY):
                font_pop();
                break;
        case (MDOC_BODY):
-               post_fn(m, n);
+               post_fn(meta, n);
                break;
        default:
                break;
                break;
        default:
                break;
@@ -1070,28 +1235,25 @@ pre_it(DECL_ARGS)
 
        switch (n->type) {
        case (MDOC_HEAD):
 
        switch (n->type) {
        case (MDOC_HEAD):
-               outflags |= MMAN_nl;
+               outflags |= MMAN_PP | MMAN_nl;
                bln = n->parent->parent;
                bln = n->parent->parent;
+               if (0 == bln->norm->Bl.comp ||
+                   (NULL == n->parent->prev &&
+                    NULL == bln->parent->prev))
+                       outflags |= MMAN_sp;
+               outflags &= ~MMAN_br;
                switch (bln->norm->Bl.type) {
                case (LIST_item):
                switch (bln->norm->Bl.type) {
                case (LIST_item):
-                       if (bln->norm->Bl.comp)
-                               outflags |= MMAN_br;
-                       else
-                               outflags |= MMAN_sp;
                        return(0);
                case (LIST_inset):
                        /* FALLTHROUGH */
                case (LIST_diag):
                        /* FALLTHROUGH */
                case (LIST_ohang):
                        return(0);
                case (LIST_inset):
                        /* FALLTHROUGH */
                case (LIST_diag):
                        /* FALLTHROUGH */
                case (LIST_ohang):
-                       if (bln->norm->Bl.comp)
-                               outflags |= MMAN_br;
-                       else
-                               outflags |= MMAN_sp;
                        if (bln->norm->Bl.type == LIST_diag)
                        if (bln->norm->Bl.type == LIST_diag)
-                               print_word(".B \"");
+                               print_line(".B \"", 0);
                        else
                        else
-                               print_word(".R \"");
+                               print_line(".R \"", 0);
                        outflags &= ~MMAN_spc;
                        return(1);
                case (LIST_bullet):
                        outflags &= ~MMAN_spc;
                        return(1);
                case (LIST_bullet):
@@ -1100,6 +1262,7 @@ pre_it(DECL_ARGS)
                        /* FALLTHROUGH */
                case (LIST_hyphen):
                        print_width(bln->norm->Bl.width, NULL, 0);
                        /* FALLTHROUGH */
                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)
                        outflags |= MMAN_nl;
                        font_push('B');
                        if (LIST_bullet == bln->norm->Bl.type)
@@ -1110,15 +1273,19 @@ pre_it(DECL_ARGS)
                        break;
                case (LIST_enum):
                        print_width(bln->norm->Bl.width, NULL, 0);
                        break;
                case (LIST_enum):
                        print_width(bln->norm->Bl.width, NULL, 0);
+                       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;
                        print_count(&bln->norm->Bl.count);
                        break;
                case (LIST_hang):
                        print_width(bln->norm->Bl.width, n->child, 6);
+                       TPremain = 0;
                        break;
                case (LIST_tag):
                        break;
                case (LIST_tag):
-                       print_width(bln->norm->Bl.width, NULL, 8);
-                       break;
+                       print_width(bln->norm->Bl.width, n->child, 0);
+                       putchar('\n');
+                       outflags &= ~MMAN_spc;
+                       return(1);
                default:
                        return(1);
                }
                default:
                        return(1);
                }
@@ -1129,6 +1296,32 @@ pre_it(DECL_ARGS)
        return(1);
 }
 
        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);
+       snprintf(buf, sizeof(buf), "%zun", 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)
 {
@@ -1151,10 +1344,39 @@ post_it(DECL_ARGS)
                }
                break;
        case (MDOC_BODY):
                }
                break;
        case (MDOC_BODY):
-               if (LIST_column == bln->norm->Bl.type &&
-                   NULL != n->next) {
-                       putchar('\t');
-                       outflags &= ~MMAN_spc;
+               switch (bln->norm->Bl.type) {
+               case (LIST_bullet):
+                       /* FALLTHROUGH */
+               case (LIST_dash):
+                       /* FALLTHROUGH */
+               case (LIST_hyphen):
+                       /* FALLTHROUGH */
+               case (LIST_enum):
+                       /* FALLTHROUGH */
+               case (LIST_hang):
+                       /* FALLTHROUGH */
+               case (LIST_tag):
+                       assert(Bl_stack_len);
+                       Bl_stack[--Bl_stack_len] = 0;
+
+                       /*
+                        * Our indentation had to be restored
+                        * 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;
+                       }
+                       break;
+               case (LIST_column):
+                       if (NULL != n->next) {
+                               putchar('\t');
+                               outflags &= ~MMAN_spc;
+                       }
+                       break;
+               default:
+                       break;
                }
                break;
        default:
                }
                break;
        default:
@@ -1194,6 +1416,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)
 {
@@ -1205,16 +1435,27 @@ pre_li(DECL_ARGS)
 static int
 pre_nm(DECL_ARGS)
 {
 static int
 pre_nm(DECL_ARGS)
 {
+       char    *name;
 
 
-       if (MDOC_BLOCK == n->type)
+       if (MDOC_BLOCK == n->type) {
+               outflags |= MMAN_Bk;
                pre_syn(n);
                pre_syn(n);
+       }
        if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
                return(1);
        if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
                return(1);
-       if (NULL == n->child && NULL == m->name)
+       name = n->child ? n->child->string : meta->name;
+       if (NULL == name)
                return(0);
                return(0);
+       if (MDOC_HEAD == n->type) {
+               if (NULL == n->parent->prev)
+                       outflags |= MMAN_sp;
+               print_block(".HP", 0);
+               printf(" %zun", strlen(name) + 1);
+               outflags |= MMAN_nl;
+       }
        font_push('B');
        if (NULL == n->child)
        font_push('B');
        if (NULL == n->child)
-               print_word(m->name);
+               print_word(meta->name);
        return(1);
 }
 
        return(1);
 }
 
@@ -1222,9 +1463,18 @@ 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 (MDOC_BLOCK):
+               outflags &= ~MMAN_Bk;
+               break;
+       case (MDOC_HEAD):
+               /* FALLTHROUGH */
+       case (MDOC_ELEM):
+               font_pop();
+               break;
+       default:
+               break;
+       }
 }
 
 static int
 }
 
 static int
@@ -1254,12 +1504,10 @@ static int
 pre_pp(DECL_ARGS)
 {
 
 pre_pp(DECL_ARGS)
 {
 
-       outflags |= MMAN_nl;
-       if (MDOC_It == n->parent->tok)
-               print_word(".sp");
-       else
-               print_word(".PP");
-       outflags |= MMAN_nl;
+       if (MDOC_It != n->parent->tok)
+               outflags |= MMAN_PP;
+       outflags |= MMAN_sp | MMAN_nl;
+       outflags &= ~MMAN_br;
        return(0);
 }
 
        return(0);
 }
 
@@ -1268,9 +1516,8 @@ pre_rs(DECL_ARGS)
 {
 
        if (SEC_SEE_ALSO == n->sec) {
 {
 
        if (SEC_SEE_ALSO == n->sec) {
-               outflags |= MMAN_nl;
-               print_word(".PP");
-               outflags |= MMAN_nl;
+               outflags |= MMAN_PP | MMAN_sp | MMAN_nl;
+               outflags &= ~MMAN_br;
        }
        return(1);
 }
        }
        return(1);
 }
@@ -1291,8 +1538,11 @@ static int
 pre_sp(DECL_ARGS)
 {
 
 pre_sp(DECL_ARGS)
 {
 
-       outflags |= MMAN_nl;
-       print_word(".sp");
+       if (MMAN_PP & outflags) {
+               outflags &= ~MMAN_PP;
+               print_line(".PP", 0);
+       } else
+               print_line(".sp", 0);
        return(1);
 }
 
        return(1);
 }
 
@@ -1346,13 +1596,13 @@ pre_xr(DECL_ARGS)
        n = n->child;
        if (NULL == n)
                return(0);
        n = n->child;
        if (NULL == n)
                return(0);
-       print_node(m, n);
+       print_node(meta, n);
        n = n->next;
        if (NULL == n)
                return(0);
        outflags &= ~MMAN_spc;
        print_word("(");
        n = n->next;
        if (NULL == n)
                return(0);
        outflags &= ~MMAN_spc;
        print_word("(");
-       print_node(m, n);
+       print_node(meta, n);
        print_word(")");
        return(0);
 }
        print_word(")");
        return(0);
 }
@@ -1365,7 +1615,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