mandoc should be a variable.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 8d3371500fcf36a6647d2a7f74640decabbc310a..b0e3a68f3ac1e410d0ef2de636b24404f4014b7e 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.98 2009/10/27 08:49:44 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.124 2010/05/15 16:24:38 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -14,11 +14,15 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

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

-#include <err.h>
+#include <stdint.h>

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


@@ -34,7 +38,6 @@
 
 struct termpair {
        struct termpair  *ppair;
 
 struct termpair {
        struct termpair  *ppair;

-       int               flag; 

        int               count;
 };
 
        int               count;
 };
 


@@ -56,20 +59,16 @@ static      int       arg_hasattr(int, const struct mdoc_node *);
 static int       arg_getattrs(const int *, int *, size_t,
                        const struct mdoc_node *);
 static int       arg_getattr(int, const struct mdoc_node *);
 static int       arg_getattrs(const int *, int *, size_t,
                        const struct mdoc_node *);
 static int       arg_getattr(int, const struct mdoc_node *);

+static int       arg_disptype(const struct mdoc_node *);

 static int       arg_listtype(const struct mdoc_node *);
 static void      print_bvspace(struct termp *,
                        const struct mdoc_node *,
                        const struct mdoc_node *);
 static int       arg_listtype(const struct mdoc_node *);
 static void      print_bvspace(struct termp *,
                        const struct mdoc_node *,
                        const struct mdoc_node *);

-static void      print_node(DECL_ARGS);
-static void      print_head(DECL_ARGS);
-static void      print_body(DECL_ARGS);
+static void      print_mdoc_node(DECL_ARGS);
+static void      print_mdoc_head(DECL_ARGS);
+static void      print_mdoc_nodelist(DECL_ARGS);

 static void      print_foot(DECL_ARGS);
 
 static void      print_foot(DECL_ARGS);
 

-#ifdef __linux__
-extern size_t    strlcpy(char *, const char *, size_t);
-extern size_t    strlcat(char *, const char *, size_t);
-#endif
-

 static void      termp____post(DECL_ARGS);
 static void      termp_an_post(DECL_ARGS);
 static void      termp_aq_post(DECL_ARGS);
 static void      termp____post(DECL_ARGS);
 static void      termp_an_post(DECL_ARGS);
 static void      termp_aq_post(DECL_ARGS);


@@ -96,12 +95,12 @@ static      void      termp_sq_post(DECL_ARGS);
 static void      termp_ss_post(DECL_ARGS);
 static void      termp_vt_post(DECL_ARGS);
 
 static void      termp_ss_post(DECL_ARGS);
 static void      termp_vt_post(DECL_ARGS);
 

-static int       termp__t_pre(DECL_ARGS);

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

+static int       termp_bl_pre(DECL_ARGS);

 static int       termp_bold_pre(DECL_ARGS);
 static int       termp_bq_pre(DECL_ARGS);
 static int       termp_brq_pre(DECL_ARGS);
 static int       termp_bold_pre(DECL_ARGS);
 static int       termp_bq_pre(DECL_ARGS);
 static int       termp_brq_pre(DECL_ARGS);


@@ -117,6 +116,7 @@ static      int       termp_fo_pre(DECL_ARGS);
 static int       termp_ft_pre(DECL_ARGS);
 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
 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_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);


@@ -134,6 +134,7 @@ static      int       termp_sq_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_under_pre(DECL_ARGS);
 static int       termp_ud_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_under_pre(DECL_ARGS);
 static int       termp_ud_pre(DECL_ARGS);

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


@@ -149,7 +150,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_d1_pre, termp_d1_post }, /* Dl */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */
        { termp_d1_pre, termp_d1_post }, /* Dl */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */

-       { NULL, termp_bl_post }, /* Bl */
+       { termp_bl_pre, termp_bl_post }, /* Bl */

        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { NULL, NULL }, /* Ad */ 
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
        { NULL, NULL }, /* Ad */ 


@@ -168,7 +169,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_ft_pre, termp_ft_post }, /* Ft */ 
        { termp_bold_pre, NULL }, /* Ic */ 
        { termp_in_pre, termp_in_post }, /* In */ 
        { termp_ft_pre, termp_ft_post }, /* Ft */ 
        { termp_bold_pre, NULL }, /* Ic */ 
        { termp_in_pre, termp_in_post }, /* In */ 

-       { NULL, NULL }, /* Li */
+       { termp_li_pre, NULL }, /* Li */

        { termp_nd_pre, NULL }, /* Nd */ 
        { termp_nm_pre, NULL }, /* Nm */ 
        { termp_op_pre, termp_op_post }, /* Op */
        { termp_nd_pre, NULL }, /* Nd */ 
        { termp_nm_pre, NULL }, /* Nm */ 
        { termp_op_pre, termp_op_post }, /* Op */


@@ -177,7 +178,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */ 
        { termp_under_pre, NULL }, /* Va */
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */ 
        { termp_under_pre, NULL }, /* Va */

-       { termp_under_pre, termp_vt_post }, /* Vt */
+       { termp_vt_pre, termp_vt_post }, /* Vt */

        { termp_xr_pre, NULL }, /* Xr */
        { NULL, termp____post }, /* %A */
        { termp_under_pre, termp____post }, /* %B */
        { termp_xr_pre, NULL }, /* Xr */
        { NULL, termp____post }, /* %A */
        { termp_under_pre, termp____post }, /* %B */


