===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- mandoc/term_ps.c	2010/07/21 08:24:39	1.36
+++ mandoc/term_ps.c	2010/07/25 11:44:31	1.37
@@ -1,4 +1,4 @@
-/*	$Id: term_ps.c,v 1.36 2010/07/21 08:24:39 kristaps Exp $ */
+/*	$Id: term_ps.c,v 1.37 2010/07/25 11:44:31 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -373,6 +373,7 @@ static	double		  ps_hspan(const struct termp *,
 static	size_t		  ps_width(const struct termp *, char);
 static	void		  ps_advance(struct termp *, size_t);
 static	void		  ps_begin(struct termp *);
+static	void		  ps_closepage(struct termp *);
 static	void		  ps_end(struct termp *);
 static	void		  ps_endline(struct termp *);
 static	void		  ps_fclose(struct termp *);
@@ -382,12 +383,39 @@ static	void		  ps_pletter(struct termp *, int);
 static	void		  ps_printf(struct termp *, const char *, ...);
 static	void		  ps_putchar(struct termp *, char);
 static	void		  ps_setfont(struct termp *, enum termfont);
+static	struct termp	 *pspdf_alloc(char *);
 
 
 void *
+pdf_alloc(char *outopts)
+{
+	struct termp	*p;
+
+	if (NULL == (p = pspdf_alloc(outopts)))
+		return(p);
+
+	p->type = TERMTYPE_PDF;
+	return(p);
+}
+
+
+void *
 ps_alloc(char *outopts)
 {
 	struct termp	*p;
+
+	if (NULL == (p = pspdf_alloc(outopts)))
+		return(p);
+
+	p->type = TERMTYPE_PS;
+	return(p);
+}
+
+
+static struct termp *
+pspdf_alloc(char *outopts)
+{
+	struct termp	*p;
 	size_t		 pagex, pagey, marginx, marginy, lineheight;
 	const char	*toks[2];
 	const char	*pp;
@@ -402,7 +430,6 @@ ps_alloc(char *outopts)
 	p->endline = ps_endline;
 	p->hspan = ps_hspan;
 	p->letter = ps_letter;
-	p->type = TERMTYPE_PS;
 	p->width = ps_width;
 	
 	toks[0] = "paper";
@@ -487,7 +514,7 @@ ps_alloc(char *outopts)
 
 
 void
-ps_free(void *arg)
+pspdf_free(void *arg)
 {
 	struct termp	*p;
 
@@ -504,7 +531,7 @@ static void
 ps_printf(struct termp *p, const char *fmt, ...)
 {
 	va_list		 ap;
-	int		 pos;
+	int		 pos, len;
 
 	va_start(ap, fmt);
 
@@ -515,8 +542,10 @@ ps_printf(struct termp *p, const char *fmt, ...)
 	 */
 
 	if ( ! (PS_MARGINS & p->engine.ps.flags)) {
-		vprintf(fmt, ap);
+		len = vprintf(fmt, ap);
 		va_end(ap);
+		p->engine.ps.pdfbytes += /* LINTED */
+			len < 0 ? 0 : (size_t)len;
 		return;
 	}
 
@@ -529,10 +558,13 @@ ps_printf(struct termp *p, const char *fmt, ...)
 	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);
+	len = vsnprintf(&p->engine.ps.psmarg[pos], PS_BUFSLOP, fmt, ap);
 
 	va_end(ap);
+
+	p->engine.ps.psmargcur = strlen(p->engine.ps.psmarg);
+	p->engine.ps.pdfbytes += /* LINTED */
+		len < 0 ? 0 : (size_t)len;
 }
 
 
@@ -545,6 +577,7 @@ ps_putchar(struct termp *p, char c)
 
 	if ( ! (PS_MARGINS & p->engine.ps.flags)) {
 		putchar(c);
+		p->engine.ps.pdfbytes++;
 		return;
 	}
 
@@ -556,10 +589,65 @@ ps_putchar(struct termp *p, char c)
 }
 
 
+static void
+ps_closepage(struct termp *p)
+{
+	int		 i;
+	size_t		 len;
+
+	assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
+	ps_printf(p, "%s", p->engine.ps.psmarg);
+
+	if (TERMTYPE_PS == p->type) {
+		ps_printf(p, "showpage\n");
+	} else {
+		ps_printf(p, "ET\n");
+		len = p->engine.ps.pdfbytes - p->engine.ps.pdflastpg;
+		ps_printf(p, "endstream\n");
+		ps_printf(p, "endobj\n");
+		ps_printf(p, "%zu 0 obj\n", 
+				p->engine.ps.pdfbody +
+				(p->engine.ps.pages + 1) * 4 + 1);
+		ps_printf(p, "%zu\n", len);
+		ps_printf(p, "endobj\n");
+		ps_printf(p, "%zu 0 obj\n", 
+				p->engine.ps.pdfbody +
+				(p->engine.ps.pages + 1) * 4 + 2);
+		ps_printf(p, "<<\n");
+		ps_printf(p, "/ProcSet [/PDF /Text]\n");
+		ps_printf(p, "/Font <<\n");
+		for (i = 0; i < (int)TERMFONT__MAX; i++) 
+			ps_printf(p, "/F%d %d 0 R\n", i, 3 + i);
+		ps_printf(p, ">>\n");
+		ps_printf(p, ">>\n");
+		ps_printf(p, "%zu 0 obj\n", 
+				p->engine.ps.pdfbody +
+				(p->engine.ps.pages + 1) * 4 + 3);
+		ps_printf(p, "<<\n");
+		ps_printf(p, "/Type /Page\n");
+		ps_printf(p, "/Parent 2 0 R\n");
+		ps_printf(p, "/Resources %zu 0 R\n",
+				p->engine.ps.pdfbody +
+				(p->engine.ps.pages + 1) * 4 + 2);
+		ps_printf(p, "/Contents %zu 0 R\n",
+				p->engine.ps.pdfbody +
+				(p->engine.ps.pages + 1) * 4);
+		ps_printf(p, ">>\n");
+		ps_printf(p, "endobj\n");
+	}
+
+	p->engine.ps.pages++;
+	p->engine.ps.psrow = p->engine.ps.top;
+	assert( ! (PS_NEWPAGE & p->engine.ps.flags));
+	p->engine.ps.flags |= PS_NEWPAGE;
+}
+
+
 /* ARGSUSED */
 static void
 ps_end(struct termp *p)
 {
+	size_t		 i, xref;
 
 	/*
 	 * At the end of the file, do one last showpage.  This is the
@@ -570,15 +658,59 @@ ps_end(struct termp *p)
 	if ( ! (PS_NEWPAGE & p->engine.ps.flags)) {
 		assert(0 == p->engine.ps.flags);
 		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");
+		ps_closepage(p);
 	}
 
-	printf("%%%%Trailer\n");
-	printf("%%%%Pages: %zu\n", p->engine.ps.pages);
-	printf("%%%%EOF\n");
+	if (TERMTYPE_PS == p->type) {
+		ps_printf(p, "%%%%Trailer\n");
+		ps_printf(p, "%%%%Pages: %zu\n", p->engine.ps.pages);
+		ps_printf(p, "%%%%EOF\n");
+		return;
+	} 
+
+	ps_printf(p, "2 0 obj\n");
+	ps_printf(p, "<<\n");
+	ps_printf(p, "/Type /Pages\n");
+	ps_printf(p, "/MediaBox [0 0 %zu %zu]\n",
+			(size_t)AFM2PNT(p, p->engine.ps.width),
+			(size_t)AFM2PNT(p, p->engine.ps.height));
+
+	ps_printf(p, "/Count %zu\n", p->engine.ps.pages);
+	ps_printf(p, "/Kids [");
+
+	for (i = 0; i < p->engine.ps.pages; i++)
+		ps_printf(p, " %zu 0 R", 
+				p->engine.ps.pdfbody +
+				(i + 1) * 4 + 3);
+	ps_printf(p, "]\n");
+	ps_printf(p, ">>\n");
+	ps_printf(p, "endobj\n");
+	ps_printf(p, "%zu 0 obj\n",
+			p->engine.ps.pdfbody +
+			(p->engine.ps.pages * 4) + 4);
+	ps_printf(p, "<<\n");
+	ps_printf(p, "/Type /Catalog\n");
+	ps_printf(p, "/Pages 2 0 R\n");
+	ps_printf(p, ">>\n");
+	xref = p->engine.ps.pdfbytes;
+	ps_printf(p, "xref\n");
+	ps_printf(p, "0 %zu\n",
+			p->engine.ps.pdfbody +
+			(p->engine.ps.pages * 4) + 5);
+	ps_printf(p, "0000000000 65535 f\n");
+	ps_printf(p, "trailer\n");
+	ps_printf(p, "<<\n");
+	ps_printf(p, "/Size %zu\n", 
+			p->engine.ps.pdfbody +
+			(p->engine.ps.pages * 4) + 5);
+	ps_printf(p, "/Root %zu 0 R\n", 
+			p->engine.ps.pdfbody +
+			(p->engine.ps.pages * 4) + 4);
+	ps_printf(p, "/Info 1 0 R\n");
+	ps_printf(p, ">>\n");
+	ps_printf(p, "startxref\n");
+	ps_printf(p, "%zu\n", xref);
+	ps_printf(p, "%%%%EOF\n");
 }
 
 
@@ -598,6 +730,7 @@ ps_begin(struct termp *p)
 		p->engine.ps.psmarg[0] = '\0';
 	}
 
+	p->engine.ps.pdfbytes = 0;
 	p->engine.ps.psmargcur = 0;
 	p->engine.ps.flags = PS_MARGINS;
 	p->engine.ps.pscol = p->engine.ps.left;
@@ -627,21 +760,44 @@ ps_begin(struct termp *p)
 
 	t = time(NULL);
 
-	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("%%%%DocumentMedia: Default %zu %zu 0 () ()\n",
-			(size_t)AFM2PNT(p, p->engine.ps.width),
-			(size_t)AFM2PNT(p, p->engine.ps.height));
-	printf("%%%%DocumentNeededResources: font");
-	for (i = 0; i < (int)TERMFONT__MAX; i++)
-		printf(" %s", fonts[i].name);
-	printf("\n%%%%EndComments\n");
+	if (TERMTYPE_PS == p->type) {
+		ps_printf(p, "%%!PS-Adobe-3.0\n");
+		ps_printf(p, "%%%%Creator: mandoc-%s\n", VERSION);
+		ps_printf(p, "%%%%CreationDate: %s", ctime(&t));
+		ps_printf(p, "%%%%DocumentData: Clean7Bit\n");
+		ps_printf(p, "%%%%Orientation: Portrait\n");
+		ps_printf(p, "%%%%Pages: (atend)\n");
+		ps_printf(p, "%%%%PageOrder: Ascend\n");
+		ps_printf(p, "%%%%DocumentMedia: "
+				"Default %zu %zu 0 () ()\n",
+				(size_t)AFM2PNT(p, p->engine.ps.width),
+				(size_t)AFM2PNT(p, p->engine.ps.height));
+		ps_printf(p, "%%%%DocumentNeededResources: font");
 
+		for (i = 0; i < (int)TERMFONT__MAX; i++)
+			ps_printf(p, " %s", fonts[i].name);
+
+		ps_printf(p, "\n%%%%EndComments\n");
+	} else {
+		ps_printf(p, "%%PDF-1.1\n");
+		ps_printf(p, "1 0 obj\n");
+		ps_printf(p, "<<\n");
+		ps_printf(p, "/Creator mandoc-%s\n", VERSION);
+		ps_printf(p, ">>\n");
+		ps_printf(p, "endobj\n");
+
+		for (i = 0; i < (int)TERMFONT__MAX; i++) {
+			ps_printf(p, "%d 0 obj\n", i + 3);
+			ps_printf(p, "<<\n");
+			ps_printf(p, "/Type /Font\n");
+			ps_printf(p, "/Subtype /Type1\n");
+			ps_printf(p, "/Name /F%zu\n", i);
+			ps_printf(p, "/BaseFont /%s\n", fonts[i].name);
+			ps_printf(p, ">>\n");
+		}
+	}
+
+	p->engine.ps.pdfbody = (size_t)TERMFONT__MAX + 3;
 	p->engine.ps.pscol = p->engine.ps.left;
 	p->engine.ps.psrow = p->engine.ps.top;
 	p->engine.ps.flags |= PS_NEWPAGE;
@@ -660,12 +816,24 @@ ps_pletter(struct termp *p, int c)
 	 */
 
 	if (PS_NEWPAGE & p->engine.ps.flags) {
-		printf("%%%%Page: %zu %zu\n", 
-				p->engine.ps.pages + 1, 
-				p->engine.ps.pages + 1);
-		ps_printf(p, "/%s %zu selectfont\n", 
-				fonts[(int)p->engine.ps.lastf].name, 
-				p->engine.ps.scale);
+		if (TERMTYPE_PS == p->type) {
+			ps_printf(p, "%%%%Page: %zu %zu\n", 
+					p->engine.ps.pages + 1, 
+					p->engine.ps.pages + 1);
+			ps_printf(p, "/%s %zu selectfont\n", 
+					fonts[(int)p->engine.ps.lastf].name, 
+					p->engine.ps.scale);
+		} else {
+			ps_printf(p, "%zu 0 obj\n", 
+					p->engine.ps.pdfbody +
+					(p->engine.ps.pages + 1) * 4);
+			ps_printf(p, "<<\n");
+			ps_printf(p, "/Length %zu 0 R\n", 
+					p->engine.ps.pdfbody +
+					(p->engine.ps.pages + 1) * 4 + 1);
+			ps_printf(p, ">>\nstream\n");
+		}
+		p->engine.ps.pdflastpg = p->engine.ps.pdfbytes;
 		p->engine.ps.flags &= ~PS_NEWPAGE;
 	}
 	
@@ -675,9 +843,17 @@ ps_pletter(struct termp *p, int c)
 	 */
 
 	if ( ! (PS_INLINE & p->engine.ps.flags)) {
-		ps_printf(p, "%.3f %.3f moveto\n(", 
-				AFM2PNT(p, p->engine.ps.pscol),
-				AFM2PNT(p, p->engine.ps.psrow));
+		if (TERMTYPE_PS != p->type) {
+			ps_printf(p, "BT\n/F%d %zu Tf\n", 
+					(int)p->engine.ps.lastf,
+					p->engine.ps.scale);
+			ps_printf(p, "%.3f %.3f Td\n(",
+					AFM2PNT(p, p->engine.ps.pscol),
+					AFM2PNT(p, p->engine.ps.psrow));
+		} else
+			ps_printf(p, "%.3f %.3f moveto\n(", 
+					AFM2PNT(p, p->engine.ps.pscol),
+					AFM2PNT(p, p->engine.ps.psrow));
 		p->engine.ps.flags |= PS_INLINE;
 	}
 
@@ -731,7 +907,11 @@ ps_pclose(struct termp *p)
 	if ( ! (PS_INLINE & p->engine.ps.flags))
 		return;
 	
-	ps_printf(p, ") show\n");
+	if (TERMTYPE_PS != p->type) {
+		ps_printf(p, ") Tj\nET\n");
+	} else
+		ps_printf(p, ") show\n");
+
 	p->engine.ps.flags &= ~PS_INLINE;
 }
 
@@ -865,13 +1045,7 @@ ps_endline(struct termp *p)
 		return;
 	}
 
-	assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
-	printf("%s", p->engine.ps.psmarg);
-	printf("showpage\n");
-	p->engine.ps.pages++;
-	p->engine.ps.psrow = p->engine.ps.top;
-	assert( ! (PS_NEWPAGE & p->engine.ps.flags));
-	p->engine.ps.flags |= PS_NEWPAGE;
+	ps_closepage(p);
 }
 
 
@@ -890,8 +1064,14 @@ ps_setfont(struct termp *p, enum termfont f)
 	if (PS_NEWPAGE & p->engine.ps.flags)
 		return;
 
-	ps_printf(p, "/%s %zu selectfont\n", 
-			fonts[(int)f].name, p->engine.ps.scale);
+	if (TERMTYPE_PS == p->type)
+		ps_printf(p, "/%s %zu selectfont\n", 
+				fonts[(int)f].name, 
+				p->engine.ps.scale);
+	else
+		ps_printf(p, "/F%d %zu Tf\n", 
+				(int)f, 
+				p->engine.ps.scale);
 }