The groff man-ext macros define fonts CB, CI, and CR,

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index 9a9abafdbc5ba9561bfed26dcf8f75fb1e5884ca..b5723ccf83833d76d88d74a94c64944233b03f75 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,15 +1,15 @@
-/*     $Id: man_term.c,v 1.159 2014/12/04 02:05:42 schwarze Exp $ */
+/*     $Id: man_term.c,v 1.211 2018/06/10 15:12:35 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2015, 2017, 2018 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
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * 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
  * 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


@@ -21,14 +21,16 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

+#include <limits.h>

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

-#include "mandoc.h"

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

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

 #include "man.h"
 #include "man.h"

+#include "out.h"

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


@@ -37,7 +39,7 @@
 struct mtermp {
        int               fl;
 #define        MANT_LITERAL     (1 << 0)
 struct mtermp {
        int               fl;
 #define        MANT_LITERAL     (1 << 0)

-       size_t            lmargin[MAXMARGINS]; /* margins (incl. visible page) */
+       int               lmargin[MAXMARGINS]; /* margins (incl. vis. page) */

        int               lmargincur; /* index of current margin */
        int               lmarginsz; /* actual number of nested margins */
        size_t            offset; /* default offset to visible page */
        int               lmargincur; /* index of current margin */
        int               lmarginsz; /* actual number of nested margins */
        size_t            offset; /* default offset to visible page */


@@ -46,8 +48,8 @@ struct        mtermp {
 
 #define        DECL_ARGS         struct termp *p, \
                          struct mtermp *mt, \
 
 #define        DECL_ARGS         struct termp *p, \
                          struct mtermp *mt, \

-                         const struct man_node *n, \
-                         const struct man_meta *meta
+                         struct roff_node *n, \
+                         const struct roff_meta *meta

 
 struct termact {
        int             (*pre)(DECL_ARGS);
 
 struct termact {
        int             (*pre)(DECL_ARGS);


@@ -56,17 +58,17 @@ struct      termact {
 #define        MAN_NOTEXT       (1 << 0) /* Never has text children. */
 };
 
 #define        MAN_NOTEXT       (1 << 0) /* Never has text children. */
 };
 

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

 static void              print_man_nodelist(DECL_ARGS);
 static void              print_man_node(DECL_ARGS);
 static void              print_man_nodelist(DECL_ARGS);
 static void              print_man_node(DECL_ARGS);

-static void              print_man_head(struct termp *, const void *);
-static void              print_man_foot(struct termp *, const void *);
+static void              print_man_head(struct termp *,
+                               const struct roff_meta *);
+static void              print_man_foot(struct termp *,
+                               const struct roff_meta *);

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

-                               const struct man_node *, int);
+                               const struct roff_node *, int);

 
 static int               pre_B(DECL_ARGS);
 
 static int               pre_B(DECL_ARGS);

