]> git.cameronkatri.com Git - mandoc.git/blobdiff - man_term.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make the generated man(7) code more portable by using .PD
[mandoc.git] / man_term.c
diff --git a/man_term.c b/man_term.c
index 56ac4ac98def939b6e8fefe43584ca12160c3fbc..73f501a6598f67dc771faa5b0b9a5ebbc7bc1210 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,6 +1,7 @@
-/*     $Id: man_term.c,v 1.22 2009/08/13 12:54:52 kristaps Exp $ */
+/*     $Id: man_term.c,v 1.135 2012/11/17 00:26:33 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,382 +15,440 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "term.h"
+#include "mandoc.h"
+#include "out.h"
 #include "man.h"
 #include "man.h"
+#include "term.h"
+#include "main.h"
 
 
-#define        INDENT            7
-#define        HALFINDENT        3
-
-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
-#endif
+#define        MAXMARGINS        64 /* maximum number of indented scopes */
 
 
+struct mtermp {
+       int               fl;
 #define        MANT_LITERAL     (1 << 0)
 #define        MANT_LITERAL     (1 << 0)
+       size_t            lmargin[MAXMARGINS]; /* margins (incl. visible page) */
+       int               lmargincur; /* index of current margin */
+       int               lmarginsz; /* actual number of nested margins */
+       size_t            offset; /* default offset to visible page */
+       int               pardist; /* vert. space before par., unit: [v] */
+};
 
 #define        DECL_ARGS         struct termp *p, \
 
 #define        DECL_ARGS         struct termp *p, \
-                         int *fl, \
+                         struct mtermp *mt, \
                          const struct man_node *n, \
                          const struct man_node *n, \
