Delete the wrapper functions mdoc_meta(), man_meta(), mdoc_node(),

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 42deb3ac4966d4d30c8f3ad2499f95ce88440800..be170bf549885902d9a0c7e823ce3cc4ff0050d1 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,39 +1,39 @@
-/*     $Id: mdoc_term.c,v 1.274 2014/07/30 17:06:26 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.319 2015/04/18 17:53:21 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * 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 <ctype.h>
 
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>

+#include <limits.h>

 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

-#include "mandoc.h"

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

+#include "mandoc.h"
+#include "roff.h"
+#include "mdoc.h"

 #include "out.h"
 #include "term.h"
 #include "out.h"
 #include "term.h"

-#include "mdoc.h"

 #include "main.h"
 
 struct termpair {
 #include "main.h"
 
 struct termpair {


@@ -43,34 +43,32 @@ struct      termpair {
 
 #define        DECL_ARGS struct termp *p, \
                  struct termpair *pair, \
 
 #define        DECL_ARGS struct termp *p, \
                  struct termpair *pair, \

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

 
 struct termact {
        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };
 
 
 struct termact {
        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };
 

-static size_t    a2width(const struct termp *, const char *);
-static size_t    a2height(const struct termp *, const char *);
-static size_t    a2offs(const struct termp *, const char *);
+static int       a2width(const struct termp *, const char *);

 
 static void      print_bvspace(struct termp *,
 
 static void      print_bvspace(struct termp *,

-                       const struct mdoc_node *,
-                       const struct mdoc_node *);
+                       const struct roff_node *,
+                       const struct roff_node *);

 static void      print_mdoc_node(DECL_ARGS);
 static void      print_mdoc_nodelist(DECL_ARGS);
 static void      print_mdoc_node(DECL_ARGS);
 static void      print_mdoc_nodelist(DECL_ARGS);

-static void      print_mdoc_head(struct termp *, const void *);
-static void      print_mdoc_foot(struct termp *, const void *);
+static void      print_mdoc_head(struct termp *, const struct roff_meta *);
+static void      print_mdoc_foot(struct termp *, const struct roff_meta *);

 static void      synopsis_pre(struct termp *,
 static void      synopsis_pre(struct termp *,

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

 
 static void      termp____post(DECL_ARGS);
 static void      termp__t_post(DECL_ARGS);
 
 static void      termp____post(DECL_ARGS);
 static void      termp__t_post(DECL_ARGS);

-static void      termp_an_post(DECL_ARGS);

 static void      termp_bd_post(DECL_ARGS);
 static void      termp_bk_post(DECL_ARGS);
 static void      termp_bl_post(DECL_ARGS);
 static void      termp_bd_post(DECL_ARGS);
 static void      termp_bk_post(DECL_ARGS);
 static void      termp_bl_post(DECL_ARGS);

+static void      termp_eo_post(DECL_ARGS);

 static void      termp_fd_post(DECL_ARGS);
 static void      termp_fo_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);
 static void      termp_fd_post(DECL_ARGS);
 static void      termp_fo_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);


@@ -95,7 +93,7 @@ static        int       termp_bt_pre(DECL_ARGS);
 static int       termp_bx_pre(DECL_ARGS);
 static int       termp_cd_pre(DECL_ARGS);
 static int       termp_d1_pre(DECL_ARGS);
 static int       termp_bx_pre(DECL_ARGS);
 static int       termp_cd_pre(DECL_ARGS);
 static int       termp_d1_pre(DECL_ARGS);

-static int       termp_es_pre(DECL_ARGS);
+static int       termp_eo_pre(DECL_ARGS);

 static int       termp_ex_pre(DECL_ARGS);
 static int       termp_fa_pre(DECL_ARGS);
 static int       termp_fd_pre(DECL_ARGS);
 static int       termp_ex_pre(DECL_ARGS);
 static int       termp_fa_pre(DECL_ARGS);
 static int       termp_fd_pre(DECL_ARGS);


@@ -115,6 +113,7 @@ static      int       termp_quote_pre(DECL_ARGS);
 static int       termp_rs_pre(DECL_ARGS);
 static int       termp_rv_pre(DECL_ARGS);
 static int       termp_sh_pre(DECL_ARGS);
 static int       termp_rs_pre(DECL_ARGS);
 static int       termp_rv_pre(DECL_ARGS);
 static int       termp_sh_pre(DECL_ARGS);

+static int       termp_skip_pre(DECL_ARGS);

 static int       termp_sm_pre(DECL_ARGS);
 static int       termp_sp_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_sm_pre(DECL_ARGS);
 static int       termp_sp_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);


@@ -140,7 +139,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { termp_under_pre, NULL }, /* Ad */
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { termp_under_pre, NULL }, /* Ad */

-       { termp_an_pre, termp_an_post }, /* An */
+       { termp_an_pre, NULL }, /* An */

        { termp_under_pre, NULL }, /* Ar */
        { termp_cd_pre, NULL }, /* Cd */
        { termp_bold_pre, NULL }, /* Cm */
        { termp_under_pre, NULL }, /* Ar */
        { termp_cd_pre, NULL }, /* Cd */
        { termp_bold_pre, NULL }, /* Cm */