@@ -188,7 +189,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, termp____post }, /* %O */
        { NULL, termp____post }, /* %P */
        { NULL, termp____post }, /* %R */
        { NULL, termp____post }, /* %O */
        { NULL, termp____post }, /* %P */
        { NULL, termp____post }, /* %R */

-       { termp__t_pre, termp____post }, /* %T */
+       { termp_under_pre, termp____post }, /* %T */

        { NULL, termp____post }, /* %V */
        { NULL, NULL }, /* Ac */
        { termp_aq_pre, termp_aq_post }, /* Ao */
        { NULL, termp____post }, /* %V */
        { NULL, NULL }, /* Ac */
        { termp_aq_pre, termp_aq_post }, /* Ao */


@@ -204,7 +205,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Dc */
        { termp_dq_pre, termp_dq_post }, /* Do */
        { termp_dq_pre, termp_dq_post }, /* Dq */
        { NULL, NULL }, /* Dc */
        { termp_dq_pre, termp_dq_post }, /* Do */
        { termp_dq_pre, termp_dq_post }, /* Dq */

-       { NULL, NULL }, /* Ec */
+       { NULL, NULL }, /* Ec */ /* FIXME: no space */

        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */
        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */


@@ -271,6 +272,9 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 
        p = (struct termp *)arg;
 
 
        p = (struct termp *)arg;
 

+       p->overstep = 0;
+       p->maxrmargin = p->defrmargin;
+

        if (NULL == p->symtab)
                switch (p->enc) {
                case (TERMENC_ASCII):
        if (NULL == p->symtab)
                switch (p->enc) {
                case (TERMENC_ASCII):


@@ -284,36 +288,36 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
        n = mdoc_node(mdoc);
        m = mdoc_meta(mdoc);
 
        n = mdoc_node(mdoc);
        m = mdoc_meta(mdoc);
 

-       print_head(p, NULL, m, n);
+       print_mdoc_head(p, NULL, m, n);

        if (n->child)
        if (n->child)

-               print_body(p, NULL, m, n->child);
+               print_mdoc_nodelist(p, NULL, m, n->child);

        print_foot(p, NULL, m, n);
 }
 
 
 static void
        print_foot(p, NULL, m, n);
 }
 
 
 static void

-print_body(DECL_ARGS)
+print_mdoc_nodelist(DECL_ARGS)

 {
 
 {
 

-       print_node(p, pair, m, n);
+       print_mdoc_node(p, pair, m, n);

        if (n->next)
        if (n->next)

-               print_body(p, pair, m, n->next);
+               print_mdoc_nodelist(p, pair, m, n->next);

 }
 
 
 /* ARGSUSED */
 static void
 }
 
 
 /* ARGSUSED */
 static void

-print_node(DECL_ARGS)
+print_mdoc_node(DECL_ARGS)

 {
 {

-       int              chld, bold, under;
+       int              chld;
+       const void      *font;

        struct termpair  npair;
        size_t           offset, rmargin;
 
        chld = 1;
        offset = p->offset;
        rmargin = p->rmargin;
        struct termpair  npair;
        size_t           offset, rmargin;
 
        chld = 1;
        offset = p->offset;
        rmargin = p->rmargin;

-       bold = p->bold;
-       under = p->under;
+       font = term_fontq(p);

 
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;
 
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;


@@ -323,22 +327,19 @@ print_node(DECL_ARGS)
                        chld = (*termacts[n->tok].pre)(p, &npair, m, n);
        } else 
                term_word(p, n->string); 
                        chld = (*termacts[n->tok].pre)(p, &npair, m, n);
        } else 
                term_word(p, n->string); 

-       if (chld && n->child)
-               print_body(p, &npair, m, n->child);

 
 

-       /*
-        * XXX - if bold/under were to span scopes, this wouldn't be
-        * possible, but because decoration is always in-scope, we can
-        * get away with this.
-        */
+       if (chld && n->child)
+               print_mdoc_nodelist(p, &npair, m, n->child);

 
 

-       p->bold = bold;
-       p->under = under;
+       term_fontpopq(p, font);

 
        if (MDOC_TEXT != n->type)
                if (termacts[n->tok].post)
                        (*termacts[n->tok].post)(p, &npair, m, n);
 
 
        if (MDOC_TEXT != n->type)
                if (termacts[n->tok].post)
                        (*termacts[n->tok].post)(p, &npair, m, n);
 

+       if (MDOC_EOS & n->flags)
+               p->flags |= TERMP_SENTENCE;
+

        p->offset = offset;
        p->rmargin = rmargin;
 }
        p->offset = offset;
        p->rmargin = rmargin;
 }


@@ -350,6 +351,8 @@ print_foot(DECL_ARGS)
 {
        char            buf[DATESIZ], os[BUFSIZ];
 
 {
        char            buf[DATESIZ], os[BUFSIZ];
 

+       term_fontrepl(p, TERMFONT_NONE);
+

        /* 
         * Output the footer in new-groff style, that is, three columns
         * with the middle being the manual date and flanking columns
        /* 
         * Output the footer in new-groff style, that is, three columns
         * with the middle being the manual date and flanking columns


@@ -391,10 +394,9 @@ print_foot(DECL_ARGS)
 }
 
 
 }
 
 

-/* FIXME: put in utility library. */

 /* ARGSUSED */
 static void
 /* ARGSUSED */
 static void

-print_head(DECL_ARGS)
+print_mdoc_head(DECL_ARGS)

 {
        char            buf[BUFSIZ], title[BUFSIZ];
 
 {
        char            buf[BUFSIZ], title[BUFSIZ];
 


@@ -423,7 +425,7 @@ print_head(DECL_ARGS)
                strlcat(buf, ")", BUFSIZ);
        }
 
                strlcat(buf, ")", BUFSIZ);
        }
 

-       snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);
+       snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);

 
        p->offset = 0;
        p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
 
        p->offset = 0;
        p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;