-                         const struct man_meta *m
+                         const struct man_meta *meta
 
 struct termact {
        int             (*pre)(DECL_ARGS);
        void            (*post)(DECL_ARGS);
 
 struct termact {
        int             (*pre)(DECL_ARGS);
        void            (*post)(DECL_ARGS);
+       int               flags;
+#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_head(struct termp *, const void *);
+static void              print_man_foot(struct termp *, const void *);
+static void              print_bvspace(struct termp *, 
+                               const struct man_node *, int);
+
 static int               pre_B(DECL_ARGS);
 static int               pre_B(DECL_ARGS);
-static int               pre_BI(DECL_ARGS);
-static int               pre_BR(DECL_ARGS);
 static int               pre_HP(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
 static int               pre_HP(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
-static int               pre_IB(DECL_ARGS);
 static int               pre_IP(DECL_ARGS);
 static int               pre_IP(DECL_ARGS);
-static int               pre_IR(DECL_ARGS);
+static int               pre_OP(DECL_ARGS);
+static int               pre_PD(DECL_ARGS);
 static int               pre_PP(DECL_ARGS);
 static int               pre_PP(DECL_ARGS);
-static int               pre_RB(DECL_ARGS);
-static int               pre_RI(DECL_ARGS);
+static int               pre_RS(DECL_ARGS);
 static int               pre_SH(DECL_ARGS);
 static int               pre_SS(DECL_ARGS);
 static int               pre_TP(DECL_ARGS);
 static int               pre_SH(DECL_ARGS);
 static int               pre_SS(DECL_ARGS);
 static int               pre_TP(DECL_ARGS);
-static int               pre_br(DECL_ARGS);
-static int               pre_fi(DECL_ARGS);
-static int               pre_nf(DECL_ARGS);
-static int               pre_r(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_sp(DECL_ARGS);
 
 static int               pre_sp(DECL_ARGS);
 
-static void              post_B(DECL_ARGS);
-static void              post_I(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);
+static void              post_RS(DECL_ARGS);
 static void              post_SH(DECL_ARGS);
 static void              post_SS(DECL_ARGS);
 static void              post_TP(DECL_ARGS);
 static void              post_SH(DECL_ARGS);
 static void              post_SS(DECL_ARGS);
 static void              post_TP(DECL_ARGS);
-static void              post_i(DECL_ARGS);
-
-static const struct termact termacts[MAN_MAX] = {
-       { pre_br, NULL }, /* br */
-       { NULL, NULL }, /* TH */
-       { pre_SH, post_SH }, /* SH */
-       { pre_SS, post_SS }, /* SS */
-       { pre_TP, post_TP }, /* TP */
-       { pre_PP, NULL }, /* LP */
-       { pre_PP, NULL }, /* PP */
-       { pre_PP, NULL }, /* P */
-       { pre_IP, post_IP }, /* IP */
-       { pre_HP, post_HP }, /* HP */ 
-       { NULL, NULL }, /* SM */
-       { pre_B, post_B }, /* SB */
-       { pre_BI, NULL }, /* BI */
-       { pre_IB, NULL }, /* IB */
-       { pre_BR, NULL }, /* BR */
-       { pre_RB, NULL }, /* RB */
-       { NULL, NULL }, /* R */
-       { pre_B, post_B }, /* B */
-       { pre_I, post_I }, /* I */
-       { pre_IR, NULL }, /* IR */
-       { pre_RI, NULL }, /* RI */
-       { NULL, NULL }, /* na */ /* TODO: document that has no effect */
-       { pre_I, post_i }, /* i */
-       { pre_sp, NULL }, /* sp */
-       { pre_nf, NULL }, /* nf */
-       { pre_fi, NULL }, /* fi */
-       { pre_r, NULL }, /* r */
-};
 
 
-static void              print_head(struct termp *, 
-                               const struct man_meta *);
-static void              print_body(DECL_ARGS);
-static void              print_node(DECL_ARGS);
-static void              print_foot(struct termp *, 
-                               const struct man_meta *);
-static void              fmt_block_vspace(struct termp *, 
-                               const struct man_node *);
-static int               arg_width(const struct man_node *);
-
-
-int
-man_run(struct termp *p, const struct man *m)
-{
-       int              fl;
-
-       print_head(p, man_meta(m));
-       p->flags |= TERMP_NOSPACE;
-       assert(man_node(m));
-       assert(MAN_ROOT == man_node(m)->type);
-
-       fl = 0;
-       if (man_node(m)->child)
-               print_body(p, &fl, man_node(m)->child, man_meta(m));
-       print_foot(p, man_meta(m));
+static const struct termact termacts[MAN_MAX] = {
+       { pre_sp, NULL, MAN_NOTEXT }, /* br */
+       { NULL, NULL, 0 }, /* TH */
+       { pre_SH, post_SH, 0 }, /* SH */
+       { pre_SS, post_SS, 0 }, /* SS */
+       { pre_TP, post_TP, 0 }, /* TP */
+       { pre_PP, NULL, 0 }, /* LP */
+       { pre_PP, NULL, 0 }, /* PP */
+       { pre_PP, NULL, 0 }, /* P */
+       { pre_IP, post_IP, 0 }, /* IP */
+       { pre_HP, post_HP, 0 }, /* HP */ 
+       { NULL, NULL, 0 }, /* SM */
+       { pre_B, NULL, 0 }, /* SB */
+       { pre_alternate, NULL, 0 }, /* BI */
+       { pre_alternate, NULL, 0 }, /* IB */
+       { pre_alternate, NULL, 0 }, /* BR */
+       { pre_alternate, NULL, 0 }, /* RB */
+       { NULL, NULL, 0 }, /* R */
+       { pre_B, NULL, 0 }, /* B */
+       { 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_ign, NULL, 0 }, /* DT */
+       { pre_ign, NULL, 0 }, /* 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 */
+};
 
 
-       return(1);
-}
 
 
 
 
-static void
-fmt_block_vspace(struct termp *p, const struct man_node *n)
+void
+terminal_man(void *arg, const struct man *man)
 {
 {
-       term_newln(p);
+       struct termp            *p;
+       const struct man_node   *n;
+       const struct man_meta   *meta;
+       struct mtermp            mt;
 
 
-       if (NULL == n->prev)
-               return;
+       p = (struct termp *)arg;
 
 
-       if (MAN_SS == n->prev->tok)
-               return;
-       if (MAN_SH == n->prev->tok)
-               return;
+       if (0 == p->defindent)
+               p->defindent = 7;
 
 
-       term_vspace(p);
-}
+       p->overstep = 0;
+       p->maxrmargin = p->defrmargin;
+       p->tabwidth = term_len(p, 5);
 
 
+       if (NULL == p->symtab)
+               p->symtab = mchars_alloc();
 
 
-static int
-arg_width(const struct man_node *n)
-{
-       int              i, len;
-       const char      *p;
-
-       assert(MAN_TEXT == n->type);
-       assert(n->string);
+       n = man_node(man);
+       meta = man_meta(man);
 
 
-       p = n->string;
+       term_begin(p, print_man_head, print_man_foot, meta);
+       p->flags |= TERMP_NOSPACE;
 
 
-       if (0 == (len = (int)strlen(p)))
-               return(-1);
+       memset(&mt, 0, sizeof(struct mtermp));
 
 
-       for (i = 0; i < len; i++) 
-               if ( ! isdigit((u_char)p[i]))
-                       break;
+       mt.lmargin[mt.lmargincur] = term_len(p, p->defindent);
+       mt.offset = term_len(p, p->defindent);
+       mt.pardist = 1;
 
 
-       if (i == len - 1)  {
-               if ('n' == p[len - 1] || 'm' == p[len - 1])
-                       return(atoi(p));
-       } else if (i == len)
-               return(atoi(p));
+       if (n->child)
+               print_man_nodelist(p, &mt, n->child, meta);
 
 
-       return(-1);
+       term_end(p);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-pre_I(DECL_ARGS)
+static size_t
+a2height(const struct termp *p, const char *cp)
 {
 {
+       struct roffsu    su;
 
 
-       p->flags |= TERMP_UNDER;
-       return(1);
+       if ( ! a2roffsu(cp, &su, SCALE_VS))
+               SCALE_VS_INIT(&su, atoi(cp));
+
+       return(term_vspan(p, &su));
 }
 
 
 }
 
 
-/* ARGSUSED */
 static int
 static int
-pre_r(DECL_ARGS)
+a2width(const struct termp *p, const char *cp)
 {
 {
+       struct roffsu    su;
 
 
-       p->flags &= ~TERMP_UNDER;
-       p->flags &= ~TERMP_BOLD;
-       return(1);
-}
+       if ( ! a2roffsu(cp, &su, SCALE_BU))
+               return(-1);
 
 
+       return((int)term_hspan(p, &su));
+}
 
 
-/* ARGSUSED */
+/*
+ * Printing leading vertical space before a block.
+ * This is used for the paragraph macros.
+ * The rules are pretty simple, since there's very little nesting going
+ * on here.  Basically, if we're the first within another block (SS/SH),
+ * then don't emit vertical space.  If we are (RS), then do.  If not the
+ * first, print it.
+ */
 static void
 static void
-post_i(DECL_ARGS)
+print_bvspace(struct termp *p, const struct man_node *n, int pardist)
 {
 {
+       int      i;
 
 
-       if (n->nchild)
-               p->flags &= ~TERMP_UNDER;
-}
+       term_newln(p);
 
 
+       if (n->body && n->body->child)
+               if (MAN_TBL == n->body->child->type)
+                       return;
 
 
-/* ARGSUSED */
-static void
-post_I(DECL_ARGS)
-{
+       if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok)
+               if (NULL == n->prev)
+                       return;
 
 
-       p->flags &= ~TERMP_UNDER;
+       for (i = 0; i < pardist; i++)
+               term_vspace(p);
 }
 
 }
 
-
 /* ARGSUSED */
 static int
 /* ARGSUSED */
 static int
-pre_fi(DECL_ARGS)
+pre_ign(DECL_ARGS)
 {
 
 {
 
-       *fl &= ~MANT_LITERAL;
-       return(1);
+       return(0);
 }
 
 
 /* ARGSUSED */
 static int
 }
 
 
 /* ARGSUSED */
 static int
-pre_nf(DECL_ARGS)
+pre_I(DECL_ARGS)
 {
 
 {
 
-       term_newln(p);
-       *fl |= MANT_LITERAL;
+       term_fontrepl(p, TERMFONT_UNDER);
        return(1);
 }
 
 
 /* ARGSUSED */
 static int
        return(1);
 }
 
 
 /* ARGSUSED */
 static int
-pre_IR(DECL_ARGS)
+pre_literal(DECL_ARGS)
 {
 {
-       const struct man_node *nn;
-       int              i;
 
 
-       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-               if ( ! (i % 2))
-                       p->flags |= TERMP_UNDER;
-               if (i > 0)
-                       p->flags |= TERMP_NOSPACE;
-               print_node(p, fl, nn, m);
-               if ( ! (i % 2))
-                       p->flags &= ~TERMP_UNDER;
+       term_newln(p);
+
+       if (MAN_nf == n->tok || MAN_EX == n->tok)
+               mt->fl |= MANT_LITERAL;
+       else
+               mt->fl &= ~MANT_LITERAL;
+
+       /*
+        * Unlike .IP and .TP, .HP does not have a HEAD.
+        * 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;
+               p->flags &= ~(TERMP_NOBREAK | TERMP_TWOSPACE);
+               p->flags |= TERMP_NOSPACE;
        }
        }
+
        return(0);
 }
 
        return(0);
 }
 
-
 /* ARGSUSED */
 static int
 /* ARGSUSED */
 static int
-pre_IB(DECL_ARGS)
+pre_PD(DECL_ARGS)
 {
 {
-       const struct man_node *nn;
-       int              i;
 
 
-       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-               p->flags |= i % 2 ? TERMP_BOLD : TERMP_UNDER;
-               if (i > 0)
-                       p->flags |= TERMP_NOSPACE;
-               print_node(p, fl, nn, m);
-               p->flags &= i % 2 ? ~TERMP_BOLD : ~TERMP_UNDER;
+       n = n->child;
+       if (0 == n) {
+               mt->pardist = 1;
+               return(0);
        }
        }
+       assert(MAN_TEXT == n->type);
+       mt->pardist = atoi(n->string);
        return(0);
 }
 
        return(0);
 }
 
-
 /* ARGSUSED */
 static int
 /* ARGSUSED */
 static int
-pre_RB(DECL_ARGS)
+pre_alternate(DECL_ARGS)
 {
 {
-       const struct man_node *nn;
-       int              i;
+       enum termfont            font[2];
+       const struct man_node   *nn;
+       int                      savelit, i;
+
+       switch (n->tok) {
+       case (MAN_RB):
+               font[0] = TERMFONT_NONE;
+               font[1] = TERMFONT_BOLD;
+               break;
+       case (MAN_RI):
+               font[0] = TERMFONT_NONE;
+               font[1] = TERMFONT_UNDER;
+               break;
+       case (MAN_BR):
+               font[0] = TERMFONT_BOLD;
+               font[1] = TERMFONT_NONE;
+               break;
+       case (MAN_BI):
+               font[0] = TERMFONT_BOLD;
+               font[1] = TERMFONT_UNDER;
+               break;
+       case (MAN_IR):
+               font[0] = TERMFONT_UNDER;
+               font[1] = TERMFONT_NONE;
+               break;
+       case (MAN_IB):
+               font[0] = TERMFONT_UNDER;
+               font[1] = TERMFONT_BOLD;
+               break;
+       default:
+               abort();
+       }
 
 
-       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-               if (i % 2)
-                       p->flags |= TERMP_BOLD;
-               if (i > 0)
+       savelit = MANT_LITERAL & mt->fl;
+       mt->fl &= ~MANT_LITERAL;
+
+       for (i = 0, nn = n->child; nn; nn = nn->next, i = 1 - i) {
+               term_fontrepl(p, font[i]);
+               if (savelit && NULL == nn->next)
+                       mt->fl |= MANT_LITERAL;
+               print_man_node(p, mt, nn, meta);
+               if (nn->next)
                        p->flags |= TERMP_NOSPACE;
                        p->flags |= TERMP_NOSPACE;
-               print_node(p, fl, nn, m);
-               if (i % 2)
-                       p->flags &= ~TERMP_BOLD;
        }
        }
+
        return(0);
 }
 
        return(0);
 }
 
-
 /* ARGSUSED */
 static int
 /* ARGSUSED */
 static int
-pre_RI(DECL_ARGS)
+pre_B(DECL_ARGS)
 {
 {
-       const struct man_node *nn;
-       int              i;
 
 
-       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-               if ( ! (i % 2))
-                       p->flags |= TERMP_UNDER;
-               if (i > 0)
-                       p->flags |= TERMP_NOSPACE;
-               print_node(p, fl, nn, m);
-               if ( ! (i % 2))
-                       p->flags &= ~TERMP_UNDER;
-       }
-       return(0);
+       term_fontrepl(p, TERMFONT_BOLD);
+       return(1);
 }
 
 }
 
-
 /* ARGSUSED */
 static int
 /* ARGSUSED */
 static int
-pre_BR(DECL_ARGS)
+pre_OP(DECL_ARGS)
 {
 {
-       const struct man_node *nn;
-       int              i;
 
 
-       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-               if ( ! (i % 2))
-                       p->flags |= TERMP_BOLD;
-               if (i > 0)
-                       p->flags |= TERMP_NOSPACE;
-               print_node(p, fl, nn, m);
-               if ( ! (i % 2))
-                       p->flags &= ~TERMP_BOLD;
+       term_word(p, "[");
+       p->flags |= TERMP_NOSPACE;
+
+       if (NULL != (n = n->child)) {
+               term_fontrepl(p, TERMFONT_BOLD);
+               term_word(p, n->string);
+       }
+       if (NULL != n && NULL != n->next) {
+               term_fontrepl(p, TERMFONT_UNDER);
+               term_word(p, n->next->string);
        }
        }
+
+       term_fontrepl(p, TERMFONT_NONE);
+       p->flags |= TERMP_NOSPACE;
+       term_word(p, "]");
        return(0);
 }
 
        return(0);
 }
 
-
 /* ARGSUSED */
 static int
 /* ARGSUSED */
 static int
-pre_BI(DECL_ARGS)
+pre_ft(DECL_ARGS)
 {
 {
-       const struct man_node *nn;
-       int              i;
+       const char      *cp;
 
 
-       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-               p->flags |= i % 2 ? TERMP_UNDER : TERMP_BOLD;
-               if (i > 0)
-                       p->flags |= TERMP_NOSPACE;
-               print_node(p, fl, nn, m);
-               p->flags &= i % 2 ? ~TERMP_UNDER : ~TERMP_BOLD;
+       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);
 }
 
-
 /* ARGSUSED */
 static int
 /* ARGSUSED */
 static int
-pre_B(DECL_ARGS)
+pre_in(DECL_ARGS)
 {
 {
+       int              len, less;
+       size_t           v;
+       const char      *cp;
 
 
-       p->flags |= TERMP_BOLD;
-       return(1);
-}
+       term_newln(p);
 
 
+       if (NULL == n->child) {
+               p->offset = mt->offset;
+               return(0);
+       }
 
 
-/* ARGSUSED */
-static void
-post_B(DECL_ARGS)
-{
+       cp = n->child->string;
+       less = 0;
 
 
-       p->flags &= ~TERMP_BOLD;
-}
+       if ('-' == *cp)
+               less = -1;
+       else if ('+' == *cp)
+               less = 1;
+       else
+               cp--;
 
 
+       if ((len = a2width(p, ++cp)) < 0)
+               return(0);
 
 
-/* ARGSUSED */
-static int
-pre_sp(DECL_ARGS)
-{
-       int              i, len;
+       v = (size_t)len;
 
 
-       if (NULL == n->child) {
-               term_vspace(p);
-               return(0);
-       }
+       if (less < 0)
+               p->offset -= p->offset > v ? v : p->offset;
+       else if (less > 0)
+               p->offset += v;
+       else 
+               p->offset = v;
 
 
-       len = atoi(n->child->string);
-       if (0 == len)
-               term_newln(p);
-       for (i = 0; i < len; i++)
-               term_vspace(p);
+       /* Don't let this creep beyond the right margin. */
+
+       if (p->offset > p->rmargin)
+               p->offset = p->rmargin;
 
        return(0);
 }
 
        return(0);
 }
@@ -397,10 +456,57 @@ pre_sp(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int
-pre_br(DECL_ARGS)
+pre_sp(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);
 
 
-       term_newln(p);
        return(0);
 }
 
        return(0);
 }
 
@@ -409,21 +515,44 @@ pre_br(DECL_ARGS)
 static int
 pre_HP(DECL_ARGS)
 {
 static int
 pre_HP(DECL_ARGS)
 {
+       size_t                   len, one;
+       int                      ival;
+       const struct man_node   *nn;
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):
-               fmt_block_vspace(p, n);
-               break;
+               print_bvspace(p, n, mt->pardist);
+               return(1);
        case (MAN_BODY):
        case (MAN_BODY):
-               p->flags |= TERMP_NOBREAK;
-               p->flags |= TERMP_TWOSPACE;
-               p->offset = INDENT;
-               p->rmargin = INDENT * 2;
                break;
        default:
                return(0);
        }
 
                break;
        default:
                return(0);
        }
 
+       if ( ! (MANT_LITERAL & mt->fl)) {
+               p->flags |= TERMP_NOBREAK;
+               p->flags |= TERMP_TWOSPACE;
+       }
+
+       len = mt->lmargin[mt->lmargincur];
+       ival = -1;
+
+       /* 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);
 }
 
        return(1);
 }
 
@@ -438,7 +567,7 @@ post_HP(DECL_ARGS)
                term_flushln(p);
                p->flags &= ~TERMP_NOBREAK;
                p->flags &= ~TERMP_TWOSPACE;
                term_flushln(p);
                p->flags &= ~TERMP_NOBREAK;
                p->flags &= ~TERMP_TWOSPACE;
-               p->offset = INDENT;
+               p->offset = mt->offset;
                p->rmargin = p->maxrmargin;
                break;
        default:
                p->rmargin = p->maxrmargin;
                break;
        default:
@@ -454,14 +583,15 @@ pre_PP(DECL_ARGS)
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):
-               fmt_block_vspace(p, n);
+               mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
+               print_bvspace(p, n, mt->pardist);
                break;
        default:
                break;
        default:
-               p->offset = INDENT;
+               p->offset = mt->offset;
                break;
        }
 
                break;
        }
 
-       return(1);
+       return(MAN_HEAD != n->type);
 }
 
 
 }
 
 
@@ -471,52 +601,59 @@ pre_IP(DECL_ARGS)
 {
        const struct man_node   *nn;
        size_t                   len;
 {
        const struct man_node   *nn;
        size_t                   len;
-       int                      ival;
+       int                      savelit, ival;
 
        switch (n->type) {
 
        switch (n->type) {
-       case (MAN_BLOCK):
-               fmt_block_vspace(p, n);
-               return(1);
        case (MAN_BODY):
        case (MAN_BODY):
-               p->flags |= TERMP_NOLPAD;
                p->flags |= TERMP_NOSPACE;
                break;
        case (MAN_HEAD):
                p->flags |= TERMP_NOBREAK;
                p->flags |= TERMP_NOSPACE;
                break;
        case (MAN_HEAD):
                p->flags |= TERMP_NOBREAK;
-               p->flags |= TERMP_TWOSPACE;
                break;
                break;
+       case (MAN_BLOCK):
+               print_bvspace(p, n, mt->pardist);
+               /* FALLTHROUGH */
        default:
                return(1);
        }
 
        default:
                return(1);
        }
 
