=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.139 retrieving revision 1.145 diff -u -p -r1.139 -r1.145 --- mandoc/term.c 2010/05/24 21:51:20 1.139 +++ mandoc/term.c 2010/06/08 13:22:37 1.145 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.139 2010/05/24 21:51:20 schwarze Exp $ */ +/* $Id: term.c,v 1.145 2010/06/08 13:22:37 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -22,6 +22,8 @@ #include #include +#include +#include #include #include #include @@ -35,33 +37,67 @@ #include "mdoc.h" #include "main.h" -static struct termp *term_alloc(enum termenc, size_t); -static void term_free(struct termp *); +#define PS_CHAR_WIDTH 6 +#define PS_CHAR_HEIGHT 12 +#define PS_CHAR_TOPMARG (792 - 24) +#define PS_CHAR_TOP (PS_CHAR_TOPMARG - 36) +#define PS_CHAR_LEFT 36 +#define PS_CHAR_BOTMARG 24 +#define PS_CHAR_BOT (PS_CHAR_BOTMARG + 36) + 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 bufferc(struct termp *, char); static void adjbuf(struct termp *p, size_t); static void encode(struct termp *, const char *, size_t); +static void advance(struct termp *, size_t); +static void endline(struct termp *); +static void letter(struct termp *, char); +static void pageopen(struct termp *); void * -ascii_alloc(size_t width) +ascii_alloc(char *outopts) { + struct termp *p; + const char *toks[2]; + char *v; - return(term_alloc(TERMENC_ASCII, width)); + if (NULL == (p = term_alloc(TERMENC_ASCII))) + return(NULL); + + p->type = TERMTYPE_CHAR; + + toks[0] = "width"; + toks[1] = NULL; + + while (outopts && *outopts) + switch (getsubopt(&outopts, UNCONST(toks), &v)) { + case (0): + p->defrmargin = (size_t)atoi(v); + break; + default: + break; + } + + /* Enforce a lower boundary. */ + if (p->defrmargin < 58) + p->defrmargin = 58; + + return(p); } void -terminal_free(void *arg) +ascii_free(void *arg) { term_free((struct termp *)arg); } -static void +void term_free(struct termp *p) { @@ -74,22 +110,215 @@ term_free(struct termp *p) } -static struct termp * -term_alloc(enum termenc enc, size_t width) +/* + * Push a single letter into our output engine. + */ +static void +letter(struct termp *p, char c) { - struct termp *p; + + if (TERMTYPE_CHAR == p->type) { + /* + * If using the terminal device, just push the letter + * out into the screen. + */ + putchar(c); + return; + } + if ( ! (PS_INLINE & p->psstate)) { + /* + * If we're not in a PostScript "word" context, then + * open one now at the current cursor. + */ + printf("%zu %zu moveto\n", p->pscol, p->psrow); + putchar('('); + p->psstate |= PS_INLINE; + } + + /* + * We need to escape these characters as per the PostScript + * specification. We would also escape non-graphable characters + * (like tabs), but none of them would get to this point and + * it's superfluous to abort() on them. + */ + + switch (c) { + case ('('): + /* FALLTHROUGH */ + case (')'): + /* FALLTHROUGH */ + case ('\\'): + putchar('\\'); + break; + default: + break; + } + + /* Write the character and adjust where we are on the page. */ + putchar(c); + p->pscol += PS_CHAR_WIDTH; +} + + +/* + * Begin a "terminal" context. Since terminal encompasses PostScript, + * the actual terminal, etc., there are a few things we can do here. + */ +void +term_begin(struct termp *p, term_margin head, + term_margin foot, const void *arg) +{ + + p->headf = head; + p->footf = foot; + p->argf = arg; + + if (TERMTYPE_CHAR == p->type) { + /* Emit the header and be done. */ + (*p->headf)(p, p->argf); + return; + } + + /* + * Emit the standard PostScript prologue, set our initial page + * position, then run pageopen() on the initial page. + */ + + printf("%s\n", "%!PS"); + printf("%s\n", "/Courier"); + printf("%s\n", "10 selectfont"); + + p->pspage = 1; + p->psstate = 0; + pageopen(p); +} + + +/* + * Open a page. This is only used for -Tps at the moment. It opens a + * page context, printing the header and the footer. THE OUTPUT BUFFER + * MUST BE EMPTY. If it is not, output will ghost on the next line and + * we'll be all gross and out of state. + */ +static void +pageopen(struct termp *p) +{ + + assert(TERMTYPE_PS == p->type); + assert(0 == p->psstate); + + p->pscol = PS_CHAR_LEFT; + p->psrow = PS_CHAR_TOPMARG; + p->psstate |= PS_MARGINS; + + (*p->headf)(p, p->argf); + endline(p); + + p->psstate &= ~PS_MARGINS; + assert(0 == p->psstate); + + p->pscol = PS_CHAR_LEFT; + p->psrow = PS_CHAR_BOTMARG; + p->psstate |= PS_MARGINS; + + (*p->footf)(p, p->argf); + endline(p); + + p->psstate &= ~PS_MARGINS; + assert(0 == p->psstate); + + p->pscol = PS_CHAR_LEFT; + p->psrow = PS_CHAR_TOP; + +} + + +void +term_end(struct termp *p) +{ + + if (TERMTYPE_CHAR == p->type) { + (*p->footf)(p, p->argf); + return; + } + + printf("%s\n", "%%END"); +} + + +static void +endline(struct termp *p) +{ + + if (TERMTYPE_CHAR == p->type) { + putchar('\n'); + return; + } + + if (PS_INLINE & p->psstate) { + printf(") show\n"); + p->psstate &= ~PS_INLINE; + } + + if (PS_MARGINS & p->psstate) + return; + + p->pscol = PS_CHAR_LEFT; + if (p->psrow >= PS_CHAR_HEIGHT + PS_CHAR_BOT) { + p->psrow -= PS_CHAR_HEIGHT; + return; + } + + /* + * XXX: can't run pageopen() until we're certain a flushln() has + * occured, else the buf will reopen in an awkward state on the + * next line. + */ + printf("showpage\n"); + p->psrow = PS_CHAR_TOP; +} + + +/* + * Advance the output engine by a certain amount of whitespace. + */ +static void +advance(struct termp *p, size_t len) +{ + size_t i; + + if (TERMTYPE_CHAR == p->type) { + /* Just print whitespace on the terminal. */ + for (i = 0; i < len; i++) + putchar(' '); + return; + } + + if (PS_INLINE & p->psstate) { + /* Dump out any existing line scope. */ + printf(") show\n"); + p->psstate &= ~PS_INLINE; + } + + p->pscol += len ? len * PS_CHAR_WIDTH : 0; +} + + +struct termp * +term_alloc(enum termenc enc) +{ + struct termp *p; + p = calloc(1, sizeof(struct termp)); if (NULL == p) { perror(NULL); exit(EXIT_FAILURE); } + p->tabwidth = 5; p->enc = enc; - /* Enforce some lower boundary. */ - if (width < 60) - width = 60; - p->defrmargin = width - 2; + p->defrmargin = 78; return(p); } @@ -138,6 +367,7 @@ term_flushln(struct termp *p) 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; /* @@ -190,26 +420,28 @@ term_flushln(struct termp *p) */ /* LINTED */ - for ( ; j < (int)p->col; 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 + if (8 != p->buf[j]) { + if (vend > vis && vend < bp && + ASCII_HYPH == p->buf[j]) + jhy = j; vend++; + } else + vend--; } /* * 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'); + endline(p); if (TERMP_NOBREAK & p->flags) { p->viscol = p->rmargin; - for (j = 0; j < (int)p->rmargin; j++) - putchar(' '); + advance(p, p->rmargin); vend += p->rmargin - p->offset; } else { p->viscol = 0; @@ -231,6 +463,8 @@ term_flushln(struct termp *p) /* 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]) { @@ -251,12 +485,16 @@ term_flushln(struct termp *p) * so write preceding white space now. */ if (vbl) { - for (j = 0; j < (int)vbl; j++) - putchar(' '); + advance(p, vbl); p->viscol += vbl; vbl = 0; } - putchar(p->buf[i]); + + if (ASCII_HYPH == p->buf[i]) + letter(p, '-'); + else + letter(p, p->buf[i]); + p->viscol += 1; } vend += vbl; @@ -268,7 +506,7 @@ term_flushln(struct termp *p) if ( ! (TERMP_NOBREAK & p->flags)) { p->viscol = 0; - putchar('\n'); + endline(p); return; } @@ -301,13 +539,12 @@ term_flushln(struct termp *p) if (maxvis > vis + /* LINTED */ ((TERMP_TWOSPACE & p->flags) ? 1 : 0)) { p->viscol += maxvis - vis; - for ( ; vis < maxvis; vis++) - putchar(' '); + advance(p, maxvis - vis); + vis += (maxvis - vis); } else { /* ...or newline break. */ - putchar('\n'); + endline(p); p->viscol = p->rmargin; - for (i = 0; i < (int)p->rmargin; i++) - putchar(' '); + advance(p, p->rmargin); } } @@ -343,7 +580,7 @@ term_vspace(struct termp *p) term_newln(p); p->viscol = 0; - putchar('\n'); + endline(p); } @@ -595,7 +832,10 @@ encode(struct termp *p, const char *word, size_t sz) * character by character. */ - if (TERMFONT_NONE == (f = term_fonttop(p))) { + if (TERMTYPE_PS == p->type) { + buffera(p, word, sz); + return; + } else if (TERMFONT_NONE == (f = term_fonttop(p))) { buffera(p, word, sz); return; }