Two functional improvements to filling in terminal output.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 4718448e04929bafd5ae01bc72cab884ff0d5f88..52ff27e17f11993fbd81e308de9f105f8942c772 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.353 2017/05/05 02:06:19 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.372 2019/01/04 03:39:01 schwarze Exp $ */

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

- * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2019 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -29,7 +29,6 @@
 #include <string.h>
 
 #include "mandoc_aux.h"
 #include <string.h>
 
 #include "mandoc_aux.h"

-#include "mandoc.h"

 #include "roff.h"
 #include "mdoc.h"
 #include "out.h"
 #include "roff.h"
 #include "mdoc.h"
 #include "out.h"


@@ -47,7 +46,7 @@ struct        termpair {
                  const struct roff_meta *meta, \
                  struct roff_node *n
 
                  const struct roff_meta *meta, \
                  struct roff_node *n
 

-struct termact {
+struct mdoc_term_act {

        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };
        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };


@@ -84,6 +83,7 @@ static        void      termp_xx_post(DECL_ARGS);
 
 static int       termp__a_pre(DECL_ARGS);
 static int       termp__t_pre(DECL_ARGS);
 
 static int       termp__a_pre(DECL_ARGS);
 static int       termp__t_pre(DECL_ARGS);

+static int       termp_abort_pre(DECL_ARGS);

 static int       termp_an_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_an_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);


@@ -106,7 +106,6 @@ static      int       termp_ft_pre(DECL_ARGS);
 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
 static int       termp_li_pre(DECL_ARGS);
 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
 static int       termp_li_pre(DECL_ARGS);

-static int       termp_ll_pre(DECL_ARGS);

 static int       termp_lk_pre(DECL_ARGS);
 static int       termp_nd_pre(DECL_ARGS);
 static int       termp_nm_pre(DECL_ARGS);
 static int       termp_lk_pre(DECL_ARGS);
 static int       termp_nd_pre(DECL_ARGS);
 static int       termp_nm_pre(DECL_ARGS);


@@ -116,7 +115,7 @@ static      int       termp_rs_pre(DECL_ARGS);
 static int       termp_sh_pre(DECL_ARGS);
 static int       termp_skip_pre(DECL_ARGS);
 static int       termp_sm_pre(DECL_ARGS);
 static int       termp_sh_pre(DECL_ARGS);
 static int       termp_skip_pre(DECL_ARGS);
 static int       termp_sm_pre(DECL_ARGS);

-static int       termp_sp_pre(DECL_ARGS);
+static int       termp_pp_pre(DECL_ARGS);

 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_sy_pre(DECL_ARGS);
 static int       termp_tag_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_sy_pre(DECL_ARGS);
 static int       termp_tag_pre(DECL_ARGS);


@@ -125,13 +124,13 @@ static    int       termp_vt_pre(DECL_ARGS);
 static int       termp_xr_pre(DECL_ARGS);
 static int       termp_xx_pre(DECL_ARGS);
 
 static int       termp_xr_pre(DECL_ARGS);
 static int       termp_xx_pre(DECL_ARGS);
 

