-/* $Id: term.c,v 1.130 2010/04/03 12:46:35 kristaps Exp $ */
+/* $Id: term.c,v 1.136 2010/05/17 02:03:49 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
#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;
exit(EXIT_FAILURE);
}
p->enc = enc;
+ /* Enforce some lower boundary. */
+ if (width < 60)
+ width = 60;
+ p->defrmargin = width - 2;
return(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 */
- size_t hyph; /* visible position of hyphen */
int j; /* temporary loop index */
size_t maxvis, mmax;
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;
-
- /*
- * 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(' ');
+ vis = vend = i = 0;
+ while (i < (int)p->col) {
- for (i = 0; i < (int)p->col; i++) {
/*
* Count up visible word characters. Control sequences
* (starting with the CSI) aren't counted. A space
* generates a non-printing word, which is valid (the
* space is printed according to regular spacing rules).
- * Collect the number of printable characters until the
- * first hyphen, if found. Hyphens aren't included if
- * they're the first character (so `Fl' doesn't break)
- * or second consecutive character (`Fl -').
*/
/* LINTED */
- for (j = i, vsz = 0, hyph = 0; j < (int)p->col; j++) {
+ for (j = i; j < (int)p->col; j++) {
if (j && ' ' == p->buf[j])
break;
if (8 == p->buf[j])
- vsz--;
+ vend--;
else
- vsz++;
- if (j > i && '-' == p->buf[j] && 0 == hyph)
- if ('-' != p->buf[j - 1])
- hyph = 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, possibly after
- * emittign character up to a hyphen. Otherwise, write
- * the chosen number of blanks.
+ * If so, break to the next line.
*/
-
- if (vis && vis + vbl + vsz > bp) {
- /*
- * Has a hyphen been found before the breakpoint
- * that we can use?
- */
- if (hyph && vis + vbl + hyph <= bp) {
- /* First prepend blanks. */
- for (j = 0; j < (int)vbl; j++)
- putchar(' ');
-
- /* Emit up to the character. */
- do {
- if (31 == p->buf[i])
- putchar(' ');
- else
- putchar(p->buf[i]);
- if (8 != p->buf[i])
- vsz--;
- } while ('-' != p->buf[i++]);
-
- /* Emit trailing decoration. */
- if (8 == p->buf[i]) {
- putchar(p->buf[i]);
- putchar(p->buf[i + 1]);
- }
- }
-
+ if (vend > bp && vis > 0) {
+ vend -= vis;
putchar('\n');
if (TERMP_NOBREAK & p->flags) {
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;
+ vbl = p->offset;
}
/* Remove the p->overstep width. */
bp += (int)/* LINTED */
p->overstep;
p->overstep = 0;
- } else {
- for (j = 0; j < (int)vbl; j++)
- putchar(' ');
- vis += vbl;
}
/* Write out the [remaining] word. */
- for ( ; i < (int)p->col; i++)
- if (' ' == p->buf[i])
+ for ( ; i < (int)p->col; i++) {
+ if (' ' == p->buf[i]) {
+ while (' ' == p->buf[i]) {
+ vbl++;
+ i++;
+ }
break;
- else if (31 == p->buf[i])
- putchar(' ');
- else
- putchar(p->buf[i]);
+ }
+ if (ASCII_NBRSP == p->buf[i]) {
+ vbl++;
+ continue;
+ }
- vis += vsz;
+ /*
+ * 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(' ');
+ vbl = 0;
+ }
+ putchar(p->buf[i]);
+ }
+ vend += vbl;
+ vis = vend;
}
p->col = 0;
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('['):
git.ckatri.com / mandoc.git / blobdiff