-       len = INDENT * 2;
+       len = mt->lmargin[mt->lmargincur];
        ival = -1;
 
        ival = -1;
 
-       /* Calculate offset. */
-
+       /* Calculate the offset from the optional second argument. */
        if (NULL != (nn = n->parent->head->child))
        if (NULL != (nn = n->parent->head->child))
-               if (NULL != (nn = nn->next)) {
-                       for ( ; nn->next; nn = nn->next)
-                               /* Do nothing. */ ;
-                       if ((ival = arg_width(nn)) >= 0)
+               if (NULL != (nn = nn->next))
+                       if ((ival = a2width(p, nn->string)) >= 0)
                                len = (size_t)ival;
                                len = (size_t)ival;
-               }
 
        switch (n->type) {
 
        switch (n->type) {
-       case (MAN_BODY):
-               p->offset = INDENT + len;
-               p->rmargin = p->maxrmargin;
-               break;
        case (MAN_HEAD):
        case (MAN_HEAD):
-               p->offset = INDENT;
-               p->rmargin = INDENT + len;
+               /* 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;
 
                if (ival < 0)
                        break;
 
-               /* Don't print the length value. */
-               for (nn = n->child; nn->next; nn = nn->next)
-                       print_node(p, fl, nn, m);
+               /* Set the saved left-margin. */
+               mt->lmargin[mt->lmargincur] = (size_t)ival;
+
+               savelit = MANT_LITERAL & mt->fl;
+               mt->fl &= ~MANT_LITERAL;
+
+               if (n->child)
+                       print_man_node(p, mt, n->child, meta);
+
+               if (savelit)
+                       mt->fl |= MANT_LITERAL;
+
                return(0);
                return(0);
+       case (MAN_BODY):
+               p->offset = mt->offset + len;
+               p->rmargin = p->maxrmargin;
+               break;
        default:
                break;
        }
        default:
                break;
        }