+static int               pre_DT(DECL_ARGS);

 static int               pre_HP(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
 static int               pre_IP(DECL_ARGS);
 static int               pre_HP(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
 static int               pre_IP(DECL_ARGS);


@@ -79,12 +81,9 @@ static       int               pre_SS(DECL_ARGS);
 static int               pre_TP(DECL_ARGS);
 static int               pre_UR(DECL_ARGS);
 static int               pre_alternate(DECL_ARGS);
 static int               pre_TP(DECL_ARGS);
 static int               pre_UR(DECL_ARGS);
 static int               pre_alternate(DECL_ARGS);

-static int               pre_ft(DECL_ARGS);

 static int               pre_ign(DECL_ARGS);
 static int               pre_in(DECL_ARGS);
 static int               pre_literal(DECL_ARGS);
 static int               pre_ign(DECL_ARGS);
 static int               pre_in(DECL_ARGS);
 static int               pre_literal(DECL_ARGS);

-static int               pre_ll(DECL_ARGS);
-static int               pre_sp(DECL_ARGS);

 
 static void              post_IP(DECL_ARGS);
 static void              post_HP(DECL_ARGS);
 
 static void              post_IP(DECL_ARGS);
 static void              post_HP(DECL_ARGS);


@@ -94,8 +93,7 @@ static        void              post_SS(DECL_ARGS);
 static void              post_TP(DECL_ARGS);
 static void              post_UR(DECL_ARGS);
 
 static void              post_TP(DECL_ARGS);
 static void              post_UR(DECL_ARGS);
 

-static const struct termact termacts[MAN_MAX] = {
-       { pre_sp, NULL, MAN_NOTEXT }, /* br */
+static const struct termact __termacts[MAN_MAX - MAN_TH] = {

        { NULL, NULL, 0 }, /* TH */
        { pre_SH, post_SH, 0 }, /* SH */
        { pre_SS, post_SS, 0 }, /* SS */
        { NULL, NULL, 0 }, /* TH */
        { pre_SH, post_SH, 0 }, /* SH */
        { pre_SS, post_SS, 0 }, /* SS */


@@ -116,95 +114,71 @@ static    const struct termact termacts[MAN_MAX] = {
        { pre_I, NULL, 0 }, /* I */
        { pre_alternate, NULL, 0 }, /* IR */
        { pre_alternate, NULL, 0 }, /* RI */
        { pre_I, NULL, 0 }, /* I */
        { pre_alternate, NULL, 0 }, /* IR */
        { pre_alternate, NULL, 0 }, /* RI */

-       { pre_ign, NULL, MAN_NOTEXT }, /* na */
-       { pre_sp, NULL, MAN_NOTEXT }, /* sp */

        { pre_literal, NULL, 0 }, /* nf */
        { pre_literal, NULL, 0 }, /* fi */
        { NULL, NULL, 0 }, /* RE */
        { pre_RS, post_RS, 0 }, /* RS */
        { pre_literal, NULL, 0 }, /* nf */
        { pre_literal, NULL, 0 }, /* fi */
        { NULL, NULL, 0 }, /* RE */
        { pre_RS, post_RS, 0 }, /* RS */

-       { pre_ign, NULL, 0 }, /* DT */
+       { pre_DT, NULL, 0 }, /* DT */

        { pre_ign, NULL, MAN_NOTEXT }, /* UC */
        { pre_PD, NULL, MAN_NOTEXT }, /* PD */
        { pre_ign, NULL, 0 }, /* AT */
        { pre_in, NULL, MAN_NOTEXT }, /* in */
        { pre_ign, NULL, MAN_NOTEXT }, /* UC */
        { pre_PD, NULL, MAN_NOTEXT }, /* PD */
        { pre_ign, NULL, 0 }, /* AT */
        { pre_in, NULL, MAN_NOTEXT }, /* in */

-       { pre_ft, NULL, MAN_NOTEXT }, /* ft */

        { pre_OP, NULL, 0 }, /* OP */
        { pre_literal, NULL, 0 }, /* EX */
        { pre_literal, NULL, 0 }, /* EE */
        { pre_UR, post_UR, 0 }, /* UR */
        { NULL, NULL, 0 }, /* UE */
        { pre_OP, NULL, 0 }, /* OP */
        { pre_literal, NULL, 0 }, /* EX */
        { pre_literal, NULL, 0 }, /* EE */
        { pre_UR, post_UR, 0 }, /* UR */
        { NULL, NULL, 0 }, /* UE */

-       { pre_ll, NULL, MAN_NOTEXT }, /* ll */
+       { pre_UR, post_UR, 0 }, /* MT */
+       { NULL, NULL, 0 }, /* ME */

 };
 };

+static const struct termact *termacts = __termacts - MAN_TH;

 
 
 void
 
 
 void

-terminal_man(void *arg, const struct man *man)
+terminal_man(void *arg, const struct roff_man *man)

 {
        struct termp            *p;
 {
        struct termp            *p;

-       const struct man_meta   *meta;
-       struct man_node         *n;
+       struct roff_node        *n;

        struct mtermp            mt;
        struct mtermp            mt;

+       size_t                   save_defindent;

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

-
-       p->overstep = 0;
-       p->rmargin = p->maxrmargin = p->defrmargin;
-       p->tabwidth = term_len(p, 5);
-
-       n = man_node(man)->child;
-       meta = man_meta(man);
+       save_defindent = p->defindent;
+       if (p->synopsisonly == 0 && p->defindent == 0)
+               p->defindent = 7;
+       p->tcol->rmargin = p->maxrmargin = p->defrmargin;
+       term_tab_set(p, NULL);
+       term_tab_set(p, "T");
+       term_tab_set(p, ".5i");

 
        memset(&mt, 0, sizeof(struct mtermp));
 
        memset(&mt, 0, sizeof(struct mtermp));

-

        mt.lmargin[mt.lmargincur] = term_len(p, p->defindent);
        mt.offset = term_len(p, p->defindent);
        mt.pardist = 1;
 
        mt.lmargin[mt.lmargincur] = term_len(p, p->defindent);
        mt.offset = term_len(p, p->defindent);
        mt.pardist = 1;
 

+       n = man->first->child;

        if (p->synopsisonly) {
                while (n != NULL) {
                        if (n->tok == MAN_SH &&
        if (p->synopsisonly) {
                while (n != NULL) {
                        if (n->tok == MAN_SH &&

-                           n->child->child->type == MAN_TEXT &&
+                           n->child->child->type == ROFFT_TEXT &&

                            !strcmp(n->child->child->string, "SYNOPSIS")) {
                                if (n->child->next->child != NULL)
                                        print_man_nodelist(p, &mt,
                            !strcmp(n->child->child->string, "SYNOPSIS")) {
                                if (n->child->next->child != NULL)
                                        print_man_nodelist(p, &mt,

-                                           n->child->next->child, meta);
+                                           n->child->next->child,
+                                           &man->meta);

                                term_newln(p);
                                break;
                        }
                        n = n->next;
                }
        } else {
                                term_newln(p);
                                break;
                        }
                        n = n->next;
                }
        } else {

-               if (p->defindent == 0)
-                       p->defindent = 7;
-               term_begin(p, print_man_head, print_man_foot, meta);
+               term_begin(p, print_man_head, print_man_foot, &man->meta);

                p->flags |= TERMP_NOSPACE;
                if (n != NULL)
                p->flags |= TERMP_NOSPACE;
                if (n != NULL)

-                       print_man_nodelist(p, &mt, n, meta);
+                       print_man_nodelist(p, &mt, n, &man->meta);

                term_end(p);
        }
                term_end(p);
        }

-}
-
-
-static size_t
-a2height(const struct termp *p, const char *cp)
-{
-       struct roffsu    su;
-
-       if ( ! a2roffsu(cp, &su, SCALE_VS))
-               SCALE_VS_INIT(&su, atoi(cp));
-
-       return(term_vspan(p, &su));
-}
-
-static int
-a2width(const struct termp *p, const char *cp)
-{
-       struct roffsu    su;
-
-       if ( ! a2roffsu(cp, &su, SCALE_EN))
-               return(-1);
-
-       return((int)term_hspan(p, &su));
+       p->defindent = save_defindent;

 }
 
 /*
 }
 
 /*


@@ -216,17 +190,17 @@ a2width(const struct termp *p, const char *cp)
  * first, print it.
  */
 static void
  * first, print it.
  */
 static void

-print_bvspace(struct termp *p, const struct man_node *n, int pardist)
+print_bvspace(struct termp *p, const struct roff_node *n, int pardist)

 {
        int      i;
 
        term_newln(p);
 
        if (n->body && n->body->child)
 {
        int      i;
 
        term_newln(p);
 
        if (n->body && n->body->child)

-               if (MAN_TBL == n->body->child->type)
+               if (n->body->child->type == ROFFT_TBL)

                        return;
 
                        return;
 

-       if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok)
+       if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS)

                if (NULL == n->prev)
                        return;
 
                if (NULL == n->prev)
                        return;
 


@@ -239,15 +213,7 @@ static int
 pre_ign(DECL_ARGS)
 {
 
 pre_ign(DECL_ARGS)
 {
 

-       return(0);
-}
-
-static int
-pre_ll(DECL_ARGS)
-{
-
-       term_setwidth(p, n->nchild ? n->child->string : NULL);
-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -255,7 +221,7 @@ pre_I(DECL_ARGS)
 {
 
        term_fontrepl(p, TERMFONT_UNDER);
 {
 
        term_fontrepl(p, TERMFONT_UNDER);

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -264,7 +230,7 @@ pre_literal(DECL_ARGS)
 
        term_newln(p);
 
 
        term_newln(p);
 

-       if (MAN_nf == n->tok || MAN_EX == n->tok)
+       if (n->tok == MAN_nf || n->tok == MAN_EX)

                mt->fl |= MANT_LITERAL;
        else
                mt->fl &= ~MANT_LITERAL;
                mt->fl |= MANT_LITERAL;
        else
                mt->fl &= ~MANT_LITERAL;


@@ -274,36 +240,38 @@ pre_literal(DECL_ARGS)
         * So in case a second call to term_flushln() is needed,
         * indentation has to be set up explicitly.
         */
         * So in case a second call to term_flushln() is needed,
         * indentation has to be set up explicitly.
         */

-       if (MAN_HP == n->parent->tok && p->rmargin < p->maxrmargin) {
-               p->offset = p->rmargin;
-               p->rmargin = p->maxrmargin;
+       if (n->parent->tok == MAN_HP && p->tcol->rmargin < p->maxrmargin) {
+               p->tcol->offset = p->tcol->rmargin;
+               p->tcol->rmargin = p->maxrmargin;

                p->trailspace = 0;
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
                p->flags |= TERMP_NOSPACE;
        }
 
                p->trailspace = 0;
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
                p->flags |= TERMP_NOSPACE;
        }
 

-       return(0);
+       return 0;

 }
 
 static int
 pre_PD(DECL_ARGS)
 {
 }
 
 static int
 pre_PD(DECL_ARGS)
 {

+       struct roffsu    su;

 
        n = n->child;
 
        n = n->child;

-       if (0 == n) {
+       if (n == NULL) {

                mt->pardist = 1;
                mt->pardist = 1;

-               return(0);
+               return 0;

        }
        }

-       assert(MAN_TEXT == n->type);
-       mt->pardist = atoi(n->string);
-       return(0);
+       assert(n->type == ROFFT_TEXT);
+       if (a2roffsu(n->string, &su, SCALE_VS) != NULL)
+               mt->pardist = term_vspan(p, &su);
+       return 0;

 }
 
 static int
 pre_alternate(DECL_ARGS)
 {
        enum termfont            font[2];
 }
 
 static int
 pre_alternate(DECL_ARGS)
 {
        enum termfont            font[2];

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

        int                      savelit, i;
 
        switch (n->tok) {
        int                      savelit, i;
 
        switch (n->tok) {


@@ -342,12 +310,15 @@ pre_alternate(DECL_ARGS)
                term_fontrepl(p, font[i]);
                if (savelit && NULL == nn->next)
                        mt->fl |= MANT_LITERAL;
                term_fontrepl(p, font[i]);
                if (savelit && NULL == nn->next)
                        mt->fl |= MANT_LITERAL;

-               print_man_node(p, mt, nn, meta);
+               assert(nn->type == ROFFT_TEXT);
+               term_word(p, nn->string);
+               if (nn->flags & NODE_EOS)
+                       p->flags |= TERMP_SENTENCE;

                if (nn->next)
                        p->flags |= TERMP_NOSPACE;
        }
 
                if (nn->next)
                        p->flags |= TERMP_NOSPACE;
        }
 

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -355,7 +326,7 @@ pre_B(DECL_ARGS)
 {
 
        term_fontrepl(p, TERMFONT_BOLD);
 {
 
        term_fontrepl(p, TERMFONT_BOLD);

-       return(1);
+       return 1;

 }
 
 static int
 }
 
 static int


@@ -377,61 +348,22 @@ pre_OP(DECL_ARGS)
        term_fontrepl(p, TERMFONT_NONE);
        p->flags |= TERMP_NOSPACE;
        term_word(p, "]");
        term_fontrepl(p, TERMFONT_NONE);
        p->flags |= TERMP_NOSPACE;
        term_word(p, "]");

-       return(0);
-}
-
-static int
-pre_ft(DECL_ARGS)
-{
-       const char      *cp;
-
-       if (NULL == n->child) {
-               term_fontlast(p);
-               return(0);
-       }
-
-       cp = n->child->string;
-       switch (*cp) {
-       case '4':
-               /* FALLTHROUGH */
-       case '3':
-               /* FALLTHROUGH */
-       case 'B':
-               term_fontrepl(p, TERMFONT_BOLD);
-               break;
-       case '2':
-               /* FALLTHROUGH */
-       case 'I':
-               term_fontrepl(p, TERMFONT_UNDER);
-               break;
-       case 'P':
-               term_fontlast(p);
-               break;
-       case '1':
-               /* FALLTHROUGH */
-       case 'C':
-               /* FALLTHROUGH */
-       case 'R':
-               term_fontrepl(p, TERMFONT_NONE);
-               break;
-       default:
-               break;
-       }
-       return(0);
+       return 0;

 }
 
 static int
 pre_in(DECL_ARGS)
 {
 }
 
 static int
 pre_in(DECL_ARGS)
 {

-       int              len, less;
-       size_t           v;
+       struct roffsu    su;

        const char      *cp;
        const char      *cp;

+       size_t           v;
+       int              less;

 
        term_newln(p);
 
 
        term_newln(p);
 

-       if (NULL == n->child) {
-               p->offset = mt->offset;
-               return(0);
+       if (n->child == NULL) {
+               p->tcol->offset = mt->offset;
+               return 0;

        }
 
        cp = n->child->string;
        }
 
        cp = n->child->string;


@@ -444,91 +376,47 @@ pre_in(DECL_ARGS)
        else
                cp--;
 
        else
                cp--;
 

-       if ((len = a2width(p, ++cp)) < 0)
-               return(0);
+       if (a2roffsu(++cp, &su, SCALE_EN) == NULL)
+               return 0;

 
 

-       v = (size_t)len;
+       v = term_hen(p, &su);

 
        if (less < 0)
 
        if (less < 0)

-               p->offset -= p->offset > v ? v : p->offset;
+               p->tcol->offset -= p->tcol->offset > v ? v : p->tcol->offset;

        else if (less > 0)
        else if (less > 0)

-               p->offset += v;
+               p->tcol->offset += v;

        else
        else

-               p->offset = v;
+               p->tcol->offset = v;
+       if (p->tcol->offset > SHRT_MAX)
+               p->tcol->offset = term_len(p, p->defindent);

 
 

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int

-pre_sp(DECL_ARGS)
+pre_DT(DECL_ARGS)

 {
 {

-       char            *s;
-       size_t           i, len;
-       int              neg;
-
-       if ((NULL == n->prev && n->parent)) {
-               switch (n->parent->tok) {
-               case MAN_SH:
-                       /* FALLTHROUGH */
-               case MAN_SS:
-                       /* FALLTHROUGH */
-               case MAN_PP:
-                       /* FALLTHROUGH */
-               case MAN_LP:
-                       /* FALLTHROUGH */
-               case MAN_P:
-                       /* FALLTHROUGH */
-                       return(0);
-               default:
-                       break;
-               }
-       }
-
-       neg = 0;
-       switch (n->tok) {
-       case MAN_br:
-               len = 0;
-               break;
-       default:
-               if (NULL == n->child) {
-                       len = 1;
-                       break;
-               }
-               s = n->child->string;
-               if ('-' == *s) {
-                       neg = 1;
-                       s++;
-               }
-               len = a2height(p, s);
-               break;
-       }
-
-       if (0 == len)
-               term_newln(p);
-       else if (neg)
-               p->skipvsp += len;
-       else
-               for (i = 0; i < len; i++)
-                       term_vspace(p);
-
-       return(0);
+       term_tab_set(p, NULL);
+       term_tab_set(p, "T");
+       term_tab_set(p, ".5i");
+       return 0;

 }
 
 static int
 pre_HP(DECL_ARGS)
 {
 }
 
 static int
 pre_HP(DECL_ARGS)
 {

-       size_t                   len, one;
-       int                      ival;
-       const struct man_node   *nn;
+       struct roffsu            su;
+       const struct roff_node  *nn;
+       int                      len;

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

-       case MAN_BLOCK:
+       case ROFFT_BLOCK:

                print_bvspace(p, n, mt->pardist);
                print_bvspace(p, n, mt->pardist);

-               return(1);
-       case MAN_BODY:
+               return 1;
+       case ROFFT_BODY:

                break;
        default:
                break;
        default:

-               return(0);
+               return 0;

        }
 
        if ( ! (MANT_LITERAL & mt->fl)) {
        }
 
        if ( ! (MANT_LITERAL & mt->fl)) {


@@ -536,26 +424,22 @@ pre_HP(DECL_ARGS)
                p->trailspace = 2;
        }
 
                p->trailspace = 2;
        }
 

-       len = mt->lmargin[mt->lmargincur];
-       ival = -1;
-

        /* Calculate offset. */
 
        /* Calculate offset. */
 

-       if (NULL != (nn = n->parent->head->child))
-               if ((ival = a2width(p, nn->string)) >= 0)
-                       len = (size_t)ival;
-
-       one = term_len(p, 1);
-       if (len < one)
-               len = one;
-
-       p->offset = mt->offset;
-       p->rmargin = mt->offset + len;
-
-       if (ival >= 0)
-               mt->lmargin[mt->lmargincur] = (size_t)ival;
-
-       return(1);
+       if ((nn = n->parent->head->child) != NULL &&
+           a2roffsu(nn->string, &su, SCALE_EN) != NULL) {
+               len = term_hen(p, &su);
+               if (len < 0 && (size_t)(-len) > mt->offset)
+                       len = -mt->offset;
+               else if (len > SHRT_MAX)
+                       len = term_len(p, p->defindent);
+               mt->lmargin[mt->lmargincur] = len;
+       } else
+               len = mt->lmargin[mt->lmargincur];
+
+       p->tcol->offset = mt->offset;
+       p->tcol->rmargin = mt->offset + len;
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -563,12 +447,23 @@ post_HP(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MAN_BODY:
+       case ROFFT_BODY:

                term_newln(p);
                term_newln(p);

+
+               /*
+                * Compatibility with a groff bug.
+                * The .HP macro uses the undocumented .tag request
+                * which causes a line break and cancels no-space
+                * mode even if there isn't any output.
+                */
+
+               if (n->child == NULL)
+                       term_vspace(p);
+

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

-               p->offset = mt->offset;
-               p->rmargin = p->maxrmargin;
+               p->tcol->offset = mt->offset;
+               p->tcol->rmargin = p->maxrmargin;

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


@@ -580,62 +475,57 @@ pre_PP(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MAN_BLOCK:
+       case ROFFT_BLOCK:

                mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
                print_bvspace(p, n, mt->pardist);
                break;
        default:
                mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
                print_bvspace(p, n, mt->pardist);
                break;
        default:

-               p->offset = mt->offset;
+               p->tcol->offset = mt->offset;

                break;
        }
 
                break;
        }
 

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

 }
 
 static int
 pre_IP(DECL_ARGS)
 {
 }
 
 static int
 pre_IP(DECL_ARGS)
 {

-       const struct man_node   *nn;
-       size_t                   len;
-       int                      savelit, ival;
+       struct roffsu            su;
+       const struct roff_node  *nn;
+       int                      len, savelit;

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

-       case MAN_BODY:
+       case ROFFT_BODY:

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

-       case MAN_HEAD:
+       case ROFFT_HEAD:

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

-       case MAN_BLOCK:
+       case ROFFT_BLOCK:

                print_bvspace(p, n, mt->pardist);
                /* FALLTHROUGH */
        default:
                print_bvspace(p, n, mt->pardist);
                /* FALLTHROUGH */
        default:

-               return(1);
+               return 1;

        }
 
        }
 

-       len = mt->lmargin[mt->lmargincur];
-       ival = -1;
-

        /* Calculate the offset from the optional second argument. */
        /* Calculate the offset from the optional second argument. */

-       if (NULL != (nn = n->parent->head->child))
-               if (NULL != (nn = nn->next))
-                       if ((ival = a2width(p, nn->string)) >= 0)
-                               len = (size_t)ival;
+       if ((nn = n->parent->head->child) != NULL &&
+           (nn = nn->next) != NULL &&
+           a2roffsu(nn->string, &su, SCALE_EN) != NULL) {
+               len = term_hen(p, &su);
+               if (len < 0 && (size_t)(-len) > mt->offset)
+                       len = -mt->offset;
+               else if (len > SHRT_MAX)
+                       len = term_len(p, p->defindent);
+               mt->lmargin[mt->lmargincur] = len;
+       } else
+               len = mt->lmargin[mt->lmargincur];

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

-       case MAN_HEAD:
-               /* Handle zero-width lengths. */
-               if (0 == len)
-                       len = term_len(p, 1);
-
-               p->offset = mt->offset;
-               p->rmargin = mt->offset + len;
-               if (ival < 0)
-                       break;
-
-               /* Set the saved left-margin. */
-               mt->lmargin[mt->lmargincur] = (size_t)ival;
+       case ROFFT_HEAD:
+               p->tcol->offset = mt->offset;
+               p->tcol->rmargin = mt->offset + len;

 
                savelit = MANT_LITERAL & mt->fl;
                mt->fl &= ~MANT_LITERAL;
 
                savelit = MANT_LITERAL & mt->fl;
                mt->fl &= ~MANT_LITERAL;


@@ -646,16 +536,16 @@ pre_IP(DECL_ARGS)
                if (savelit)
                        mt->fl |= MANT_LITERAL;
 
                if (savelit)
                        mt->fl |= MANT_LITERAL;
 

-               return(0);
-       case MAN_BODY:
-               p->offset = mt->offset + len;
-               p->rmargin = p->maxrmargin;
+               return 0;
+       case ROFFT_BODY:
+               p->tcol->offset = mt->offset + len;
+               p->tcol->rmargin = p->maxrmargin;

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

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -663,15 +553,15 @@ post_IP(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MAN_HEAD:
+       case ROFFT_HEAD:

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

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

                break;
                break;

-       case MAN_BODY:
+       case ROFFT_BODY:

                term_newln(p);
                term_newln(p);

-               p->offset = mt->offset;
+               p->tcol->offset = mt->offset;

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


@@ -681,50 +571,50 @@ post_IP(DECL_ARGS)
 static int
 pre_TP(DECL_ARGS)
 {
 static int
 pre_TP(DECL_ARGS)
 {

-       const struct man_node   *nn;
-       size_t                   len;
-       int                      savelit, ival;
+       struct roffsu            su;
+       struct roff_node        *nn;
+       int                      len, savelit;

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

-       case MAN_HEAD:
-               p->flags |= TERMP_NOBREAK;
+       case ROFFT_HEAD:
+               p->flags |= TERMP_NOBREAK | TERMP_BRTRSP;

                p->trailspace = 1;
                break;
                p->trailspace = 1;
                break;

-       case MAN_BODY:
+       case ROFFT_BODY:

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

-       case MAN_BLOCK:
+       case ROFFT_BLOCK:

                print_bvspace(p, n, mt->pardist);
                /* FALLTHROUGH */
        default:
                print_bvspace(p, n, mt->pardist);
                /* FALLTHROUGH */
        default:

-               return(1);
+               return 1;

        }
 
        }
 

-       len = (size_t)mt->lmargin[mt->lmargincur];
-       ival = -1;
-

        /* Calculate offset. */
 
        /* Calculate offset. */
 

-       if (NULL != (nn = n->parent->head->child))
-               if (nn->string && 0 == (MAN_LINE & nn->flags))
-                       if ((ival = a2width(p, nn->string)) >= 0)
-                               len = (size_t)ival;
+       if ((nn = n->parent->head->child) != NULL &&
+           nn->string != NULL && ! (NODE_LINE & nn->flags) &&
+           a2roffsu(nn->string, &su, SCALE_EN) != NULL) {
+               len = term_hen(p, &su);
+               if (len < 0 && (size_t)(-len) > mt->offset)
+                       len = -mt->offset;
+               else if (len > SHRT_MAX)
+                       len = term_len(p, p->defindent);
+               mt->lmargin[mt->lmargincur] = len;
+       } else
+               len = mt->lmargin[mt->lmargincur];

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

-       case MAN_HEAD:
-               /* Handle zero-length properly. */
-               if (0 == len)
-                       len = term_len(p, 1);
-
-               p->offset = mt->offset;
-               p->rmargin = mt->offset + len;
+       case ROFFT_HEAD:
+               p->tcol->offset = mt->offset;
+               p->tcol->rmargin = mt->offset + len;

 
                savelit = MANT_LITERAL & mt->fl;
                mt->fl &= ~MANT_LITERAL;
 
                /* Don't print same-line elements. */
                nn = n->child;
 
                savelit = MANT_LITERAL & mt->fl;
                mt->fl &= ~MANT_LITERAL;
 
                /* Don't print same-line elements. */
                nn = n->child;

-               while (NULL != nn && 0 == (MAN_LINE & nn->flags))
+               while (NULL != nn && 0 == (NODE_LINE & nn->flags))

                        nn = nn->next;
 
                while (NULL != nn) {
                        nn = nn->next;
 
                while (NULL != nn) {


@@ -734,21 +624,18 @@ pre_TP(DECL_ARGS)
 
                if (savelit)
                        mt->fl |= MANT_LITERAL;
 
                if (savelit)
                        mt->fl |= MANT_LITERAL;

-               if (ival >= 0)
-                       mt->lmargin[mt->lmargincur] = (size_t)ival;
-
-               return(0);
-       case MAN_BODY:
-               p->offset = mt->offset + len;
-               p->rmargin = p->maxrmargin;
+               return 0;
+       case ROFFT_BODY:
+               p->tcol->offset = mt->offset + len;
+               p->tcol->rmargin = p->maxrmargin;

                p->trailspace = 0;
                p->trailspace = 0;

-               p->flags &= ~TERMP_NOBREAK;
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP);

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

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -756,12 +643,12 @@ post_TP(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MAN_HEAD:
+       case ROFFT_HEAD:

                term_flushln(p);
                break;
                term_flushln(p);
                break;

-       case MAN_BODY:
+       case ROFFT_BODY:

                term_newln(p);
                term_newln(p);

-               p->offset = mt->offset;
+               p->tcol->offset = mt->offset;

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


@@ -774,7 +661,7 @@ pre_SS(DECL_ARGS)
        int      i;
 
        switch (n->type) {
        int      i;
 
        switch (n->type) {

-       case MAN_BLOCK:
+       case ROFFT_BLOCK:

                mt->fl &= ~MANT_LITERAL;
                mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
                mt->offset = term_len(p, p->defindent);
                mt->fl &= ~MANT_LITERAL;
                mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
                mt->offset = term_len(p, p->defindent);


@@ -786,25 +673,33 @@ pre_SS(DECL_ARGS)
 
                do {
                        n = n->prev;
 
                do {
                        n = n->prev;

-               } while (n != NULL && termacts[n->tok].flags & MAN_NOTEXT);
-               if (n == NULL || (n->tok == MAN_SS && n->body->child == NULL))
+               } while (n != NULL && n->tok >= MAN_TH &&
+                   termacts[n->tok].flags & MAN_NOTEXT);
+               if (n == NULL || n->type == ROFFT_COMMENT ||
+                   (n->tok == MAN_SS && n->body->child == NULL))

                        break;
 
                for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;
                        break;
 
                for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;

-       case MAN_HEAD:
+       case ROFFT_HEAD:

                term_fontrepl(p, TERMFONT_BOLD);
                term_fontrepl(p, TERMFONT_BOLD);

-               p->offset = term_len(p, 3);
+               p->tcol->offset = term_len(p, 3);
+               p->tcol->rmargin = mt->offset;
+               p->trailspace = mt->offset;
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND;

                break;
                break;

-       case MAN_BODY:
-               p->offset = mt->offset;
+       case ROFFT_BODY:
+               p->tcol->offset = mt->offset;
+               p->tcol->rmargin = p->maxrmargin;
+               p->trailspace = 0;
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);

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

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -812,10 +707,10 @@ post_SS(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MAN_HEAD:
+       case ROFFT_HEAD:

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

-       case MAN_BODY:
+       case ROFFT_BODY:

                term_newln(p);
                break;
        default:
                term_newln(p);
                break;
        default:


@@ -829,7 +724,7 @@ pre_SH(DECL_ARGS)
        int      i;
 
        switch (n->type) {
        int      i;
 
        switch (n->type) {

-       case MAN_BLOCK:
+       case ROFFT_BLOCK:

                mt->fl &= ~MANT_LITERAL;
                mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
                mt->offset = term_len(p, p->defindent);
                mt->fl &= ~MANT_LITERAL;
                mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
                mt->offset = term_len(p, p->defindent);


@@ -841,25 +736,33 @@ pre_SH(DECL_ARGS)
 
                do {
                        n = n->prev;
 
                do {
                        n = n->prev;

-               } while (n != NULL && termacts[n->tok].flags & MAN_NOTEXT);
-               if (n == NULL || (n->tok == MAN_SH && n->body->child == NULL))
+               } while (n != NULL && n->tok >= MAN_TH &&
+                   termacts[n->tok].flags & MAN_NOTEXT);
+               if (n == NULL || n->type == ROFFT_COMMENT ||
+                   (n->tok == MAN_SH && n->body->child == NULL))

                        break;
 
                for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;
                        break;
 
                for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;

-       case MAN_HEAD:
+       case ROFFT_HEAD:

                term_fontrepl(p, TERMFONT_BOLD);
                term_fontrepl(p, TERMFONT_BOLD);

-               p->offset = 0;
+               p->tcol->offset = 0;
+               p->tcol->rmargin = mt->offset;
+               p->trailspace = mt->offset;
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND;

                break;
                break;

-       case MAN_BODY:
-               p->offset = mt->offset;
+       case ROFFT_BODY:
+               p->tcol->offset = mt->offset;
+               p->tcol->rmargin = p->maxrmargin;
+               p->trailspace = 0;
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);

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

-       return(1);
+       return 1;

 }
 
 static void
 }
 
 static void


@@ -867,10 +770,10 @@ post_SH(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MAN_HEAD:
+       case ROFFT_HEAD:

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

-       case MAN_BODY:
+       case ROFFT_BODY:

                term_newln(p);
                break;
        default:
                term_newln(p);
                break;
        default:


@@ -881,60 +784,56 @@ post_SH(DECL_ARGS)
 static int
 pre_RS(DECL_ARGS)
 {
 static int
 pre_RS(DECL_ARGS)
 {

-       int              ival;
-       size_t           sz;
+       struct roffsu    su;

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

-       case MAN_BLOCK:
+       case ROFFT_BLOCK:

                term_newln(p);
                term_newln(p);

-               return(1);
-       case MAN_HEAD:
-               return(0);
+               return 1;
+       case ROFFT_HEAD:
+               return 0;

        default:
                break;
        }
 
        default:
                break;
        }
 

-       sz = term_len(p, p->defindent);
-
-       if (NULL != (n = n->parent->head->child))
-               if ((ival = a2width(p, n->string)) >= 0)
-                       sz = (size_t)ival;
-
-       mt->offset += sz;
-       p->offset = mt->offset;
-       p->rmargin = p->maxrmargin;
+       n = n->parent->head;
+       n->aux = SHRT_MAX + 1;
+       if (n->child == NULL)
+               n->aux = mt->lmargin[mt->lmargincur];
+       else if (a2roffsu(n->child->string, &su, SCALE_EN) != NULL)
+               n->aux = term_hen(p, &su);
+       if (n->aux < 0 && (size_t)(-n->aux) > mt->offset)
+               n->aux = -mt->offset;
+       else if (n->aux > SHRT_MAX)
+               n->aux = term_len(p, p->defindent);
+
+       mt->offset += n->aux;
+       p->tcol->offset = mt->offset;
+       p->tcol->rmargin = p->maxrmargin;

 
        if (++mt->lmarginsz < MAXMARGINS)
                mt->lmargincur = mt->lmarginsz;
 
 
        if (++mt->lmarginsz < MAXMARGINS)
                mt->lmargincur = mt->lmarginsz;
 

-       mt->lmargin[mt->lmargincur] = mt->lmargin[mt->lmargincur - 1];
-       return(1);
+       mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
+       return 1;

 }
 
 static void
 post_RS(DECL_ARGS)
 {
 }
 
 static void
 post_RS(DECL_ARGS)
 {

-       int              ival;
-       size_t           sz;

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

-       case MAN_BLOCK:
+       case ROFFT_BLOCK:

                return;
                return;

-       case MAN_HEAD:
+       case ROFFT_HEAD:

                return;
        default:
                term_newln(p);
                break;
        }
 
                return;
        default:
                term_newln(p);
                break;
        }
 

-       sz = term_len(p, p->defindent);
-
-       if (NULL != (n = n->parent->head->child))
-               if ((ival = a2width(p, n->string)) >= 0)
-                       sz = (size_t)ival;
-
-       mt->offset = mt->offset < sz ?  0 : mt->offset - sz;
-       p->offset = mt->offset;
+       mt->offset -= n->parent->head->aux;
+       p->tcol->offset = mt->offset;

 
        if (--mt->lmarginsz < MAXMARGINS)
                mt->lmargincur = mt->lmarginsz;
 
        if (--mt->lmarginsz < MAXMARGINS)
                mt->lmargincur = mt->lmarginsz;


@@ -944,14 +843,14 @@ static int
 pre_UR(DECL_ARGS)
 {
 
 pre_UR(DECL_ARGS)
 {
 

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

 }
 
 static void
 post_UR(DECL_ARGS)
 {
 
 }
 
 static void
 post_UR(DECL_ARGS)
 {
 

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

                return;
 
        term_word(p, "<");
                return;
 
        term_word(p, "<");


@@ -967,45 +866,51 @@ post_UR(DECL_ARGS)
 static void
 print_man_node(DECL_ARGS)
 {
 static void
 print_man_node(DECL_ARGS)
 {

-       size_t           rm, rmax;

        int              c;
 
        switch (n->type) {
        int              c;
 
        switch (n->type) {

-       case MAN_TEXT:
+       case ROFFT_TEXT:

                /*
                 * If we have a blank line, output a vertical space.
                 * If we have a space as the first character, break
                 * before printing the line's data.
                 */
                /*
                 * If we have a blank line, output a vertical space.
                 * If we have a space as the first character, break
                 * before printing the line's data.
                 */

-               if ('\0' == *n->string) {
-                       term_vspace(p);
+               if (*n->string == '\0') {
+                       if (p->flags & TERMP_NONEWLINE)
+                               term_newln(p);
+                       else
+                               term_vspace(p);

                        return;
                        return;

-               } else if (' ' == *n->string && MAN_LINE & n->flags)
+               } else if (*n->string == ' ' && n->flags & NODE_LINE &&
+                   (p->flags & TERMP_NONEWLINE) == 0)

                        term_newln(p);
 
                term_word(p, n->string);
                goto out;
                        term_newln(p);
 
                term_word(p, n->string);
                goto out;

-
-       case MAN_EQN:
-               if ( ! (n->flags & MAN_LINE))
+       case ROFFT_COMMENT:
+               return;
+       case ROFFT_EQN:
+               if ( ! (n->flags & NODE_LINE))

                        p->flags |= TERMP_NOSPACE;
                term_eqn(p, n->eqn);
                        p->flags |= TERMP_NOSPACE;
                term_eqn(p, n->eqn);

-               if (n->next != NULL && ! (n->next->flags & MAN_LINE))
+               if (n->next != NULL && ! (n->next->flags & NODE_LINE))

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

-       case MAN_TBL:
-               /*
-                * Tables are preceded by a newline.  Then process a
-                * table line, which will cause line termination,
-                */
-               if (TBL_SPAN_FIRST & n->span->flags)
-                       term_newln(p);
+       case ROFFT_TBL:
+               if (p->tbl.cols == NULL)
+                       term_vspace(p);

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

+       if (n->tok < ROFF_MAX) {
+               roff_term_pre(p, n);
+               return;
+       }
+
+       assert(n->tok >= MAN_TH && n->tok <= MAN_MAX);

        if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
                term_fontrepl(p, TERMFONT_NONE);
 
        if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
                term_fontrepl(p, TERMFONT_NONE);
 


@@ -1031,23 +936,20 @@ out:
         */
        if (mt->fl & MANT_LITERAL &&
            ! (p->flags & (TERMP_NOBREAK | TERMP_NONEWLINE)) &&
         */
        if (mt->fl & MANT_LITERAL &&
            ! (p->flags & (TERMP_NOBREAK | TERMP_NONEWLINE)) &&

-           (n->next == NULL || n->next->flags & MAN_LINE)) {
-               rm = p->rmargin;
-               rmax = p->maxrmargin;
-               p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
-               p->flags |= TERMP_NOSPACE;
+           (n->next == NULL || n->next->flags & NODE_LINE)) {
+               p->flags |= TERMP_BRNEVER | TERMP_NOSPACE;

                if (n->string != NULL && *n->string != '\0')
                        term_flushln(p);
                else
                        term_newln(p);
                if (n->string != NULL && *n->string != '\0')
                        term_flushln(p);
                else
                        term_newln(p);

-               if (rm < rmax && n->parent->tok == MAN_HP) {
-                       p->offset = rm;
-                       p->rmargin = rmax;
-               } else
-                       p->rmargin = rm;
-               p->maxrmargin = rmax;
+               p->flags &= ~TERMP_BRNEVER;
+               if (p->tcol->rmargin < p->maxrmargin &&
+                   n->parent->tok == MAN_HP) {
+                       p->tcol->offset = p->tcol->rmargin;
+                       p->tcol->rmargin = p->maxrmargin;
+               }

        }
        }

-       if (MAN_EOS & n->flags)
+       if (NODE_EOS & n->flags)

                p->flags |= TERMP_SENTENCE;
 }
 
                p->flags |= TERMP_SENTENCE;
 }
 


@@ -1056,20 +958,18 @@ static void
 print_man_nodelist(DECL_ARGS)
 {
 
 print_man_nodelist(DECL_ARGS)
 {
 

-       print_man_node(p, mt, n, meta);
-       if ( ! n->next)
-               return;
-       print_man_nodelist(p, mt, n->next, meta);
+       while (n != NULL) {
+               print_man_node(p, mt, n, meta);
+               n = n->next;
+       }

 }
 
 static void
 }
 
 static void

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

 {
 {

-       const struct man_meta   *meta;

        char                    *title;
        size_t                   datelen, titlen;
 
        char                    *title;
        size_t                   datelen, titlen;
 

-       meta = (const struct man_meta *)arg;

        assert(meta->title);
        assert(meta->msec);
        assert(meta->date);
        assert(meta->title);
        assert(meta->msec);
        assert(meta->date);


@@ -1081,8 +981,8 @@ print_man_foot(struct termp *p, const void *arg)
 
        /*
         * Temporary, undocumented option to imitate mdoc(7) output.
 
        /*
         * Temporary, undocumented option to imitate mdoc(7) output.

-        * In the bottom right corner, use the source instead of
-        * the title.
+        * In the bottom right corner, use the operating system
+        * instead of the title.

         */
 
        if ( ! p->mdocstyle) {
         */
 
        if ( ! p->mdocstyle) {


@@ -1092,30 +992,31 @@ print_man_foot(struct termp *p, const void *arg)
                }
                mandoc_asprintf(&title, "%s(%s)",
                    meta->title, meta->msec);
                }
                mandoc_asprintf(&title, "%s(%s)",
                    meta->title, meta->msec);

-       } else if (meta->source) {
-               title = mandoc_strdup(meta->source);
+       } else if (meta->os) {
+               title = mandoc_strdup(meta->os);

        } else {
                title = mandoc_strdup("");
        }
        datelen = term_strlen(p, meta->date);
 
        } else {
                title = mandoc_strdup("");
        }
        datelen = term_strlen(p, meta->date);
 

-       /* Bottom left corner: manual source. */
+       /* Bottom left corner: operating system. */

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

-       p->offset = 0;
-       p->rmargin = p->maxrmargin > datelen ?
+       p->tcol->offset = 0;
+       p->tcol->rmargin = p->maxrmargin > datelen ?

            (p->maxrmargin + term_len(p, 1) - datelen) / 2 : 0;
 
            (p->maxrmargin + term_len(p, 1) - datelen) / 2 : 0;
 

-       if (meta->source)
-               term_word(p, meta->source);
+       if (meta->os)
+               term_word(p, meta->os);

        term_flushln(p);
 
        /* At the bottom in the middle: manual date. */
 
        term_flushln(p);
 
        /* At the bottom in the middle: manual date. */
 

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

        titlen = term_strlen(p, title);
        titlen = term_strlen(p, title);

-       p->rmargin = p->maxrmargin > titlen ? p->maxrmargin - titlen : 0;
+       p->tcol->rmargin = p->maxrmargin > titlen ?
+           p->maxrmargin - titlen : 0;

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


@@ -1126,23 +1027,33 @@ print_man_foot(struct termp *p, const void *arg)
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE;
        p->trailspace = 0;
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE;
        p->trailspace = 0;

-       p->offset = p->rmargin;
-       p->rmargin = p->maxrmargin;
+       p->tcol->offset = p->tcol->rmargin;
+       p->tcol->rmargin = p->maxrmargin;

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

+
+       /*
+        * Reset the terminal state for more output after the footer:
+        * Some output modes, in particular PostScript and PDF, print
+        * the header and the footer into a buffer such that it can be
+        * reused for multiple output pages, then go on to format the
+        * main text.
+        */
+
+        p->tcol->offset = 0;
+        p->flags = 0;
+

        free(title);
 }
 
 static void
        free(title);
 }
 
 static void

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

 {
 {

-       const struct man_meta   *meta;

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

-       meta = (const struct man_meta *)arg;

        assert(meta->title);
        assert(meta->msec);
 
        assert(meta->title);
        assert(meta->msec);
 


@@ -1156,8 +1067,8 @@ print_man_head(struct termp *p, const void *arg)
 
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->trailspace = 1;
 
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->trailspace = 1;

-       p->offset = 0;
-       p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
+       p->tcol->offset = 0;
+       p->tcol->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?

            (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
            vollen < p->maxrmargin ? p->maxrmargin - vollen : 0;
 
            (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
            vollen < p->maxrmargin ? p->maxrmargin - vollen : 0;
 


@@ -1167,9 +1078,9 @@ print_man_head(struct termp *p, const void *arg)
        /* At the top in the middle: manual volume. */
 
        p->flags |= TERMP_NOSPACE;
        /* At the top in the middle: manual volume. */
 
        p->flags |= TERMP_NOSPACE;

-       p->offset = p->rmargin;
-       p->rmargin = p->offset + vollen + titlen < p->maxrmargin ?
-           p->maxrmargin - titlen : p->maxrmargin;
+       p->tcol->offset = p->tcol->rmargin;
+       p->tcol->rmargin = p->tcol->offset + vollen + titlen <
+           p->maxrmargin ?  p->maxrmargin - titlen : p->maxrmargin;

 
        term_word(p, volume);
        term_flushln(p);
 
        term_word(p, volume);
        term_flushln(p);


@@ -1178,17 +1089,17 @@ print_man_head(struct termp *p, const void *arg)
 
        p->flags &= ~TERMP_NOBREAK;
        p->trailspace = 0;
 
        p->flags &= ~TERMP_NOBREAK;
        p->trailspace = 0;

-       if (p->rmargin + titlen <= p->maxrmargin) {
+       if (p->tcol->rmargin + titlen <= p->maxrmargin) {

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

-               p->offset = p->rmargin;
-               p->rmargin = p->maxrmargin;
+               p->tcol->offset = p->tcol->rmargin;
+               p->tcol->rmargin = p->maxrmargin;

                term_word(p, title);
                term_flushln(p);
        }
 
        p->flags &= ~TERMP_NOSPACE;
                term_word(p, title);
                term_flushln(p);
        }
 
        p->flags &= ~TERMP_NOSPACE;

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

 
        /*
         * Groff prints three blank lines before the content.
 
        /*
         * Groff prints three blank lines before the content.