Documented `In' in full.

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 1397418c2678715924b62679677b4b5ffc886e08..02f69d9f638c81afe8373dcc8ae8d65d2c30d33f 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.137 2010/05/17 22:11:42 kristaps Exp $ */
+/*     $Id: term.c,v 1.140 2010/05/25 12:37:20 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -84,6 +84,7 @@ term_alloc(enum termenc enc, size_t width)
                perror(NULL);
                exit(EXIT_FAILURE);
        }
+       p->tabwidth = 5;
        p->enc = enc;
        /* Enforce some lower boundary. */
        if (width < 60)
@@ -137,6 +138,7 @@ term_flushln(struct termp *p)
        size_t           vend;  /* end of word visual position on output */
        size_t           bp;    /* visual right border position */
        int              j;     /* temporary loop index */
+       int              jhy;   /* last hyphen before line overflow */
        size_t           maxvis, mmax;
 
        /*
@@ -170,6 +172,17 @@ term_flushln(struct termp *p)
        vis = vend = i = 0;
        while (i < (int)p->col) {
 
+               /*
+                * Handle literal tab characters.
+                */
+               for (j = i; j < (int)p->col; j++) {
+                       if ('\t' != p->buf[j])
+                               break;
+                       vend = (vis/p->tabwidth+1)*p->tabwidth;
+                       vbl += vend - vis;
+                       vis = vend;
+               }
+
                /*
                 * Count up visible word characters.  Control sequences
                 * (starting with the CSI) aren't counted.  A space
@@ -178,27 +191,32 @@ term_flushln(struct termp *p)
                 */
 
                /* LINTED */
-               for (j = i; j < (int)p->col; j++) {
-                       if (j && ' ' == p->buf[j]) 
+               for (jhy = 0; j < (int)p->col; j++) {
+                       if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
                                break;
-                       if (8 == p->buf[j])
-                               vend--;
-                       else
+                       if (8 != p->buf[j]) {
+                               if (vend > vis && vend < bp &&
+                                   ASCII_HYPH == p->buf[j])
+                                       jhy = j;
                                vend++;
+                       } else
+                               vend--;
                }
 
                /*
                 * Find out whether we would exceed the right margin.
                 * If so, break to the next line.
                 */
-               if (vend > bp && vis > 0) {
+               if (vend > bp && 0 == jhy && vis > 0) {
                        vend -= vis;
                        putchar('\n');
                        if (TERMP_NOBREAK & p->flags) {
+                               p->viscol = p->rmargin;
                                for (j = 0; j < (int)p->rmargin; j++)
                                        putchar(' ');
                                vend += p->rmargin - p->offset;
                        } else {
+                               p->viscol = 0;
                                vbl = p->offset;
                        }
 
@@ -209,8 +227,18 @@ term_flushln(struct termp *p)
                        p->overstep = 0;
                }
 
+               /*
+                * Skip leading tabs, they were handled above.
+                */
+               while (i < (int)p->col && '\t' == p->buf[i])
+                       i++;
+
                /* Write out the [remaining] word. */
                for ( ; i < (int)p->col; i++) {
+                       if (vend > bp && jhy > 0 && i > jhy)
+                               break;
+                       if ('\t' == p->buf[i])
+                               break;
                        if (' ' == p->buf[i]) {
                                while (' ' == p->buf[i]) {
                                        vbl++;
@@ -231,9 +259,16 @@ term_flushln(struct termp *p)
                        if (vbl) {
                                for (j = 0; j < (int)vbl; j++)
                                        putchar(' ');
+                               p->viscol += vbl;
                                vbl = 0;
                        }
-                       putchar(p->buf[i]);
+
+                       if (ASCII_HYPH == p->buf[i])
+                               putchar('-');
+                       else
+                               putchar(p->buf[i]);
+
+                       p->viscol += 1;
                }
                vend += vbl;
                vis = vend;
@@ -243,6 +278,7 @@ term_flushln(struct termp *p)
        p->overstep = 0;
 
        if ( ! (TERMP_NOBREAK & p->flags)) {
+               p->viscol = 0;
                putchar('\n');
                return;
        }
@@ -274,11 +310,13 @@ term_flushln(struct termp *p)
 
        /* Right-pad. */
        if (maxvis > vis + /* LINTED */
-                       ((TERMP_TWOSPACE & p->flags) ? 1 : 0))  
+                       ((TERMP_TWOSPACE & p->flags) ? 1 : 0)) {
+               p->viscol += maxvis - vis;
                for ( ; vis < maxvis; vis++)
                        putchar(' ');
-       else {  /* ...or newline break. */
+       } else {        /* ...or newline break. */
                putchar('\n');
+               p->viscol = p->rmargin;
                for (i = 0; i < (int)p->rmargin; i++)
                        putchar(' ');
        }
@@ -295,7 +333,7 @@ term_newln(struct termp *p)
 {
 
        p->flags |= TERMP_NOSPACE;
-       if (0 == p->col) {
+       if (0 == p->col && 0 == p->viscol) {
                p->flags &= ~TERMP_NOLPAD;
                return;
        }
@@ -315,6 +353,7 @@ term_vspace(struct termp *p)
 {
 
        term_newln(p);
+       p->viscol = 0;
        putchar('\n');
 }