=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.3 retrieving revision 1.9 diff -u -p -r1.3 -r1.9 --- mandoc/term_ps.c 2010/06/08 15:06:01 1.3 +++ mandoc/term_ps.c 2010/06/11 16:58:20 1.9 @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.3 2010/06/08 15:06:01 kristaps Exp $ */ +/* $Id: term_ps.c,v 1.9 2010/06/11 16:58:20 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -18,9 +18,13 @@ #include "config.h" #endif +#include + #include +#include #include #include +#include #include "out.h" #include "main.h" @@ -34,12 +38,33 @@ #define PS_CHAR_BOTMARG 24 #define PS_CHAR_BOT (PS_CHAR_BOTMARG + 36) +#define PS_BUFSLOP 128 +#define PS_GROWBUF(p, sz) \ + do if ((p)->engine.ps.psmargcur + (sz) > \ + (p)->engine.ps.psmargsz) { \ + (p)->engine.ps.psmargsz += /* CONSTCOND */ \ + MAX(PS_BUFSLOP, (sz)); \ + (p)->engine.ps.psmarg = realloc \ + ((p)->engine.ps.psmarg, \ + (p)->engine.ps.psmargsz); \ + if (NULL == (p)->engine.ps.psmarg) { \ + perror(NULL); \ + exit(EXIT_FAILURE); \ + } \ + } while (/* CONSTCOND */ 0) + + static void ps_letter(struct termp *, char); static void ps_begin(struct termp *); static void ps_end(struct termp *); -static void ps_pageopen(struct termp *); static void ps_advance(struct termp *, size_t); static void ps_endline(struct termp *); +static void ps_fclose(struct termp *); +static void ps_pclose(struct termp *); +static void ps_pletter(struct termp *, char); +static void ps_printf(struct termp *, const char *, ...); +static void ps_putchar(struct termp *, char); +static void ps_setfont(struct termp *, enum termfont); void * @@ -63,16 +88,89 @@ ps_alloc(void) void ps_free(void *arg) { + struct termp *p; - term_free((struct termp *)arg); + p = (struct termp *)arg; + + if (p->engine.ps.psmarg) + free(p->engine.ps.psmarg); + + term_free(p); } +static void +ps_printf(struct termp *p, const char *fmt, ...) +{ + va_list ap; + int pos; + + va_start(ap, fmt); + + /* + * If we're running in regular mode, then pipe directly into + * vprintf(). If we're processing margins, then push the data + * into our growable margin buffer. + */ + + if ( ! (PS_MARGINS & p->engine.ps.psstate)) { + vprintf(fmt, ap); + va_end(ap); + return; + } + + /* + * XXX: I assume that the in-margin print won't exceed + * PS_BUFSLOP (128 bytes), which is reasonable but still an + * assumption that will cause pukeage if it's not the case. + */ + + PS_GROWBUF(p, PS_BUFSLOP); + + pos = (int)p->engine.ps.psmargcur; + vsnprintf(&p->engine.ps.psmarg[pos], PS_BUFSLOP, fmt, ap); + p->engine.ps.psmargcur = strlen(p->engine.ps.psmarg); + + va_end(ap); +} + + +static void +ps_putchar(struct termp *p, char c) +{ + int pos; + + /* See ps_printf(). */ + + if ( ! (PS_MARGINS & p->engine.ps.psstate)) { + putchar(c); + return; + } + + PS_GROWBUF(p, 2); + + pos = (int)p->engine.ps.psmargcur++; + p->engine.ps.psmarg[pos++] = c; + p->engine.ps.psmarg[pos] = '\0'; +} + + /* ARGSUSED */ static void ps_end(struct termp *p) { + /* + * At the end of the file, do one last showpage. This is the + * same behaviour as groff(1) and works for multiple pages as + * well as just one. + */ + + assert(0 == p->engine.ps.psstate); + assert('\0' == p->engine.ps.last); + assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]); + printf("%s", p->engine.ps.psmarg); + printf("showpage\n"); printf("%s\n", "%%EOF"); } @@ -81,34 +179,63 @@ static void ps_begin(struct termp *p) { - /* - * Emit the standard PostScript prologue, set our initial page - * position, then run pageopen() on the initial page. + /* + * Print margins into margin buffer. Nothing gets output to the + * screen yet, so we don't need to initialise the primary state. */ - printf("%s\n", "%!PS"); - printf("%s\n", "/Courier"); - printf("%s\n", "10 selectfont"); + if (p->engine.ps.psmarg) { + assert(p->engine.ps.psmargsz); + p->engine.ps.psmarg[0] = '\0'; + } - p->engine.ps.pspage = 1; - p->engine.ps.psstate = 0; - ps_pageopen(p); + p->engine.ps.psmargcur = 0; + p->engine.ps.psstate = PS_MARGINS; + p->engine.ps.pscol = PS_CHAR_LEFT; + p->engine.ps.psrow = PS_CHAR_TOPMARG; + + ps_setfont(p, TERMFONT_NONE); + + (*p->headf)(p, p->argf); + (*p->endline)(p); + + p->engine.ps.pscol = PS_CHAR_LEFT; + p->engine.ps.psrow = PS_CHAR_BOTMARG; + + (*p->footf)(p, p->argf); + (*p->endline)(p); + + p->engine.ps.psstate &= ~PS_MARGINS; + + assert(0 == p->engine.ps.psstate); + assert(p->engine.ps.psmarg); + assert('\0' != p->engine.ps.psmarg[0]); + + /* + * Print header and initialise page state. Following this, + * stuff gets printed to the screen, so make sure we're sane. + */ + + printf("%s\n", "%!PS"); + ps_setfont(p, TERMFONT_NONE); + p->engine.ps.pscol = PS_CHAR_LEFT; + p->engine.ps.psrow = PS_CHAR_TOP; } static void -ps_letter(struct termp *p, char c) +ps_pletter(struct termp *p, char c) { + /* + * If we're not in a PostScript "word" context, then open one + * now at the current cursor. + */ + if ( ! (PS_INLINE & p->engine.ps.psstate)) { - /* - * If we're not in a PostScript "word" context, then - * open one now at the current cursor. - */ - printf("%zu %zu moveto\n", + ps_printf(p, "%zu %zu moveto\n(", p->engine.ps.pscol, p->engine.ps.psrow); - putchar('('); p->engine.ps.psstate |= PS_INLINE; } @@ -125,54 +252,110 @@ ps_letter(struct termp *p, char c) case (')'): /* FALLTHROUGH */ case ('\\'): - putchar('\\'); + ps_putchar(p, '\\'); break; default: break; } /* Write the character and adjust where we are on the page. */ - putchar(c); + + ps_putchar(p, c); p->engine.ps.pscol += PS_CHAR_WIDTH; } -/* - * 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 -ps_pageopen(struct termp *p) +ps_pclose(struct termp *p) { + + /* + * Spit out that we're exiting a word context (this is a + * "partial close" because we don't check the last-char buffer + * or anything). + */ + + if ( ! (PS_INLINE & p->engine.ps.psstate)) + return; - assert(TERMTYPE_PS == p->type); - assert(0 == p->engine.ps.psstate); + ps_printf(p, ") show\n"); + p->engine.ps.psstate &= ~PS_INLINE; +} - p->engine.ps.pscol = PS_CHAR_LEFT; - p->engine.ps.psrow = PS_CHAR_TOPMARG; - p->engine.ps.psstate |= PS_MARGINS; - (*p->headf)(p, p->argf); - (*p->endline)(p); +static void +ps_fclose(struct termp *p) +{ - p->engine.ps.psstate &= ~PS_MARGINS; - assert(0 == p->engine.ps.psstate); + /* + * Strong closure: if we have a last-char, spit it out after + * checking that we're in the right font mode. This will of + * course open a new scope, if applicable. + * + * Following this, close out any scope that's open. + */ - p->engine.ps.pscol = PS_CHAR_LEFT; - p->engine.ps.psrow = PS_CHAR_BOTMARG; - p->engine.ps.psstate |= PS_MARGINS; + if ('\0' != p->engine.ps.last) { + if (p->engine.ps.lastf != TERMFONT_NONE) { + ps_pclose(p); + ps_setfont(p, TERMFONT_NONE); + } + ps_pletter(p, p->engine.ps.last); + p->engine.ps.last = '\0'; + } - (*p->footf)(p, p->argf); - (*p->endline)(p); + if ( ! (PS_INLINE & p->engine.ps.psstate)) + return; - p->engine.ps.psstate &= ~PS_MARGINS; - assert(0 == p->engine.ps.psstate); + ps_pclose(p); +} - p->engine.ps.pscol = PS_CHAR_LEFT; - p->engine.ps.psrow = PS_CHAR_TOP; +static void +ps_letter(struct termp *p, char c) +{ + char cc; + + /* + * State machine dictates whether to buffer the last character + * or not. Basically, encoded words are detected by checking if + * we're an "8" and switching on the buffer. Then we put "8" in + * our buffer, and on the next charater, flush both character + * and buffer. Thus, "regular" words are detected by having a + * regular character and a regular buffer character. + */ + + if ('\0' == p->engine.ps.last) { + assert(8 != c); + p->engine.ps.last = c; + return; + } else if (8 == p->engine.ps.last) { + assert(8 != c); + p->engine.ps.last = '\0'; + } else if (8 == c) { + assert(8 != p->engine.ps.last); + if ('_' == p->engine.ps.last) { + if (p->engine.ps.lastf != TERMFONT_UNDER) { + ps_pclose(p); + ps_setfont(p, TERMFONT_UNDER); + } + } else if (p->engine.ps.lastf != TERMFONT_BOLD) { + ps_pclose(p); + ps_setfont(p, TERMFONT_BOLD); + } + p->engine.ps.last = c; + return; + } else { + if (p->engine.ps.lastf != TERMFONT_NONE) { + ps_pclose(p); + ps_setfont(p, TERMFONT_NONE); + } + cc = p->engine.ps.last; + p->engine.ps.last = c; + c = cc; + } + + ps_pletter(p, c); } @@ -180,12 +363,14 @@ static void ps_advance(struct termp *p, size_t len) { - if (PS_INLINE & p->engine.ps.psstate) { - /* Dump out any existing line scope. */ - printf(") show\n"); - p->engine.ps.psstate &= ~PS_INLINE; - } + /* + * Advance some spaces. This can probably be made smarter, + * i.e., to have multiple space-separated words in the same + * scope, but this is easier: just close out the current scope + * and readjust our column settings. + */ + ps_fclose(p); p->engine.ps.pscol += len ? len * PS_CHAR_WIDTH : 0; } @@ -194,25 +379,49 @@ static void ps_endline(struct termp *p) { - if (PS_INLINE & p->engine.ps.psstate) { - printf(") show\n"); - p->engine.ps.psstate &= ~PS_INLINE; - } + /* Close out any scopes we have open: we're at eoln. */ + ps_fclose(p); + + /* + * If we're in the margin, don't try to recalculate our current + * row. XXX: if the column tries to be fancy with multiple + * lines, we'll do nasty stuff. + */ + if (PS_MARGINS & p->engine.ps.psstate) return; + /* + * Put us down a line. If we're at the page bottom, spit out a + * showpage and restart our row. + */ + p->engine.ps.pscol = PS_CHAR_LEFT; if (p->engine.ps.psrow >= PS_CHAR_HEIGHT + PS_CHAR_BOT) { p->engine.ps.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. - */ + assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]); + printf("%s", p->engine.ps.psmarg); printf("showpage\n"); p->engine.ps.psrow = PS_CHAR_TOP; } + + +static void +ps_setfont(struct termp *p, enum termfont f) +{ + + if (TERMFONT_BOLD == f) + ps_printf(p, "/Courier-Bold\n"); + else if (TERMFONT_UNDER == f) + ps_printf(p, "/Courier-Oblique\n"); + else + ps_printf(p, "/Courier\n"); + + ps_printf(p, "10 selectfont\n"); + p->engine.ps.lastf = f; +} +