From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id o5TEI6xi022684 for ; Tue, 29 Jun 2010 10:18:06 -0400 (EDT) Received: (from kristaps@localhost) by krisdoz.my.domain (8.14.3/8.14.3/Submit) id o5TEI5T7018235; Tue, 29 Jun 2010 10:18:05 -0400 (EDT) Date: Tue, 29 Jun 2010 10:18:05 -0400 (EDT) Message-Id: <201006291418.o5TEI5T7018235@krisdoz.my.domain> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: kristaps@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: Give -Tps better PostScript hinting. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- Give -Tps better PostScript hinting. Note that we're using Adobe-3.0 constructs. Push the stupid CPP defines for page boundaries and margins into proper variables. Give enum termfont a proper TERMFONT__MAX. Modified Files: -------------- mdocml: mandoc.1 term.h term_ps.c Revision Data ------------- Index: term.h =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/term.h,v retrieving revision 1.67 retrieving revision 1.68 diff -Lterm.h -Lterm.h -u -p -r1.67 -r1.68 --- term.h +++ term.h @@ -33,7 +33,8 @@ enum termtype { enum termfont { TERMFONT_NONE = 0, TERMFONT_BOLD, - TERMFONT_UNDER + TERMFONT_UNDER, + TERMFONT__MAX }; #define TERM_MAXMARGIN 100000 /* FIXME */ @@ -44,13 +45,22 @@ struct termp_ps { int psstate; /* state of ps output */ #define PS_INLINE (1 << 0) /* we're in a word */ #define PS_MARGINS (1 << 1) /* we're in the margins */ - size_t pscol; /* visible column */ - size_t psrow; /* visible row */ + size_t pscol; /* visible column (points) */ + size_t psrow; /* visible row (points) */ char *psmarg; /* margin buf */ size_t psmargsz; /* margin buf size */ - size_t psmargcur; /* current pos in margin buf */ + size_t psmargcur; /* cur index in margin buf */ char last; /* character buffer */ enum termfont lastf; /* last set font */ + size_t pages; /* number of pages shown */ + size_t lineheight; /* each line's height (points) */ + size_t top; /* body top (points) */ + size_t bottom; /* body bottom (points) */ + size_t height; /* total height (points) */ + size_t width; /* total width (points) */ + size_t left; /* body left (points) */ + size_t header; /* header position (points) */ + size_t footer; /* footer position (points) */ }; struct termp { Index: mandoc.1 =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandoc.1,v retrieving revision 1.64 retrieving revision 1.65 diff -Lmandoc.1 -Lmandoc.1 -u -p -r1.64 -r1.65 --- mandoc.1 +++ mandoc.1 @@ -352,7 +352,9 @@ cause rendered documents to appear as th .Pp Special characters are rendered in decimal-encoded UTF-8. .Ss PostScript Output -PostScript Level 2 pages may be generated by +PostScript +.Qq Adobe-3.0 +Level-2 pages may be generated by .Fl T Ns Cm ps . Output pages are US-letter sized (215.9 x 279.4 mm) and rendered in fixed, 10-point Courier font. Index: term_ps.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/term_ps.c,v retrieving revision 1.15 retrieving revision 1.16 diff -Lterm_ps.c -Lterm_ps.c -u -p -r1.15 -r1.16 --- term_ps.c +++ term_ps.c @@ -31,14 +31,6 @@ #include "main.h" #include "term.h" -/* TODO: all this will go away with different paper sizes. */ -#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) - struct glyph { int wx; /* WX in AFM */ }; @@ -55,7 +47,7 @@ struct font { * ASCII, i.e., 32--127. */ -static const struct font fonts[3] = { +static const struct font fonts[TERMFONT__MAX] = { { "Courier", { { 600 }, { 600 }, @@ -384,11 +376,14 @@ void * ps_alloc(void) { struct termp *p; + size_t pagex, pagey, margin; if (NULL == (p = term_alloc(TERMENC_ASCII))) return(NULL); - p->defrmargin = 612 - (PS_CHAR_LEFT * 2); + pagex = 612; + pagey = 792; + margin = 72; p->type = TERMTYPE_PS; p->letter = ps_letter; @@ -397,6 +392,20 @@ ps_alloc(void) p->advance = ps_advance; p->endline = ps_endline; p->width = ps_width; + + assert(margin * 2 < pagex); + assert(margin * 2 < pagey); + + p->engine.ps.width = pagex; + p->engine.ps.height = pagey; + p->engine.ps.header = pagey - (margin / 2); + p->engine.ps.top = pagey - margin; + p->engine.ps.footer = (margin / 2); + p->engine.ps.bottom = margin; + p->engine.ps.left = margin; + p->engine.ps.lineheight = 12; + + p->defrmargin = pagex - (margin * 2); return(p); } @@ -486,8 +495,12 @@ ps_end(struct termp *p) assert('\0' == p->engine.ps.last); assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]); printf("%s", p->engine.ps.psmarg); + p->engine.ps.pages++; printf("showpage\n"); - printf("%s\n", "%%EOF"); + + printf("%%%%Trailer\n"); + printf("%%%%Pages: %zu\n", p->engine.ps.pages); + printf("%%%%EOF\n"); } @@ -495,6 +508,7 @@ static void ps_begin(struct termp *p) { time_t t; + int i; /* * Print margins into margin buffer. Nothing gets output to the @@ -508,16 +522,16 @@ ps_begin(struct termp *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; + p->engine.ps.pscol = p->engine.ps.left; + p->engine.ps.psrow = p->engine.ps.header; 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->engine.ps.pscol = p->engine.ps.left; + p->engine.ps.psrow = p->engine.ps.footer; (*p->footf)(p, p->argf); (*p->endline)(p); @@ -535,16 +549,29 @@ ps_begin(struct termp *p) t = time(NULL); - printf("%%!PS\n"); + printf("%%!PS-Adobe-3.0\n"); printf("%%%%Creator: mandoc-%s\n", VERSION); printf("%%%%CreationDate: %s", ctime(&t)); + printf("%%%%DocumentData: Clean7Bit\n"); + printf("%%%%Orientation: Portrait\n"); + printf("%%%%Pages: (atend)\n"); printf("%%%%PageOrder: Ascend\n"); printf("%%%%Orientation: Portrait\n"); - printf("%%%%EndComments\n"); + printf("%%%%DocumentMedia: Default %zu %zu 0 () ()\n", + p->engine.ps.width, + p->engine.ps.height); + printf("%%%%DocumentNeededResources: font"); + for (i = 0; i < (int)TERMFONT__MAX; i++) + printf(" %s", fonts[i].name); + printf("\n%%%%EndComments\n"); + + printf("%%%%Page: %zu %zu\n", + p->engine.ps.pages + 1, + p->engine.ps.pages + 1); ps_setfont(p, TERMFONT_NONE); - p->engine.ps.pscol = PS_CHAR_LEFT; - p->engine.ps.psrow = PS_CHAR_TOP; + p->engine.ps.pscol = p->engine.ps.left; + p->engine.ps.psrow = p->engine.ps.top; } @@ -732,16 +759,21 @@ ps_endline(struct termp *p) * 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; + p->engine.ps.pscol = p->engine.ps.left; + if (p->engine.ps.psrow >= p->engine.ps.lineheight + + p->engine.ps.bottom) { + p->engine.ps.psrow -= p->engine.ps.lineheight; return; } assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]); printf("%s", p->engine.ps.psmarg); + printf("%%%%Page: %zu %zu\n", + p->engine.ps.pages + 1, + p->engine.ps.pages + 1); printf("showpage\n"); - p->engine.ps.psrow = PS_CHAR_TOP; + p->engine.ps.pages++; + p->engine.ps.psrow = p->engine.ps.top; } @@ -749,6 +781,7 @@ static void ps_setfont(struct termp *p, enum termfont f) { + assert(f < TERMFONT__MAX); ps_printf(p, "/%s 10 selectfont\n", fonts[(int)f].name); p->engine.ps.lastf = f; } -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv