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 6cd40e3958730b24b5bd062b6b02abeae84b0b64..8500ad9fa7217741ca65009d5d9045b2b10dab0c 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,6 +1,7 @@
-/*     $Id: man_term.c,v 1.88 2010/12/06 14:04:11 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) 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
@@ -94,6 +95,7 @@ static        int               pre_ign(DECL_ARGS);
 static int               pre_in(DECL_ARGS);
 static int               pre_literal(DECL_ARGS);
 static int               pre_sp(DECL_ARGS);
+static int               pre_ft(DECL_ARGS);
 
 static void              post_IP(DECL_ARGS);
 static void              post_HP(DECL_ARGS);
@@ -125,11 +127,9 @@ static     const struct termact termacts[MAN_MAX] = {
        { pre_alternate, NULL, 0 }, /* IR */
        { pre_alternate, NULL, 0 }, /* RI */
        { NULL, NULL, MAN_NOTEXT }, /* na */
-       { pre_I, NULL, 0 }, /* i */
        { pre_sp, NULL, MAN_NOTEXT }, /* sp */
        { pre_literal, NULL, 0 }, /* nf */
        { pre_literal, NULL, 0 }, /* fi */
-       { NULL, NULL, 0 }, /* r */
        { NULL, NULL, 0 }, /* RE */
        { pre_RS, post_RS, 0 }, /* RS */
        { pre_ign, NULL, 0 }, /* DT */
@@ -137,6 +137,7 @@ static      const struct termact termacts[MAN_MAX] = {
        { pre_ign, NULL, 0 }, /* PD */
        { pre_ign, NULL, 0 }, /* AT */
        { pre_in, NULL, MAN_NOTEXT }, /* in */
+       { pre_ft, NULL, MAN_NOTEXT }, /* ft */
 };
 
 
@@ -318,6 +319,47 @@ pre_B(DECL_ARGS)
        return(1);
 }
 
+/* ARGSUSED */
+static int
+pre_ft(DECL_ARGS)
+{
+       const char      *cp;
+
+       if (NULL == n->child) {
+               term_fontlast(p);
+               return(0);
+       }
+
+       cp = n->child->string;
+       switch (*cp) {
+       case ('4'):
+               /* FALLTHROUGH */
+       case ('3'):
+               /* FALLTHROUGH */
+       case ('B'):
+               term_fontrepl(p, TERMFONT_BOLD);
+               break;
+       case ('2'):
+               /* FALLTHROUGH */
+       case ('I'):
+               term_fontrepl(p, TERMFONT_UNDER);
+               break;
+       case ('P'):
+               term_fontlast(p);
+               break;
+       case ('1'):
+               /* FALLTHROUGH */
+       case ('C'):
+               /* FALLTHROUGH */
+       case ('R'):
+               term_fontrepl(p, TERMFONT_NONE);
+               break;
+       default:
+               break;
+       }
+       return(0);
+}
+
 /* ARGSUSED */
 static int
 pre_in(DECL_ARGS)
@@ -355,6 +397,11 @@ pre_in(DECL_ARGS)
        else 
                p->offset = v;
 
+       /* Don't let this creep beyond the right margin. */
+
+       if (p->offset > p->rmargin)
+               p->offset = p->rmargin;
+
        return(0);
 }
 
@@ -472,7 +519,7 @@ pre_IP(DECL_ARGS)
 {
        const struct man_node   *nn;
        size_t                   len;
-       int                      ival;
+       int                      savelit, ival;
 
        switch (n->type) {
        case (MAN_BODY):
@@ -492,15 +539,11 @@ pre_IP(DECL_ARGS)
        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 = 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;
-               }
 
        switch (n->type) {
        case (MAN_HEAD):
@@ -516,9 +559,15 @@ pre_IP(DECL_ARGS)
                /* 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;
@@ -544,7 +593,7 @@ post_IP(DECL_ARGS)
                p->rmargin = p->maxrmargin;
                break;
        case (MAN_BODY):
-               term_flushln(p);
+               term_newln(p);
                p->flags &= ~TERMP_NOLPAD;
                break;
        default:
@@ -559,12 +608,11 @@ pre_TP(DECL_ARGS)
 {
        const struct man_node   *nn;
        size_t                   len;
-       int                      ival;
+       int                      savelit, ival;
 
        switch (n->type) {
        case (MAN_HEAD):
                p->flags |= TERMP_NOBREAK;
-               p->flags |= TERMP_TWOSPACE;
                break;
        case (MAN_BODY):
                p->flags |= TERMP_NOLPAD;
@@ -599,11 +647,17 @@ pre_TP(DECL_ARGS)
                p->offset = mt->offset;
                p->rmargin = mt->offset + len;
 
+               savelit = MANT_LITERAL & mt->fl;
+               mt->fl &= ~MANT_LITERAL;
+
                /* 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 (savelit)
+                       mt->fl |= MANT_LITERAL;
+
                if (ival >= 0)
                        mt->lmargin = (size_t)ival;
 
@@ -633,7 +687,7 @@ post_TP(DECL_ARGS)
                p->rmargin = p->maxrmargin;
                break;
        case (MAN_BODY):
-               term_flushln(p);
+               term_newln(p);
                p->flags &= ~TERMP_NOLPAD;
                break;
        default:
@@ -820,10 +874,16 @@ print_man_node(DECL_ARGS)
                        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
                        p->flags |= TERMP_NOSPACE;
                        term_flushln(p);
+                       p->flags &= ~TERMP_NOLPAD;
                        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);
@@ -835,11 +895,17 @@ print_man_node(DECL_ARGS)
        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);
+               break;
        }
 
        if (MAN_EOS & n->flags)