@@ -476,8 +478,36 @@ a2width(const struct mdoc_argv *arg, int pos)
        if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
                SCALE_HS_INIT(&su, strlen(arg->value[pos]));
 
        if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
                SCALE_HS_INIT(&su, strlen(arg->value[pos]));
 

-       /* XXX: pachemu? */
-       return(term_hspan(&su) + 2);
+       return(term_hspan(&su));
+}
+
+
+static int
+arg_disptype(const struct mdoc_node *n)
+{
+       int              i, len;
+
+       assert(MDOC_BLOCK == n->type);
+
+       len = (int)(n->args ? n->args->argc : 0);
+
+       for (i = 0; i < len; i++)
+               switch (n->args->argv[i].arg) {
+               case (MDOC_Centred):
+                       /* FALLTHROUGH */
+               case (MDOC_Ragged):
+                       /* FALLTHROUGH */
+               case (MDOC_Filled):
+                       /* FALLTHROUGH */
+               case (MDOC_Unfilled):
+                       /* FALLTHROUGH */
+               case (MDOC_Literal):
+                       return(n->args->argv[i].arg);
+               default:
+                       break;
+               }
+
+       return(-1);

 }
 
 
 }
 
 


@@ -542,6 +572,10 @@ a2offs(const struct mdoc_argv *arg)
 }
 
 
 }
 
 

+/*
+ * Return 1 if an argument has a particular argument value or 0 if it
+ * does not.  See arg_getattr().
+ */

 static int
 arg_hasattr(int arg, const struct mdoc_node *n)
 {
 static int
 arg_hasattr(int arg, const struct mdoc_node *n)
 {


@@ -550,6 +584,10 @@ arg_hasattr(int arg, const struct mdoc_node *n)
 }
 
 
 }
 
 

+/*
+ * Get the index of an argument in a node's argument list or -1 if it
+ * does not exist.  See arg_getattrs().
+ */

 static int
 arg_getattr(int v, const struct mdoc_node *n)
 {
 static int
 arg_getattr(int v, const struct mdoc_node *n)
 {


@@ -559,6 +597,12 @@ arg_getattr(int v, const struct mdoc_node *n)
 }
 
 
 }
 
 

+/*
+ * Walk through the argument list for a node and fill an array "vals"
+ * with the positions of the argument structures listed in "keys".
+ * Return the number of elements that were written into "vals", which
+ * can be zero.
+ */

 static int
 arg_getattrs(const int *keys, int *vals, 
                size_t sz, const struct mdoc_node *n)
 static int
 arg_getattrs(const int *keys, int *vals, 
                size_t sz, const struct mdoc_node *n)


@@ -578,6 +622,11 @@ arg_getattrs(const int *keys, int *vals,
 }
 
 
 }
 
 

+/*
+ * Determine how much space to print out before block elements of `It'
+ * (and thus `Bl') and `Bd'.  And then go ahead and print that space,
+ * too.
+ */

 static void
 print_bvspace(struct termp *p, 
                const struct mdoc_node *bl, 
 static void
 print_bvspace(struct termp *p, 
                const struct mdoc_node *bl, 


@@ -656,7 +705,7 @@ termp_it_pre(DECL_ARGS)
        const struct mdoc_node *bl, *nn;
        char                    buf[7];
        int                     i, type, keys[3], vals[3];
        const struct mdoc_node *bl, *nn;
        char                    buf[7];
        int                     i, type, keys[3], vals[3];

-       size_t                  width, offset;
+       size_t                  width, offset, ncols, dcol;

 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n->parent->parent, n);
 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n->parent->parent, n);


@@ -665,11 +714,7 @@ termp_it_pre(DECL_ARGS)
 
        bl = n->parent->parent->parent;
 
 
        bl = n->parent->parent->parent;
 

-       /* Save parent attributes. */
-
-       pair->flag = p->flags;
-
-       /* Get list width and offset. */
+       /* Get list width, offset, and list type from argument list. */

 
        keys[0] = MDOC_Width;
        keys[1] = MDOC_Offset;
 
        keys[0] = MDOC_Width;
        keys[1] = MDOC_Offset;


@@ -677,48 +722,71 @@ termp_it_pre(DECL_ARGS)
 
        vals[0] = vals[1] = vals[2] = -1;
 
 
        vals[0] = vals[1] = vals[2] = -1;
 

-       width = offset = 0;
-
-       (void)arg_getattrs(keys, vals, 3, bl);
+       arg_getattrs(keys, vals, 3, bl);

 
        type = arg_listtype(bl);
        assert(-1 != type);
 
 
        type = arg_listtype(bl);
        assert(-1 != type);
 

