=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.132 retrieving revision 1.141 diff -u -p -r1.132 -r1.141 --- mandoc/term.c 2010/05/07 04:50:44 1.132 +++ mandoc/term.c 2010/06/07 10:52:44 1.141 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.132 2010/05/07 04:50:44 kristaps Exp $ */ +/* $Id: term.c,v 1.141 2010/06/07 10:52:44 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -22,11 +22,13 @@ #include #include +#include #include #include #include #include +#include "mandoc.h" #include "chars.h" #include "out.h" #include "term.h" @@ -34,7 +36,7 @@ #include "mdoc.h" #include "main.h" -static struct termp *term_alloc(enum termenc); +static struct termp *term_alloc(char *, enum termenc); static void term_free(struct termp *); static void spec(struct termp *, const char *, size_t); static void res(struct termp *, const char *, size_t); @@ -45,10 +47,10 @@ static void encode(struct termp *, const char *, si void * -ascii_alloc(void) +ascii_alloc(char *outopts) { - return(term_alloc(TERMENC_ASCII)); + return(term_alloc(outopts, TERMENC_ASCII)); } @@ -74,16 +76,39 @@ term_free(struct termp *p) static struct termp * -term_alloc(enum termenc enc) +term_alloc(char *outopts, enum termenc enc) { - struct termp *p; + struct termp *p; + const char *toks[2]; + char *v; + size_t width; + toks[0] = "width"; + toks[1] = NULL; + p = calloc(1, sizeof(struct termp)); if (NULL == p) { perror(NULL); exit(EXIT_FAILURE); } + + p->tabwidth = 5; p->enc = enc; + width = 80; + + while (outopts && *outopts) + switch (getsubopt(&outopts, UNCONST(toks), &v)) { + case (0): + width = atoi(v); + break; + default: + break; + } + + /* Enforce some lower boundary. */ + if (width < 60) + width = 60; + p->defrmargin = width - 2; return(p); } @@ -129,9 +154,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 */ - 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 */ + int jhy; /* last hyphen before line overflow */ size_t maxvis, mmax; /* @@ -152,25 +178,30 @@ term_flushln(struct termp *p) 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. */ - vis = 0; + vis = vend = i = 0; + while (i < (int)p->col) { - /* - * If in the standard case (left-justified), then begin with our - * indentation, otherwise (columns, etc.) just start spitting - * out text. - */ + /* + * 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; + } - if ( ! (p->flags & TERMP_NOLPAD)) - /* LINTED */ - for (j = 0; j < (int)p->offset; j++) - putchar(' '); - - for (i = 0; i < (int)p->col; i++) { /* * Count up visible word characters. Control sequences * (starting with the CSI) aren't counted. A space @@ -179,39 +210,33 @@ term_flushln(struct termp *p) */ /* 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; - 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. - * 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) { + p->viscol = p->rmargin; for (j = 0; j < (int)p->rmargin; j++) putchar(' '); - vis = p->rmargin - p->offset; + vend += p->rmargin - p->offset; } else { - for (j = 0; j < (int)p->offset; j++) - putchar(' '); - vis = 0; + p->viscol = 0; + vbl = p->offset; } /* Remove the p->overstep width. */ @@ -219,28 +244,60 @@ term_flushln(struct termp *p) 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. */ - for ( ; i < (int)p->col; i++) - if (' ' == p->buf[i]) + for ( ; i < (int)p->col; i++) { + if (vend > bp && jhy > 0 && i > jhy) break; - else if (31 == p->buf[i]) - putchar(' '); + if ('\t' == p->buf[i]) + break; + if (' ' == p->buf[i]) { + while (' ' == p->buf[i]) { + vbl++; + i++; + } + break; + } + 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]); - vis += vsz; + p->viscol += 1; + } + vend += vbl; + vis = vend; } p->col = 0; p->overstep = 0; if ( ! (TERMP_NOBREAK & p->flags)) { + p->viscol = 0; putchar('\n'); return; } @@ -272,11 +329,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(' '); } @@ -293,7 +352,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; } @@ -313,6 +372,7 @@ term_vspace(struct termp *p) { term_newln(p); + p->viscol = 0; putchar('\n'); } @@ -445,11 +505,16 @@ term_word(struct termp *p, const char *word) break; } - if ( ! (TERMP_NOSPACE & p->flags)) + if ( ! (TERMP_NOSPACE & p->flags)) { bufferc(p, ' '); + if (TERMP_SENTENCE & p->flags) + bufferc(p, ' '); + } if ( ! (p->flags & TERMP_NONOSPACE)) p->flags &= ~TERMP_NOSPACE; + + p->flags &= ~TERMP_SENTENCE; /* FIXME: use strcspn. */