... and remove the trailing spaces (duh. i should pay more attention)

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index b9ea22ab7d735cf6b07fadd47b911f6fd2f2135e..d61b728dea1531aab0afbb9659ad772f415ccf83 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,7 +1,7 @@
-/*     $Id: man_term.c,v 1.134 2012/07/29 12:35:42 schwarze Exp $ */
+/*     $Id: man_term.c,v 1.150 2014/08/10 23:54:41 schwarze Exp $ */

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

- * Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2014 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


@@ -15,9 +15,7 @@
  * 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"
 #include "config.h"

-#endif

 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 


@@ -28,6 +26,7 @@
 #include <string.h>
 
 #include "mandoc.h"
 #include <string.h>
 
 #include "mandoc.h"

+#include "mandoc_aux.h"

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


@@ -45,10 +44,10 @@ struct      mtermp {
        int               pardist; /* vert. space before par., unit: [v] */
 };
 
        int               pardist; /* vert. space before par., unit: [v] */
 };
 

-#define        DECL_ARGS         struct termp *p, \
+#define        DECL_ARGS         struct termp *p, \

                          struct mtermp *mt, \
                          const struct man_node *n, \
                          struct mtermp *mt, \
                          const struct man_node *n, \

-                         const struct man_meta *m
+                         const struct man_meta *meta

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


@@ -64,7 +63,7 @@ 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_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 *, 
+static void              print_bvspace(struct termp *,

                                const struct man_node *, int);
 
 static int               pre_B(DECL_ARGS);
                                const struct man_node *, int);
 
 static int               pre_B(DECL_ARGS);


@@ -78,11 +77,13 @@ 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_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_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_ll(DECL_ARGS);

 static int               pre_sp(DECL_ARGS);
 
 static void              post_IP(DECL_ARGS);
 static int               pre_sp(DECL_ARGS);
 
 static void              post_IP(DECL_ARGS);


@@ -91,6 +92,7 @@ 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_UR(DECL_ARGS);

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


