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 974cfbd46f58cd9505bf843e47a39e34200469d9..b72225862d3c1ae17a54b62ecd20103778124325 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_man.c,v 1.77 2014/11/30 05:29:00 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.91 2015/04/02 23:48:20 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2011, 2012, 2013, 2014 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


@@ -22,15 +22,15 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

-#include "mandoc.h"

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

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

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

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

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

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

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


@@ -108,7 +108,7 @@ 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_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 int       pre_vt(DECL_ARGS);
 static int       pre_ux(DECL_ARGS);
 static int       pre_xr(DECL_ARGS);


@@ -116,8 +116,8 @@ 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 *, int);
 static void      print_line(const char *, int);
 static void      print_block(const char *, int);
 static void      print_offs(const char *, int);

-static void      print_width(const char *,
-                               const struct mdoc_node *, size_t);
+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);
 


@@ -186,8 +186,8 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
        { NULL, pre_skip, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
        { NULL, pre_skip, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */

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

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


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

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

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


@@ -423,7 +423,7 @@ 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);
 
 
        print_line(".RS", MMAN_Bk_susp);
 


@@ -434,7 +434,7 @@ print_offs(const char *v, int keywords)
                sz = 6;
        else if (keywords && !strcmp(v, "indent-two"))
                sz = 12;
                sz = 6;
        else if (keywords && !strcmp(v, "indent-two"))
                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 {


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

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

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


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

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

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

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

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

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

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


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

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

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

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

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


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

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

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

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

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

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

        TPremain = remain;
 }
 
        TPremain = remain;
 }
 


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

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

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


@@ -544,11 +547,11 @@ 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\"\n",
            meta->title,
 
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
            meta->title,


@@ -564,15 +567,18 @@ 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  *sub;

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

+       struct roff_node        *sub;

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


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

+       n->flags &= ~MDOC_ENDED;

 
 

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

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


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

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

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


@@ -642,14 +649,14 @@ static int
 cond_head(DECL_ARGS)
 {
 
 cond_head(DECL_ARGS)
 {
 

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

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

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

 }
 
 static int
 }
 
 static int


@@ -772,7 +779,7 @@ static int
 pre_sect(DECL_ARGS)
 {
 
 pre_sect(DECL_ARGS)
 {
 

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

                outflags |= MMAN_sp;
                print_block(manacts[n->tok].prefix, 0);
                print_word("");
                outflags |= MMAN_sp;
                print_block(manacts[n->tok].prefix, 0);
                print_word("");


@@ -789,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("");


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

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

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


@@ -876,8 +883,8 @@ static int
 pre_aq(DECL_ARGS)
 {
 
 pre_aq(DECL_ARGS)
 {
 

-       print_word(n->parent->prev != NULL &&
-           n->parent->prev->tok == MDOC_An ?  "<" : "\\(la");
+       print_word(n->nchild == 1 &&
+           n->child->tok == MDOC_Mt ?  "<" : "\\(la");

        outflags &= ~MMAN_spc;
        return(1);
 }
        outflags &= ~MMAN_spc;
        return(1);
 }


@@ -887,8 +894,8 @@ post_aq(DECL_ARGS)
 {
 
        outflags &= ~(MMAN_spc | MMAN_nl);
 {
 
        outflags &= ~(MMAN_spc | MMAN_nl);

-       print_word(n->parent->prev != NULL &&
-           n->parent->prev->tok == MDOC_An ?  ">" : "\\(ra");
+       print_word(n->nchild == 1 &&
+           n->child->tok == MDOC_Mt ?  ">" : "\\(ra");

 }
 
 static int
 }
 
 static int


@@ -926,9 +933,9 @@ 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);
                break;
        default:
                return(0);


@@ -951,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();
 }
 


@@ -960,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:


@@ -974,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;
 }
 


@@ -1003,10 +1010,12 @@ pre_bl(DECL_ARGS)
                return(1);
        }
 
                return(1);
        }
 

-       print_line(".TS", MMAN_nl);
-       for (icol = 0; icol < n->norm->Bl.ncols; icol++)
-               print_word("l");
-       print_word(".");
+       if (n->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);
 }


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

-               print_line(".TE", 0);
+               if (n->nchild)
+                       print_line(".TE", 0);

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


@@ -1128,16 +1138,37 @@ static int
 pre_eo(DECL_ARGS)
 {
 
 pre_eo(DECL_ARGS)
 {
 

-       outflags &= ~(MMAN_spc | MMAN_nl);
+       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)
 {
        return(1);
 }
 
 static void
 post_eo(DECL_ARGS)
 {

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

 
 

-       if (n->end != ENDBODY_SPACE)
+       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
 }
 
 static int


@@ -1205,7 +1236,7 @@ post_fl(DECL_ARGS)
        font_pop();
        if ( ! (n->nchild ||
            n->next == NULL ||
        font_pop();
        if ( ! (n->nchild ||
            n->next == NULL ||

-           n->next->type == MDOC_TEXT ||
+           n->next->type == ROFFT_TEXT ||

            n->next->flags & MDOC_LINE))
                outflags &= ~MMAN_spc;
 }
            n->next->flags & MDOC_LINE))
                outflags &= ~MMAN_spc;
 }


@@ -1252,16 +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;
                if (MDOC_SYNPRETTY & n->flags)
                        print_block(".HP 4n", MMAN_nl);
                font_push('B');
                break;

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

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


@@ -1276,10 +1309,11 @@ post_fo(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

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

                break;
                break;

-       case MDOC_BODY:
+       case ROFFT_BODY:

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


@@ -1332,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 ||


@@ -1362,7 +1396,7 @@ pre_it(DECL_ARGS)
                case LIST_dash:
                        /* FALLTHROUGH */
                case LIST_hyphen:
                case LIST_dash:
                        /* FALLTHROUGH */
                case LIST_hyphen:

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

                        TPremain = 0;
                        outflags |= MMAN_nl;
                        font_push('B');
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        font_push('B');


@@ -1374,19 +1408,19 @@ pre_it(DECL_ARGS)
                        outflags |= MMAN_nl;
                        return(0);
                case LIST_enum:
                        outflags |= MMAN_nl;
                        return(0);
                case LIST_enum:

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

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

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

                        TPremain = 0;
                        outflags |= MMAN_nl;
                        return(1);
                case LIST_tag:
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        return(1);
                case LIST_tag:

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

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


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

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

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


@@ -1429,12 +1463,12 @@ mid_it(void)
 static void
 post_it(DECL_ARGS)
 {
 static void
 post_it(DECL_ARGS)
 {

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

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

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

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


@@ -1447,7 +1481,7 @@ post_it(DECL_ARGS)
                        break;
                }
                break;
                        break;
                }
                break;

-       case MDOC_BODY:
+       case ROFFT_BODY:

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


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


@@ -1541,16 +1575,16 @@ pre_nm(DECL_ARGS)
 {
        char    *name;
 
 {
        char    *name;
 

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

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

-       if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
+       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);


@@ -1568,12 +1602,12 @@ post_nm(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

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

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case MDOC_ELEM:
+       case ROFFT_ELEM:

                if (n->child != NULL || meta->name != NULL)
                        font_pop();
                break;
                if (n->child != NULL || meta->name != NULL)
                        font_pop();
                break;


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


@@ -1754,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();
 }