catch up with the changed interface of mparse_alloc(), see mandoc.h rev 1.100

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index 8184fc23ea540fac61eb052dd4b7ad566fb017c7..2e65d09f2890156d41d3378092daea279c2b45ea 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,6 +1,6 @@
-/*     $Id: man_term.c,v 1.110 2011/06/18 17:36:52 kristaps Exp $ */
+/*     $Id: man_term.c,v 1.128 2012/05/27 17:39:28 schwarze Exp $ */

 /*
 /*

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

  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -33,29 +33,17 @@
 #include "term.h"
 #include "main.h"
 
 #include "term.h"
 #include "main.h"
 

-#define        INDENT            7
-#define        HALFINDENT        3
+#define        MAXMARGINS        64 /* maximum number of indented scopes */

 
 /* FIXME: have PD set the default vspace width. */
 
 struct mtermp {
        int               fl;
 #define        MANT_LITERAL     (1 << 0)
 
 /* FIXME: have PD set the default vspace width. */
 
 struct mtermp {
        int               fl;
 #define        MANT_LITERAL     (1 << 0)

-       /* 
-        * Default amount to indent the left margin after leading text
-        * has been printed (e.g., `HP' left-indent, `TP' and `IP' body
-        * indent).  This needs to be saved because `HP' and so on, if
-        * not having a specified value, must default.
-        *
-        * Note that this is the indentation AFTER the left offset, so
-        * the total offset is usually offset + lmargin.
-        */
-       size_t            lmargin;
-       /*
-        * The default offset, i.e., the amount between any text and the
-        * page boundary.
-        */
-       size_t            offset;
+       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 */

 };
 
 #define        DECL_ARGS         struct termp *p, \
 };
 
 #define        DECL_ARGS         struct termp *p, \


@@ -80,21 +68,22 @@ static      void              print_man_foot(struct termp *, const void *);
 static void              print_bvspace(struct termp *, 
                                const struct man_node *);
 
 static void              print_bvspace(struct termp *, 
                                const struct man_node *);
 

-static int               pre_alternate(DECL_ARGS);

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

+static int               pre_OP(DECL_ARGS);

 static int               pre_PP(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_PP(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_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_ign(DECL_ARGS);
 static int               pre_in(DECL_ARGS);
 static int               pre_literal(DECL_ARGS);
 static int               pre_sp(DECL_ARGS);

-static int               pre_ft(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);


@@ -137,6 +126,7 @@ static      const struct termact termacts[MAN_MAX] = {
        { pre_ign, NULL, 0 }, /* AT */
        { pre_in, NULL, MAN_NOTEXT }, /* in */
        { pre_ft, NULL, MAN_NOTEXT }, /* ft */
        { pre_ign, NULL, 0 }, /* AT */
        { pre_in, NULL, MAN_NOTEXT }, /* in */
        { pre_ft, NULL, MAN_NOTEXT }, /* ft */

+       { pre_OP, NULL, 0 }, /* OP */

 };
 
 
 };
 
 


@@ -151,6 +141,9 @@ terminal_man(void *arg, const struct man *man)
 
        p = (struct termp *)arg;
 
 
        p = (struct termp *)arg;
 

+       if (0 == p->defindent)
+               p->defindent = 7;
+

        p->overstep = 0;
        p->maxrmargin = p->defrmargin;
        p->tabwidth = term_len(p, 5);
        p->overstep = 0;
        p->maxrmargin = p->defrmargin;
        p->tabwidth = term_len(p, 5);


@@ -164,9 +157,10 @@ terminal_man(void *arg, const struct man *man)
        term_begin(p, print_man_head, print_man_foot, m);
        p->flags |= TERMP_NOSPACE;
 
        term_begin(p, print_man_head, print_man_foot, m);
        p->flags |= TERMP_NOSPACE;
 

-       mt.fl = 0;
-       mt.lmargin = term_len(p, INDENT);
-       mt.offset = term_len(p, INDENT);
+       memset(&mt, 0, sizeof(struct mtermp));
+
+       mt.lmargin[mt.lmargincur] = term_len(p, p->defindent);
+       mt.offset = term_len(p, p->defindent);

 
        if (n->child)
                print_man_nodelist(p, &mt, n->child, m);
 
        if (n->child)
                print_man_nodelist(p, &mt, n->child, m);


@@ -181,7 +175,7 @@ a2height(const struct termp *p, const char *cp)
        struct roffsu    su;
 
        if ( ! a2roffsu(cp, &su, SCALE_VS))
        struct roffsu    su;
 
        if ( ! a2roffsu(cp, &su, SCALE_VS))

-               SCALE_VS_INIT(&su, term_strlen(p, cp));
+               SCALE_VS_INIT(&su, atoi(cp));

 
        return(term_vspan(p, &su));
 }
 
        return(term_vspan(p, &su));
 }