@@ -534,12 +671,10 @@ post_IP(DECL_ARGS)
        case (MAN_HEAD):
                term_flushln(p);
                p->flags &= ~TERMP_NOBREAK;
        case (MAN_HEAD):
                term_flushln(p);
                p->flags &= ~TERMP_NOBREAK;
-               p->flags &= ~TERMP_TWOSPACE;
                p->rmargin = p->maxrmargin;
                break;
        case (MAN_BODY):
                p->rmargin = p->maxrmargin;
                break;
        case (MAN_BODY):
-               term_flushln(p);
-               p->flags &= ~TERMP_NOLPAD;
+               term_newln(p);
                break;
        default:
                break;
                break;
        default:
                break;
@@ -551,21 +686,62 @@ 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;
 
        switch (n->type) {
 
        switch (n->type) {
-       case (MAN_BLOCK):
-               fmt_block_vspace(p, n);
-               break;
        case (MAN_HEAD):
        case (MAN_HEAD):
-               p->rmargin = INDENT * 2;
-               p->offset = INDENT;
                p->flags |= TERMP_NOBREAK;
                p->flags |= TERMP_NOBREAK;
-               p->flags |= TERMP_TWOSPACE;
                break;
        case (MAN_BODY):
                break;
        case (MAN_BODY):
-               p->flags |= TERMP_NOLPAD;
                p->flags |= TERMP_NOSPACE;
                p->flags |= TERMP_NOSPACE;
-               p->offset = INDENT * 2;
+               break;
+       case (MAN_BLOCK):
+               print_bvspace(p, n, mt->pardist);
+               /* FALLTHROUGH */
+       default:
+               return(1);
+       }
+
+       len = (size_t)mt->lmargin[mt->lmargincur];
+       ival = -1;
+
+       /* Calculate offset. */
+
+       if (NULL != (nn = n->parent->head->child))
+               if (nn->string && nn->parent->line == nn->line)
+                       if ((ival = a2width(p, nn->string)) >= 0)
+                               len = (size_t)ival;
+
+       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;
+
+               savelit = MANT_LITERAL & mt->fl;
+               mt->fl &= ~MANT_LITERAL;
+
+               /* Don't print same-line elements. */
+               for (nn = n->child; nn; nn = nn->next)
+                       if (nn->line > n->line)
+                               print_man_node(p, mt, nn, meta);
+
+               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;
+               p->flags &= ~TERMP_NOBREAK;
+               p->flags &= ~TERMP_TWOSPACE;
                break;
        default:
                break;
                break;
        default:
                break;
@@ -583,13 +759,9 @@ post_TP(DECL_ARGS)
        switch (n->type) {
        case (MAN_HEAD):
                term_flushln(p);
        switch (n->type) {
        case (MAN_HEAD):
                term_flushln(p);
-               p->flags &= ~TERMP_NOBREAK;
-               p->flags &= ~TERMP_TWOSPACE;
-               p->rmargin = p->maxrmargin;
                break;
        case (MAN_BODY):
                break;
        case (MAN_BODY):
-               term_flushln(p);
-               p->flags &= ~TERMP_NOLPAD;
+               term_newln(p);
                break;
        default:
                break;
                break;
        default:
                break;
@@ -601,19 +773,30 @@ post_TP(DECL_ARGS)
 static int
 pre_SS(DECL_ARGS)
 {
 static int
 pre_SS(DECL_ARGS)
 {
+       int      i;
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):
-               term_newln(p);
-               if (n->prev)
+               mt->fl &= ~MANT_LITERAL;
+               mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
+               mt->offset = term_len(p, p->defindent);
+               /* If following a prior empty `SS', no vspace. */
+               if (n->prev && MAN_SS == n->prev->tok)
+                       if (NULL == n->prev->body->child)
+                               break;
+               if (NULL == n->prev)
+                       break;
+               for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;
        case (MAN_HEAD):
                        term_vspace(p);
                break;
        case (MAN_HEAD):
-               p->flags |= TERMP_BOLD;
-               p->offset = HALFINDENT;
+               term_fontrepl(p, TERMFONT_BOLD);
+               p->offset = term_len(p, 3);
+               break;
+       case (MAN_BODY):
+               p->offset = mt->offset;
                break;
        default:
                break;
        default:
-               p->offset = INDENT;
                break;
        }
 
                break;
        }
 
@@ -629,7 +812,9 @@ post_SS(DECL_ARGS)
        switch (n->type) {
        case (MAN_HEAD):
                term_newln(p);
        switch (n->type) {
        case (MAN_HEAD):
                term_newln(p);
-               p->flags &= ~TERMP_BOLD;
+               break;
+       case (MAN_BODY):
+               term_newln(p);
                break;
        default:
                break;
                break;
        default:
                break;
@@ -641,21 +826,29 @@ post_SS(DECL_ARGS)
 static int
 pre_SH(DECL_ARGS)
 {
 static int
 pre_SH(DECL_ARGS)
 {
+       int      i;
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):
+               mt->fl &= ~MANT_LITERAL;
+               mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
+               mt->offset = term_len(p, p->defindent);
                /* If following a prior empty `SH', no vspace. */
                if (n->prev && MAN_SH == n->prev->tok)
                        if (NULL == n->prev->body->child)
                                break;
                /* If following a prior empty `SH', no vspace. */
                if (n->prev && MAN_SH == n->prev->tok)
                        if (NULL == n->prev->body->child)
                                break;
-               term_vspace(p);
+               /* If the first macro, no vspae. */
+               if (NULL == n->prev)
+                       break;
+               for (i = 0; i < mt->pardist; i++)
+                       term_vspace(p);
                break;
        case (MAN_HEAD):
                break;
        case (MAN_HEAD):
-               p->flags |= TERMP_BOLD;
+               term_fontrepl(p, TERMFONT_BOLD);
                p->offset = 0;
                break;
        case (MAN_BODY):
                p->offset = 0;
                break;
        case (MAN_BODY):
-               p->offset = INDENT;
+               p->offset = mt->offset;
                break;
        default:
                break;
                break;
        default:
                break;
@@ -673,7 +866,6 @@ post_SH(DECL_ARGS)
        switch (n->type) {
        case (MAN_HEAD):
                term_newln(p);
        switch (n->type) {
        case (MAN_HEAD):
                term_newln(p);
-               p->flags &= ~TERMP_BOLD;
                break;
        case (MAN_BODY):
                term_newln(p);
                break;
        case (MAN_BODY):
                term_newln(p);
@@ -683,149 +875,296 @@ post_SH(DECL_ARGS)
        }
 }
 
        }
 }
 
+/* ARGSUSED */
+static int
+pre_RS(DECL_ARGS)
+{
+       int              ival;
+       size_t           sz;
+
+       switch (n->type) {
+       case (MAN_BLOCK):
+               term_newln(p);
+               return(1);
+       case (MAN_HEAD):
+               return(0);
+       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->rmargin = p->maxrmargin;
+       p->offset = mt->offset < p->rmargin ? mt->offset : p->rmargin;
+
+       if (++mt->lmarginsz < MAXMARGINS)
+               mt->lmargincur = mt->lmarginsz;
 
 
+       mt->lmargin[mt->lmargincur] = mt->lmargin[mt->lmargincur - 1];
+       return(1);
+}
+
+/* ARGSUSED */
 static void
 static void
-print_node(DECL_ARGS)
+post_RS(DECL_ARGS)
 {
 {
-       int              c, sz;
+       int              ival;
+       size_t           sz;
 
 
-       c = 1;
+       switch (n->type) {
+       case (MAN_BLOCK):
+               return;
+       case (MAN_HEAD):
+               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;
+
+       if (--mt->lmarginsz < MAXMARGINS)
+               mt->lmargincur = mt->lmarginsz;
+}
+
+static void
+print_man_node(DECL_ARGS)
+{
+       size_t           rm, rmax;
+       int              c;
 
        switch (n->type) {
        case(MAN_TEXT):
 
        switch (n->type) {
        case(MAN_TEXT):
-               if (0 == *n->string) {
-                       term_vspace(p);
-                       break;
-               }
                /*
                /*
-                * Note!  This is hacky.  Here, we recognise the `\c'
-                * escape embedded in so many -man pages.  It's supposed
-                * to remove the subsequent space, so we mark NOSPACE if
-                * it's encountered in the string.
+                * 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.
                 */
                 */
-               sz = (int)strlen(n->string);
+               if ('\0' == *n->string) {
+                       term_vspace(p);
+                       return;
+               } else if (' ' == *n->string && MAN_LINE & n->flags)
+                       term_newln(p);
+
                term_word(p, n->string);
                term_word(p, n->string);
-               if (sz >= 2 && n->string[sz - 1] == 'c' &&
-                               n->string[sz - 2] == '\\')
-                       p->flags |= TERMP_NOSPACE;
-               /* FIXME: this means that macro lines are munged!  */
-               if (MANT_LITERAL & *fl) {
-                       p->flags |= TERMP_NOSPACE;
-                       term_flushln(p);
-               }
-               break;
+               goto out;
+
+       case (MAN_EQN):
+               term_eqn(p, n->eqn);
+               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);
+               term_tbl(p, n->span);
+               return;
        default:
        default:
-               if (termacts[n->tok].pre)
-                       c = (*termacts[n->tok].pre)(p, fl, n, m);
                break;
        }
 
                break;
        }
 
-       if (c && n->child)
-               print_body(p, fl, n->child, m);
+       if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
+               term_fontrepl(p, TERMFONT_NONE);
 
 
-       if (MAN_TEXT != n->type)
-               if (termacts[n->tok].post)
-                       (*termacts[n->tok].post)(p, fl, n, m);
+       c = 1;
+       if (termacts[n->tok].pre)
+               c = (*termacts[n->tok].pre)(p, mt, n, meta);
+
+       if (c && n->child)
+               print_man_nodelist(p, mt, n->child, meta);
+
+       if (termacts[n->tok].post)
+               (*termacts[n->tok].post)(p, mt, n, meta);
+       if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
+               term_fontrepl(p, TERMFONT_NONE);
+
+out:
+       /*
+        * If we're in a literal context, make sure that words
+        * together on the same line stay together.  This is a
+        * POST-printing call, so we check the NEXT word.  Since
+        * -man doesn't have nested macros, we don't need to be
+        * more specific than this.
+        */
+       if (MANT_LITERAL & mt->fl && ! (TERMP_NOBREAK & p->flags) &&
+           NULL != n->next && n->next->line > n->line) {
+               rm = p->rmargin;
+               rmax = p->maxrmargin;
+               p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
+               p->flags |= TERMP_NOSPACE;
+               if (NULL != n->string && '\0' != *n->string)
+                       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;
+       }
+       if (MAN_EOS & n->flags)
+               p->flags |= TERMP_SENTENCE;
 }
 
 
 static void
 }
 
 
 static void
-print_body(DECL_ARGS)
+print_man_nodelist(DECL_ARGS)
 {
 
 {
 
-       print_node(p, fl, n, m);
+       print_man_node(p, mt, n, meta);
        if ( ! n->next)
                return;
        if ( ! n->next)
                return;
-       print_body(p, fl, n->next, m);
+       print_man_nodelist(p, mt, n->next, meta);
 }
 
 
 static void
 }
 
 
 static void
-print_foot(struct termp *p, const struct man_meta *meta)
+print_man_foot(struct termp *p, const void *arg)
 {
 {
-       struct tm       *tm;
-       char            *buf;
+       char            title[BUFSIZ];
+       size_t          datelen;
+       const struct man_meta *meta;
 
 
-       if (NULL == (buf = malloc(p->rmargin)))
-               err(1, "malloc");
+       meta = (const struct man_meta *)arg;
+       assert(meta->title);
+       assert(meta->msec);
+       assert(meta->date);
 
 
-       tm = localtime(&meta->date);
-
-       if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-               err(1, "strftime");
+       term_fontrepl(p, TERMFONT_NONE);
 
        term_vspace(p);
 
 
        term_vspace(p);
 
+       /*
+        * Temporary, undocumented option to imitate mdoc(7) output.
+        * In the bottom right corner, use the source instead of
+        * the title.
+        */
+
+       if ( ! p->mdocstyle) {
+               term_vspace(p);
+               term_vspace(p);
+               snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
+       } else if (meta->source) {
+               strlcpy(title, meta->source, BUFSIZ);
+       } else {
+               title[0] = '\0';
+       }
+       datelen = term_strlen(p, meta->date);
+
+       /* Bottom left corner: manual source. */
+
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
-       p->rmargin = p->maxrmargin - strlen(buf);
        p->offset = 0;
        p->offset = 0;
+       p->rmargin = (p->maxrmargin - datelen + term_len(p, 1)) / 2;
 
        if (meta->source)
                term_word(p, meta->source);
 
        if (meta->source)
                term_word(p, meta->source);
-       if (meta->source)
-               term_word(p, "");
        term_flushln(p);
 
        term_flushln(p);
 
-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+       /* At the bottom in the middle: manual date. */
+
+       p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
        p->offset = p->rmargin;
-       p->rmargin = p->maxrmargin;
-       p->flags &= ~TERMP_NOBREAK;
+       p->rmargin = p->maxrmargin - term_strlen(p, title);
+       if (p->offset + datelen >= p->rmargin)
+               p->rmargin = p->offset + datelen;
 
 
-       term_word(p, buf);
+       term_word(p, meta->date);
        term_flushln(p);
 
        term_flushln(p);
 
-       free(buf);
+       /* Bottom right corner: manual title and section. */
+
+       p->flags &= ~TERMP_NOBREAK;
+       p->flags |= TERMP_NOSPACE;
+       p->offset = p->rmargin;
+       p->rmargin = p->maxrmargin;
+
+       term_word(p, title);
+       term_flushln(p);
 }
 
 
 static void
 }
 
 
 static void
-print_head(struct termp *p, const struct man_meta *meta)
+print_man_head(struct termp *p, const void *arg)
 {
 {
-       char            *buf, *title;
+       char            buf[BUFSIZ], title[BUFSIZ];
+       size_t          buflen, titlen;
+       const struct man_meta *meta;
 
 
-       p->rmargin = p->maxrmargin;
-       p->offset = 0;
-
-       if (NULL == (buf = malloc(p->rmargin)))
-               err(1, "malloc");
-       if (NULL == (title = malloc(p->rmargin)))
-               err(1, "malloc");
+       meta = (const struct man_meta *)arg;
+       assert(meta->title);
+       assert(meta->msec);
 
        if (meta->vol)
 
        if (meta->vol)
-               (void)strlcpy(buf, meta->vol, p->rmargin);
+               strlcpy(buf, meta->vol, BUFSIZ);
        else
        else
-               *buf = 0;
+               buf[0] = '\0';
+       buflen = term_strlen(p, buf);
 
 
-       (void)snprintf(title, p->rmargin, "%s(%d)", 
-                       meta->title, meta->msec);
+       /* Top left corner: manual title and section. */
+
+       snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
+       titlen = term_strlen(p, title);
 
 
-       p->offset = 0;
-       p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
+       p->offset = 0;
+       p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?
+           (p->maxrmargin - 
+            term_strlen(p, buf) + term_len(p, 1)) / 2 :
+           p->maxrmargin - buflen;
 
        term_word(p, title);
        term_flushln(p);
 
 
        term_word(p, title);
        term_flushln(p);
 
-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+       /* At the top in the middle: manual volume. */
+
+       p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
        p->offset = p->rmargin;
-       p->rmargin = p->maxrmargin - strlen(title);
+       p->rmargin = p->offset + buflen + titlen < p->maxrmargin ?
+           p->maxrmargin - titlen : p->maxrmargin;
 
        term_word(p, buf);
        term_flushln(p);
 
 
        term_word(p, buf);
        term_flushln(p);
 
-       p->offset = p->rmargin;
-       p->rmargin = p->maxrmargin;
-       p->flags &= ~TERMP_NOBREAK;
-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+       /* Top right corner: title and section, again. */
 
 
-       term_word(p, title);
-       term_flushln(p);
+       p->flags &= ~TERMP_NOBREAK;
+       if (p->rmargin + titlen <= p->maxrmargin) {
+               p->flags |= TERMP_NOSPACE;
+               p->offset = p->rmargin;
+               p->rmargin = p->maxrmargin;
+               term_word(p, title);
+               term_flushln(p);
+       }
 
 
-       p->rmargin = p->maxrmargin;
-       p->offset = 0;
        p->flags &= ~TERMP_NOSPACE;
        p->flags &= ~TERMP_NOSPACE;
+       p->offset = 0;
+       p->rmargin = p->maxrmargin;
 
 
-       free(title);
-       free(buf);
-}
+       /* 
+        * Groff prints three blank lines before the content.
+        * Do the same, except in the temporary, undocumented
+        * mode imitating mdoc(7) output.
+        */
 
 
+       term_vspace(p);
+       if ( ! p->mdocstyle) {
+               term_vspace(p);
+               term_vspace(p);
+       }
+}
A git conversion mirror of mandoc.bsd.lv