-       /* Calculate real width and offset. */
+       /* 
+        * First calculate width and offset.  This is pretty easy unless
+        * we're a -column list, in which case all prior columns must
+        * be accounted for.
+        */
+
+       width = offset = 0;
+
+       if (vals[1] >= 0) 
+               offset = a2offs(&bl->args->argv[vals[1]]);

 
        switch (type) {
        case (MDOC_Column):
                if (MDOC_BODY == n->type)
                        break;
 
        switch (type) {
        case (MDOC_Column):
                if (MDOC_BODY == n->type)
                        break;

-               /* 
-                * Work around groff's column handling.  The offset is
-                * equal to the sum of all widths leading to the current
-                * column (plus the -offset value).  If this column
-                * exceeds the stated number of columns, the width is
-                * set as 0, else it's the stated column width (later
-                * the 0 will be adjusted to default 10 or, if in the
-                * last column case, set to stretch to the margin).
+               /*
+                * Imitate groff's column handling:
+                * - For each earlier column, add its width.
+                * - For less than 5 columns, add four more blanks per
+                *   column.
+                * - For exactly 5 columns, add three more blank per
+                *   column.
+                * - For more than 5 columns, add only one column.

                 */
                 */

-               for (i = 0, nn = n->prev; nn && 
-                               i < (int)bl->args->argv[vals[2]].sz; 
+               ncols = bl->args->argv[vals[2]].sz;
+               /* LINTED */
+               dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1;
+
+               for (i = 0, nn = n->prev; 
+                               nn && i < (int)ncols; 

                                nn = nn->prev, i++)
                                nn = nn->prev, i++)

-                       offset += a2width 
+                       offset += dcol + a2width

                                (&bl->args->argv[vals[2]], i);
 
                                (&bl->args->argv[vals[2]], i);
 

-               /* Whether exceeds maximum column. */
-               if (i < (int)bl->args->argv[vals[2]].sz)
-                       width = a2width(&bl->args->argv[vals[2]], i);
-               else
-                       width = 0;

 
 

-               if (vals[1] >= 0) 
-                       offset += a2offs(&bl->args->argv[vals[1]]);
+               /*
+                * When exceeding the declared number of columns, leave
+                * the remaining widths at 0.  This will later be
+                * adjusted to the default width of 10, or, for the last
+                * column, stretched to the right margin.
+                */
+               if (i >= (int)ncols)
+                       break;
+
+               /*
+                * Use the declared column widths, extended as explained
+                * in the preceding paragraph.
+                */
+               width = a2width(&bl->args->argv[vals[2]], i) + dcol;

                break;
        default:
                break;
        default:

-               if (vals[0] >= 0) 
-                       width = a2width(&bl->args->argv[vals[0]], 0);
-               if (vals[1] >= 0) 
-                       offset += a2offs(&bl->args->argv[vals[1]]);
+               if (vals[0] < 0) 
+                       break;
+
+               /* 
+                * Note: buffer the width by 2, which is groff's magic
+                * number for buffering single arguments.  See the above
+                * handling for column for how this changes.
+                */
+               width = a2width(&bl->args->argv[vals[0]], 0) + 2;

                break;
        }
 
                break;
        }
 