@@ -187,17 +186,17 @@ static    const struct termact termacts[MDOC_MAX] = {
        { termp_quote_pre, termp_quote_post }, /* Bq */
        { termp_xx_pre, NULL }, /* Bsx */
        { termp_bx_pre, NULL }, /* Bx */
        { termp_quote_pre, termp_quote_post }, /* Bq */
        { termp_xx_pre, NULL }, /* Bsx */
        { termp_bx_pre, NULL }, /* Bx */

-       { NULL, NULL }, /* Db */
+       { termp_skip_pre, NULL }, /* Db */

        { NULL, NULL }, /* Dc */
        { termp_quote_pre, termp_quote_post }, /* Do */
        { termp_quote_pre, termp_quote_post }, /* Dq */
        { NULL, NULL }, /* Ec */ /* FIXME: no space */
        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */
        { NULL, NULL }, /* Dc */
        { termp_quote_pre, termp_quote_post }, /* Do */
        { termp_quote_pre, termp_quote_post }, /* Dq */
        { NULL, NULL }, /* Ec */ /* FIXME: no space */
        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */

-       { termp_quote_pre, termp_quote_post }, /* Eo */
+       { termp_eo_pre, termp_eo_post }, /* Eo */

        { termp_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */
        { termp_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */

-       { NULL, NULL }, /* No */
+       { termp_li_pre, NULL }, /* No */

        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */
        { termp_xx_pre, NULL }, /* Ox */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */
        { termp_xx_pre, NULL }, /* Ox */


@@ -239,7 +238,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_quote_pre, termp_quote_post }, /* Bro */
        { NULL, NULL }, /* Brc */
        { NULL, termp____post }, /* %C */
        { termp_quote_pre, termp_quote_post }, /* Bro */
        { NULL, NULL }, /* Brc */
        { NULL, termp____post }, /* %C */

-       { termp_es_pre, NULL }, /* Es */
+       { termp_skip_pre, NULL }, /* Es */

        { termp_quote_pre, termp_quote_post }, /* En */
        { termp_xx_pre, NULL }, /* Dx */
        { NULL, termp____post }, /* %Q */
        { termp_quote_pre, termp_quote_post }, /* En */
        { termp_xx_pre, NULL }, /* Dx */
        { NULL, termp____post }, /* %Q */


@@ -252,45 +251,51 @@ static    const struct termact termacts[MDOC_MAX] = {
 
 
 void
 
 
 void

-terminal_mdoc(void *arg, const struct mdoc *mdoc)
+terminal_mdoc(void *arg, const struct roff_man *mdoc)

 {
 {

-       const struct mdoc_node  *n;
-       const struct mdoc_meta  *meta;
+       struct roff_node        *n;

        struct termp            *p;
 
        p = (struct termp *)arg;
        struct termp            *p;
 
        p = (struct termp *)arg;

-
-       if (0 == p->defindent)
-               p->defindent = 5;
-

        p->overstep = 0;
        p->overstep = 0;

-       p->maxrmargin = p->defrmargin;
+       p->rmargin = p->maxrmargin = p->defrmargin;

        p->tabwidth = term_len(p, 5);
 
        p->tabwidth = term_len(p, 5);
 

-       if (NULL == p->symtab)
-               p->symtab = mchars_alloc();
-
-       n = mdoc_node(mdoc);
-       meta = mdoc_meta(mdoc);
-
-       term_begin(p, print_mdoc_head, print_mdoc_foot, meta);
-
-       if (n->child) {
-               if (MDOC_Sh != n->child->tok)
-                       term_vspace(p);
-               print_mdoc_nodelist(p, NULL, meta, n->child);
+       n = mdoc->first->child;
+       if (p->synopsisonly) {
+               while (n != NULL) {
+                       if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) {
+                               if (n->child->next->child != NULL)
+                                       print_mdoc_nodelist(p, NULL,
+                                           &mdoc->meta,
+                                           n->child->next->child);
+                               term_newln(p);
+                               break;
+                       }
+                       n = n->next;
+               }
+       } else {
+               if (p->defindent == 0)
+                       p->defindent = 5;
+               term_begin(p, print_mdoc_head, print_mdoc_foot,
+                   &mdoc->meta);
+               if (n != NULL) {
+                       if (n->tok != MDOC_Sh)
+                               term_vspace(p);
+                       print_mdoc_nodelist(p, NULL, &mdoc->meta, n);
+               }
+               term_end(p);

        }
        }

-
-       term_end(p);

 }
 
 static void
 print_mdoc_nodelist(DECL_ARGS)
 {
 
 }
 
 static void
 print_mdoc_nodelist(DECL_ARGS)
 {
 

-       print_mdoc_node(p, pair, meta, n);
-       if (n->next)
-               print_mdoc_nodelist(p, pair, meta, n->next);
+       while (n != NULL) {
+               print_mdoc_node(p, pair, meta, n);
+               n = n->next;
+       }

 }
 
 static void
 }
 
 static void


@@ -303,7 +308,8 @@ print_mdoc_node(DECL_ARGS)
        chld = 1;
        offset = p->offset;
        rmargin = p->rmargin;
        chld = 1;
        offset = p->offset;
        rmargin = p->rmargin;

-       n->prev_font = term_fontq(p);
+       n->flags &= ~MDOC_ENDED;
+       n->prev_font = p->fonti;

 
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;
 
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;


@@ -313,12 +319,9 @@ print_mdoc_node(DECL_ARGS)
         * invoked in a prior line, revert it to PREKEEP.
         */
 
         * invoked in a prior line, revert it to PREKEEP.
         */
 

-       if (TERMP_KEEP & p->flags) {
-               if (n->prev ? (n->prev->lastline != n->line) :
-                   (n->parent && n->parent->line != n->line)) {
-                       p->flags &= ~TERMP_KEEP;
-                       p->flags |= TERMP_PREKEEP;
-               }
+       if (p->flags & TERMP_KEEP && n->flags & MDOC_LINE) {
+               p->flags &= ~TERMP_KEEP;
+               p->flags |= TERMP_PREKEEP;

        }
 
        /*
        }
 
        /*


@@ -327,7 +330,7 @@ print_mdoc_node(DECL_ARGS)
         */
 
        switch (n->type) {
         */
 
        switch (n->type) {

-       case MDOC_TEXT:
+       case ROFFT_TEXT:

                if (' ' == *n->string && MDOC_LINE & n->flags)
                        term_newln(p);
                if (MDOC_DELIMC & n->flags)
                if (' ' == *n->string && MDOC_LINE & n->flags)
                        term_newln(p);
                if (MDOC_DELIMC & n->flags)


@@ -336,14 +339,21 @@ print_mdoc_node(DECL_ARGS)
                if (MDOC_DELIMO & n->flags)
                        p->flags |= TERMP_NOSPACE;
                break;
                if (MDOC_DELIMO & n->flags)
                        p->flags |= TERMP_NOSPACE;
                break;

-       case MDOC_EQN:
+       case ROFFT_EQN:
+               if ( ! (n->flags & MDOC_LINE))
+                       p->flags |= TERMP_NOSPACE;

                term_eqn(p, n->eqn);
                term_eqn(p, n->eqn);

+               if (n->next != NULL && ! (n->next->flags & MDOC_LINE))
+                       p->flags |= TERMP_NOSPACE;

                break;
                break;

-       case MDOC_TBL:
+       case ROFFT_TBL:
+               if (p->tbl.cols == NULL)
+                       term_newln(p);

                term_tbl(p, n->span);
                break;
        default:
                term_tbl(p, n->span);
                break;
        default:

-               if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
+               if (termacts[n->tok].pre &&
+                   (n->end == ENDBODY_NOT || n->nchild))

                        chld = (*termacts[n->tok].pre)
                                (p, &npair, meta, n);
                break;
                        chld = (*termacts[n->tok].pre)
                                (p, &npair, meta, n);
                break;


@@ -353,14 +363,14 @@ print_mdoc_node(DECL_ARGS)
                print_mdoc_nodelist(p, &npair, meta, n->child);
 
        term_fontpopq(p,
                print_mdoc_nodelist(p, &npair, meta, n->child);
 
        term_fontpopq(p,

-           (ENDBODY_NOT == n->end ? n : n->pending)->prev_font);
+           (ENDBODY_NOT == n->end ? n : n->body)->prev_font);

 
        switch (n->type) {
 
        switch (n->type) {

-       case MDOC_TEXT:
+       case ROFFT_TEXT:

                break;
                break;

-       case MDOC_TBL:
+       case ROFFT_TBL:

                break;
                break;

-       case MDOC_EQN:
+       case ROFFT_EQN:

                break;
        default:
                if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
                break;
        default:
                if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)


@@ -373,7 +383,7 @@ print_mdoc_node(DECL_ARGS)
                 * that it must not call the post handler again.
                 */
                if (ENDBODY_NOT != n->end)
                 * that it must not call the post handler again.
                 */
                if (ENDBODY_NOT != n->end)

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

 
                /*
                 * End of line terminating an implicit block
 
                /*
                 * End of line terminating an implicit block


@@ -395,11 +405,9 @@ print_mdoc_node(DECL_ARGS)
 }
 
 static void
 }
 
 static void

-print_mdoc_foot(struct termp *p, const void *arg)
+print_mdoc_foot(struct termp *p, const struct roff_meta *meta)

 {
 {

-       const struct mdoc_meta *meta;
-
-       meta = (const struct mdoc_meta *)arg;
+       size_t sz;

 
        term_fontrepl(p, TERMFONT_NONE);
 
 
        term_fontrepl(p, TERMFONT_NONE);
 


@@ -414,8 +422,9 @@ print_mdoc_foot(struct termp *p, const void *arg)
        term_vspace(p);
 
        p->offset = 0;
        term_vspace(p);
 
        p->offset = 0;

-       p->rmargin = (p->maxrmargin -
-           term_strlen(p, meta->date) + term_len(p, 1)) / 2;
+       sz = term_strlen(p, meta->date);
+       p->rmargin = p->maxrmargin > sz ?
+           (p->maxrmargin + term_len(p, 1) - sz) / 2 : 0;

        p->trailspace = 1;
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
 
        p->trailspace = 1;
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
 


@@ -423,7 +432,8 @@ print_mdoc_foot(struct termp *p, const void *arg)
        term_flushln(p);
 
        p->offset = p->rmargin;
        term_flushln(p);
 
        p->offset = p->rmargin;

-       p->rmargin = p->maxrmargin - term_strlen(p, meta->os);
+       sz = term_strlen(p, meta->os);
+       p->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0;

        p->flags |= TERMP_NOSPACE;
 
        term_word(p, meta->date);
        p->flags |= TERMP_NOSPACE;
 
        term_word(p, meta->date);


@@ -444,14 +454,11 @@ print_mdoc_foot(struct termp *p, const void *arg)
 }
 
 static void
 }
 
 static void

-print_mdoc_head(struct termp *p, const void *arg)
+print_mdoc_head(struct termp *p, const struct roff_meta *meta)

 {
 {

-       const struct mdoc_meta  *meta;

        char                    *volume, *title;
        size_t                   vollen, titlen;
 
        char                    *volume, *title;
        size_t                   vollen, titlen;
 

-       meta = (const struct mdoc_meta *)arg;
-

        /*
         * The header is strange.  It has three components, which are
         * really two with the first duplicated.  It goes like this:
        /*
         * The header is strange.  It has three components, which are
         * really two with the first duplicated.  It goes like this:


@@ -465,9 +472,6 @@ print_mdoc_head(struct termp *p, const void *arg)
         * switches on the manual section.
         */
 
         * switches on the manual section.
         */
 

-       p->offset = 0;
-       p->rmargin = p->maxrmargin;
-

        assert(meta->vol);
        if (NULL == meta->arch)
                volume = mandoc_strdup(meta->vol);
        assert(meta->vol);
        if (NULL == meta->arch)
                volume = mandoc_strdup(meta->vol);


@@ -476,7 +480,11 @@ print_mdoc_head(struct termp *p, const void *arg)
                    meta->vol, meta->arch);
        vollen = term_strlen(p, volume);
 
                    meta->vol, meta->arch);
        vollen = term_strlen(p, volume);
 

-       mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec);
+       if (NULL == meta->msec)
+               title = mandoc_strdup(meta->title);
+       else
+               mandoc_asprintf(&title, "%s(%s)",
+                   meta->title, meta->msec);

        titlen = term_strlen(p, title);
 
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        titlen = term_strlen(p, title);
 
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;


@@ -484,7 +492,7 @@ print_mdoc_head(struct termp *p, const void *arg)
        p->offset = 0;
        p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
            (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
        p->offset = 0;
        p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
            (p->maxrmargin - vollen + term_len(p, 1)) / 2 :

-           p->maxrmargin - vollen;
+           vollen < p->maxrmargin ?  p->maxrmargin - vollen : 0;

 
        term_word(p, title);
        term_flushln(p);
 
        term_word(p, title);
        term_flushln(p);


@@ -514,48 +522,16 @@ print_mdoc_head(struct termp *p, const void *arg)
        free(volume);
 }
 
        free(volume);
 }
 

-static size_t
-a2height(const struct termp *p, const char *v)
-{
-       struct roffsu    su;
-
-
-       assert(v);
-       if ( ! a2roffsu(v, &su, SCALE_VS))
-               SCALE_VS_INIT(&su, atoi(v));
-
-       return(term_vspan(p, &su));
-}
-
-static size_t
+static int

 a2width(const struct termp *p, const char *v)
 {
        struct roffsu    su;
 
 a2width(const struct termp *p, const char *v)
 {
        struct roffsu    su;
 

-       assert(v);
-       if ( ! a2roffsu(v, &su, SCALE_MAX))
-               SCALE_HS_INIT(&su, term_strlen(p, v));
-
-       return(term_hspan(p, &su));
-}
-
-static size_t
-a2offs(const struct termp *p, const char *v)
-{
-       struct roffsu    su;
-
-       if ('\0' == *v)
-               return(0);
-       else if (0 == strcmp(v, "left"))
-               return(0);
-       else if (0 == strcmp(v, "indent"))
-               return(term_len(p, p->defindent + 1));
-       else if (0 == strcmp(v, "indent-two"))
-               return(term_len(p, (p->defindent + 1) * 2));
-       else if ( ! a2roffsu(v, &su, SCALE_MAX))
+       if (a2roffsu(v, &su, SCALE_MAX) < 2) {

                SCALE_HS_INIT(&su, term_strlen(p, v));
                SCALE_HS_INIT(&su, term_strlen(p, v));

-
-       return(term_hspan(p, &su));
+               su.scale /= term_strlen(p, "0");
+       }
+       return(term_hspan(p, &su) / 24);

 }
 
 /*
 }
 
 /*


@@ -565,10 +541,10 @@ a2offs(const struct termp *p, const char *v)
  */
 static void
 print_bvspace(struct termp *p,
  */
 static void
 print_bvspace(struct termp *p,

-       const struct mdoc_node *bl,
-       const struct mdoc_node *n)
+       const struct roff_node *bl,
+       const struct roff_node *n)

 {
 {

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

 
        assert(n);
 
 
        assert(n);
 


@@ -581,16 +557,18 @@ print_bvspace(struct termp *p,
 
        /* Do not vspace directly after Ss/Sh. */
 
 
        /* Do not vspace directly after Ss/Sh. */
 

-       for (nn = n; nn; nn = nn->parent) {
-               if (MDOC_BLOCK != nn->type)
-                       continue;
-               if (MDOC_Ss == nn->tok)
-                       return;
-               if (MDOC_Sh == nn->tok)
+       nn = n;
+       while (nn->prev == NULL) {
+               do {
+                       nn = nn->parent;
+                       if (nn->type == ROFFT_ROOT)
+                               return;
+               } while (nn->type != ROFFT_BLOCK);
+               if (nn->tok == MDOC_Sh || nn->tok == MDOC_Ss)

                        return;
                        return;

-               if (NULL == nn->prev)
-                       continue;
-               break;
+               if (nn->tok == MDOC_It &&
+                   nn->parent->parent->norm->Bl.type != LIST_item)
+                       break;

        }
 
        /* A `-column' does not assert vspace within the list. */
        }
 
        /* A `-column' does not assert vspace within the list. */


@@ -623,13 +601,13 @@ termp_ll_pre(DECL_ARGS)
 static int
 termp_it_pre(DECL_ARGS)
 {
 static int
 termp_it_pre(DECL_ARGS)
 {

-       const struct mdoc_node *bl, *nn;

        char                    buf[24];
        char                    buf[24];

-       int                     i;
-       size_t                  width, offset, ncols, dcol;
+       const struct roff_node *bl, *nn;
+       size_t                  ncols, dcol;
+       int                     i, offset, width;

        enum mdoc_list          type;
 
        enum mdoc_list          type;
 

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

                print_bvspace(p, n->parent->parent, n);
                return(1);
        }
                print_bvspace(p, n->parent->parent, n);
                return(1);
        }


@@ -637,20 +615,51 @@ termp_it_pre(DECL_ARGS)
        bl = n->parent->parent->parent;
        type = bl->norm->Bl.type;
 
        bl = n->parent->parent->parent;
        type = bl->norm->Bl.type;
 

+       /*
+        * Defaults for specific list types.
+        */
+
+       switch (type) {
+       case LIST_bullet:
+               /* FALLTHROUGH */
+       case LIST_dash:
+               /* FALLTHROUGH */
+       case LIST_hyphen:
+               /* FALLTHROUGH */
+       case LIST_enum:
+               width = term_len(p, 2);
+               break;
+       case LIST_hang:
+               width = term_len(p, 8);
+               break;
+       case LIST_column:
+               /* FALLTHROUGH */
+       case LIST_tag:
+               width = term_len(p, 10);
+               break;
+       default:
+               width = 0;
+               break;
+       }
+       offset = 0;
+

        /*
         * First calculate width and offset.  This is pretty easy unless
         * we're a -column list, in which case all prior columns must
         * be accounted for.
         */
 
        /*
         * First calculate width and offset.  This is pretty easy unless
         * we're a -column list, in which case all prior columns must
         * be accounted for.
         */
 

-       width = offset = 0;
-
-       if (bl->norm->Bl.offs)
-               offset = a2offs(p, bl->norm->Bl.offs);
+       if (bl->norm->Bl.offs != NULL) {
+               offset = a2width(p, bl->norm->Bl.offs);
+               if (offset < 0 && (size_t)(-offset) > p->offset)
+                       offset = -p->offset;
+               else if (offset > SHRT_MAX)
+                       offset = 0;
+       }

 
        switch (type) {
        case LIST_column:
 
        switch (type) {
        case LIST_column:

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

                        break;
 
                /*
                        break;
 
                /*


@@ -667,8 +676,8 @@ termp_it_pre(DECL_ARGS)
                    ncols == 5 ? term_len(p, 3) : term_len(p, 1);
 
                /*
                    ncols == 5 ? term_len(p, 3) : term_len(p, 1);
 
                /*

-                * Calculate the offset by applying all prior MDOC_BODY,
-                * so we stop at the MDOC_HEAD (NULL == nn->prev).
+                * Calculate the offset by applying all prior ROFFT_BODY,
+                * so we stop at the ROFFT_HEAD (nn->prev == NULL).

                 */
 
                for (i = 0, nn = n->prev;
                 */
 
                for (i = 0, nn = n->prev;


@@ -701,39 +710,11 @@ termp_it_pre(DECL_ARGS)
                 * number for buffering single arguments.  See the above
                 * handling for column for how this changes.
                 */
                 * number for buffering single arguments.  See the above
                 * handling for column for how this changes.
                 */

-               assert(bl->norm->Bl.width);

                width = a2width(p, bl->norm->Bl.width) + term_len(p, 2);
                width = a2width(p, bl->norm->Bl.width) + term_len(p, 2);

-               break;
-       }
-
-       /*
-        * List-type can override the width in the case of fixed-head
-        * values (bullet, dash/hyphen, enum).  Tags need a non-zero
-        * offset.
-        */
-
-       switch (type) {
-       case LIST_bullet:
-               /* FALLTHROUGH */
-       case LIST_dash:
-               /* FALLTHROUGH */
-       case LIST_hyphen:
-               /* FALLTHROUGH */
-       case LIST_enum:
-               if (width < term_len(p, 2))
-                       width = term_len(p, 2);
-               break;
-       case LIST_hang:
-               if (0 == width)
-                       width = term_len(p, 8);
-               break;
-       case LIST_column:
-               /* FALLTHROUGH */
-       case LIST_tag:
-               if (0 == width)
-                       width = term_len(p, 10);
-               break;
-       default:
+               if (width < 0 && (size_t)(-width) > p->offset)
+                       width = -p->offset;
+               else if (width > SHRT_MAX)
+                       width = 0;

                break;
        }
 
                break;
        }
 


@@ -746,11 +727,11 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_diag:
 
        switch (type) {
        case LIST_diag:

-               if (MDOC_BODY == n->type)
+               if (n->type == ROFFT_BODY)

                        term_word(p, "\\ \\ ");
                break;
        case LIST_inset:
                        term_word(p, "\\ \\ ");
                break;
        case LIST_inset:

-               if (MDOC_BODY == n->type && n->parent->head->nchild)
+               if (n->type == ROFFT_BODY && n->parent->head->nchild)

                        term_word(p, "\\ ");
                break;
        default:
                        term_word(p, "\\ ");
                break;
        default:


@@ -761,7 +742,7 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_diag:
 
        switch (type) {
        case LIST_diag:

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

                        term_fontpush(p, TERMFONT_BOLD);
                break;
        default:
                        term_fontpush(p, TERMFONT_BOLD);
                break;
        default:


@@ -779,23 +760,23 @@ termp_it_pre(DECL_ARGS)
        case LIST_enum:
                /*
                 * Weird special case.
        case LIST_enum:
                /*
                 * Weird special case.

-                * Very narrow enum lists actually hang.
+                * Some very narrow lists actually hang.

                 */
                 */

-               if (width == term_len(p, 2))
-                       p->flags |= TERMP_HANG;

                /* FALLTHROUGH */
        case LIST_bullet:
                /* FALLTHROUGH */
        case LIST_dash:
                /* FALLTHROUGH */
        case LIST_hyphen:
                /* FALLTHROUGH */
        case LIST_bullet:
                /* FALLTHROUGH */
        case LIST_dash:
                /* FALLTHROUGH */
        case LIST_hyphen:

-               if (MDOC_HEAD != n->type)
+               if (width <= (int)term_len(p, 2))
+                       p->flags |= TERMP_HANG;
+               if (n->type != ROFFT_HEAD)

                        break;
                p->flags |= TERMP_NOBREAK;
                p->trailspace = 1;
                break;
        case LIST_hang:
                        break;
                p->flags |= TERMP_NOBREAK;
                p->trailspace = 1;
                break;
        case LIST_hang:

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

                        break;
 
                /*
                        break;
 
                /*


@@ -804,7 +785,8 @@ termp_it_pre(DECL_ARGS)
                 * the "overstep" effect in term_flushln() and treat
                 * this as a `-ohang' list instead.
                 */
                 * the "overstep" effect in term_flushln() and treat
                 * this as a `-ohang' list instead.
                 */

-               if (n->next->child &&
+               if (NULL != n->next &&
+                   NULL != n->next->child &&

                    (MDOC_Bl == n->next->child->tok ||
                     MDOC_Bd == n->next->child->tok))
                        break;
                    (MDOC_Bl == n->next->child->tok ||
                     MDOC_Bd == n->next->child->tok))
                        break;


@@ -813,7 +795,7 @@ termp_it_pre(DECL_ARGS)
                p->trailspace = 1;
                break;
        case LIST_tag:
                p->trailspace = 1;
                break;
        case LIST_tag:

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

                        break;
 
                p->flags |= TERMP_NOBREAK | TERMP_BRIND;
                        break;
 
                p->flags |= TERMP_NOBREAK | TERMP_BRIND;


@@ -823,7 +805,7 @@ termp_it_pre(DECL_ARGS)
                        p->flags |= TERMP_DANGLE;
                break;
        case LIST_column:
                        p->flags |= TERMP_DANGLE;
                break;
        case LIST_column:

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

                        break;
 
                if (NULL == n->next) {
                        break;
 
                if (NULL == n->next) {


@@ -836,7 +818,7 @@ termp_it_pre(DECL_ARGS)
 
                break;
        case LIST_diag:
 
                break;
        case LIST_diag:

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

                        break;
                p->flags |= TERMP_NOBREAK | TERMP_BRIND;
                p->trailspace = 1;
                        break;
                p->flags |= TERMP_NOBREAK | TERMP_BRIND;
                p->trailspace = 1;


@@ -860,7 +842,9 @@ termp_it_pre(DECL_ARGS)
                 * don't want to recalculate rmargin and offsets when
                 * using `Bd' or `Bl' within `-hang' overstep lists.
                 */
                 * don't want to recalculate rmargin and offsets when
                 * using `Bd' or `Bl' within `-hang' overstep lists.
                 */

-               if (MDOC_HEAD == n->type && n->next->child &&
+               if (n->type == ROFFT_HEAD &&
+                   NULL != n->next &&
+                   NULL != n->next->child &&

                    (MDOC_Bl == n->next->child->tok ||
                     MDOC_Bd == n->next->child->tok))
                        break;
                    (MDOC_Bl == n->next->child->tok ||
                     MDOC_Bd == n->next->child->tok))
                        break;


@@ -874,14 +858,10 @@ termp_it_pre(DECL_ARGS)
        case LIST_hyphen:
                /* FALLTHROUGH */
        case LIST_tag:
        case LIST_hyphen:
                /* FALLTHROUGH */
        case LIST_tag:

-               assert(width);
-               if (MDOC_HEAD == n->type)
+               if (n->type == ROFFT_HEAD)

                        p->rmargin = p->offset + width;
                        p->rmargin = p->offset + width;

-               else {
+               else

                        p->offset += width;
                        p->offset += width;

-                       if (p->rmargin < p->offset)
-                               p->rmargin = p->offset;
-               }

                break;
        case LIST_column:
                assert(width);
                break;
        case LIST_column:
                assert(width);


@@ -890,7 +870,7 @@ termp_it_pre(DECL_ARGS)
                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */
                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */

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

                        break;
                if (NULL == n->next && p->rmargin < p->maxrmargin)
                        p->rmargin = p->maxrmargin;
                        break;
                if (NULL == n->next && p->rmargin < p->maxrmargin)
                        p->rmargin = p->maxrmargin;


@@ -904,7 +884,7 @@ termp_it_pre(DECL_ARGS)
         * HEAD character (temporarily bold, in some cases).
         */
 
         * HEAD character (temporarily bold, in some cases).
         */
 

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

                switch (type) {
                case LIST_bullet:
                        term_fontpush(p, TERMFONT_BOLD);
                switch (type) {
                case LIST_bullet:
                        term_fontpush(p, TERMFONT_BOLD);


@@ -942,11 +922,11 @@ termp_it_pre(DECL_ARGS)
        case LIST_hyphen:
                /* FALLTHROUGH */
        case LIST_enum:
        case LIST_hyphen:
                /* FALLTHROUGH */
        case LIST_enum:

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

                        return(0);
                break;
        case LIST_column:
                        return(0);
                break;
        case LIST_column:

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

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


@@ -961,7 +941,7 @@ termp_it_post(DECL_ARGS)
 {
        enum mdoc_list     type;
 
 {
        enum mdoc_list     type;
 

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

                return;
 
        type = n->parent->parent->parent->norm->Bl.type;
                return;
 
        type = n->parent->parent->parent->norm->Bl.type;


@@ -972,11 +952,11 @@ termp_it_post(DECL_ARGS)
        case LIST_diag:
                /* FALLTHROUGH */
        case LIST_inset:
        case LIST_diag:
                /* FALLTHROUGH */
        case LIST_inset:

-               if (MDOC_BODY == n->type)
+               if (n->type == ROFFT_BODY)

                        term_newln(p);
                break;
        case LIST_column:
                        term_newln(p);
                break;
        case LIST_column:

-               if (MDOC_BODY == n->type)
+               if (n->type == ROFFT_BODY)

                        term_flushln(p);
                break;
        default:
                        term_flushln(p);
                break;
        default:


@@ -998,40 +978,43 @@ termp_it_post(DECL_ARGS)
 static int
 termp_nm_pre(DECL_ARGS)
 {
 static int
 termp_nm_pre(DECL_ARGS)
 {

+       const char      *cp;

 
 

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

                p->flags |= TERMP_PREKEEP;
                return(1);
        }
 
                p->flags |= TERMP_PREKEEP;
                return(1);
        }
 

-       if (MDOC_BODY == n->type) {
+       if (n->type == ROFFT_BODY) {

                if (NULL == n->child)
                        return(0);
                p->flags |= TERMP_NOSPACE;
                if (NULL == n->child)
                        return(0);
                p->flags |= TERMP_NOSPACE;

-               p->offset += term_len(p, 1) +
-                   (NULL == n->prev->child ?
-                    term_strlen(p, meta->name) :
-                    MDOC_TEXT == n->prev->child->type ?
-                    term_strlen(p, n->prev->child->string) :
-                    term_len(p, 5));
-               if (p->rmargin < p->offset)
-                       p->rmargin = p->offset;
+               cp = NULL;
+               if (n->prev->child != NULL)
+                   cp = n->prev->child->string;
+               if (cp == NULL)
+                       cp = meta->name;
+               if (cp == NULL)
+                       p->offset += term_len(p, 6);
+               else
+                       p->offset += term_len(p, 1) + term_strlen(p, cp);

                return(1);
        }
 
        if (NULL == n->child && NULL == meta->name)
                return(0);
 
                return(1);
        }
 
        if (NULL == n->child && NULL == meta->name)
                return(0);
 

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

                synopsis_pre(p, n->parent);
 
                synopsis_pre(p, n->parent);
 

-       if (MDOC_HEAD == n->type && n->next->child) {
+       if (n->type == ROFFT_HEAD &&
+           NULL != n->next && NULL != n->next->child) {

                p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND;
                p->trailspace = 1;
                p->rmargin = p->offset + term_len(p, 1);
                if (NULL == n->child) {
                        p->rmargin += term_strlen(p, meta->name);
                p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND;
                p->trailspace = 1;
                p->rmargin = p->offset + term_len(p, 1);
                if (NULL == n->child) {
                        p->rmargin += term_strlen(p, meta->name);

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

                        p->rmargin += term_strlen(p, n->child->string);
                        if (n->child->next)
                                p->flags |= TERMP_HANG;
                        p->rmargin += term_strlen(p, n->child->string);
                        if (n->child->next)
                                p->flags |= TERMP_HANG;


@@ -1051,13 +1034,14 @@ static void
 termp_nm_post(DECL_ARGS)
 {
 
 termp_nm_post(DECL_ARGS)
 {
 

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

                p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
                p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);

-       } else if (MDOC_HEAD == n->type && n->next->child) {
+       } else if (n->type == ROFFT_HEAD &&
+           NULL != n->next && NULL != n->next->child) {

                term_flushln(p);
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
                p->trailspace = 0;
                term_flushln(p);
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
                p->trailspace = 0;

-       } else if (MDOC_BODY == n->type && n->child)
+       } else if (n->type == ROFFT_BODY && n->child != NULL)

                term_flushln(p);
 }
 
                term_flushln(p);
 }
 


@@ -1068,9 +1052,10 @@ termp_fl_pre(DECL_ARGS)
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, "\\-");
 
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, "\\-");
 

-       if (n->child)
-               p->flags |= TERMP_NOSPACE;
-       else if (n->next && n->next->line == n->line)
+       if ( ! (n->nchild == 0 &&
+           (n->next == NULL ||
+            n->next->type == ROFFT_TEXT ||
+            n->next->flags & MDOC_LINE)))

                p->flags |= TERMP_NOSPACE;
 
        return(1);
                p->flags |= TERMP_NOSPACE;
 
        return(1);


@@ -1091,54 +1076,24 @@ static int
 termp_an_pre(DECL_ARGS)
 {
 
 termp_an_pre(DECL_ARGS)
 {
 

-       if (NULL == n->child)
-               return(1);
-
-       /*
-        * If not in the AUTHORS section, `An -split' will cause
-        * newlines to occur before the author name.  If in the AUTHORS
-        * section, by default, the first `An' invocation is nosplit,
-        * then all subsequent ones, regardless of whether interspersed
-        * with other macros/text, are split.  -split, in this case,
-        * will override the condition of the implied first -nosplit.
-        */
-
-       if (n->sec == SEC_AUTHORS) {
-               if ( ! (TERMP_ANPREC & p->flags)) {
-                       if (TERMP_SPLIT & p->flags)
-                               term_newln(p);
-                       return(1);
-               }
-               if (TERMP_NOSPLIT & p->flags)
-                       return(1);
-               term_newln(p);
-               return(1);
-       }
-
-       if (TERMP_SPLIT & p->flags)
-               term_newln(p);
-
-       return(1);
-}
-
-static void
-termp_an_post(DECL_ARGS)
-{
-
-       if (n->child) {
-               if (SEC_AUTHORS == n->sec)
-                       p->flags |= TERMP_ANPREC;
-               return;
-       }
-
-       if (AUTH_split == n->norm->An.auth) {
+       if (n->norm->An.auth == AUTH_split) {

                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;
                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;

-       } else if (AUTH_nosplit == n->norm->An.auth) {
+               return(0);
+       }
+       if (n->norm->An.auth == AUTH_nosplit) {

                p->flags &= ~TERMP_SPLIT;
                p->flags |= TERMP_NOSPLIT;
                p->flags &= ~TERMP_SPLIT;
                p->flags |= TERMP_NOSPLIT;

+               return(0);

        }
 
        }
 

+       if (p->flags & TERMP_SPLIT)
+               term_newln(p);
+
+       if (n->sec == SEC_AUTHORS && ! (p->flags & TERMP_NOSPLIT))
+               p->flags |= TERMP_SPLIT;
+
+       return(1);

 }
 
 static int
 }
 
 static int


@@ -1156,7 +1111,7 @@ termp_rs_pre(DECL_ARGS)
 
        if (SEC_SEE_ALSO != n->sec)
                return(1);
 
        if (SEC_SEE_ALSO != n->sec)
                return(1);

-       if (MDOC_BLOCK == n->type && n->prev)
+       if (n->type == ROFFT_BLOCK && n->prev != NULL)

                term_vspace(p);
        return(1);
 }
                term_vspace(p);
        return(1);
 }


@@ -1252,14 +1207,8 @@ static int
 termp_nd_pre(DECL_ARGS)
 {
 
 termp_nd_pre(DECL_ARGS)
 {
 

-       if (MDOC_BODY != n->type)
-               return(1);
-
-#if defined(__OpenBSD__) || defined(__linux__)
-       term_word(p, "\\(en");
-#else
-       term_word(p, "\\(em");
-#endif
+       if (n->type == ROFFT_BODY)
+               term_word(p, "\\(en");

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


@@ -1267,14 +1216,14 @@ static int
 termp_bl_pre(DECL_ARGS)
 {
 
 termp_bl_pre(DECL_ARGS)
 {
 

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

 }
 
 static void
 termp_bl_post(DECL_ARGS)
 {
 
 }
 
 static void
 termp_bl_post(DECL_ARGS)
 {
 

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

                term_newln(p);
 }
 
                term_newln(p);
 }
 


@@ -1285,7 +1234,7 @@ termp_xr_pre(DECL_ARGS)
        if (NULL == (n = n->child))
                return(0);
 
        if (NULL == (n = n->child))
                return(0);
 

-       assert(MDOC_TEXT == n->type);
+       assert(n->type == ROFFT_TEXT);

        term_word(p, n->string);
 
        if (NULL == (n = n->next))
        term_word(p, n->string);
 
        if (NULL == (n = n->next))


@@ -1295,7 +1244,7 @@ termp_xr_pre(DECL_ARGS)
        term_word(p, "(");
        p->flags |= TERMP_NOSPACE;
 
        term_word(p, "(");
        p->flags |= TERMP_NOSPACE;
 

-       assert(MDOC_TEXT == n->type);
+       assert(n->type == ROFFT_TEXT);

        term_word(p, n->string);
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, n->string);
 
        p->flags |= TERMP_NOSPACE;


@@ -1310,7 +1259,7 @@ termp_xr_pre(DECL_ARGS)
  * macro combos).
  */
 static void
  * macro combos).
  */
 static void

-synopsis_pre(struct termp *p, const struct mdoc_node *n)
+synopsis_pre(struct termp *p, const struct roff_node *n)

 {
        /*
         * Obviously, if we're not in a SYNOPSIS or no prior macros
 {
        /*
         * Obviously, if we're not in a SYNOPSIS or no prior macros


@@ -1365,13 +1314,13 @@ static int
 termp_vt_pre(DECL_ARGS)
 {
 
 termp_vt_pre(DECL_ARGS)
 {
 

-       if (MDOC_ELEM == n->type) {
+       if (n->type == ROFFT_ELEM) {

                synopsis_pre(p, n);
                return(termp_under_pre(p, pair, meta, n));
                synopsis_pre(p, n);
                return(termp_under_pre(p, pair, meta, n));

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

                synopsis_pre(p, n);
                return(1);
                synopsis_pre(p, n);
                return(1);

-       } else if (MDOC_HEAD == n->type)
+       } else if (n->type == ROFFT_HEAD)

                return(0);
 
        return(termp_under_pre(p, pair, meta, n));
                return(0);
 
        return(termp_under_pre(p, pair, meta, n));


@@ -1404,19 +1353,22 @@ static int
 termp_sh_pre(DECL_ARGS)
 {
 
 termp_sh_pre(DECL_ARGS)
 {
 

-       /* No vspace between consecutive `Sh' calls. */
-

        switch (n->type) {
        switch (n->type) {

-       case MDOC_BLOCK:
-               if (n->prev && MDOC_Sh == n->prev->tok)
-                       if (NULL == n->prev->body->child)
-                               break;
-               term_vspace(p);
+       case ROFFT_BLOCK:
+               /*
+                * Vertical space before sections, except
+                * when the previous section was empty.
+                */
+               if (n->prev == NULL ||
+                   MDOC_Sh != n->prev->tok ||
+                   (n->prev->body != NULL &&
+                    n->prev->body->child != NULL))
+                       term_vspace(p);

                break;
                break;

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                term_fontpush(p, TERMFONT_BOLD);
                break;
                term_fontpush(p, TERMFONT_BOLD);
                break;

-       case MDOC_BODY:
+       case ROFFT_BODY:

                p->offset = term_len(p, p->defindent);
                if (SEC_AUTHORS == n->sec)
                        p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);
                p->offset = term_len(p, p->defindent);
                if (SEC_AUTHORS == n->sec)
                        p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);


@@ -1432,10 +1384,10 @@ termp_sh_post(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                term_newln(p);
                break;
                term_newln(p);
                break;

-       case MDOC_BODY:
+       case ROFFT_BODY:

                term_newln(p);
                p->offset = 0;
                break;
                term_newln(p);
                p->offset = 0;
                break;


@@ -1474,7 +1426,7 @@ static int
 termp_d1_pre(DECL_ARGS)
 {
 
 termp_d1_pre(DECL_ARGS)
 {
 

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

                return(1);
        term_newln(p);
        p->offset += term_len(p, p->defindent + 1);
                return(1);
        term_newln(p);
        p->offset += term_len(p, p->defindent + 1);


@@ -1510,7 +1462,7 @@ termp_fn_pre(DECL_ARGS)
                p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
        }
 
                p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
        }
 

-       assert(MDOC_TEXT == n->type);
+       assert(n->type == ROFFT_TEXT);

        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, n->string);
        term_fontpop(p);
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, n->string);
        term_fontpop(p);


@@ -1527,7 +1479,7 @@ termp_fn_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
 
        for (n = n->next; n; n = n->next) {
        p->flags |= TERMP_NOSPACE;
 
        for (n = n->next; n; n = n->next) {

-               assert(MDOC_TEXT == n->type);
+               assert(n->type == ROFFT_TEXT);

                term_fontpush(p, TERMFONT_UNDER);
                if (pretty)
                        p->flags |= TERMP_NBRWORD;
                term_fontpush(p, TERMFONT_UNDER);
                if (pretty)
                        p->flags |= TERMP_NBRWORD;


@@ -1555,7 +1507,7 @@ termp_fn_pre(DECL_ARGS)
 static int
 termp_fa_pre(DECL_ARGS)
 {
 static int
 termp_fa_pre(DECL_ARGS)
 {

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

 
        if (n->parent->tok != MDOC_Fo) {
                term_fontpush(p, TERMFONT_UNDER);
 
        if (n->parent->tok != MDOC_Fo) {
                term_fontpush(p, TERMFONT_UNDER);


@@ -1581,16 +1533,31 @@ static int
 termp_bd_pre(DECL_ARGS)
 {
        size_t                   tabwidth, lm, len, rm, rmax;
 termp_bd_pre(DECL_ARGS)
 {
        size_t                   tabwidth, lm, len, rm, rmax;

-       struct mdoc_node        *nn;
+       struct roff_node        *nn;
+       int                      offset;

 
 

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

                print_bvspace(p, n, n);
                return(1);
                print_bvspace(p, n, n);
                return(1);

-       } else if (MDOC_HEAD == n->type)
+       } else if (n->type == ROFFT_HEAD)

                return(0);
 
                return(0);
 

-       if (n->norm->Bd.offs)
-               p->offset += a2offs(p, n->norm->Bd.offs);
+       /* Handle the -offset argument. */
+
+       if (n->norm->Bd.offs == NULL ||
+           ! strcmp(n->norm->Bd.offs, "left"))
+               /* nothing */;
+       else if ( ! strcmp(n->norm->Bd.offs, "indent"))
+               p->offset += term_len(p, p->defindent + 1);
+       else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
+               p->offset += term_len(p, (p->defindent + 1) * 2);
+       else {
+               offset = a2width(p, n->norm->Bd.offs);
+               if (offset < 0 && (size_t)(-offset) > p->offset)
+                       p->offset = 0;
+               else if (offset < SHRT_MAX)
+                       p->offset += offset;
+       }

 
        /*
         * If -ragged or -filled are specified, the block does nothing
 
        /*
         * If -ragged or -filled are specified, the block does nothing


@@ -1616,7 +1583,7 @@ termp_bd_pre(DECL_ARGS)
 
        for (nn = n->child; nn; nn = nn->next) {
                if (DISP_centered == n->norm->Bd.type) {
 
        for (nn = n->child; nn; nn = nn->next) {
                if (DISP_centered == n->norm->Bd.type) {

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

                                len = term_strlen(p, nn->string);
                                p->offset = len >= rm ? 0 :
                                    lm + len >= rm ? rm - len :
                                len = term_strlen(p, nn->string);
                                p->offset = len >= rm ? 0 :
                                    lm + len >= rm ? rm - len :


@@ -1651,7 +1618,8 @@ termp_bd_pre(DECL_ARGS)
                default:
                        break;
                }
                default:
                        break;
                }

-               if (nn->next && nn->next->line == nn->line)
+               if (p->flags & TERMP_NONEWLINE ||
+                   (nn->next && ! (nn->next->flags & MDOC_LINE)))

                        continue;
                term_flushln(p);
                p->flags |= TERMP_NOSPACE;
                        continue;
                term_flushln(p);
                p->flags |= TERMP_NOSPACE;


@@ -1668,7 +1636,7 @@ termp_bd_post(DECL_ARGS)
 {
        size_t           rm, rmax;
 
 {
        size_t           rm, rmax;
 

-       if (MDOC_BODY != n->type)
+       if (n->type != ROFFT_BODY)

                return;
 
        rm = p->rmargin;
                return;
 
        rm = p->rmargin;


@@ -1753,7 +1721,8 @@ static void
 termp_pf_post(DECL_ARGS)
 {
 
 termp_pf_post(DECL_ARGS)
 {
 

-       p->flags |= TERMP_NOSPACE;
+       if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+               p->flags |= TERMP_NOSPACE;

 }
 
 static int
 }
 
 static int


@@ -1761,16 +1730,16 @@ termp_ss_pre(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

                term_newln(p);
                if (n->prev)
                        term_vspace(p);
                break;
                term_newln(p);
                if (n->prev)
                        term_vspace(p);
                break;

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                term_fontpush(p, TERMFONT_BOLD);
                p->offset = term_len(p, (p->defindent+1)/2);
                break;
                term_fontpush(p, TERMFONT_BOLD);
                p->offset = term_len(p, (p->defindent+1)/2);
                break;

-       case MDOC_BODY:
+       case ROFFT_BODY:

                p->offset = term_len(p, p->defindent);
                break;
        default:
                p->offset = term_len(p, p->defindent);
                break;
        default:


@@ -1784,7 +1753,7 @@ static void
 termp_ss_post(DECL_ARGS)
 {
 
 termp_ss_post(DECL_ARGS)
 {
 

-       if (n->type == MDOC_HEAD || n->type == MDOC_BODY)
+       if (n->type == ROFFT_HEAD || n->type == ROFFT_BODY)

                term_newln(p);
 }
 
                term_newln(p);
 }
 


@@ -1833,11 +1802,17 @@ termp_in_post(DECL_ARGS)
 static int
 termp_sp_pre(DECL_ARGS)
 {
 static int
 termp_sp_pre(DECL_ARGS)
 {

-       size_t           i, len;
+       struct roffsu    su;
+       int              i, len;

 
        switch (n->tok) {
        case MDOC_sp:
 
        switch (n->tok) {
        case MDOC_sp:

-               len = n->child ? a2height(p, n->child->string) : 1;
+               if (n->child) {
+                       if ( ! a2roffsu(n->child->string, &su, SCALE_VS))
+                               su.scale = 1.0;
+                       len = term_vspan(p, &su);
+               } else
+                       len = 1;

                break;
        case MDOC_br:
                len = 0;
                break;
        case MDOC_br:
                len = 0;


@@ -1849,14 +1824,17 @@ termp_sp_pre(DECL_ARGS)
 
        if (0 == len)
                term_newln(p);
 
        if (0 == len)
                term_newln(p);

-       for (i = 0; i < len; i++)
-               term_vspace(p);
+       else if (len < 0)
+               p->skipvsp -= len;
+       else
+               for (i = 0; i < len; i++)
+                       term_vspace(p);

 
        return(0);
 }
 
 static int
 
        return(0);
 }
 
 static int

-termp_es_pre(DECL_ARGS)
+termp_skip_pre(DECL_ARGS)

 {
 
        return(0);
 {
 
        return(0);


@@ -1866,14 +1844,15 @@ static int
 termp_quote_pre(DECL_ARGS)
 {
 
 termp_quote_pre(DECL_ARGS)
 {
 

-       if (MDOC_BODY != n->type && MDOC_ELEM != n->type)
+       if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)

                return(1);
 
        switch (n->tok) {
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:
                return(1);
 
        switch (n->tok) {
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:

-               term_word(p, "<");
+               term_word(p, n->nchild == 1 &&
+                   n->child->tok == MDOC_Mt ? "<" : "\\(la");

                break;
        case MDOC_Bro:
                /* FALLTHROUGH */
                break;
        case MDOC_Bro:
                /* FALLTHROUGH */


@@ -1892,7 +1871,7 @@ termp_quote_pre(DECL_ARGS)
        case MDOC_Do:
                /* FALLTHROUGH */
        case MDOC_Dq:
        case MDOC_Do:
                /* FALLTHROUGH */
        case MDOC_Dq:

-               term_word(p, "\\(lq");
+               term_word(p, "\\(Lq");

                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||
                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||


@@ -1900,8 +1879,6 @@ termp_quote_pre(DECL_ARGS)
                        return(1);
                term_word(p, n->norm->Es->child->string);
                break;
                        return(1);
                term_word(p, n->norm->Es->child->string);
                break;

-       case MDOC_Eo:
-               break;

        case MDOC_Po:
                /* FALLTHROUGH */
        case MDOC_Pq:
        case MDOC_Po:
                /* FALLTHROUGH */
        case MDOC_Pq:


@@ -1934,17 +1911,17 @@ static void
 termp_quote_post(DECL_ARGS)
 {
 
 termp_quote_post(DECL_ARGS)
 {
 

-       if (MDOC_BODY != n->type && MDOC_ELEM != n->type)
+       if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)

                return;
 
                return;
 

-       if (MDOC_En != n->tok)
-               p->flags |= TERMP_NOSPACE;
+       p->flags |= TERMP_NOSPACE;

 
        switch (n->tok) {
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:
 
        switch (n->tok) {
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:

-               term_word(p, ">");
+               term_word(p, n->nchild == 1 &&
+                   n->child->tok == MDOC_Mt ? ">" : "\\(ra");

                break;
        case MDOC_Bro:
                /* FALLTHROUGH */
                break;
        case MDOC_Bro:
                /* FALLTHROUGH */


@@ -1963,17 +1940,15 @@ termp_quote_post(DECL_ARGS)
        case MDOC_Do:
                /* FALLTHROUGH */
        case MDOC_Dq:
        case MDOC_Do:
                /* FALLTHROUGH */
        case MDOC_Dq:

-               term_word(p, "\\(rq");
+               term_word(p, "\\(Rq");

                break;
        case MDOC_En:
                break;
        case MDOC_En:

-               if (NULL != n->norm->Es &&
-                   NULL != n->norm->Es->child &&
-                   NULL != n->norm->Es->child->next) {
-                       p->flags |= TERMP_NOSPACE;
+               if (n->norm->Es == NULL ||
+                   n->norm->Es->child == NULL ||
+                   n->norm->Es->child->next == NULL)
+                       p->flags &= ~TERMP_NOSPACE;
+               else

                        term_word(p, n->norm->Es->child->next->string);
                        term_word(p, n->norm->Es->child->next->string);

-               }
-               break;
-       case MDOC_Eo:

                break;
        case MDOC_Po:
                /* FALLTHROUGH */
                break;
        case MDOC_Po:
                /* FALLTHROUGH */


@@ -2000,6 +1975,50 @@ termp_quote_post(DECL_ARGS)
        }
 }
 
        }
 }
 

+static int
+termp_eo_pre(DECL_ARGS)
+{
+
+       if (n->type != ROFFT_BODY)
+               return(1);
+
+       if (n->end == ENDBODY_NOT &&
+           n->parent->head->child == NULL &&
+           n->child != NULL &&
+           n->child->end != ENDBODY_NOT)
+               term_word(p, "\\&");
+       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)))
+               p->flags |= TERMP_NOSPACE;
+
+       return(1);
+}
+
+static void
+termp_eo_post(DECL_ARGS)
+{
+       int      body, tail;
+
+       if (n->type != ROFFT_BODY)
+               return;
+
+       if (n->end != ENDBODY_NOT) {
+               p->flags &= ~TERMP_NOSPACE;
+               return;
+       }
+
+       body = n->child != NULL || n->parent->head->child != NULL;
+       tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+       if (body && tail)
+               p->flags |= TERMP_NOSPACE;
+       else if ( ! (body || tail))
+               term_word(p, "\\&");
+       else if ( ! tail)
+               p->flags &= ~TERMP_NOSPACE;
+}
+

 static int
 termp_fo_pre(DECL_ARGS)
 {
 static int
 termp_fo_pre(DECL_ARGS)
 {


@@ -2008,10 +2027,10 @@ termp_fo_pre(DECL_ARGS)
 
        pretty = MDOC_SYNPRETTY & n->flags;
 
 
        pretty = MDOC_SYNPRETTY & n->flags;
 

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

                synopsis_pre(p, n);
                return(1);
                synopsis_pre(p, n);
                return(1);

-       } else if (MDOC_BODY == n->type) {
+       } else if (n->type == ROFFT_BODY) {

                if (pretty) {
                        rmargin = p->rmargin;
                        p->rmargin = p->offset + term_len(p, 4);
                if (pretty) {
                        rmargin = p->rmargin;
                        p->rmargin = p->offset + term_len(p, 4);


@@ -2046,7 +2065,7 @@ static void
 termp_fo_post(DECL_ARGS)
 {
 
 termp_fo_post(DECL_ARGS)
 {
 

-       if (MDOC_BODY != n->type)
+       if (n->type != ROFFT_BODY)

                return;
 
        p->flags |= TERMP_NOSPACE;
                return;
 
        p->flags |= TERMP_NOSPACE;


@@ -2063,9 +2082,9 @@ static int
 termp_bf_pre(DECL_ARGS)
 {
 
 termp_bf_pre(DECL_ARGS)
 {
 

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

                return(0);
                return(0);

-       else if (MDOC_BODY != n->type)
+       else if (n->type != ROFFT_BODY)

                return(1);
 
        if (FONT_Em == n->norm->Bf.font)
                return(1);
 
        if (FONT_Em == n->norm->Bf.font)


@@ -2143,7 +2162,7 @@ termp_li_pre(DECL_ARGS)
 static int
 termp_lk_pre(DECL_ARGS)
 {
 static int
 termp_lk_pre(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);


@@ -2171,11 +2190,11 @@ termp_bk_pre(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

                break;
                break;

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                return(0);
                return(0);

-       case MDOC_BODY:
+       case ROFFT_BODY:

                if (n->parent->args || 0 == n->prev->nchild)
                        p->flags |= TERMP_PREKEEP;
                break;
                if (n->parent->args || 0 == n->prev->nchild)
                        p->flags |= TERMP_PREKEEP;
                break;


@@ -2191,7 +2210,7 @@ static void
 termp_bk_post(DECL_ARGS)
 {
 
 termp_bk_post(DECL_ARGS)
 {
 

-       if (MDOC_BODY == n->type)
+       if (n->type == ROFFT_BODY)

                p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }
 
                p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }