-/* $Id: term.c,v 1.136 2010/05/17 02:03:49 schwarze Exp $ */
+/* $Id: term.c,v 1.153 2010/06/28 22:46:21 kristaps Exp $ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#include <assert.h>
#include <ctype.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
+#include "mandoc.h"
#include "chars.h"
#include "out.h"
#include "term.h"
-#include "man.h"
-#include "mdoc.h"
#include "main.h"
-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);
static void buffera(struct termp *, const char *, size_t);
static void encode(struct termp *, const char *, size_t);
-void *
-ascii_alloc(size_t width)
+void
+term_free(struct termp *p)
{
- return(term_alloc(TERMENC_ASCII, width));
+ if (p->buf)
+ free(p->buf);
+ if (p->symtab)
+ chars_free(p->symtab);
+
+ free(p);
}
void
-terminal_free(void *arg)
+term_begin(struct termp *p, term_margin head,
+ term_margin foot, const void *arg)
{
- term_free((struct termp *)arg);
+ p->headf = head;
+ p->footf = foot;
+ p->argf = arg;
+ (*p->begin)(p);
}
-static void
-term_free(struct termp *p)
+void
+term_end(struct termp *p)
{
- if (p->buf)
- free(p->buf);
- if (p->symtab)
- chars_free(p->symtab);
-
- free(p);
+ (*p->end)(p);
}
-static struct termp *
-term_alloc(enum termenc enc, size_t width)
+struct termp *
+term_alloc(enum termenc enc)
{
- struct termp *p;
+ struct termp *p;
p = calloc(1, sizeof(struct termp));
if (NULL == p) {
perror(NULL);
exit(EXIT_FAILURE);
}
+
p->enc = enc;
- /* Enforce some lower boundary. */
- if (width < 60)
- width = 60;
- p->defrmargin = width - 2;
return(p);
}
size_t vbl; /* number of blanks to prepend 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;
+ int j; /* temporary loop index for p->buf */
+ int jhy; /* last hyph before overflow w/r/t j */
+ size_t maxvis; /* output position of visible boundary */
+ size_t mmax; /* used in calculating bp */
/*
* First, establish the maximum columns of "visible" content.
vis = vend = i = 0;
while (i < (int)p->col) {
+ /*
+ * 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;
+ }
+
/*
* Count up visible word characters. Control sequences
* (starting with the CSI) aren't counted. A space
*/
/* LINTED */
- for (j = i; 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])
- vend--;
- else
- vend++;
+ if (8 != p->buf[j]) {
+ if (vend > vis && vend < bp &&
+ ASCII_HYPH == p->buf[j])
+ jhy = j;
+ vend += (*p->width)(p, p->buf[j]);
+ } else {
+ assert(j);
+ vend -= (*p->width)(p, p->buf[j - 1]);
+ }
}
/*
* Find out whether we would exceed the right margin.
* If so, break to the next line.
*/
- if (vend > bp && vis > 0) {
+ if (vend > bp && 0 == jhy && vis > 0) {
vend -= vis;
- putchar('\n');
+ (*p->endline)(p);
if (TERMP_NOBREAK & p->flags) {
- for (j = 0; j < (int)p->rmargin; j++)
- putchar(' ');
+ p->viscol = p->rmargin;
+ (*p->advance)(p, p->rmargin);
vend += p->rmargin - p->offset;
} else {
+ p->viscol = 0;
vbl = p->offset;
}
p->overstep = 0;
}
+ /*
+ * 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 (vend > bp && jhy > 0 && i > jhy)
+ break;
+ if ('\t' == p->buf[i])
+ break;
if (' ' == p->buf[i]) {
while (' ' == p->buf[i]) {
- vbl++;
+ vbl += (*p->width)(p, p->buf[i]);
i++;
}
break;
}
if (ASCII_NBRSP == p->buf[i]) {
- vbl++;
+ vbl += (*p->width)(p, ' ');
continue;
}
* so write preceding white space now.
*/
if (vbl) {
- for (j = 0; j < (int)vbl; j++)
- putchar(' ');
+ (*p->advance)(p, vbl);
+ p->viscol += vbl;
vbl = 0;
}
- putchar(p->buf[i]);
+
+ if (ASCII_HYPH == p->buf[i]) {
+ (*p->letter)(p, '-');
+ p->viscol += (*p->width)(p, '-');
+ } else {
+ (*p->letter)(p, p->buf[i]);
+ p->viscol += (*p->width)(p, p->buf[i]);
+ }
}
vend += vbl;
vis = vend;
p->overstep = 0;
if ( ! (TERMP_NOBREAK & p->flags)) {
- putchar('\n');
+ p->viscol = 0;
+ (*p->endline)(p);
return;
}
if (TERMP_HANG & p->flags) {
/* We need one blank after the tag. */
p->overstep = /* LINTED */
- vis - maxvis + 1;
+ vis - maxvis + (*p->width)(p, ' ');
/*
* Behave exactly the same way as groff:
/* Right-pad. */
if (maxvis > vis + /* LINTED */
- ((TERMP_TWOSPACE & p->flags) ? 1 : 0))
- for ( ; vis < maxvis; vis++)
- putchar(' ');
- else { /* ...or newline break. */
- putchar('\n');
- for (i = 0; i < (int)p->rmargin; i++)
- putchar(' ');
+ ((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) {
+ p->viscol += maxvis - vis;
+ (*p->advance)(p, maxvis - vis);
+ vis += (maxvis - vis);
+ } else { /* ...or newline break. */
+ (*p->endline)(p);
+ p->viscol = p->rmargin;
+ (*p->advance)(p, p->rmargin);
}
}
{
p->flags |= TERMP_NOSPACE;
- if (0 == p->col) {
+ if (0 == p->col && 0 == p->viscol) {
p->flags &= ~TERMP_NOLPAD;
return;
}
{
term_newln(p);
- putchar('\n');
+ p->viscol = 0;
+ (*p->endline)(p);
}
}
if ( ! (TERMP_NOSPACE & p->flags)) {
- bufferc(p, ' ');
- if (TERMP_SENTENCE & p->flags)
+ if ( ! (TERMP_KEEP & p->flags)) {
+ if (TERMP_PREKEEP & p->flags)
+ p->flags |= TERMP_KEEP;
bufferc(p, ' ');
+ if (TERMP_SENTENCE & p->flags)
+ bufferc(p, ' ');
+ } else
+ bufferc(p, ASCII_NBRSP);
}
if ( ! (p->flags & TERMP_NONOSPACE))
size_t
-term_vspan(const struct roffsu *su)
+term_len(const struct termp *p, size_t sz)
+{
+
+ return((*p->width)(p, ' ') * sz);
+}
+
+
+size_t
+term_strlen(const struct termp *p, const char *cp)
+{
+ size_t sz;
+
+ for (sz = 0; *cp; cp++)
+ sz += (*p->width)(p, *cp);
+
+ return(sz);
+}
+
+
+size_t
+term_vspan(const struct termp *p, const struct roffsu *su)
{
double r;
size_t
-term_hspan(const struct roffsu *su)
+term_hspan(const struct termp *p, const struct roffsu *su)
{
double r;
git.ckatri.com / mandoc.git / blobdiff