@@ -198,27 +192,31 @@ a2width(const struct termp *p, const char *cp)
        return((int)term_hspan(p, &su));
 }
 
        return((int)term_hspan(p, &su));
 }
 

-
+/*
+ * 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
 print_bvspace(struct termp *p, const struct man_node *n)
 {
 static void
 print_bvspace(struct termp *p, const struct man_node *n)
 {

-       term_newln(p);

 
 

-       if (n->body && n->body->child && MAN_TBL == n->body->child->type)
-               return;
+       term_newln(p);

 
 

-       if (NULL == n->prev)
-               return;
+       if (n->body && n->body->child)
+               if (MAN_TBL == n->body->child->type)
+                       return;

 
 

-       if (MAN_SS == n->prev->tok)
-               return;
-       if (MAN_SH == n->prev->tok)
-               return;
+       if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok)
+               if (NULL == n->prev)
+                       return;

 
        term_vspace(p);
 }
 
 
        term_vspace(p);
 }
 

-

 /* ARGSUSED */
 static int
 pre_ign(DECL_ARGS)
 /* ARGSUSED */
 static int
 pre_ign(DECL_ARGS)


@@ -250,6 +248,18 @@ pre_literal(DECL_ARGS)
        else
                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);
 }
 


@@ -314,6 +324,29 @@ pre_B(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

+/* ARGSUSED */
+static int
+pre_OP(DECL_ARGS)
+{
+
+       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);
+}
+

 /* ARGSUSED */
 static int
 pre_ft(DECL_ARGS)
 /* ARGSUSED */
 static int
 pre_ft(DECL_ARGS)