-static const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {
+static const struct mdoc_term_act mdoc_term_acts[MDOC_MAX - MDOC_Dd] = {

        { NULL, NULL }, /* Dd */
        { NULL, NULL }, /* Dt */
        { NULL, NULL }, /* Os */
        { termp_sh_pre, termp_sh_post }, /* Sh */
        { termp_ss_pre, termp_ss_post }, /* Ss */
        { NULL, NULL }, /* Dd */
        { NULL, NULL }, /* Dt */
        { NULL, NULL }, /* Os */
        { termp_sh_pre, termp_sh_post }, /* Sh */
        { termp_ss_pre, termp_ss_post }, /* Ss */

-       { termp_sp_pre, NULL }, /* Pp */
+       { termp_pp_pre, NULL }, /* Pp */

        { termp_d1_pre, termp_bl_post }, /* D1 */
        { termp_d1_pre, termp_bl_post }, /* Dl */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { termp_d1_pre, termp_bl_post }, /* D1 */
        { termp_d1_pre, termp_bl_post }, /* Dl */
        { termp_bd_pre, termp_bd_post }, /* Bd */


@@ -160,7 +159,7 @@ static      const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {
        { termp_nd_pre, NULL }, /* Nd */
        { termp_nm_pre, termp_nm_post }, /* Nm */
        { termp_quote_pre, termp_quote_post }, /* Op */
        { termp_nd_pre, NULL }, /* Nd */
        { termp_nm_pre, termp_nm_post }, /* Nm */
        { termp_quote_pre, termp_quote_post }, /* Op */

-       { termp_ft_pre, NULL }, /* Ot */
+       { termp_abort_pre, NULL }, /* Ot */

        { termp_under_pre, NULL }, /* Pa */
        { termp_ex_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */
        { termp_under_pre, NULL }, /* Pa */
        { termp_ex_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */


@@ -233,7 +232,7 @@ static      const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {
        { termp_under_pre, NULL }, /* Fr */
        { NULL, NULL }, /* Ud */
        { NULL, termp_lb_post }, /* Lb */
        { termp_under_pre, NULL }, /* Fr */
        { NULL, NULL }, /* Ud */
        { NULL, termp_lb_post }, /* Lb */

-       { termp_sp_pre, NULL }, /* Lp */
+       { termp_abort_pre, NULL }, /* Lp */

        { termp_lk_pre, NULL }, /* Lk */
        { termp_under_pre, NULL }, /* Mt */
        { termp_quote_pre, termp_quote_post }, /* Brq */
        { termp_lk_pre, NULL }, /* Lk */
        { termp_under_pre, NULL }, /* Mt */
        { termp_quote_pre, termp_quote_post }, /* Brq */


@@ -244,27 +243,25 @@ static    const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {
        { termp_quote_pre, termp_quote_post }, /* En */
        { termp_xx_pre, termp_xx_post }, /* Dx */
        { NULL, termp____post }, /* %Q */
        { termp_quote_pre, termp_quote_post }, /* En */
        { termp_xx_pre, termp_xx_post }, /* Dx */
        { NULL, termp____post }, /* %Q */

-       { termp_sp_pre, NULL }, /* sp */

        { NULL, termp____post }, /* %U */
        { NULL, NULL }, /* Ta */
        { NULL, termp____post }, /* %U */
        { NULL, NULL }, /* Ta */

-       { termp_ll_pre, NULL }, /* ll */

 };
 };

-static const struct termact *const termacts = __termacts - MDOC_Dd;

 
 static int      fn_prio;
 
 
 void
 
 static int      fn_prio;
 
 
 void

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

 {
        struct roff_node        *n;
        struct termp            *p;
        size_t                   save_defindent;
 
        p = (struct termp *)arg;
 {
        struct roff_node        *n;
        struct termp            *p;
        size_t                   save_defindent;
 
        p = (struct termp *)arg;

-       p->overstep = 0;
-       p->rmargin = p->maxrmargin = p->defrmargin;
-       p->tabwidth = term_len(p, 5);
+       p->tcol->rmargin = p->maxrmargin = p->defrmargin;
+       term_tab_set(p, NULL);
+       term_tab_set(p, "T");
+       term_tab_set(p, ".5i");

 
        n = mdoc->first->child;
        if (p->synopsisonly) {
 
        n = mdoc->first->child;
        if (p->synopsisonly) {


@@ -272,8 +269,7 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
                        if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) {
                                if (n->child->next->child != NULL)
                                        print_mdoc_nodelist(p, NULL,
                        if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) {
                                if (n->child->next->child != NULL)
                                        print_mdoc_nodelist(p, NULL,

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

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


@@ -283,14 +279,15 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
                save_defindent = p->defindent;
                if (p->defindent == 0)
                        p->defindent = 5;
                save_defindent = p->defindent;
                if (p->defindent == 0)
                        p->defindent = 5;

-               term_begin(p, print_mdoc_head, print_mdoc_foot,
-                   &mdoc->meta);
-               while (n != NULL && n->flags & NODE_NOPRT)
+               term_begin(p, print_mdoc_head, print_mdoc_foot, mdoc);
+               while (n != NULL &&
+                   (n->type == ROFFT_COMMENT ||
+                    n->flags & NODE_NOPRT))

                        n = n->next;
                if (n != NULL) {
                        if (n->tok != MDOC_Sh)
                                term_vspace(p);
                        n = n->next;
                if (n != NULL) {
                        if (n->tok != MDOC_Sh)
                                term_vspace(p);

-                       print_mdoc_nodelist(p, NULL, &mdoc->meta, n);
+                       print_mdoc_nodelist(p, NULL, mdoc, n);

                }
                term_end(p);
                p->defindent = save_defindent;
                }
                term_end(p);
                p->defindent = save_defindent;


@@ -310,16 +307,30 @@ print_mdoc_nodelist(DECL_ARGS)
 static void
 print_mdoc_node(DECL_ARGS)
 {
 static void
 print_mdoc_node(DECL_ARGS)
 {

-       int              chld;
+       const struct mdoc_term_act *act;

        struct termpair  npair;
        size_t           offset, rmargin;
        struct termpair  npair;
        size_t           offset, rmargin;

+       int              chld;

 
 

-       if (n->flags & NODE_NOPRT)
+       /*
+        * In no-fill mode, break the output line at the beginning
+        * of new input lines except after \c, and nowhere else.
+        */
+
+       if (n->flags & NODE_NOFILL) {
+               if (n->flags & NODE_LINE &&
+                   (p->flags & TERMP_NONEWLINE) == 0)
+                       term_newln(p);
+               p->flags |= TERMP_BRNEVER;
+       } else
+               p->flags &= ~TERMP_BRNEVER;
+
+       if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)

                return;
 
        chld = 1;
                return;
 
        chld = 1;

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

        n->flags &= ~NODE_ENDED;
        n->prev_font = p->fonti;
 
        n->flags &= ~NODE_ENDED;
        n->prev_font = p->fonti;
 


@@ -343,8 +354,22 @@ print_mdoc_node(DECL_ARGS)
 
        switch (n->type) {
        case ROFFT_TEXT:
 
        switch (n->type) {
        case ROFFT_TEXT:

-               if (' ' == *n->string && NODE_LINE & n->flags)
-                       term_newln(p);
+               if (n->flags & NODE_LINE) {
+                       switch (*n->string) {
+                       case '\0':
+                               if (p->flags & TERMP_NONEWLINE)
+                                       term_newln(p);
+                               else
+                                       term_vspace(p);
+                               return;
+                       case ' ':
+                               if ((p->flags & TERMP_NONEWLINE) == 0)
+                                       term_newln(p);
+                               break;
+                       default:
+                               break;
+                       }
+               }

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


@@ -366,14 +391,13 @@ print_mdoc_node(DECL_ARGS)
        default:
                if (n->tok < ROFF_MAX) {
                        roff_term_pre(p, n);
        default:
                if (n->tok < ROFF_MAX) {
                        roff_term_pre(p, n);

-                       chld = 0;
-                       break;
+                       return;

                }
                assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
                }
                assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);

-               if (termacts[n->tok].pre != NULL &&
+               act = mdoc_term_acts + (n->tok - MDOC_Dd);
+               if (act->pre != NULL &&

                    (n->end == ENDBODY_NOT || n->child != NULL))
                    (n->end == ENDBODY_NOT || n->child != NULL))

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

                break;
        }
 
                break;
        }
 


@@ -391,11 +415,9 @@ print_mdoc_node(DECL_ARGS)
        case ROFFT_EQN:
                break;
        default:
        case ROFFT_EQN:
                break;
        default:

-               if (n->tok < ROFF_MAX ||
-                   termacts[n->tok].post == NULL ||
-                   n->flags & NODE_ENDED)
+               if (act->post == NULL || n->flags & NODE_ENDED)

                        break;
                        break;

-               (void)(*termacts[n->tok].post)(p, &npair, meta, n);
+               (void)(*act->post)(p, &npair, meta, n);

 
                /*
                 * Explicit end tokens not only call the post
 
                /*
                 * Explicit end tokens not only call the post


@@ -410,10 +432,9 @@ print_mdoc_node(DECL_ARGS)
        if (NODE_EOS & n->flags)
                p->flags |= TERMP_SENTENCE;
 
        if (NODE_EOS & n->flags)
                p->flags |= TERMP_SENTENCE;
 

-       if (MDOC_ll != n->tok) {
-               p->offset = offset;
-               p->rmargin = rmargin;
-       }
+       if (n->type != ROFFT_TEXT)
+               p->tcol->offset = offset;
+       p->tcol->rmargin = rmargin;

 }
 
 static void
 }
 
 static void


@@ -433,9 +454,9 @@ print_mdoc_foot(struct termp *p, const struct roff_meta *meta)
 
        term_vspace(p);
 
 
        term_vspace(p);
 

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

        sz = term_strlen(p, meta->date);
        sz = term_strlen(p, meta->date);

-       p->rmargin = p->maxrmargin > sz ?
+       p->tcol->rmargin = p->maxrmargin > sz ?

            (p->maxrmargin + term_len(p, 1) - sz) / 2 : 0;
        p->trailspace = 1;
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
            (p->maxrmargin + term_len(p, 1) - sz) / 2 : 0;
        p->trailspace = 1;
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;


@@ -443,16 +464,16 @@ print_mdoc_foot(struct termp *p, const struct roff_meta *meta)
        term_word(p, meta->os);
        term_flushln(p);
 
        term_word(p, meta->os);
        term_flushln(p);
 

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

        sz = term_strlen(p, meta->os);
        sz = term_strlen(p, meta->os);

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

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

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

        p->trailspace = 0;
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE;
        p->trailspace = 0;
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE;


@@ -460,8 +481,8 @@ print_mdoc_foot(struct termp *p, const struct roff_meta *meta)
        term_word(p, meta->os);
        term_flushln(p);
 
        term_word(p, meta->os);
        term_flushln(p);
 

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

        p->flags = 0;
 }
 
        p->flags = 0;
 }
 


@@ -501,8 +522,8 @@ print_mdoc_head(struct termp *p, const struct roff_meta *meta)
 
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->trailspace = 1;
 
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->trailspace = 1;

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

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


@@ -510,26 +531,26 @@ print_mdoc_head(struct termp *p, const struct roff_meta *meta)
        term_flushln(p);
 
        p->flags |= TERMP_NOSPACE;
        term_flushln(p);
 
        p->flags |= TERMP_NOSPACE;

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

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

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

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

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

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

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

        free(title);
        free(volume);
 }
        free(title);
        free(volume);
 }


@@ -538,12 +559,14 @@ static int
 a2width(const struct termp *p, const char *v)
 {
        struct roffsu    su;
 a2width(const struct termp *p, const char *v)
 {
        struct roffsu    su;

+       const char      *end;

 
 

-       if (a2roffsu(v, &su, SCALE_MAX) < 2) {
+       end = a2roffsu(v, &su, SCALE_MAX);
+       if (end == NULL || *end != '\0') {

                SCALE_HS_INIT(&su, term_strlen(p, v));
                su.scale /= term_strlen(p, "0");
        }
                SCALE_HS_INIT(&su, term_strlen(p, v));
                su.scale /= term_strlen(p, "0");
        }

-       return term_hspan(p, &su) / 24;
+       return term_hen(p, &su);

 }
 
 /*
 }
 
 /*


@@ -570,7 +593,9 @@ print_bvspace(struct termp *p,
        /* Do not vspace directly after Ss/Sh. */
 
        nn = n;
        /* Do not vspace directly after Ss/Sh. */
 
        nn = n;

-       while (nn->prev != NULL && nn->prev->flags & NODE_NOPRT)
+       while (nn->prev != NULL &&
+           (nn->prev->type == ROFFT_COMMENT ||
+            nn->prev->flags & NODE_NOPRT))

                nn = nn->prev;
        while (nn->prev == NULL) {
                do {
                nn = nn->prev;
        while (nn->prev == NULL) {
                do {


@@ -604,14 +629,6 @@ print_bvspace(struct termp *p,
 }
 
 
 }
 
 

-static int
-termp_ll_pre(DECL_ARGS)
-{
-
-       term_setwidth(p, n->child != NULL ? n->child->string : NULL);
-       return 0;
-}
-

 static int
 termp_it_pre(DECL_ARGS)
 {
 static int
 termp_it_pre(DECL_ARGS)
 {


@@ -662,8 +679,8 @@ termp_it_pre(DECL_ARGS)
 
        if (bl->norm->Bl.offs != NULL) {
                offset = a2width(p, bl->norm->Bl.offs);
 
        if (bl->norm->Bl.offs != NULL) {
                offset = a2width(p, bl->norm->Bl.offs);

-               if (offset < 0 && (size_t)(-offset) > p->offset)
-                       offset = -p->offset;
+               if (offset < 0 && (size_t)(-offset) > p->tcol->offset)
+                       offset = -p->tcol->offset;

                else if (offset > SHRT_MAX)
                        offset = 0;
        }
                else if (offset > SHRT_MAX)
                        offset = 0;
        }


@@ -697,7 +714,7 @@ termp_it_pre(DECL_ARGS)
                        SCALE_HS_INIT(&su,
                            term_strlen(p, bl->norm->Bl.cols[i]));
                        su.scale /= term_strlen(p, "0");
                        SCALE_HS_INIT(&su,
                            term_strlen(p, bl->norm->Bl.cols[i]));
                        su.scale /= term_strlen(p, "0");

-                       offset += term_hspan(p, &su) / 24 + dcol;
+                       offset += term_hen(p, &su) + dcol;

                }
 
                /*
                }
 
                /*


@@ -715,7 +732,7 @@ termp_it_pre(DECL_ARGS)
                 */
                SCALE_HS_INIT(&su, term_strlen(p, bl->norm->Bl.cols[i]));
                su.scale /= term_strlen(p, "0");
                 */
                SCALE_HS_INIT(&su, term_strlen(p, bl->norm->Bl.cols[i]));
                su.scale /= term_strlen(p, "0");

-               width = term_hspan(p, &su) / 24 + dcol;
+               width = term_hen(p, &su) + dcol;

                break;
        default:
                if (NULL == bl->norm->Bl.width)
                break;
        default:
                if (NULL == bl->norm->Bl.width)


@@ -727,8 +744,8 @@ termp_it_pre(DECL_ARGS)
                 * handling for column for how this changes.
                 */
                width = a2width(p, bl->norm->Bl.width) + term_len(p, 2);
                 * handling for column for how this changes.
                 */
                width = a2width(p, bl->norm->Bl.width) + term_len(p, 2);

-               if (width < 0 && (size_t)(-width) > p->offset)
-                       width = -p->offset;
+               if (width < 0 && (size_t)(-width) > p->tcol->offset)
+                       width = -p->tcol->offset;

                else if (width > SHRT_MAX)
                        width = 0;
                break;
                else if (width > SHRT_MAX)
                        width = 0;
                break;


@@ -777,33 +794,15 @@ termp_it_pre(DECL_ARGS)
        case LIST_bullet:
        case LIST_dash:
        case LIST_hyphen:
        case LIST_bullet:
        case LIST_dash:
        case LIST_hyphen:

-               /*
-                * Weird special case.
-                * Some very narrow lists actually hang.
-                */
-               if (width <= (int)term_len(p, 2))
-                       p->flags |= TERMP_HANG;
-               if (n->type != ROFFT_HEAD)
-                       break;
-               p->flags |= TERMP_NOBREAK;
-               p->trailspace = 1;
+               if (n->type == ROFFT_HEAD) {
+                       p->flags |= TERMP_NOBREAK | TERMP_HANG;
+                       p->trailspace = 1;
+               } else if (width <= (int)term_len(p, 2))
+                       p->flags |= TERMP_NOPAD;

                break;
        case LIST_hang:
                if (n->type != ROFFT_HEAD)
                        break;
                break;
        case LIST_hang:
                if (n->type != ROFFT_HEAD)
                        break;

-
-               /*
-                * This is ugly.  If `-hang' is specified and the body
-                * is a `Bl' or `Bd', then we want basically to nullify
-                * the "overstep" effect in term_flushln() and treat
-                * this as a `-ohang' list instead.
-                */
-               if (NULL != n->next &&
-                   NULL != n->next->child &&
-                   (MDOC_Bl == n->next->child->tok ||
-                    MDOC_Bd == n->next->child->tok))
-                       break;
-

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


@@ -815,7 +814,7 @@ termp_it_pre(DECL_ARGS)
                p->trailspace = 2;
 
                if (NULL == n->next || NULL == n->next->child)
                p->trailspace = 2;
 
                if (NULL == n->next || NULL == n->next->child)

-                       p->flags |= TERMP_DANGLE;
+                       p->flags |= TERMP_HANG;

                break;
        case LIST_column:
                if (n->type == ROFFT_HEAD)
                break;
        case LIST_column:
                if (n->type == ROFFT_HEAD)


@@ -846,43 +845,31 @@ termp_it_pre(DECL_ARGS)
         * necessarily lengthened.  Everybody gets the offset.
         */
 
         * necessarily lengthened.  Everybody gets the offset.
         */
 

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

 
        switch (type) {
 
        switch (type) {

-       case LIST_hang:
-               /*
-                * Same stipulation as above, regarding `-hang'.  We
-                * don't want to recalculate rmargin and offsets when
-                * using `Bd' or `Bl' within `-hang' overstep lists.
-                */
-               if (n->type == ROFFT_HEAD &&
-                   NULL != n->next &&
-                   NULL != n->next->child &&
-                   (MDOC_Bl == n->next->child->tok ||
-                    MDOC_Bd == n->next->child->tok))
-                       break;
-               /* FALLTHROUGH */

        case LIST_bullet:
        case LIST_dash:
        case LIST_enum:
        case LIST_hyphen:
        case LIST_bullet:
        case LIST_dash:
        case LIST_enum:
        case LIST_hyphen:

+       case LIST_hang:

        case LIST_tag:
                if (n->type == ROFFT_HEAD)
        case LIST_tag:
                if (n->type == ROFFT_HEAD)

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

                else
                else

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

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

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

                /*
                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */
                if (n->type == ROFFT_HEAD)
                        break;
                /*
                 * XXX - this behaviour is not documented: the
                 * right-most column is filled to the right margin.
                 */
                if (n->type == ROFFT_HEAD)
                        break;

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

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


@@ -932,6 +919,7 @@ termp_it_pre(DECL_ARGS)
        case LIST_column:
                if (n->type == ROFFT_HEAD)
                        return 0;
        case LIST_column:
                if (n->type == ROFFT_HEAD)
                        return 0;

+               p->minbl = 0;

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


@@ -972,8 +960,7 @@ termp_it_post(DECL_ARGS)
         * has munged them in the meanwhile.
         */
 
         * has munged them in the meanwhile.
         */
 

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

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


@@ -988,7 +975,7 @@ termp_nm_pre(DECL_ARGS)
        }
 
        if (n->type == ROFFT_BODY) {
        }
 
        if (n->type == ROFFT_BODY) {

-               if (NULL == n->child)
+               if (n->child == NULL)

                        return 0;
                p->flags |= TERMP_NOSPACE;
                cp = NULL;
                        return 0;
                p->flags |= TERMP_NOSPACE;
                cp = NULL;


@@ -997,9 +984,10 @@ termp_nm_pre(DECL_ARGS)
                if (cp == NULL)
                        cp = meta->name;
                if (cp == NULL)
                if (cp == NULL)
                        cp = meta->name;
                if (cp == NULL)

-                       p->offset += term_len(p, 6);
+                       p->tcol->offset += term_len(p, 6);

                else
                else

-                       p->offset += term_len(p, 1) + term_strlen(p, cp);
+                       p->tcol->offset += term_len(p, 1) +
+                           term_strlen(p, cp);

                return 1;
        }
 
                return 1;
        }
 


@@ -1010,18 +998,18 @@ termp_nm_pre(DECL_ARGS)
                synopsis_pre(p, n->parent);
 
        if (n->type == ROFFT_HEAD &&
                synopsis_pre(p, n->parent);
 
        if (n->type == ROFFT_HEAD &&

-           NULL != n->next && NULL != n->next->child) {
+           n->next != NULL && n->next->child != NULL) {

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

-               p->rmargin = p->offset + term_len(p, 1);
-               if (NULL == n->child) {
-                       p->rmargin += term_strlen(p, meta->name);
-               } else if (n->child->type == ROFFT_TEXT) {
-                       p->rmargin += term_strlen(p, n->child->string);
-                       if (n->child->next)
+               p->tcol->rmargin = p->tcol->offset + term_len(p, 1);
+               if (n->child == NULL)
+                       p->tcol->rmargin += term_strlen(p, meta->name);
+               else if (n->child->type == ROFFT_TEXT) {
+                       p->tcol->rmargin += term_strlen(p, n->child->string);
+                       if (n->child->next != NULL)

                                p->flags |= TERMP_HANG;
                } else {
                                p->flags |= TERMP_HANG;
                } else {

-                       p->rmargin += term_len(p, 5);
+                       p->tcol->rmargin += term_len(p, 5);

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


@@ -1144,8 +1132,14 @@ static void
 termp_bl_post(DECL_ARGS)
 {
 
 termp_bl_post(DECL_ARGS)
 {
 

-       if (n->type == ROFFT_BLOCK)
-               term_newln(p);
+       if (n->type != ROFFT_BLOCK)
+               return;
+       term_newln(p);
+       if (n->tok != MDOC_Bl || n->norm->Bl.type != LIST_column)
+               return;
+       term_tab_set(p, NULL);
+       term_tab_set(p, "T");
+       term_tab_set(p, ".5i");

 }
 
 static int
 }
 
 static int


@@ -1287,7 +1281,10 @@ termp_sh_pre(DECL_ARGS)
                term_fontpush(p, TERMFONT_BOLD);
                break;
        case ROFFT_BODY:
                term_fontpush(p, TERMFONT_BOLD);
                break;
        case ROFFT_BODY:

-               p->offset = term_len(p, p->defindent);
+               p->tcol->offset = term_len(p, p->defindent);
+               term_tab_set(p, NULL);
+               term_tab_set(p, "T");
+               term_tab_set(p, ".5i");

                switch (n->sec) {
                case SEC_DESCRIPTION:
                        fn_prio = 0;
                switch (n->sec) {
                case SEC_DESCRIPTION:
                        fn_prio = 0;


@@ -1315,7 +1312,7 @@ termp_sh_post(DECL_ARGS)
                break;
        case ROFFT_BODY:
                term_newln(p);
                break;
        case ROFFT_BODY:
                term_newln(p);

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

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


@@ -1337,7 +1334,10 @@ termp_d1_pre(DECL_ARGS)
        if (n->type != ROFFT_BLOCK)
                return 1;
        term_newln(p);
        if (n->type != ROFFT_BLOCK)
                return 1;
        term_newln(p);

-       p->offset += term_len(p, p->defindent + 1);
+       p->tcol->offset += term_len(p, p->defindent + 1);
+       term_tab_set(p, NULL);
+       term_tab_set(p, "T");
+       term_tab_set(p, ".5i");

        return 1;
 }
 
        return 1;
 }
 


@@ -1365,8 +1365,8 @@ termp_fn_pre(DECL_ARGS)
                return 0;
 
        if (pretty) {
                return 0;
 
        if (pretty) {

-               rmargin = p->rmargin;
-               p->rmargin = p->offset + term_len(p, 4);
+               rmargin = p->tcol->rmargin;
+               p->tcol->rmargin = p->tcol->offset + term_len(p, 4);

                p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
        }
 
                p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
        }
 


@@ -1381,8 +1381,9 @@ termp_fn_pre(DECL_ARGS)
        if (pretty) {
                term_flushln(p);
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
        if (pretty) {
                term_flushln(p);
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);

-               p->offset = p->rmargin;
-               p->rmargin = rmargin;
+               p->flags |= TERMP_NOPAD;
+               p->tcol->offset = p->tcol->rmargin;
+               p->tcol->rmargin = rmargin;

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


@@ -1443,8 +1444,6 @@ termp_fa_pre(DECL_ARGS)
 static int
 termp_bd_pre(DECL_ARGS)
 {
 static int
 termp_bd_pre(DECL_ARGS)
 {

-       size_t                   tabwidth, lm, len, rm, rmax;
-       struct roff_node        *nn;

        int                      offset;
 
        if (n->type == ROFFT_BLOCK) {
        int                      offset;
 
        if (n->type == ROFFT_BLOCK) {


@@ -1459,102 +1458,45 @@ termp_bd_pre(DECL_ARGS)
            ! strcmp(n->norm->Bd.offs, "left"))
                /* nothing */;
        else if ( ! strcmp(n->norm->Bd.offs, "indent"))
            ! strcmp(n->norm->Bd.offs, "left"))
                /* nothing */;
        else if ( ! strcmp(n->norm->Bd.offs, "indent"))

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

        else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
        else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))

-               p->offset += term_len(p, (p->defindent + 1) * 2);
+               p->tcol->offset += term_len(p, (p->defindent + 1) * 2);

        else {
                offset = a2width(p, n->norm->Bd.offs);
        else {
                offset = a2width(p, n->norm->Bd.offs);

-               if (offset < 0 && (size_t)(-offset) > p->offset)
-                       p->offset = 0;
+               if (offset < 0 && (size_t)(-offset) > p->tcol->offset)
+                       p->tcol->offset = 0;

                else if (offset < SHRT_MAX)
                else if (offset < SHRT_MAX)

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

        }
 
        }
 

-       /*
-        * If -ragged or -filled are specified, the block does nothing
-        * but change the indentation.  If -unfilled or -literal are
-        * specified, text is printed exactly as entered in the display:
-        * for macro lines, a newline is appended to the line.  Blank
-        * lines are allowed.
-        */
-
-       if (DISP_literal != n->norm->Bd.type &&
-           DISP_unfilled != n->norm->Bd.type &&
-           DISP_centered != n->norm->Bd.type)
-               return 1;
-
-       tabwidth = p->tabwidth;
-       if (DISP_literal == n->norm->Bd.type)
-               p->tabwidth = term_len(p, 8);
-
-       lm = p->offset;
-       rm = p->rmargin;
-       rmax = p->maxrmargin;
-       p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
-
-       for (nn = n->child; nn; nn = nn->next) {
-               if (DISP_centered == n->norm->Bd.type) {
-                       if (nn->type == ROFFT_TEXT) {
-                               len = term_strlen(p, nn->string);
-                               p->offset = len >= rm ? 0 :
-                                   lm + len >= rm ? rm - len :
-                                   (lm + rm - len) / 2;
-                       } else
-                               p->offset = lm;
-               }
-               print_mdoc_node(p, pair, meta, nn);
-               /*
-                * If the printed node flushes its own line, then we
-                * needn't do it here as well.  This is hacky, but the
-                * notion of selective eoln whitespace is pretty dumb
-                * anyway, so don't sweat it.
-                */
-               switch (nn->tok) {
-               case MDOC_Sm:
-               case ROFF_br:
-               case MDOC_sp:
-               case MDOC_Bl:
-               case MDOC_D1:
-               case MDOC_Dl:
-               case MDOC_Lp:
-               case MDOC_Pp:
-                       continue;
-               default:
-                       break;
-               }
-               if (p->flags & TERMP_NONEWLINE ||
-                   (nn->next && ! (nn->next->flags & NODE_LINE)))
-                       continue;
-               term_flushln(p);
-               p->flags |= TERMP_NOSPACE;
+       switch (n->norm->Bd.type) {
+       case DISP_literal:
+               term_tab_set(p, NULL);
+               term_tab_set(p, "T");
+               term_tab_set(p, "8n");
+               break;
+       case DISP_centered:
+               p->flags |= TERMP_CENTER;
+               break;
+       default:
+               break;

        }
        }

-
-       p->tabwidth = tabwidth;
-       p->rmargin = rm;
-       p->maxrmargin = rmax;
-       return 0;
+       return 1;

 }
 
 static void
 termp_bd_post(DECL_ARGS)
 {
 }
 
 static void
 termp_bd_post(DECL_ARGS)
 {

-       size_t           rm, rmax;
-

        if (n->type != ROFFT_BODY)
                return;
        if (n->type != ROFFT_BODY)
                return;

-
-       rm = p->rmargin;
-       rmax = p->maxrmargin;
-
-       if (DISP_literal == n->norm->Bd.type ||
-           DISP_unfilled == n->norm->Bd.type)
-               p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
-
+       if (n->norm->Bd.type == DISP_unfilled ||
+           n->norm->Bd.type == DISP_literal)
+               p->flags |= TERMP_BRNEVER;

        p->flags |= TERMP_NOSPACE;
        term_newln(p);
        p->flags |= TERMP_NOSPACE;
        term_newln(p);

-
-       p->rmargin = rm;
-       p->maxrmargin = rmax;
+       p->flags &= ~TERMP_BRNEVER;
+       if (n->norm->Bd.type == DISP_centered)
+               p->flags &= ~TERMP_CENTER;

 }
 
 static int
 }
 
 static int


@@ -1589,17 +1531,21 @@ termp_ss_pre(DECL_ARGS)
        case ROFFT_BLOCK:
                term_newln(p);
                for (nn = n->prev; nn != NULL; nn = nn->prev)
        case ROFFT_BLOCK:
                term_newln(p);
                for (nn = n->prev; nn != NULL; nn = nn->prev)

-                       if ((nn->flags & NODE_NOPRT) == 0)
+                       if (nn->type != ROFFT_COMMENT &&
+                           (nn->flags & NODE_NOPRT) == 0)

                                break;
                if (nn != NULL)
                        term_vspace(p);
                break;
        case ROFFT_HEAD:
                term_fontpush(p, TERMFONT_BOLD);
                                break;
                if (nn != NULL)
                        term_vspace(p);
                break;
        case ROFFT_HEAD:
                term_fontpush(p, TERMFONT_BOLD);

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

                break;
        case ROFFT_BODY:
                break;
        case ROFFT_BODY:

-               p->offset = term_len(p, p->defindent);
+               p->tcol->offset = term_len(p, p->defindent);
+               term_tab_set(p, NULL);
+               term_tab_set(p, "T");
+               term_tab_set(p, ".5i");

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


@@ -1659,37 +1605,10 @@ termp_in_post(DECL_ARGS)
 }
 
 static int
 }
 
 static int

-termp_sp_pre(DECL_ARGS)
+termp_pp_pre(DECL_ARGS)

 {
 {

-       struct roffsu    su;
-       int              i, len;
-
-       switch (n->tok) {
-       case MDOC_sp:
-               if (n->child) {
-                       if ( ! a2roffsu(n->child->string, &su, SCALE_VS))
-                               su.scale = 1.0;
-                       len = term_vspan(p, &su);
-               } else
-                       len = 1;
-               break;
-       case ROFF_br:
-               len = 0;
-               break;
-       default:
-               len = 1;
-               fn_prio = 0;
-               break;
-       }
-
-       if (0 == len)
-               term_newln(p);
-       else if (len < 0)
-               p->skipvsp -= len;
-       else
-               for (i = 0; i < len; i++)
-                       term_vspace(p);
-
+       fn_prio = 0;
+       term_vspace(p);

        return 0;
 }
 
        return 0;
 }
 


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

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

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


@@ -1785,7 +1704,7 @@ termp_quote_post(DECL_ARGS)
                /* FALLTHROUGH */
        case MDOC_Do:
        case MDOC_Dq:
                /* FALLTHROUGH */
        case MDOC_Do:
        case MDOC_Dq:

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

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


@@ -1870,8 +1789,8 @@ termp_fo_pre(DECL_ARGS)
                return 1;
        } else if (n->type == ROFFT_BODY) {
                if (pretty) {
                return 1;
        } else if (n->type == ROFFT_BODY) {
                if (pretty) {

-                       rmargin = p->rmargin;
-                       p->rmargin = p->offset + term_len(p, 4);
+                       rmargin = p->tcol->rmargin;
+                       p->tcol->rmargin = p->tcol->offset + term_len(p, 4);

                        p->flags |= TERMP_NOBREAK | TERMP_BRIND |
                                        TERMP_HANG;
                }
                        p->flags |= TERMP_NOBREAK | TERMP_BRIND |
                                        TERMP_HANG;
                }


@@ -1882,8 +1801,9 @@ termp_fo_pre(DECL_ARGS)
                        term_flushln(p);
                        p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
                                        TERMP_HANG);
                        term_flushln(p);
                        p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
                                        TERMP_HANG);

-                       p->offset = p->rmargin;
-                       p->rmargin = rmargin;
+                       p->flags |= TERMP_NOPAD;
+                       p->tcol->offset = p->tcol->rmargin;
+                       p->tcol->rmargin = rmargin;

                }
                return 1;
        }
                }
                return 1;
        }


@@ -2001,16 +1921,23 @@ termp_li_pre(DECL_ARGS)
 static int
 termp_lk_pre(DECL_ARGS)
 {
 static int
 termp_lk_pre(DECL_ARGS)
 {

-       const struct roff_node *link, *descr;
-       int display;
+       const struct roff_node *link, *descr, *punct;

 
        if ((link = n->child) == NULL)
                return 0;
 
 
        if ((link = n->child) == NULL)
                return 0;
 

+       /* Find beginning of trailing punctuation. */
+       punct = n->last;
+       while (punct != link && punct->flags & NODE_DELIMC)
+               punct = punct->prev;
+       punct = punct->next;
+

        /* Link text. */
        /* Link text. */

-       if ((descr = link->next) != NULL && !(descr->flags & NODE_DELIMC)) {
+       if ((descr = link->next) != NULL && descr != punct) {

                term_fontpush(p, TERMFONT_UNDER);
                term_fontpush(p, TERMFONT_UNDER);

-               while (descr != NULL && !(descr->flags & NODE_DELIMC)) {
+               while (descr != punct) {
+                       if (descr->flags & (NODE_DELIMC | NODE_DELIMO))
+                               p->flags |= TERMP_NOSPACE;

                        term_word(p, descr->string);
                        descr = descr->next;
                }
                        term_word(p, descr->string);
                        descr = descr->next;
                }


@@ -2020,23 +1947,16 @@ termp_lk_pre(DECL_ARGS)
        }
 
        /* Link target. */
        }
 
        /* Link target. */

-       display = term_strlen(p, link->string) >= 26;
-       if (display) {
-               term_newln(p);
-               p->offset += term_len(p, p->defindent + 1);
-       }

        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, link->string);
        term_fontpop(p);
 
        /* Trailing punctuation. */
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, link->string);
        term_fontpop(p);
 
        /* Trailing punctuation. */

-       while (descr != NULL) {
+       while (punct != NULL) {

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

-               term_word(p, descr->string);
-               descr = descr->next;
+               term_word(p, punct->string);
+               punct = punct->next;

        }
        }

-       if (display)
-               term_newln(p);

        return 0;
 }
 
        return 0;
 }
 


@@ -2155,3 +2075,9 @@ termp_tag_pre(DECL_ARGS)
                tag_put(n->child->string, 1, p->line);
        return 1;
 }
                tag_put(n->child->string, 1, p->line);
        return 1;
 }

+
+static int
+termp_abort_pre(DECL_ARGS)
+{
+       abort();
+}