=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.106 retrieving revision 1.121 diff -u -p -r1.106 -r1.121 --- mandoc/term.c 2009/10/18 13:34:17 1.106 +++ mandoc/term.c 2009/11/05 07:21:02 1.121 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.106 2009/10/18 13:34:17 kristaps Exp $ */ +/* $Id: term.c,v 1.121 2009/11/05 07:21:02 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -15,17 +15,17 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include -#include #include #include #include +#include #include "chars.h" +#include "out.h" #include "term.h" #include "man.h" #include "mdoc.h" #include "main.h" -#include "out.h" /* FIXME: accomodate non-breaking, non-collapsing white-space. */ /* FIXME: accomodate non-breaking, collapsing white-space. */ @@ -76,9 +76,11 @@ term_alloc(enum termenc enc) { struct termp *p; - if (NULL == (p = malloc(sizeof(struct termp)))) - return(NULL); - bzero(p, sizeof(struct termp)); + p = calloc(1, sizeof(struct termp)); + if (NULL == p) { + perror(NULL); + exit(EXIT_FAILURE); + } p->maxrmargin = 78; p->enc = enc; return(p); @@ -119,41 +121,45 @@ term_alloc(enum termenc enc) * If TERMP_NOBREAK is specified and the line overruns the right * margin, it will break and pad-right to the right margin after * writing. If maxrmargin is violated, it will break and continue - * writing from the right-margin, which will lead to the above - * scenario upon exit. - * - * Otherwise, the line will break at the right margin. Extremely long - * lines will cause the system to emit a warning (TODO: hyphenate, if - * possible). + * writing from the right-margin, which will lead to the above scenario + * upon exit. Otherwise, the line will break at the right margin. */ void term_flushln(struct termp *p) { - int i, j; - size_t vbl, vsz, vis, maxvis, mmax, bp, os; + 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 bp; /* visual right border position */ + int j; /* temporary loop index */ + size_t maxvis, mmax; static int overstep = 0; /* * First, establish the maximum columns of "visible" content. * This is usually the difference between the right-margin and * an indentation, but can be, for tagged lists or columns, a - * small set of values. + * small set of values. */ assert(p->offset < p->rmargin); - assert((int)(p->rmargin - p->offset) - overstep > 0); - /* Save the overstep. */ - os = (size_t)overstep; + maxvis = (int)(p->rmargin - p->offset) - overstep < 0 ? + /* LINTED */ + 0 : p->rmargin - p->offset - overstep; + mmax = (int)(p->maxrmargin - p->offset) - overstep < 0 ? + /* LINTED */ + 0 : p->maxrmargin - p->offset - overstep; - maxvis = /* LINTED */ - p->rmargin - p->offset - overstep; - mmax = /* LINTED */ - p->maxrmargin - p->offset - overstep; - bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; + + /* + * FIXME: if bp is zero, we still output the first word before + * breaking the line. + */ + vis = 0; - overstep = 0; /* * If in the standard case (left-justified), then begin with our @@ -208,8 +214,9 @@ term_flushln(struct termp *p) vis = 0; } /* Remove the overstep width. */ - bp += os; - os = 0; + bp += (int)/* LINTED */ + overstep; + overstep = 0; } else { for (j = 0; j < (int)vbl; j++) putchar(' '); @@ -222,11 +229,18 @@ term_flushln(struct termp *p) for ( ; i < (int)p->col; i++) { if (' ' == p->buf[i]) break; - putchar(p->buf[i]); + + /* The unit sep. is a non-breaking space. */ + if (31 == p->buf[i]) + putchar(' '); + else + putchar(p->buf[i]); } vis += vsz; } + p->col = 0; + overstep = 0; if ( ! (TERMP_NOBREAK & p->flags)) { putchar('\n'); @@ -535,8 +549,10 @@ buffer(struct termp *p, char c) p->maxcols = 256; s = p->maxcols * 2; p->buf = realloc(p->buf, s); - if (NULL == p->buf) - err(1, "realloc"); /* FIXME: shouldn't be here! */ + if (NULL == p->buf) { + perror(NULL); + exit(EXIT_FAILURE); + } p->maxcols = s; } p->buf[(int)(p->col)++] = c; @@ -548,95 +564,90 @@ encode(struct termp *p, char c) { if (' ' != c) { - if (p->bold) { - buffer(p, c); - buffer(p, 8); - } if (p->under) { buffer(p, '_'); buffer(p, 8); } + if (p->bold) { + buffer(p, c); + buffer(p, 8); + } } buffer(p, c); } -int -a2height(const char *p) +size_t +term_vspan(const struct roffsu *su) { - struct roffsu su; double r; - if ( ! a2roffsu(p, &su)) - return(-1); - - switch (su.unit) { + switch (su->unit) { case (SCALE_CM): - r = su.scale * 2; + r = su->scale * 2; break; case (SCALE_IN): - r = su.scale * 6; + r = su->scale * 6; break; case (SCALE_PC): - r = su.scale; + r = su->scale; break; case (SCALE_PT): - r = su.scale / 8; + r = su->scale / 8; break; case (SCALE_MM): - r = su.scale / 1000; + r = su->scale / 1000; break; case (SCALE_VS): - r = su.scale; + r = su->scale; break; default: - r = su.scale - 1; + r = su->scale - 1; break; } if (r < 0.0) r = 0.0; - return(/* LINTED */(int) + return(/* LINTED */(size_t) r); } -int -a2width(const char *p) +size_t +term_hspan(const struct roffsu *su) { - struct roffsu su; double r; - if ( ! a2roffsu(p, &su)) - return(-1); + /* XXX: CM, IN, and PT are approximations. */ - switch (su.unit) { + switch (su->unit) { case (SCALE_CM): - r = (4 * su.scale) + 2; /* FIXME: double-check. */ + r = 4 * su->scale; break; case (SCALE_IN): - r = (10 * su.scale) + 2; /* FIXME: double-check. */ + /* XXX: this is an approximation. */ + r = 10 * su->scale; break; case (SCALE_PC): - r = (10 * su.scale) / 6; /* FIXME: double-check. */ + r = (10 * su->scale) / 6; break; case (SCALE_PT): - r = (10 * su.scale) / 72; /* FIXME: double-check. */ + r = (10 * su->scale) / 72; break; case (SCALE_MM): - r = su.scale / 1000; /* FIXME: double-check. */ + r = su->scale / 1000; /* FIXME: double-check. */ break; case (SCALE_VS): - r = su.scale * 2 - 1; /* FIXME: double-check. */ + r = su->scale * 2 - 1; /* FIXME: double-check. */ break; default: - r = su.scale + 2; + r = su->scale; break; } if (r < 0.0) r = 0.0; - return((int)/* LINTED */ + return((size_t)/* LINTED */ r); }