-/* $Id: term.c,v 1.128 2010/01/01 17:14:30 kristaps Exp $ */
+/* $Id: term.c,v 1.139 2010/05/24 21:51:20 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
#include <string.h>
#include <time.h>
+#include "mandoc.h"
#include "chars.h"
#include "out.h"
#include "term.h"
#include "mdoc.h"
#include "main.h"
-static struct termp *term_alloc(enum termenc);
+static struct termp *term_alloc(enum termenc, size_t);
static void term_free(struct termp *);
static void spec(struct termp *, const char *, size_t);
static void res(struct termp *, const char *, size_t);
void *
-ascii_alloc(void)
+ascii_alloc(size_t width)
{
- return(term_alloc(TERMENC_ASCII));
+ return(term_alloc(TERMENC_ASCII, width));
}
static struct termp *
-term_alloc(enum termenc enc)
+term_alloc(enum termenc enc, size_t width)
{
struct termp *p;
perror(NULL);
exit(EXIT_FAILURE);
}
- p->maxrmargin = 78;
+ p->tabwidth = 5;
p->enc = enc;
+ /* Enforce some lower boundary. */
+ if (width < 60)
+ width = 60;
+ p->defrmargin = width - 2;
return(p);
}
* Flush a line of text. A "line" is loosely defined as being something
* that should be followed by a newline, regardless of whether it's
* broken apart by newlines getting there. A line can also be a
- * fragment of a columnar list.
+ * fragment of a columnar list (`Bl -tag' or `Bl -column'), which does
+ * not have a trailing newline.
*
- * Specifically, a line is whatever's in p->buf of length p->col, which
- * is zeroed after this function returns.
- *
- * The usage of termp:flags is as follows:
+ * The following flags may be specified:
*
* - TERMP_NOLPAD: when beginning to write the line, don't left-pad the
* offset value. This is useful when doing columnar lists where the
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 maxvis, mmax;
- static int overstep = 0;
/*
* First, establish the maximum columns of "visible" content.
assert(p->offset < p->rmargin);
- maxvis = (int)(p->rmargin - p->offset) - overstep < 0 ?
+ maxvis = (int)(p->rmargin - p->offset) - p->overstep < 0 ?
/* LINTED */
- 0 : p->rmargin - p->offset - overstep;
- mmax = (int)(p->maxrmargin - p->offset) - overstep < 0 ?
+ 0 : p->rmargin - p->offset - p->overstep;
+ mmax = (int)(p->maxrmargin - p->offset) - p->overstep < 0 ?
/* LINTED */
- 0 : p->maxrmargin - p->offset - overstep;
+ 0 : p->maxrmargin - p->offset - p->overstep;
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.
- */
-
- 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
*/
/* LINTED */
- for (j = i, vsz = 0; j < (int)p->col; j++) {
- if (j && ' ' == p->buf[j])
+ for ( ; j < (int)p->col; j++) {
+ if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
break;
- else if (8 == p->buf[j])
- vsz--;
+ if (8 == p->buf[j])
+ vend--;
else
- vsz++;
+ 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. (TODO: hyphenate)
- * Otherwise, write the chosen number of blanks now.
+ * If so, break to the next line.
*/
- if (vis && vis + vbl + vsz > bp) {
+ if (vend > bp && 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 overstep width. */
+
+ /* Remove the p->overstep width. */
+
bp += (int)/* LINTED */
- overstep;
- overstep = 0;
- } else {
- for (j = 0; j < (int)vbl; j++)
- putchar(' ');
- vis += vbl;
+ p->overstep;
+ p->overstep = 0;
}
/*
- * Finally, write out the word.
+ * 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])
+ 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;
+ }
- /* The unit sep. is a non-breaking space. */
- if (31 == p->buf[i])
- putchar(' ');
- else
- putchar(p->buf[i]);
+ /*
+ * 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;
+ }
+ putchar(p->buf[i]);
+ p->viscol += 1;
}
- vis += vsz;
+ vend += vbl;
+ vis = vend;
}
p->col = 0;
- overstep = 0;
+ p->overstep = 0;
if ( ! (TERMP_NOBREAK & p->flags)) {
+ p->viscol = 0;
putchar('\n');
return;
}
if (TERMP_HANG & p->flags) {
/* We need one blank after the tag. */
- overstep = /* LINTED */
+ p->overstep = /* LINTED */
vis - maxvis + 1;
/*
* move it one step LEFT and flag the rest of the line
* to be longer.
*/
- if (overstep >= -1) {
- assert((int)maxvis + overstep >= 0);
+ if (p->overstep >= -1) {
+ assert((int)maxvis + p->overstep >= 0);
/* LINTED */
- maxvis += overstep;
+ maxvis += p->overstep;
} else
- overstep = 0;
+ p->overstep = 0;
} else if (TERMP_DANGLE & p->flags)
return;
/* 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(' ');
}
{
p->flags |= TERMP_NOSPACE;
- if (0 == p->col) {
+ if (0 == p->col && 0 == p->viscol) {
p->flags &= ~TERMP_NOLPAD;
return;
}
{
term_newln(p);
+ p->viscol = 0;
putchar('\n');
}
case(')'):
/* FALLTHROUGH */
case(']'):
- /* FALLTHROUGH */
- case('}'):
if ( ! (TERMP_IGNDELIM & p->flags))
p->flags |= TERMP_NOSPACE;
break;
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. */
while (*word) {
p->flags |= TERMP_NOSPACE;
}
+ /*
+ * Note that we don't process the pipe: the parser sees it as
+ * punctuation, but we don't in terms of typography.
+ */
if (sv[0] && 0 == sv[1])
switch (sv[0]) {
case('('):
/* FALLTHROUGH */
case('['):
- /* FALLTHROUGH */
- case('{'):
p->flags |= TERMP_NOSPACE;
break;
default:
git.ckatri.com / mandoc.git / blobdiff