Add support for "^" vertical spanners. Unlike GNU tbl, raise

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index 77e88aee223731ac676425df4b50122a2932c98f..8500ad9fa7217741ca65009d5d9045b2b10dab0c 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,6 +1,7 @@
-/*     $Id: man_term.c,v 1.90 2010/12/08 10:58:22 kristaps Exp $ */
+/*     $Id: man_term.c,v 1.95 2011/01/11 00:39:00 kristaps Exp $ */

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

+ * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -396,6 +397,11 @@ pre_in(DECL_ARGS)
        else 
                p->offset = v;
 
        else 
                p->offset = v;
 

+       /* Don't let this creep beyond the right margin. */
+
+       if (p->offset > p->rmargin)
+               p->offset = p->rmargin;
+

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


@@ -513,7 +519,7 @@ pre_IP(DECL_ARGS)
 {
        const struct man_node   *nn;
        size_t                   len;
 {
        const struct man_node   *nn;
        size_t                   len;

-       int                      ival;
+       int                      savelit, ival;

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


@@ -533,15 +539,11 @@ pre_IP(DECL_ARGS)
        len = mt->lmargin;
        ival = -1;
 
        len = mt->lmargin;
        ival = -1;
 

-       /* Calculate offset. */
-
+       /* Calculate the offset from the optional second argument. */

        if (NULL != (nn = n->parent->head->child))
        if (NULL != (nn = n->parent->head->child))

-               if (NULL != (nn = nn->next)) {
-                       for ( ; nn->next; nn = nn->next)
-                               /* Do nothing. */ ;
+               if (NULL != (nn = nn->next))

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

-               }

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


@@ -557,9 +559,15 @@ pre_IP(DECL_ARGS)
                /* Set the saved left-margin. */
                mt->lmargin = (size_t)ival;
 
                /* Set the saved left-margin. */
                mt->lmargin = (size_t)ival;
 

-               /* Don't print the length value. */
-               for (nn = n->child; nn->next; nn = nn->next)
-                       print_man_node(p, mt, nn, m);
+               savelit = MANT_LITERAL & mt->fl;
+               mt->fl &= ~MANT_LITERAL;
+
+               if (n->child)
+                       print_man_node(p, mt, n->child, m);
+
+               if (savelit)
+                       mt->fl |= MANT_LITERAL;
+

                return(0);
        case (MAN_BODY):
                p->offset = mt->offset + len;
                return(0);
        case (MAN_BODY):
                p->offset = mt->offset + len;


@@ -585,7 +593,7 @@ post_IP(DECL_ARGS)
                p->rmargin = p->maxrmargin;
                break;
        case (MAN_BODY):
                p->rmargin = p->maxrmargin;
                break;
        case (MAN_BODY):

-               term_flushln(p);
+               term_newln(p);

                p->flags &= ~TERMP_NOLPAD;
                break;
        default:
                p->flags &= ~TERMP_NOLPAD;
                break;
        default:


@@ -600,12 +608,11 @@ pre_TP(DECL_ARGS)
 {
        const struct man_node   *nn;
        size_t                   len;
 {
        const struct man_node   *nn;
        size_t                   len;

-       int                      ival;
+       int                      savelit, ival;

 
        switch (n->type) {
        case (MAN_HEAD):
                p->flags |= TERMP_NOBREAK;
 
        switch (n->type) {
        case (MAN_HEAD):
                p->flags |= TERMP_NOBREAK;

-               p->flags |= TERMP_TWOSPACE;

                break;
        case (MAN_BODY):
                p->flags |= TERMP_NOLPAD;
                break;
        case (MAN_BODY):
                p->flags |= TERMP_NOLPAD;


@@ -640,11 +647,17 @@ pre_TP(DECL_ARGS)
                p->offset = mt->offset;
                p->rmargin = mt->offset + len;
 
                p->offset = mt->offset;
                p->rmargin = mt->offset + len;
 

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

                /* Don't print same-line elements. */
                /* Don't print same-line elements. */

-               for (nn = n->child; nn; nn = nn->next) 
+               for (nn = n->child; nn; nn = nn->next)

                        if (nn->line > n->line)
                                print_man_node(p, mt, nn, m);
 
                        if (nn->line > n->line)
                                print_man_node(p, mt, nn, m);
 

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

                if (ival >= 0)
                        mt->lmargin = (size_t)ival;
 
                if (ival >= 0)
                        mt->lmargin = (size_t)ival;
 


@@ -674,7 +687,7 @@ post_TP(DECL_ARGS)
                p->rmargin = p->maxrmargin;
                break;
        case (MAN_BODY):
                p->rmargin = p->maxrmargin;
                break;
        case (MAN_BODY):

-               term_flushln(p);
+               term_newln(p);

                p->flags &= ~TERMP_NOLPAD;
                break;
        default:
                p->flags &= ~TERMP_NOLPAD;
                break;
        default:


@@ -861,10 +874,16 @@ print_man_node(DECL_ARGS)
                        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
                        p->flags |= TERMP_NOSPACE;
                        term_flushln(p);
                        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
                        p->flags |= TERMP_NOSPACE;
                        term_flushln(p);

+                       p->flags &= ~TERMP_NOLPAD;

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

+       case (MAN_TBL):
+               if (TBL_SPAN_FIRST & n->span->flags) 
+                       term_newln(p);
+               term_tbl(p, n->span);
+               break;

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


@@ -876,11 +895,17 @@ print_man_node(DECL_ARGS)
        if (c && n->child)
                print_man_nodelist(p, mt, n->child, m);
 
        if (c && n->child)
                print_man_nodelist(p, mt, n->child, m);
 

-       if (MAN_TEXT != n->type) {
+       switch (n->type) {
+       case (MAN_TEXT):
+               /* FALLTHROUGH */
+       case (MAN_TBL):
+               break;
+       default:

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

+               break;

        }
 
        if (MAN_EOS & n->flags)
        }
 
        if (MAN_EOS & n->flags)