@@ -407,6 +440,13 @@ pre_sp(DECL_ARGS)
 {
        size_t           i, len;
 
 {
        size_t           i, len;
 

+       if ((NULL == n->prev && n->parent)) {
+               if (MAN_SS == n->parent->tok)
+                       return(0);
+               if (MAN_SH == n->parent->tok)
+                       return(0);
+       }
+

        switch (n->tok) {
        case (MAN_br):
                len = 0;
        switch (n->tok) {
        case (MAN_br):
                len = 0;


@@ -429,7 +469,7 @@ pre_sp(DECL_ARGS)
 static int
 pre_HP(DECL_ARGS)
 {
 static int
 pre_HP(DECL_ARGS)
 {

-       size_t                   len;
+       size_t                   len, one;

        int                      ival;
        const struct man_node   *nn;
 
        int                      ival;
        const struct man_node   *nn;
 


@@ -445,7 +485,7 @@ pre_HP(DECL_ARGS)
                return(0);
        }
 
                return(0);
        }
 

-       len = mt->lmargin;
+       len = mt->lmargin[mt->lmargincur];

        ival = -1;
 
        /* Calculate offset. */
        ival = -1;
 
        /* Calculate offset. */


@@ -454,14 +494,15 @@ pre_HP(DECL_ARGS)
                if ((ival = a2width(p, nn->string)) >= 0)
                        len = (size_t)ival;
 
                if ((ival = a2width(p, nn->string)) >= 0)
                        len = (size_t)ival;
 

-       if (0 == len)
-               len = term_len(p, 1);
+       one = term_len(p, 1);
+       if (len < one)
+               len = one;

 
        p->offset = mt->offset;
        p->rmargin = mt->offset + len;
 
        if (ival >= 0)
 
        p->offset = mt->offset;
        p->rmargin = mt->offset + len;
 
        if (ival >= 0)

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

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


@@ -496,7 +537,7 @@ pre_PP(DECL_ARGS)
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):

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

                print_bvspace(p, n);
                break;
        default:
                print_bvspace(p, n);
                break;
        default:


@@ -518,7 +559,6 @@ pre_IP(DECL_ARGS)
 
        switch (n->type) {
        case (MAN_BODY):
 
        switch (n->type) {
        case (MAN_BODY):

-               p->flags |= TERMP_NOLPAD;

                p->flags |= TERMP_NOSPACE;
                break;
        case (MAN_HEAD):
                p->flags |= TERMP_NOSPACE;
                break;
        case (MAN_HEAD):


@@ -531,7 +571,7 @@ pre_IP(DECL_ARGS)
                return(1);
        }
 
                return(1);
        }
 

-       len = mt->lmargin;
+       len = mt->lmargin[mt->lmargincur];

        ival = -1;
 
        /* Calculate the offset from the optional second argument. */
        ival = -1;
 
        /* Calculate the offset from the optional second argument. */


@@ -552,7 +592,7 @@ pre_IP(DECL_ARGS)
                        break;
 
                /* Set the saved left-margin. */
                        break;
 
                /* Set the saved left-margin. */

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

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


@@ -589,7 +629,6 @@ post_IP(DECL_ARGS)
                break;
        case (MAN_BODY):
                term_newln(p);
                break;
        case (MAN_BODY):
                term_newln(p);

-               p->flags &= ~TERMP_NOLPAD;

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


@@ -610,7 +649,6 @@ pre_TP(DECL_ARGS)
                p->flags |= TERMP_NOBREAK;
                break;
        case (MAN_BODY):
                p->flags |= TERMP_NOBREAK;
                break;
        case (MAN_BODY):

-               p->flags |= TERMP_NOLPAD;

                p->flags |= TERMP_NOSPACE;
                break;
        case (MAN_BLOCK):
                p->flags |= TERMP_NOSPACE;
                break;
        case (MAN_BLOCK):


@@ -620,18 +658,15 @@ pre_TP(DECL_ARGS)
                return(1);
        }
 
                return(1);
        }
 

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

        ival = -1;
 
        /* Calculate offset. */
 
        ival = -1;
 
        /* Calculate offset. */
 

-       if (NULL != (nn = n->parent->head->child)) {
-               while (nn && MAN_TEXT != nn->type)
-                       nn = nn->next;
-               if (nn && nn->next)
+       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;
                        if ((ival = a2width(p, nn->string)) >= 0)
                                len = (size_t)ival;

-       }

 
        switch (n->type) {
        case (MAN_HEAD):
 
        switch (n->type) {
        case (MAN_HEAD):


@@ -652,9 +687,8 @@ pre_TP(DECL_ARGS)
 
                if (savelit)
                        mt->fl |= MANT_LITERAL;
 
                if (savelit)
                        mt->fl |= MANT_LITERAL;

-

                if (ival >= 0)
                if (ival >= 0)

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

 
                return(0);
        case (MAN_BODY):
 
                return(0);
        case (MAN_BODY):


@@ -683,7 +717,6 @@ post_TP(DECL_ARGS)
                break;
        case (MAN_BODY):
                term_newln(p);
                break;
        case (MAN_BODY):
                term_newln(p);

-               p->flags &= ~TERMP_NOLPAD;

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


@@ -698,8 +731,9 @@ pre_SS(DECL_ARGS)
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):

-               mt->lmargin = term_len(p, INDENT);
-               mt->offset = term_len(p, INDENT);
+               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)
                /* If following a prior empty `SS', no vspace. */
                if (n->prev && MAN_SS == n->prev->tok)
                        if (NULL == n->prev->body->child)


@@ -710,7 +744,7 @@ pre_SS(DECL_ARGS)
                break;
        case (MAN_HEAD):
                term_fontrepl(p, TERMFONT_BOLD);
                break;
        case (MAN_HEAD):
                term_fontrepl(p, TERMFONT_BOLD);

-               p->offset = term_len(p, HALFINDENT);
+               p->offset = term_len(p, p->defindent/2);

                break;
        case (MAN_BODY):
                p->offset = mt->offset;
                break;
        case (MAN_BODY):
                p->offset = mt->offset;


@@ -748,8 +782,9 @@ pre_SH(DECL_ARGS)
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):

-               mt->lmargin = term_len(p, INDENT);
-               mt->offset = term_len(p, INDENT);
+               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)
                /* If following a prior empty `SH', no vspace. */
                if (n->prev && MAN_SH == n->prev->tok)
                        if (NULL == n->prev->body->child)


@@ -808,15 +843,20 @@ pre_RS(DECL_ARGS)
                break;
        }
 
                break;
        }
 

-       sz = term_len(p, INDENT);
+       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;
 
        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;
+       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);
 }
 
        return(1);
 }
 


@@ -837,7 +877,7 @@ post_RS(DECL_ARGS)
                break;
        }
 
                break;
        }
 

-       sz = term_len(p, INDENT);
+       sz = term_len(p, p->defindent);

 
        if (NULL != (n = n->parent->head->child)) 
                if ((ival = a2width(p, n->string)) >= 0) 
 
        if (NULL != (n = n->parent->head->child)) 
                if ((ival = a2width(p, n->string)) >= 0) 


@@ -845,6 +885,9 @@ post_RS(DECL_ARGS)
 
        mt->offset = mt->offset < sz ?  0 : mt->offset - sz;
        p->offset = mt->offset;
 
        mt->offset = mt->offset < sz ?  0 : mt->offset - sz;
        p->offset = mt->offset;

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

 }
 
 static void
 }
 
 static void


@@ -875,7 +918,7 @@ print_man_node(DECL_ARGS)
                 * -man doesn't have nested macros, we don't need to be
                 * more specific than this.
                 */
                 * -man doesn't have nested macros, we don't need to be
                 * more specific than this.
                 */

-               if (MANT_LITERAL & mt->fl && 
+               if (MANT_LITERAL & mt->fl && ! (TERMP_NOBREAK & p->flags) &&

                                (NULL == n->next || 
                                 n->next->line > n->line)) {
                        rm = p->rmargin;
                                (NULL == n->next || 
                                 n->next->line > n->line)) {
                        rm = p->rmargin;


@@ -883,7 +926,6 @@ print_man_node(DECL_ARGS)
                        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
                        p->flags |= TERMP_NOSPACE;
                        term_flushln(p);
                        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
                        p->flags |= TERMP_NOSPACE;
                        term_flushln(p);

-                       p->flags &= ~TERMP_NOLPAD;

                        p->rmargin = rm;
                        p->maxrmargin = rmax;
                }
                        p->rmargin = rm;
                        p->maxrmargin = rmax;
                }


@@ -892,7 +934,7 @@ print_man_node(DECL_ARGS)
                        p->flags |= TERMP_SENTENCE;
                return;
        case (MAN_EQN):
                        p->flags |= TERMP_SENTENCE;
                return;
        case (MAN_EQN):

-               term_word(p, n->eqn->data);
+               term_eqn(p, n->eqn);

                return;
        case (MAN_TBL):
                /*
                return;
        case (MAN_TBL):
                /*


@@ -941,37 +983,66 @@ print_man_nodelist(DECL_ARGS)
 static void
 print_man_foot(struct termp *p, const void *arg)
 {
 static void
 print_man_foot(struct termp *p, const void *arg)
 {

+       char            title[BUFSIZ];
+       size_t          datelen;

        const struct man_meta *meta;
 
        meta = (const struct man_meta *)arg;
        const struct man_meta *meta;
 
        meta = (const struct man_meta *)arg;

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

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

-       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 - term_strlen(p, meta->date);

        p->offset = 0;
        p->offset = 0;

-
-       /* term_strlen() can return zero. */
-       if (p->rmargin == p->maxrmargin)
-               p->rmargin--;
+       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, meta->date);
        term_flushln(p);
 
        term_word(p, meta->date);
        term_flushln(p);

+
+       /* 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);

 }
 
 
 }
 
 


@@ -983,36 +1054,33 @@ print_man_head(struct termp *p, const void *arg)
        const struct man_meta *m;
 
        m = (const struct man_meta *)arg;
        const struct man_meta *m;
 
        m = (const struct man_meta *)arg;

-
-       /*
-        * Note that old groff would spit out some spaces before the
-        * header.  We discontinue this strange behaviour, but at one
-        * point we did so here.
-        */
-
-       p->rmargin = p->maxrmargin;
-
-       p->offset = 0;
-       buf[0] = title[0] = '\0';
+       assert(m->title);
+       assert(m->msec);

 
        if (m->vol)
                strlcpy(buf, m->vol, BUFSIZ);
 
        if (m->vol)
                strlcpy(buf, m->vol, BUFSIZ);

+       else
+               buf[0] = '\0';

        buflen = term_strlen(p, buf);
 
        buflen = term_strlen(p, buf);
 

+       /* Top left corner: manual title and section. */
+

        snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
        titlen = term_strlen(p, title);
 
        snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
        titlen = term_strlen(p, title);
 

+       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;
        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;

-       p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;

 
        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->rmargin = p->offset + buflen + titlen < p->maxrmargin ?
            p->maxrmargin - titlen : p->maxrmargin;
        p->offset = p->rmargin;
        p->rmargin = p->offset + buflen + titlen < p->maxrmargin ?
            p->maxrmargin - titlen : p->maxrmargin;


@@ -1020,25 +1088,30 @@ print_man_head(struct termp *p, const void *arg)
        term_word(p, buf);
        term_flushln(p);
 
        term_word(p, buf);
        term_flushln(p);
 

+       /* Top right corner: title and section, again. */
+

        p->flags &= ~TERMP_NOBREAK;
        if (p->rmargin + titlen <= p->maxrmargin) {
        p->flags &= ~TERMP_NOBREAK;
        if (p->rmargin + titlen <= p->maxrmargin) {

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

                p->offset = p->rmargin;
                p->rmargin = p->maxrmargin;
                term_word(p, title);
                term_flushln(p);
        }
 
                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;

 
        /* 
 
        /* 

-        * Groff likes to have some leading spaces before content.  Well
-        * that's fine by me.
+        * Groff prints three blank lines before the content.
+        * Do the same, except in the temporary, undocumented
+        * mode imitating mdoc(7) output.

         */
 
        term_vspace(p);
         */
 
        term_vspace(p);

-       term_vspace(p);
-       term_vspace(p);
+       if ( ! p->mdocstyle) {
+               term_vspace(p);
+               term_vspace(p);
+       }

 }
 }