@@ -102,7 +104,7 @@ static      const struct termact termacts[MAN_MAX] = {
        { pre_PP, NULL, 0 }, /* PP */
        { pre_PP, NULL, 0 }, /* P */
        { pre_IP, post_IP, 0 }, /* IP */
        { pre_PP, NULL, 0 }, /* PP */
        { pre_PP, NULL, 0 }, /* P */
        { pre_IP, post_IP, 0 }, /* IP */

-       { pre_HP, post_HP, 0 }, /* HP */ 
+       { pre_HP, post_HP, 0 }, /* HP */

        { NULL, NULL, 0 }, /* SM */
        { pre_B, NULL, 0 }, /* SB */
        { pre_alternate, NULL, 0 }, /* BI */
        { NULL, NULL, 0 }, /* SM */
        { pre_B, NULL, 0 }, /* SB */
        { pre_alternate, NULL, 0 }, /* BI */


@@ -129,16 +131,18 @@ static    const struct termact termacts[MAN_MAX] = {
        { pre_OP, NULL, 0 }, /* OP */
        { pre_literal, NULL, 0 }, /* EX */
        { pre_literal, NULL, 0 }, /* EE */
        { 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 */

 };
 
 
 };
 
 

-

 void
 terminal_man(void *arg, const struct man *man)
 {
        struct termp            *p;
        const struct man_node   *n;
 void
 terminal_man(void *arg, const struct man *man)
 {
        struct termp            *p;
        const struct man_node   *n;

-       const struct man_meta   *m;
+       const struct man_meta   *meta;

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


@@ -154,9 +158,9 @@ terminal_man(void *arg, const struct man *man)
                p->symtab = mchars_alloc();
 
        n = man_node(man);
                p->symtab = mchars_alloc();
 
        n = man_node(man);

-       m = man_meta(man);
+       meta = man_meta(man);

 
 

-       term_begin(p, print_man_head, print_man_foot, m);
+       term_begin(p, print_man_head, print_man_foot, meta);

        p->flags |= TERMP_NOSPACE;
 
        memset(&mt, 0, sizeof(struct mtermp));
        p->flags |= TERMP_NOSPACE;
 
        memset(&mt, 0, sizeof(struct mtermp));


@@ -166,7 +170,7 @@ terminal_man(void *arg, const struct man *man)
        mt.pardist = 1;
 
        if (n->child)
        mt.pardist = 1;
 
        if (n->child)

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

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


@@ -183,7 +187,6 @@ a2height(const struct termp *p, const char *cp)
        return(term_vspan(p, &su));
 }
 
        return(term_vspan(p, &su));
 }
 

-

 static int
 a2width(const struct termp *p, const char *cp)
 {
 static int
 a2width(const struct termp *p, const char *cp)
 {


@@ -222,7 +225,7 @@ print_bvspace(struct termp *p, const struct man_node *n, int pardist)
                term_vspace(p);
 }
 
                term_vspace(p);
 }
 

-/* ARGSUSED */
+

 static int
 pre_ign(DECL_ARGS)
 {
 static int
 pre_ign(DECL_ARGS)
 {


@@ -230,8 +233,14 @@ pre_ign(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

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

 
 

-/* ARGSUSED */

 static int
 pre_I(DECL_ARGS)
 {
 static int
 pre_I(DECL_ARGS)
 {


@@ -240,8 +249,6 @@ pre_I(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static int
 pre_literal(DECL_ARGS)
 {
 static int
 pre_literal(DECL_ARGS)
 {


@@ -261,14 +268,14 @@ pre_literal(DECL_ARGS)
        if (MAN_HP == n->parent->tok && p->rmargin < p->maxrmargin) {
                p->offset = p->rmargin;
                p->rmargin = p->maxrmargin;
        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->trailspace = 0;
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);

                p->flags |= TERMP_NOSPACE;
        }
 
        return(0);
 }
 
                p->flags |= TERMP_NOSPACE;
        }
 
        return(0);
 }
 

-/* ARGSUSED */

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


@@ -283,7 +290,6 @@ pre_PD(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-/* ARGSUSED */

 static int
 pre_alternate(DECL_ARGS)
 {
 static int
 pre_alternate(DECL_ARGS)
 {


@@ -292,27 +298,27 @@ pre_alternate(DECL_ARGS)
        int                      savelit, i;
 
        switch (n->tok) {
        int                      savelit, i;
 
        switch (n->tok) {

-       case (MAN_RB):
+       case MAN_RB:

                font[0] = TERMFONT_NONE;
                font[1] = TERMFONT_BOLD;
                break;
                font[0] = TERMFONT_NONE;
                font[1] = TERMFONT_BOLD;
                break;

-       case (MAN_RI):
+       case MAN_RI:

                font[0] = TERMFONT_NONE;
                font[1] = TERMFONT_UNDER;
                break;
                font[0] = TERMFONT_NONE;
                font[1] = TERMFONT_UNDER;
                break;

-       case (MAN_BR):
+       case MAN_BR:

                font[0] = TERMFONT_BOLD;
                font[1] = TERMFONT_NONE;
                break;
                font[0] = TERMFONT_BOLD;
                font[1] = TERMFONT_NONE;
                break;

-       case (MAN_BI):
+       case MAN_BI:

                font[0] = TERMFONT_BOLD;
                font[1] = TERMFONT_UNDER;
                break;
                font[0] = TERMFONT_BOLD;
                font[1] = TERMFONT_UNDER;
                break;

-       case (MAN_IR):
+       case MAN_IR:

                font[0] = TERMFONT_UNDER;
                font[1] = TERMFONT_NONE;
                break;
                font[0] = TERMFONT_UNDER;
                font[1] = TERMFONT_NONE;
                break;

-       case (MAN_IB):
+       case MAN_IB:

                font[0] = TERMFONT_UNDER;
                font[1] = TERMFONT_BOLD;
                break;
                font[0] = TERMFONT_UNDER;
                font[1] = TERMFONT_BOLD;
                break;


@@ -327,7 +333,7 @@ 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, m);
+               print_man_node(p, mt, nn, meta);

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


@@ -335,7 +341,6 @@ pre_alternate(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-/* ARGSUSED */

 static int
 pre_B(DECL_ARGS)
 {
 static int
 pre_B(DECL_ARGS)
 {


@@ -344,7 +349,6 @@ pre_B(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-/* ARGSUSED */

 static int
 pre_OP(DECL_ARGS)
 {
 static int
 pre_OP(DECL_ARGS)
 {


@@ -367,7 +371,6 @@ pre_OP(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-/* ARGSUSED */

 static int
 pre_ft(DECL_ARGS)
 {
 static int
 pre_ft(DECL_ARGS)
 {


@@ -380,26 +383,26 @@ pre_ft(DECL_ARGS)
 
        cp = n->child->string;
        switch (*cp) {
 
        cp = n->child->string;
        switch (*cp) {

-       case ('4'):
+       case '4':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('3'):
+       case '3':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('B'):
+       case 'B':

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

-       case ('2'):
+       case '2':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('I'):
+       case 'I':

                term_fontrepl(p, TERMFONT_UNDER);
                break;
                term_fontrepl(p, TERMFONT_UNDER);
                break;

-       case ('P'):
+       case 'P':

                term_fontlast(p);
                break;
                term_fontlast(p);
                break;

-       case ('1'):
+       case '1':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('C'):
+       case 'C':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('R'):
+       case 'R':

                term_fontrepl(p, TERMFONT_NONE);
                break;
        default:
                term_fontrepl(p, TERMFONT_NONE);
                break;
        default:


@@ -408,7 +411,6 @@ pre_ft(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-/* ARGSUSED */

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


@@ -442,7 +444,7 @@ pre_in(DECL_ARGS)
                p->offset -= p->offset > v ? v : p->offset;
        else if (less > 0)
                p->offset += v;
                p->offset -= p->offset > v ? v : p->offset;
        else if (less > 0)
                p->offset += v;

-       else 
+       else

                p->offset = v;
 
        /* Don't let this creep beyond the right margin. */
                p->offset = v;
 
        /* Don't let this creep beyond the right margin. */


@@ -453,8 +455,6 @@ pre_in(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-
-/* ARGSUSED */

 static int
 pre_sp(DECL_ARGS)
 {
 static int
 pre_sp(DECL_ARGS)
 {


@@ -464,15 +464,15 @@ pre_sp(DECL_ARGS)
 
        if ((NULL == n->prev && n->parent)) {
                switch (n->parent->tok) {
 
        if ((NULL == n->prev && n->parent)) {
                switch (n->parent->tok) {

-               case (MAN_SH):
+               case MAN_SH:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MAN_SS):
+               case MAN_SS:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MAN_PP):
+               case MAN_PP:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MAN_LP):
+               case MAN_LP:

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (MAN_P):
+               case MAN_P:

                        /* FALLTHROUGH */
                        return(0);
                default:
                        /* FALLTHROUGH */
                        return(0);
                default:


@@ -482,7 +482,7 @@ pre_sp(DECL_ARGS)
 
        neg = 0;
        switch (n->tok) {
 
        neg = 0;
        switch (n->tok) {

-       case (MAN_br):
+       case MAN_br:

                len = 0;
                break;
        default:
                len = 0;
                break;
        default:


@@ -510,8 +510,6 @@ pre_sp(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-
-/* ARGSUSED */

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


@@ -520,18 +518,18 @@ pre_HP(DECL_ARGS)
        const struct man_node   *nn;
 
        switch (n->type) {
        const struct man_node   *nn;
 
        switch (n->type) {

-       case (MAN_BLOCK):
+       case MAN_BLOCK:

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

-       case (MAN_BODY):
+       case MAN_BODY:

                break;
        default:
                return(0);
        }
 
        if ( ! (MANT_LITERAL & mt->fl)) {
                break;
        default:
                return(0);
        }
 
        if ( ! (MANT_LITERAL & mt->fl)) {

-               p->flags |= TERMP_NOBREAK;
-               p->flags |= TERMP_TWOSPACE;
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND;
+               p->trailspace = 2;

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


@@ -556,17 +554,15 @@ pre_HP(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 post_HP(DECL_ARGS)
 {
 
        switch (n->type) {
 static void
 post_HP(DECL_ARGS)
 {
 
        switch (n->type) {

-       case (MAN_BODY):
-               term_flushln(p);
-               p->flags &= ~TERMP_NOBREAK;
-               p->flags &= ~TERMP_TWOSPACE;
+       case MAN_BODY:
+               term_newln(p);
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
+               p->trailspace = 0;

                p->offset = mt->offset;
                p->rmargin = p->maxrmargin;
                break;
                p->offset = mt->offset;
                p->rmargin = p->maxrmargin;
                break;


@@ -575,14 +571,12 @@ post_HP(DECL_ARGS)
        }
 }
 
        }
 }
 

-
-/* ARGSUSED */

 static int
 pre_PP(DECL_ARGS)
 {
 
        switch (n->type) {
 static int
 pre_PP(DECL_ARGS)
 {
 
        switch (n->type) {

-       case (MAN_BLOCK):
+       case MAN_BLOCK:

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


@@ -594,8 +588,6 @@ pre_PP(DECL_ARGS)
        return(MAN_HEAD != n->type);
 }
 
        return(MAN_HEAD != n->type);
 }
 

-
-/* ARGSUSED */

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


@@ -604,13 +596,14 @@ pre_IP(DECL_ARGS)
        int                      savelit, ival;
 
        switch (n->type) {
        int                      savelit, ival;
 
        switch (n->type) {

-       case (MAN_BODY):
+       case MAN_BODY:

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

-       case (MAN_HEAD):
+       case MAN_HEAD:

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

+               p->trailspace = 1;

                break;
                break;

-       case (MAN_BLOCK):
+       case MAN_BLOCK:

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


@@ -627,7 +620,7 @@ pre_IP(DECL_ARGS)
                                len = (size_t)ival;
 
        switch (n->type) {
                                len = (size_t)ival;
 
        switch (n->type) {

-       case (MAN_HEAD):
+       case MAN_HEAD:

                /* Handle zero-width lengths. */
                if (0 == len)
                        len = term_len(p, 1);
                /* Handle zero-width lengths. */
                if (0 == len)
                        len = term_len(p, 1);


@@ -644,15 +637,16 @@ pre_IP(DECL_ARGS)
                mt->fl &= ~MANT_LITERAL;
 
                if (n->child)
                mt->fl &= ~MANT_LITERAL;
 
                if (n->child)

-                       print_man_node(p, mt, n->child, m);
+                       print_man_node(p, mt, n->child, meta);

 
                if (savelit)
                        mt->fl |= MANT_LITERAL;
 
                return(0);
 
                if (savelit)
                        mt->fl |= MANT_LITERAL;
 
                return(0);

-       case (MAN_BODY):
+       case MAN_BODY:

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

-               p->rmargin = p->maxrmargin;
+               p->rmargin = p->maxrmargin > p->offset ?
+                   p->maxrmargin : p->offset;

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


@@ -661,28 +655,26 @@ pre_IP(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 post_IP(DECL_ARGS)
 {
 
        switch (n->type) {
 static void
 post_IP(DECL_ARGS)
 {
 
        switch (n->type) {

-       case (MAN_HEAD):
+       case MAN_HEAD:

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

+               p->trailspace = 0;

                p->rmargin = p->maxrmargin;
                break;
                p->rmargin = p->maxrmargin;
                break;

-       case (MAN_BODY):
+       case MAN_BODY:

                term_newln(p);
                term_newln(p);

+               p->offset = mt->offset;

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

-
-/* ARGSUSED */

 static int
 pre_TP(DECL_ARGS)
 {
 static int
 pre_TP(DECL_ARGS)
 {


@@ -691,13 +683,14 @@ pre_TP(DECL_ARGS)
        int                      savelit, ival;
 
        switch (n->type) {
        int                      savelit, ival;
 
        switch (n->type) {

-       case (MAN_HEAD):
+       case MAN_HEAD:

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

+               p->trailspace = 1;

                break;
                break;

-       case (MAN_BODY):
+       case MAN_BODY:

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

-       case (MAN_BLOCK):
+       case MAN_BLOCK:

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


@@ -710,12 +703,12 @@ pre_TP(DECL_ARGS)
        /* Calculate offset. */
 
        if (NULL != (nn = n->parent->head->child))
        /* Calculate offset. */
 
        if (NULL != (nn = n->parent->head->child))

-               if (nn->string && nn->parent->line == nn->line)
+               if (nn->string && 0 == (MAN_LINE & nn->flags))

                        if ((ival = a2width(p, nn->string)) >= 0)
                                len = (size_t)ival;
 
        switch (n->type) {
                        if ((ival = a2width(p, nn->string)) >= 0)
                                len = (size_t)ival;
 
        switch (n->type) {

-       case (MAN_HEAD):
+       case MAN_HEAD:

                /* Handle zero-length properly. */
                if (0 == len)
                        len = term_len(p, 1);
                /* Handle zero-length properly. */
                if (0 == len)
                        len = term_len(p, 1);


@@ -727,9 +720,14 @@ pre_TP(DECL_ARGS)
                mt->fl &= ~MANT_LITERAL;
 
                /* Don't print same-line elements. */
                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, m);
+               nn = n->child;
+               while (NULL != nn && 0 == (MAN_LINE & nn->flags))
+                       nn = nn->next;
+
+               while (NULL != nn) {
+                       print_man_node(p, mt, nn, meta);
+                       nn = nn->next;
+               }

 
                if (savelit)
                        mt->fl |= MANT_LITERAL;
 
                if (savelit)
                        mt->fl |= MANT_LITERAL;


@@ -737,11 +735,12 @@ pre_TP(DECL_ARGS)
                        mt->lmargin[mt->lmargincur] = (size_t)ival;
 
                return(0);
                        mt->lmargin[mt->lmargincur] = (size_t)ival;
 
                return(0);

-       case (MAN_BODY):
+       case MAN_BODY:

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

-               p->rmargin = p->maxrmargin;
+               p->rmargin = p->maxrmargin > p->offset ?
+                   p->maxrmargin : p->offset;
+               p->trailspace = 0;

                p->flags &= ~TERMP_NOBREAK;
                p->flags &= ~TERMP_NOBREAK;

-               p->flags &= ~TERMP_TWOSPACE;

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


@@ -750,33 +749,30 @@ pre_TP(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 post_TP(DECL_ARGS)
 {
 
        switch (n->type) {
 static void
 post_TP(DECL_ARGS)
 {
 
        switch (n->type) {

-       case (MAN_HEAD):
+       case MAN_HEAD:

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

-       case (MAN_BODY):
+       case MAN_BODY:

                term_newln(p);
                term_newln(p);

+               p->offset = mt->offset;

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

-
-/* ARGSUSED */

 static int
 pre_SS(DECL_ARGS)
 {
        int      i;
 
        switch (n->type) {
 static int
 pre_SS(DECL_ARGS)
 {
        int      i;
 
        switch (n->type) {

-       case (MAN_BLOCK):
+       case MAN_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);


@@ -789,11 +785,11 @@ pre_SS(DECL_ARGS)
                for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;
                for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;

-       case (MAN_HEAD):
+       case MAN_HEAD:

                term_fontrepl(p, TERMFONT_BOLD);
                p->offset = term_len(p, 3);
                break;
                term_fontrepl(p, TERMFONT_BOLD);
                p->offset = term_len(p, 3);
                break;

-       case (MAN_BODY):
+       case MAN_BODY:

                p->offset = mt->offset;
                break;
        default:
                p->offset = mt->offset;
                break;
        default:


@@ -803,17 +799,15 @@ pre_SS(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 post_SS(DECL_ARGS)
 {
 static void
 post_SS(DECL_ARGS)
 {

-       
+

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

-       case (MAN_HEAD):
+       case MAN_HEAD:

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

-       case (MAN_BODY):
+       case MAN_BODY:

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


@@ -821,15 +815,13 @@ post_SS(DECL_ARGS)
        }
 }
 
        }
 }
 

-
-/* ARGSUSED */

 static int
 pre_SH(DECL_ARGS)
 {
        int      i;
 
        switch (n->type) {
 static int
 pre_SH(DECL_ARGS)
 {
        int      i;
 
        switch (n->type) {

-       case (MAN_BLOCK):
+       case MAN_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);


@@ -843,11 +835,11 @@ pre_SH(DECL_ARGS)
                for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;
                for (i = 0; i < mt->pardist; i++)
                        term_vspace(p);
                break;

-       case (MAN_HEAD):
+       case MAN_HEAD:

                term_fontrepl(p, TERMFONT_BOLD);
                p->offset = 0;
                break;
                term_fontrepl(p, TERMFONT_BOLD);
                p->offset = 0;
                break;

-       case (MAN_BODY):
+       case MAN_BODY:

                p->offset = mt->offset;
                break;
        default:
                p->offset = mt->offset;
                break;
        default:


@@ -857,17 +849,15 @@ pre_SH(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-
-/* ARGSUSED */

 static void
 post_SH(DECL_ARGS)
 {
 static void
 post_SH(DECL_ARGS)
 {

-       
+

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

-       case (MAN_HEAD):
+       case MAN_HEAD:

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

-       case (MAN_BODY):
+       case MAN_BODY:

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


@@ -875,7 +865,6 @@ post_SH(DECL_ARGS)
        }
 }
 
        }
 }
 

-/* ARGSUSED */

 static int
 pre_RS(DECL_ARGS)
 {
 static int
 pre_RS(DECL_ARGS)
 {


@@ -883,10 +872,10 @@ pre_RS(DECL_ARGS)
        size_t           sz;
 
        switch (n->type) {
        size_t           sz;
 
        switch (n->type) {

-       case (MAN_BLOCK):
+       case MAN_BLOCK:

                term_newln(p);
                return(1);
                term_newln(p);
                return(1);

-       case (MAN_HEAD):
+       case MAN_HEAD:

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


@@ -895,12 +884,13 @@ pre_RS(DECL_ARGS)
        sz = term_len(p, p->defindent);
 
        if (NULL != (n = n->parent->head->child))
        sz = term_len(p, p->defindent);
 
        if (NULL != (n = n->parent->head->child))

-               if ((ival = a2width(p, n->string)) >= 0) 
+               if ((ival = a2width(p, n->string)) >= 0)

                        sz = (size_t)ival;
 
        mt->offset += sz;
                        sz = (size_t)ival;
 
        mt->offset += sz;

-       p->rmargin = p->maxrmargin;
-       p->offset = mt->offset < p->rmargin ? mt->offset : p->rmargin;
+       p->offset = mt->offset;
+       p->rmargin = p->maxrmargin > p->offset ?
+           p->maxrmargin : p->offset;

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


@@ -909,7 +899,6 @@ pre_RS(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-/* ARGSUSED */

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


@@ -917,9 +906,9 @@ post_RS(DECL_ARGS)
        size_t           sz;
 
        switch (n->type) {
        size_t           sz;
 
        switch (n->type) {

-       case (MAN_BLOCK):
+       case MAN_BLOCK:

                return;
                return;

-       case (MAN_HEAD):
+       case MAN_HEAD:

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


@@ -928,8 +917,8 @@ post_RS(DECL_ARGS)
 
        sz = term_len(p, p->defindent);
 
 
        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)

                        sz = (size_t)ival;
 
        mt->offset = mt->offset < sz ?  0 : mt->offset - sz;
                        sz = (size_t)ival;
 
        mt->offset = mt->offset < sz ?  0 : mt->offset - sz;


@@ -939,6 +928,30 @@ post_RS(DECL_ARGS)
                mt->lmargincur = mt->lmarginsz;
 }
 
                mt->lmargincur = mt->lmarginsz;
 }
 

+static int
+pre_UR(DECL_ARGS)
+{
+
+       return (MAN_HEAD != n->type);
+}
+
+static void
+post_UR(DECL_ARGS)
+{
+
+       if (MAN_BLOCK != n->type)
+               return;
+
+       term_word(p, "<");
+       p->flags |= TERMP_NOSPACE;
+
+       if (NULL != n->child->child)
+               print_man_node(p, mt, n->child->child, meta);
+
+       p->flags |= TERMP_NOSPACE;
+       term_word(p, ">");
+}
+

 static void
 print_man_node(DECL_ARGS)
 {
 static void
 print_man_node(DECL_ARGS)
 {


@@ -946,7 +959,7 @@ print_man_node(DECL_ARGS)
        int              c;
 
        switch (n->type) {
        int              c;
 
        switch (n->type) {

-       case(MAN_TEXT):
+       case MAN_TEXT:

                /*
                 * If we have a blank line, output a vertical space.
                 * If we have a space as the first character, break
                /*
                 * If we have a blank line, output a vertical space.
                 * If we have a space as the first character, break


@@ -961,15 +974,15 @@ print_man_node(DECL_ARGS)
                term_word(p, n->string);
                goto out;
 
                term_word(p, n->string);
                goto out;
 

-       case (MAN_EQN):
+       case MAN_EQN:

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

-       case (MAN_TBL):
+       case MAN_TBL:

                /*
                 * Tables are preceded by a newline.  Then process a
                 * table line, which will cause line termination,
                 */
                /*
                 * Tables are preceded by a newline.  Then process a
                 * table line, which will cause line termination,
                 */

-               if (TBL_SPAN_FIRST & n->span->flags) 
+               if (TBL_SPAN_FIRST & n->span->flags)

                        term_newln(p);
                term_tbl(p, n->span);
                return;
                        term_newln(p);
                term_tbl(p, n->span);
                return;


@@ -982,13 +995,13 @@ print_man_node(DECL_ARGS)
 
        c = 1;
        if (termacts[n->tok].pre)
 
        c = 1;
        if (termacts[n->tok].pre)

-               c = (*termacts[n->tok].pre)(p, mt, n, m);
+               c = (*termacts[n->tok].pre)(p, mt, n, meta);

 
        if (c && n->child)
 
        if (c && n->child)

-               print_man_nodelist(p, mt, n->child, m);
+               print_man_nodelist(p, mt, n->child, meta);

 
        if (termacts[n->tok].post)
 
        if (termacts[n->tok].post)

-               (*termacts[n->tok].post)(p, mt, n, m);
+               (*termacts[n->tok].post)(p, mt, n, meta);

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


@@ -1001,7 +1014,7 @@ out:
         * more specific than this.
         */
        if (MANT_LITERAL & mt->fl && ! (TERMP_NOBREAK & p->flags) &&
         * more specific than this.
         */
        if (MANT_LITERAL & mt->fl && ! (TERMP_NOBREAK & p->flags) &&

-           NULL != n->next && n->next->line > n->line) {
+           (NULL == n->next || MAN_LINE & n->next->flags)) {

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


@@ -1026,19 +1039,18 @@ static void
 print_man_nodelist(DECL_ARGS)
 {
 
 print_man_nodelist(DECL_ARGS)
 {
 

-       print_man_node(p, mt, n, m);
+       print_man_node(p, mt, n, meta);

        if ( ! n->next)
                return;
        if ( ! n->next)
                return;

-       print_man_nodelist(p, mt, n->next, m);
+       print_man_nodelist(p, mt, n->next, meta);

 }
 
 }
 

-

 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;
+       const struct man_meta   *meta;
+       char                    *title;
+       size_t                   datelen;

 
        meta = (const struct man_meta *)arg;
        assert(meta->title);
 
        meta = (const struct man_meta *)arg;
        assert(meta->title);


@@ -1047,7 +1059,8 @@ print_man_foot(struct termp *p, const void *arg)
 
        term_fontrepl(p, TERMFONT_NONE);
 
 
        term_fontrepl(p, TERMFONT_NONE);
 

-       term_vspace(p);
+       if (meta->hasbody)
+               term_vspace(p);

 
        /*
         * Temporary, undocumented option to imitate mdoc(7) output.
 
        /*
         * Temporary, undocumented option to imitate mdoc(7) output.


@@ -1056,19 +1069,23 @@ print_man_foot(struct termp *p, const void *arg)
         */
 
        if ( ! p->mdocstyle) {
         */
 
        if ( ! p->mdocstyle) {

-               term_vspace(p);
-               term_vspace(p);
-               snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
+               if (meta->hasbody) {
+                       term_vspace(p);
+                       term_vspace(p);
+               }
+               mandoc_asprintf(&title, "%s(%s)",
+                   meta->title, meta->msec);

        } else if (meta->source) {
        } else if (meta->source) {

-               strlcpy(title, meta->source, BUFSIZ);
+               title = mandoc_strdup(meta->source);

        } else {
        } else {

-               title[0] = '\0';
+               title = mandoc_strdup("");

        }
        datelen = term_strlen(p, meta->date);
 
        /* Bottom left corner: manual source. */
 
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
        }
        datelen = term_strlen(p, meta->date);
 
        /* Bottom left corner: manual source. */
 
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;

+       p->trailspace = 1;

        p->offset = 0;
        p->rmargin = (p->maxrmargin - datelen + term_len(p, 1)) / 2;
 
        p->offset = 0;
        p->rmargin = (p->maxrmargin - datelen + term_len(p, 1)) / 2;
 


@@ -1091,42 +1108,41 @@ print_man_foot(struct termp *p, const void *arg)
 
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE;
 
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE;

+       p->trailspace = 0;

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

+       free(title);

 }
 
 }
 

-

 static void
 print_man_head(struct termp *p, const void *arg)
 {
 static void
 print_man_head(struct termp *p, const void *arg)
 {

-       char            buf[BUFSIZ], title[BUFSIZ];
-       size_t          buflen, titlen;
-       const struct man_meta *m;
+       const struct man_meta   *meta;
+       const char              *volume;
+       char                    *title;
+       size_t                   vollen, titlen;

 
 

-       m = (const struct man_meta *)arg;
-       assert(m->title);
-       assert(m->msec);
+       meta = (const struct man_meta *)arg;
+       assert(meta->title);
+       assert(meta->msec);

 
 

-       if (m->vol)
-               strlcpy(buf, m->vol, BUFSIZ);
-       else
-               buf[0] = '\0';
-       buflen = term_strlen(p, buf);
+       volume = NULL == meta->vol ? "" : meta->vol;
+       vollen = term_strlen(p, volume);

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

-       snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
+       mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec);

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

+       p->trailspace = 1;

        p->offset = 0;
        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->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
+           (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
+           p->maxrmargin - vollen;

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


@@ -1135,15 +1151,16 @@ print_man_head(struct termp *p, const void *arg)
 
        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
 
        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;

-       p->rmargin = p->offset + buflen + titlen < p->maxrmargin ?
+       p->rmargin = p->offset + vollen + titlen < p->maxrmargin ?

            p->maxrmargin - titlen : p->maxrmargin;
 
            p->maxrmargin - titlen : p->maxrmargin;
 

-       term_word(p, buf);
+       term_word(p, volume);

        term_flushln(p);
 
        /* Top right corner: title and section, again. */
 
        p->flags &= ~TERMP_NOBREAK;
        term_flushln(p);
 
        /* Top right corner: title and section, again. */
 
        p->flags &= ~TERMP_NOBREAK;

+       p->trailspace = 0;

        if (p->rmargin + titlen <= p->maxrmargin) {
                p->flags |= TERMP_NOSPACE;
                p->offset = p->rmargin;
        if (p->rmargin + titlen <= p->maxrmargin) {
                p->flags |= TERMP_NOSPACE;
                p->offset = p->rmargin;


@@ -1156,7 +1173,7 @@ print_man_head(struct termp *p, const void *arg)
        p->offset = 0;
        p->rmargin = p->maxrmargin;
 
        p->offset = 0;
        p->rmargin = p->maxrmargin;
 

-       /* 
+       /*

         * Groff prints three blank lines before the content.
         * Do the same, except in the temporary, undocumented
         * mode imitating mdoc(7) output.
         * Groff prints three blank lines before the content.
         * Do the same, except in the temporary, undocumented
         * mode imitating mdoc(7) output.


@@ -1167,4 +1184,5 @@ print_man_head(struct termp *p, const void *arg)
                term_vspace(p);
                term_vspace(p);
        }
                term_vspace(p);
                term_vspace(p);
        }

+       free(title);

 }
 }