@@ -780,18 +848,17 @@ termp_it_pre(DECL_ARGS)
        switch (type) {
        case (MDOC_Diag):
                if (MDOC_HEAD == n->type)
        switch (type) {
        case (MDOC_Diag):
                if (MDOC_HEAD == n->type)

-                       p->bold++;
+                       term_fontpush(p, TERMFONT_BOLD);

                break;
        default:
                break;
        }
 
        /*
                break;
        default:
                break;
        }
 
        /*

-        * Pad and break control.  This is the tricker part.  Lists with
-        * set right-margins for the head get TERMP_NOBREAK because, if
-        * they overrun the margin, they wrap to the new margin.
-        * Correspondingly, the body for these types don't left-pad, as
-        * the head will pad out to to the right.
+        * Pad and break control.  This is the tricky part.  These flags
+        * are documented in term_flushln() in term.c.  Note that we're
+        * going to unset all of these flags in termp_it_post() when we
+        * exit.

         */
 
        switch (type) {
         */
 
        switch (type) {


@@ -903,7 +970,8 @@ termp_it_pre(DECL_ARGS)
                 * right-most column is filled to the right margin.
                 */
                if (MDOC_HEAD == n->type &&
                 * right-most column is filled to the right margin.
                 */
                if (MDOC_HEAD == n->type &&

-                               MDOC_BODY == n->next->type)
+                               MDOC_BODY == n->next->type &&
+                               p->rmargin < p->maxrmargin)

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


@@ -918,20 +986,20 @@ termp_it_pre(DECL_ARGS)
        if (MDOC_HEAD == n->type)
                switch (type) {
                case (MDOC_Bullet):
        if (MDOC_HEAD == n->type)
                switch (type) {
                case (MDOC_Bullet):

-                       p->bold++;
+                       term_fontpush(p, TERMFONT_BOLD);

                        term_word(p, "\\[bu]");
                        term_word(p, "\\[bu]");

-                       p->bold--;
+                       term_fontpop(p);

                        break;
                case (MDOC_Dash):
                        /* FALLTHROUGH */
                case (MDOC_Hyphen):
                        break;
                case (MDOC_Dash):
                        /* FALLTHROUGH */
                case (MDOC_Hyphen):

-                       p->bold++;
+                       term_fontpush(p, TERMFONT_BOLD);

                        term_word(p, "\\(hy");
                        term_word(p, "\\(hy");

-                       p->bold--;
+                       term_fontpop(p);

                        break;
                case (MDOC_Enum):
                        (pair->ppair->ppair->count)++;
                        break;
                case (MDOC_Enum):
                        (pair->ppair->ppair->count)++;

-                       (void)snprintf(buf, sizeof(buf), "%d.", 
+                       snprintf(buf, sizeof(buf), "%d.", 

                                        pair->ppair->ppair->count);
                        term_word(p, buf);
                        break;
                                        pair->ppair->ppair->count);
                        term_word(p, buf);
                        break;


@@ -974,7 +1042,7 @@ termp_it_post(DECL_ARGS)
 {
        int                type;
 
 {
        int                type;
 

-       if (MDOC_BODY != n->type && MDOC_HEAD != n->type)
+       if (MDOC_BLOCK == n->type)

                return;
 
        type = arg_listtype(n->parent->parent->parent);
                return;
 
        type = arg_listtype(n->parent->parent->parent);


@@ -998,7 +1066,17 @@ termp_it_post(DECL_ARGS)
                break;
        }
 
                break;
        }
 

-       p->flags = pair->flag;
+       /* 
+        * Now that our output is flushed, we can reset our tags.  Since
+        * only `It' sets these flags, we're free to assume that nobody
+        * has munged them in the meanwhile.
+        */
+
+       p->flags &= ~TERMP_DANGLE;
+       p->flags &= ~TERMP_NOBREAK;
+       p->flags &= ~TERMP_TWOSPACE;
+       p->flags &= ~TERMP_NOLPAD;
+       p->flags &= ~TERMP_HANG;

 }
 
 
 }
 
 


@@ -1007,9 +1085,11 @@ static int
 termp_nm_pre(DECL_ARGS)
 {
 
 termp_nm_pre(DECL_ARGS)
 {
 

-       if (SEC_SYNOPSIS == n->sec)
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)

                term_newln(p);
                term_newln(p);

-       p->bold++;
+
+       term_fontpush(p, TERMFONT_BOLD);
+

        if (NULL == n->child)
                term_word(p, m->name);
        return(1);
        if (NULL == n->child)
                term_word(p, m->name);
        return(1);


@@ -1021,9 +1101,14 @@ static int
 termp_fl_pre(DECL_ARGS)
 {
 
 termp_fl_pre(DECL_ARGS)
 {
 

-       p->bold++;
+       term_fontpush(p, TERMFONT_BOLD);

        term_word(p, "\\-");
        term_word(p, "\\-");

-       p->flags |= TERMP_NOSPACE;
+
+       if (n->child)
+               p->flags |= TERMP_NOSPACE;
+       else if (n->next && n->next->line == n->line)
+               p->flags |= TERMP_NOSPACE;
+

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


@@ -1075,7 +1160,7 @@ termp_an_post(DECL_ARGS)
                return;
        }
 
                return;
        }
 

-       if (arg_getattr(MDOC_Split, n) > -1) {
+       if (arg_hasattr(MDOC_Split, n)) {

                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;
        } else {
                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;
        } else {


@@ -1119,9 +1204,9 @@ termp_rv_pre(DECL_ARGS)
        term_word(p, "The");
 
        for (nn = n->child; nn; nn = nn->next) {
        term_word(p, "The");
 
        for (nn = n->child; nn; nn = nn->next) {

-               p->bold++;
+               term_fontpush(p, TERMFONT_BOLD);

                term_word(p, nn->string);
                term_word(p, nn->string);

-               p->bold--;
+               term_fontpop(p);

                p->flags |= TERMP_NOSPACE;
                if (nn->next && NULL == nn->next->next)
                        term_word(p, "(), and");
                p->flags |= TERMP_NOSPACE;
                if (nn->next && NULL == nn->next->next)
                        term_word(p, "(), and");


@@ -1139,9 +1224,9 @@ termp_rv_pre(DECL_ARGS)
                term_word(p, "the value 0 if successful; otherwise the value "
                        "-1 is returned and the global variable");
 
                term_word(p, "the value 0 if successful; otherwise the value "
                        "-1 is returned and the global variable");
 

-       p->under++;
+       term_fontpush(p, TERMFONT_UNDER);

        term_word(p, "errno");
        term_word(p, "errno");

-       p->under--;
+       term_fontpop(p);

 
                term_word(p, "is set to indicate the error.");
 
 
                term_word(p, "is set to indicate the error.");
 


@@ -1158,9 +1243,9 @@ termp_ex_pre(DECL_ARGS)
        term_word(p, "The");
 
        for (nn = n->child; nn; nn = nn->next) {
        term_word(p, "The");
 
        for (nn = n->child; nn; nn = nn->next) {

-               p->bold++;
+               term_fontpush(p, TERMFONT_BOLD);

                term_word(p, nn->string);
                term_word(p, nn->string);

-               p->bold--;
+               term_fontpop(p);

                p->flags |= TERMP_NOSPACE;
                if (nn->next && NULL == nn->next->next)
                        term_word(p, ", and");
                p->flags |= TERMP_NOSPACE;
                if (nn->next && NULL == nn->next->next)
                        term_word(p, ", and");


@@ -1198,6 +1283,15 @@ termp_nd_pre(DECL_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */
+static int
+termp_bl_pre(DECL_ARGS)
+{
+
+       return(MDOC_HEAD != n->type);
+}
+
+

 /* ARGSUSED */
 static void
 termp_bl_post(DECL_ARGS)
 /* ARGSUSED */
 static void
 termp_bl_post(DECL_ARGS)


@@ -1226,7 +1320,10 @@ termp_xr_pre(DECL_ARGS)
 {
        const struct mdoc_node *nn;
 
 {
        const struct mdoc_node *nn;
 

-       assert(n->child && MDOC_TEXT == n->child->type);
+       if (NULL == n->child)
+               return(0);
+
+       assert(MDOC_TEXT == n->child->type);

        nn = n->child;
 
        term_word(p, nn->string);
        nn = n->child;
 
        term_word(p, nn->string);


@@ -1243,12 +1340,27 @@ termp_xr_pre(DECL_ARGS)
 }
 
 
 }
 
 

+static int
+termp_vt_pre(DECL_ARGS)
+{
+
+       if (MDOC_ELEM == n->type)
+               return(termp_under_pre(p, pair, m, n));
+       else if (MDOC_HEAD == n->type)
+               return(0);
+       else if (MDOC_BLOCK == n->type)
+               return(1);
+
+       return(termp_under_pre(p, pair, m, n));
+}
+
+

 /* ARGSUSED */
 static void
 termp_vt_post(DECL_ARGS)
 {
 
 /* ARGSUSED */
 static void
 termp_vt_post(DECL_ARGS)
 {
 

-       if (n->sec != SEC_SYNOPSIS)
+       if (MDOC_BLOCK != n->type)

                return;
        if (n->next && MDOC_Vt == n->next->tok)
                term_newln(p);
                return;
        if (n->next && MDOC_Vt == n->next->tok)
                term_newln(p);


@@ -1262,7 +1374,7 @@ static int
 termp_bold_pre(DECL_ARGS)
 {
 
 termp_bold_pre(DECL_ARGS)
 {
 

-       p->bold++;
+       term_fontpush(p, TERMFONT_BOLD);

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


@@ -1272,7 +1384,7 @@ static void
 termp_fd_post(DECL_ARGS)
 {
 
 termp_fd_post(DECL_ARGS)
 {
 

-       if (n->sec != SEC_SYNOPSIS)
+       if (n->sec != SEC_SYNOPSIS || ! (MDOC_LINE & n->flags))

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


@@ -1296,7 +1408,7 @@ termp_sh_pre(DECL_ARGS)
                term_vspace(p);
                break;
        case (MDOC_HEAD):
                term_vspace(p);
                break;
        case (MDOC_HEAD):

-               p->bold++;
+               term_fontpush(p, TERMFONT_BOLD);

                break;
        case (MDOC_BODY):
                p->offset = INDENT;
                break;
        case (MDOC_BODY):
                p->offset = INDENT;


@@ -1359,7 +1471,7 @@ static void
 termp_lb_post(DECL_ARGS)
 {
 
 termp_lb_post(DECL_ARGS)
 {
 

-       if (SEC_LIBRARY == n->sec)
+       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)

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


@@ -1428,10 +1540,11 @@ static int
 termp_ft_pre(DECL_ARGS)
 {
 
 termp_ft_pre(DECL_ARGS)
 {
 

-       if (SEC_SYNOPSIS == n->sec)
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)

                if (n->prev && MDOC_Fo == n->prev->tok)
                        term_vspace(p);
                if (n->prev && MDOC_Fo == n->prev->tok)
                        term_vspace(p);

-       p->under++;
+
+       term_fontpush(p, TERMFONT_UNDER);

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


@@ -1441,7 +1554,7 @@ static void
 termp_ft_post(DECL_ARGS)
 {
 
 termp_ft_post(DECL_ARGS)
 {
 

-       if (SEC_SYNOPSIS == n->sec)
+       if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)

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


@@ -1452,17 +1565,18 @@ termp_fn_pre(DECL_ARGS)
 {
        const struct mdoc_node  *nn;
 
 {
        const struct mdoc_node  *nn;
 

-       p->bold++;
+       term_fontpush(p, TERMFONT_BOLD);

        term_word(p, n->child->string);
        term_word(p, n->child->string);

-       p->bold--;
+       term_fontpop(p);

 
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
 
        for (nn = n->child->next; nn; nn = nn->next) {
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
 
        for (nn = n->child->next; nn; nn = nn->next) {

-               p->under++;
+               term_fontpush(p, TERMFONT_UNDER);

                term_word(p, nn->string);
                term_word(p, nn->string);

-               p->under--;
+               term_fontpop(p);
+

                if (nn->next)
                        term_word(p, ",");
        }
                if (nn->next)
                        term_word(p, ",");
        }


@@ -1481,7 +1595,7 @@ static void
 termp_fn_post(DECL_ARGS)
 {
 
 termp_fn_post(DECL_ARGS)
 {
 

-       if (n->sec == SEC_SYNOPSIS && n->next)
+       if (n->sec == SEC_SYNOPSIS && n->next && MDOC_LINE & n->flags)

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


@@ -1493,14 +1607,15 @@ termp_fa_pre(DECL_ARGS)
        const struct mdoc_node  *nn;
 
        if (n->parent->tok != MDOC_Fo) {
        const struct mdoc_node  *nn;
 
        if (n->parent->tok != MDOC_Fo) {

-               p->under++;
+               term_fontpush(p, TERMFONT_UNDER);

                return(1);
        }
 
        for (nn = n->child; nn; nn = nn->next) {
                return(1);
        }
 
        for (nn = n->child; nn; nn = nn->next) {

-               p->under++;
+               term_fontpush(p, TERMFONT_UNDER);

                term_word(p, nn->string);
                term_word(p, nn->string);

-               p->under--;
+               term_fontpop(p);
+

                if (nn->next)
                        term_word(p, ",");
        }
                if (nn->next)
                        term_word(p, ",");
        }


@@ -1517,36 +1632,22 @@ static int
 termp_bd_pre(DECL_ARGS)
 {
        int                      i, type;
 termp_bd_pre(DECL_ARGS)
 {
        int                      i, type;

+       size_t                   rm, rmax;

        const struct mdoc_node  *nn;
 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n, n);
                return(1);
        const struct mdoc_node  *nn;
 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n, n);
                return(1);

-       } else if (MDOC_BODY != n->type)
-               return(1);
+       } else if (MDOC_HEAD == n->type)
+               return(0);

 
        nn = n->parent;
 
 
        nn = n->parent;
 

-       for (type = -1, i = 0; i < (int)nn->args->argc; i++) {
-               switch (nn->args->argv[i].arg) {
-               case (MDOC_Centred):
-                       /* FALLTHROUGH */
-               case (MDOC_Ragged):
-                       /* FALLTHROUGH */
-               case (MDOC_Filled):
-                       /* FALLTHROUGH */
-               case (MDOC_Unfilled):
-                       /* FALLTHROUGH */
-               case (MDOC_Literal):
-                       type = nn->args->argv[i].arg;
-                       break;
-               case (MDOC_Offset):
-                       p->offset += a2offs(&nn->args->argv[i]);
-                       break;
-               default:
-                       break;
-               }
-       }
+       type = arg_disptype(nn);
+       assert(-1 != type);
+
+       if (-1 != (i = arg_getattr(MDOC_Offset, nn)))
+               p->offset += a2offs(&nn->args->argv[i]);

 
        /*
         * If -ragged or -filled are specified, the block does nothing
 
        /*
         * If -ragged or -filled are specified, the block does nothing


@@ -1556,13 +1657,16 @@ termp_bd_pre(DECL_ARGS)
         * lines are allowed.
         */
        
         * lines are allowed.
         */
        

-       assert(type > -1);

        if (MDOC_Literal != type && MDOC_Unfilled != type)
                return(1);
 
        if (MDOC_Literal != type && MDOC_Unfilled != type)
                return(1);
 

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

        for (nn = n->child; nn; nn = nn->next) {
                p->flags |= TERMP_NOSPACE;
        for (nn = n->child; nn; nn = nn->next) {
                p->flags |= TERMP_NOSPACE;

-               print_node(p, pair, m, nn);
+               print_mdoc_node(p, pair, m, nn);

                if (NULL == nn->next)
                        continue;
                if (nn->prev && nn->prev->line < nn->line)
                if (NULL == nn->next)
                        continue;
                if (nn->prev && nn->prev->line < nn->line)


@@ -1571,6 +1675,8 @@ termp_bd_pre(DECL_ARGS)
                        term_flushln(p);
        }
 
                        term_flushln(p);
        }
 

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

        return(0);
 }
 
        return(0);
 }
 


@@ -1579,11 +1685,26 @@ termp_bd_pre(DECL_ARGS)
 static void
 termp_bd_post(DECL_ARGS)
 {
 static void
 termp_bd_post(DECL_ARGS)
 {

+       int              type;
+       size_t           rm, rmax;

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

+
+       type = arg_disptype(n->parent);
+       assert(-1 != type);
+
+       rm = p->rmargin;
+       rmax = p->maxrmargin;
+
+       if (MDOC_Literal == type || MDOC_Unfilled == type)
+               p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
+

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

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

 }
 
 
 }
 
 


@@ -1635,7 +1756,7 @@ termp_xx_pre(DECL_ARGS)
                pp = "BSDI BSD/OS";
                break;
        case (MDOC_Dx):
                pp = "BSDI BSD/OS";
                break;
        case (MDOC_Dx):

-               pp = "DragonFlyBSD";
+               pp = "DragonFly";

                break;
        case (MDOC_Fx):
                pp = "FreeBSD";
                break;
        case (MDOC_Fx):
                pp = "FreeBSD";


@@ -1716,7 +1837,7 @@ termp_ss_pre(DECL_ARGS)
                        term_vspace(p);
                break;
        case (MDOC_HEAD):
                        term_vspace(p);
                break;
        case (MDOC_HEAD):

-               p->bold++;
+               term_fontpush(p, TERMFONT_BOLD);

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


@@ -1742,7 +1863,7 @@ static int
 termp_cd_pre(DECL_ARGS)
 {
 
 termp_cd_pre(DECL_ARGS)
 {
 

-       p->bold++;
+       term_fontpush(p, TERMFONT_BOLD);

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


@@ -1753,7 +1874,7 @@ static int
 termp_in_pre(DECL_ARGS)
 {
 
 termp_in_pre(DECL_ARGS)
 {
 

-       p->bold++;
+       term_fontpush(p, TERMFONT_BOLD);

        if (SEC_SYNOPSIS == n->sec)
                term_word(p, "#include");
 
        if (SEC_SYNOPSIS == n->sec)
                term_word(p, "#include");
 


@@ -1768,12 +1889,12 @@ static void
 termp_in_post(DECL_ARGS)
 {
 
 termp_in_post(DECL_ARGS)
 {
 

-       p->bold++;
+       term_fontpush(p, TERMFONT_BOLD);

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

-       p->bold--;
+       term_fontpop(p);

 
 

-       if (SEC_SYNOPSIS != n->sec)
+       if (SEC_SYNOPSIS != n->sec && ! (MDOC_LINE & n->flags))

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


@@ -1903,12 +2024,12 @@ termp_fo_pre(DECL_ARGS)
        } else if (MDOC_HEAD != n->type) 
                return(1);
 
        } else if (MDOC_HEAD != n->type) 
                return(1);
 

-       p->bold++;
+       term_fontpush(p, TERMFONT_BOLD);

        for (nn = n->child; nn; nn = nn->next) {
                assert(MDOC_TEXT == nn->type);
                term_word(p, nn->string);
        }
        for (nn = n->child; nn; nn = nn->next) {
                assert(MDOC_TEXT == nn->type);
                term_word(p, nn->string);
        }

-       p->bold--;
+       term_fontpop(p);

 
        return(0);
 }
 
        return(0);
 }


@@ -1942,18 +2063,22 @@ termp_bf_pre(DECL_ARGS)
 
        if (NULL == (nn = n->head->child)) {
                if (arg_hasattr(MDOC_Emphasis, n))
 
        if (NULL == (nn = n->head->child)) {
                if (arg_hasattr(MDOC_Emphasis, n))

-                       p->under++;
+                       term_fontpush(p, TERMFONT_UNDER);

                else if (arg_hasattr(MDOC_Symbolic, n))
                else if (arg_hasattr(MDOC_Symbolic, n))

-                       p->bold++;
+                       term_fontpush(p, TERMFONT_BOLD);
+               else
+                       term_fontpush(p, TERMFONT_NONE);

 
                return(1);
        } 
 
        assert(MDOC_TEXT == nn->type);
        if (0 == strcmp("Em", nn->string))
 
                return(1);
        } 
 
        assert(MDOC_TEXT == nn->type);
        if (0 == strcmp("Em", nn->string))

-               p->under++;
+               term_fontpush(p, TERMFONT_UNDER);

        else if (0 == strcmp("Sy", nn->string))
        else if (0 == strcmp("Sy", nn->string))

-               p->bold++;
+               term_fontpush(p, TERMFONT_BOLD);
+       else
+               term_fontpush(p, TERMFONT_NONE);

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


@@ -1965,10 +2090,9 @@ termp_sm_pre(DECL_ARGS)
 {
 
        assert(n->child && MDOC_TEXT == n->child->type);
 {
 
        assert(n->child && MDOC_TEXT == n->child->type);

-       if (0 == strcmp("on", n->child->string)) {
+       if (0 == strcmp("on", n->child->string))

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

-               p->flags &= ~TERMP_NOSPACE;
-       } else
+       else

                p->flags |= TERMP_NONOSPACE;
 
        return(0);
                p->flags |= TERMP_NONOSPACE;
 
        return(0);


@@ -1995,40 +2119,42 @@ termp____post(DECL_ARGS)
        /* TODO: %U. */
 
        p->flags |= TERMP_NOSPACE;
        /* TODO: %U. */
 
        p->flags |= TERMP_NOSPACE;

-       switch (n->tok) {
-       case (MDOC__T):
-               term_word(p, "\\(rq");
-               p->flags |= TERMP_NOSPACE;
-               break;
-       default:
-               break;
-       }

        term_word(p, n->next ? "," : ".");
 }
 
 
        term_word(p, n->next ? "," : ".");
 }
 
 

+/* ARGSUSED */
+static int
+termp_li_pre(DECL_ARGS)
+{
+
+       term_fontpush(p, TERMFONT_NONE);
+       return(1);
+}
+
+

 /* ARGSUSED */
 static int
 termp_lk_pre(DECL_ARGS)
 {
        const struct mdoc_node *nn;
 
 /* ARGSUSED */
 static int
 termp_lk_pre(DECL_ARGS)
 {
        const struct mdoc_node *nn;
 

-       p->under++;
+       term_fontpush(p, TERMFONT_UNDER);

        nn = n->child;
 
        if (NULL == nn->next)
                return(1);
 
        term_word(p, nn->string);
        nn = n->child;
 
        if (NULL == nn->next)
                return(1);
 
        term_word(p, nn->string);

-       p->under--;
+       term_fontpop(p);

 
        p->flags |= TERMP_NOSPACE;
        term_word(p, ":");
 
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, ":");
 

-       p->bold++;
+       term_fontpush(p, TERMFONT_BOLD);

        for (nn = nn->next; nn; nn = nn->next) 
                term_word(p, nn->string);
        for (nn = nn->next; nn; nn = nn->next) 
                term_word(p, nn->string);

-       p->bold--;
+       term_fontpop(p);

 
        return(0);
 }
 
        return(0);
 }


@@ -2039,17 +2165,6 @@ static int
 termp_under_pre(DECL_ARGS)
 {
 
 termp_under_pre(DECL_ARGS)
 {
 

-       p->under++;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp__t_pre(DECL_ARGS)
-{
-
-       term_word(p, "\\(lq");
-       p->flags |= TERMP_NOSPACE;
+       term_fontpush(p, TERMFONT_UNDER);

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