]> git.cameronkatri.com Git - mandoc.git/blobdiff - term.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Documented `In' in full.
[mandoc.git] / term.c
diff --git a/term.c b/term.c
index 1641df3d8e6d478d0a6bfce309e37ee342927d85..02f69d9f638c81afe8373dcc8ae8d65d2c30d33f 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.135 2010/05/16 01:35:37 schwarze Exp $ */
+/*     $Id: term.c,v 1.140 2010/05/25 12:37:20 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 
+#include "mandoc.h"
 #include "chars.h"
 #include "out.h"
 #include "term.h"
 #include "chars.h"
 #include "out.h"
 #include "term.h"
@@ -83,6 +84,7 @@ term_alloc(enum termenc enc, size_t width)
                perror(NULL);
                exit(EXIT_FAILURE);
        }
                perror(NULL);
                exit(EXIT_FAILURE);
        }
+       p->tabwidth = 5;
        p->enc = enc;
        /* Enforce some lower boundary. */
        if (width < 60)
        p->enc = enc;
        /* Enforce some lower boundary. */
        if (width < 60)
@@ -133,9 +135,10 @@ term_flushln(struct termp *p)
        int              i;     /* current input position in p->buf */
        size_t           vis;   /* current visual position on output */
        size_t           vbl;   /* number of blanks to prepend to output */
        int              i;     /* current input position in p->buf */
        size_t           vis;   /* current visual position on output */
        size_t           vbl;   /* number of blanks to prepend to output */
-       size_t           vsz;   /* visual characters to write to output */
+       size_t           vend;  /* end of word visual position on output */
        size_t           bp;    /* visual right border position */
        int              j;     /* temporary loop index */
        size_t           bp;    /* visual right border position */
        int              j;     /* temporary loop index */
+       int              jhy;   /* last hyphen before line overflow */
        size_t           maxvis, mmax;
 
        /*
        size_t           maxvis, mmax;
 
        /*
@@ -156,25 +159,30 @@ term_flushln(struct termp *p)
 
        bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 
 
        bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 
+       /*
+        * Indent the first line of a paragraph.
+        */
+       vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset;
+
        /* 
         * FIXME: if bp is zero, we still output the first word before
         * breaking the line.
         */
 
        /* 
         * FIXME: if bp is zero, we still output the first word before
         * breaking the line.
         */
 
-       vis = 0;
-
-       /*
-        * If in the standard case (left-justified), then begin with our
-        * indentation, otherwise (columns, etc.) just start spitting
-        * out text.
-        */
+       vis = vend = i = 0;
+       while (i < (int)p->col) {
 
 
-       if ( ! (p->flags & TERMP_NOLPAD))
-               /* LINTED */
-               for (j = 0; j < (int)p->offset; j++)
-                       putchar(' ');
+               /*
+                * 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;
+               }
 
 
-       for (i = 0; i < (int)p->col; i++) {
                /*
                 * Count up visible word characters.  Control sequences
                 * (starting with the CSI) aren't counted.  A space
                /*
                 * Count up visible word characters.  Control sequences
                 * (starting with the CSI) aren't counted.  A space
@@ -183,39 +191,33 @@ term_flushln(struct termp *p)
                 */
 
                /* LINTED */
                 */
 
                /* LINTED */
-               for (j = i, vsz = 0; 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;
                                break;
-                       if (8 == p->buf[j])
-                               vsz--;
-                       else
-                               vsz++;
+                       if (8 != p->buf[j]) {
+                               if (vend > vis && vend < bp &&
+                                   ASCII_HYPH == p->buf[j])
+                                       jhy = j;
+                               vend++;
+                       } else
+                               vend--;
                }
 
                }
 
-               /*
-                * Choose the number of blanks to prepend: no blank at the
-                * beginning of a line, one between words -- but do not
-                * actually write them yet.
-                */
-
-               vbl = (size_t)(0 == vis ? 0 : 1);
-
                /*
                 * Find out whether we would exceed the right margin.
                /*
                 * Find out whether we would exceed the right margin.
-                * If so, break to the next line.  Otherwise, write the chosen
-                * number of blanks.
+                * If so, break to the next line.
                 */
                 */
-
-               if (vis && vis + vbl + vsz > bp) {
+               if (vend > bp && 0 == jhy && vis > 0) {
+                       vend -= vis;
                        putchar('\n');
                        if (TERMP_NOBREAK & p->flags) {
                        putchar('\n');
                        if (TERMP_NOBREAK & p->flags) {
+                               p->viscol = p->rmargin;
                                for (j = 0; j < (int)p->rmargin; j++)
                                        putchar(' ');
                                for (j = 0; j < (int)p->rmargin; j++)
                                        putchar(' ');
-                               vis = p->rmargin - p->offset;
+                               vend += p->rmargin - p->offset;
                        } else {
                        } else {
-                               for (j = 0; j < (int)p->offset; j++)
-                                       putchar(' ');
-                               vis = 0;
+                               p->viscol = 0;
+                               vbl = p->offset;
                        }
 
                        /* Remove the p->overstep width. */
                        }
 
                        /* Remove the p->overstep width. */
@@ -223,28 +225,60 @@ term_flushln(struct termp *p)
                        bp += (int)/* LINTED */
                                p->overstep;
                        p->overstep = 0;
                        bp += (int)/* LINTED */
                                p->overstep;
                        p->overstep = 0;
-               } else {
-                       for (j = 0; j < (int)vbl; j++)
-                               putchar(' ');
-                       vis += vbl;
                }
 
                }
 
+               /*
+                * Skip leading tabs, they were handled above.
+                */
+               while (i < (int)p->col && '\t' == p->buf[i])
+                       i++;
+
                /* Write out the [remaining] word. */
                /* Write out the [remaining] word. */
-               for ( ; i < (int)p->col; i++)
-                       if (' ' == p->buf[i])
+               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++;
+                                       i++;
+                               }
                                break;
                                break;
-                       else if (ASCII_NBRSP == p->buf[i])
-                               putchar(' ');
+                       }
+                       if (ASCII_NBRSP == p->buf[i]) {
+                               vbl++;
+                               continue;
+                       }
+
+                       /*
+                        * Now we definitely know there will be
+                        * printable characters to output,
+                        * so write preceding white space now.
+                        */
+                       if (vbl) {
+                               for (j = 0; j < (int)vbl; j++)
+                                       putchar(' ');
+                               p->viscol += vbl;
+                               vbl = 0;
+                       }
+
+                       if (ASCII_HYPH == p->buf[i])
+                               putchar('-');
                        else
                                putchar(p->buf[i]);
 
                        else
                                putchar(p->buf[i]);
 
-               vis += vsz;
+                       p->viscol += 1;
+               }
+               vend += vbl;
+               vis = vend;
        }
 
        p->col = 0;
        p->overstep = 0;
 
        if ( ! (TERMP_NOBREAK & p->flags)) {
        }
 
        p->col = 0;
        p->overstep = 0;
 
        if ( ! (TERMP_NOBREAK & p->flags)) {
+               p->viscol = 0;
                putchar('\n');
                return;
        }
                putchar('\n');
                return;
        }
@@ -276,11 +310,13 @@ term_flushln(struct termp *p)
 
        /* Right-pad. */
        if (maxvis > vis + /* LINTED */
 
        /* 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(' ');
                for ( ; vis < maxvis; vis++)
                        putchar(' ');
-       else {  /* ...or newline break. */
+       } else {        /* ...or newline break. */
                putchar('\n');
                putchar('\n');
+               p->viscol = p->rmargin;
                for (i = 0; i < (int)p->rmargin; i++)
                        putchar(' ');
        }
                for (i = 0; i < (int)p->rmargin; i++)
                        putchar(' ');
        }
@@ -297,7 +333,7 @@ term_newln(struct termp *p)
 {
 
        p->flags |= TERMP_NOSPACE;
 {
 
        p->flags |= TERMP_NOSPACE;
-       if (0 == p->col) {
+       if (0 == p->col && 0 == p->viscol) {
                p->flags &= ~TERMP_NOLPAD;
                return;
        }
                p->flags &= ~TERMP_NOLPAD;
                return;
        }
@@ -317,6 +353,7 @@ term_vspace(struct termp *p)
 {
 
        term_newln(p);
 {
 
        term_newln(p);
+       p->viscol = 0;
        putchar('\n');
 }
 
        putchar('\n');
 }
 
A git conversion mirror of mandoc.bsd.lv