From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Fully-working -Tpdf: xref table is now generated.
Date: Sun, 25 Jul 2010 18:15:07 -0400 (EDT) [thread overview]
Message-ID: <201007252215.o6PMF7U5014345@krisdoz.my.domain> (raw)
Log Message:
-----------
Fully-working -Tpdf: xref table is now generated. This works for both
single and multiple-manual mode (e.g., mandoc -Tpdf foo.1 bar.1).
Modified Files:
--------------
mdocml:
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.75
retrieving revision 1.76
diff -Lterm.h -Lterm.h -u -p -r1.75 -r1.76
--- term.h
+++ term.h
@@ -64,9 +64,11 @@ struct termp_ps {
size_t left; /* body left (AFM units) */
size_t header; /* header pos (AFM units) */
size_t footer; /* footer pos (AFM units) */
- size_t pdfbytes;
- size_t pdflastpg;
- size_t pdfbody;
+ size_t pdfbytes; /* current output byte */
+ size_t pdflastpg; /* byte of last page mark */
+ size_t pdfbody; /* start of body object */
+ size_t *pdfobjs; /* table of object offsets */
+ size_t pdfobjsz; /* size of pdfobjs */
};
struct termp {
Index: term_ps.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/term_ps.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lterm_ps.c -Lterm_ps.c -u -p -r1.38 -r1.39
--- term_ps.c
+++ term_ps.c
@@ -384,6 +384,7 @@ static void ps_printf(struct termp *,
static void ps_putchar(struct termp *, char);
static void ps_setfont(struct termp *, enum termfont);
static struct termp *pspdf_alloc(char *);
+static void pdf_obj(struct termp *, size_t);
void *
@@ -520,6 +521,8 @@ pspdf_free(void *arg)
if (p->engine.ps.psmarg)
free(p->engine.ps.psmarg);
+ if (p->engine.ps.pdfobjs)
+ free(p->engine.ps.pdfobjs);
term_free(p);
}
@@ -561,8 +564,6 @@ ps_printf(struct termp *p, const char *f
va_end(ap);
p->engine.ps.psmargcur = strlen(p->engine.ps.psmarg);
- p->engine.ps.pdfbytes += /* LINTED */
- len < 0 ? 0 : (size_t)len;
}
@@ -588,6 +589,28 @@ ps_putchar(struct termp *p, char c)
static void
+pdf_obj(struct termp *p, size_t obj)
+{
+
+ assert(obj > 0);
+
+ if ((obj - 1) >= p->engine.ps.pdfobjsz) {
+ p->engine.ps.pdfobjsz = obj + 128;
+ p->engine.ps.pdfobjs = realloc
+ (p->engine.ps.pdfobjs,
+ p->engine.ps.pdfobjsz * sizeof(size_t));
+ if (NULL == p->engine.ps.pdfobjs) {
+ perror(NULL);
+ exit(EXIT_FAILURE);
+ }
+ }
+
+ p->engine.ps.pdfobjs[(int)obj - 1] = p->engine.ps.pdfbytes;
+ ps_printf(p, "%zu 0 obj\n", obj);
+}
+
+
+static void
ps_closepage(struct termp *p)
{
int i;
@@ -612,19 +635,20 @@ ps_closepage(struct termp *p)
ps_printf(p, "endstream\nendobj\n");
/* Length of content. */
- ps_printf(p, "%zu 0 obj\n", base + 1);
+ pdf_obj(p, base + 1);
ps_printf(p, "%zu\nendobj\n", len);
/* Resource for content. */
- ps_printf(p, "%zu 0 obj\n", base + 2);
+ pdf_obj(p, base + 2);
ps_printf(p, "<<\n/ProcSet [/PDF /Text]\n");
ps_printf(p, "/Font <<\n");
- for (i = 0; i < TERMFONT__MAX; i++)
+ for (i = 0; i < (int)TERMFONT__MAX; i++)
ps_printf(p, "/F%d %d 0 R\n", i, 3 + i);
ps_printf(p, ">>\n>>\n");
/* Page node. */
- ps_printf(p, "%zu 0 obj\n<<\n", base + 3);
+ pdf_obj(p, base + 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", base + 2);
@@ -665,7 +689,8 @@ ps_end(struct termp *p)
return;
}
- ps_printf(p, "2 0 obj\n<<\n/Type /Pages\n");
+ pdf_obj(p, 2);
+ ps_printf(p, "<<\n/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));
@@ -681,7 +706,7 @@ ps_end(struct termp *p)
p->engine.ps.pdfbody + 4;
ps_printf(p, "]\n>>\nendobj\n");
- ps_printf(p, "%zu 0 obj\n", base);
+ pdf_obj(p, base);
ps_printf(p, "<<\n");
ps_printf(p, "/Type /Catalog\n");
ps_printf(p, "/Pages 2 0 R\n");
@@ -689,7 +714,12 @@ ps_end(struct termp *p)
xref = p->engine.ps.pdfbytes;
ps_printf(p, "xref\n");
ps_printf(p, "0 %zu\n", base + 1);
- ps_printf(p, "0000000000 65535 f\n");
+ ps_printf(p, "0000000000 65535 f \n");
+
+ for (i = 0; i < base; i++)
+ ps_printf(p, "%.10zu 00000 n \n",
+ p->engine.ps.pdfobjs[(int)i]);
+
ps_printf(p, "trailer\n");
ps_printf(p, "<<\n");
ps_printf(p, "/Size %zu\n", base + 1);
@@ -718,7 +748,7 @@ ps_begin(struct termp *p)
p->engine.ps.psmarg[0] = '\0';
}
- p->engine.ps.pdfbytes = 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;
@@ -768,14 +798,14 @@ ps_begin(struct termp *p)
ps_printf(p, "\n%%%%EndComments\n");
} else {
ps_printf(p, "%%PDF-1.1\n");
- ps_printf(p, "1 0 obj\n");
+ pdf_obj(p, 1);
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);
+ pdf_obj(p, (size_t)i + 3);
ps_printf(p, "<<\n");
ps_printf(p, "/Type /Font\n");
ps_printf(p, "/Subtype /Type1\n");
@@ -812,8 +842,7 @@ ps_pletter(struct termp *p, int c)
fonts[(int)p->engine.ps.lastf].name,
p->engine.ps.scale);
} else {
- ps_printf(p, "%zu 0 obj\n",
- p->engine.ps.pdfbody +
+ pdf_obj(p, p->engine.ps.pdfbody +
p->engine.ps.pages * 4);
ps_printf(p, "<<\n");
ps_printf(p, "/Length %zu 0 R\n",
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2010-07-25 22:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201007252215.o6PMF7U5014345@krisdoz.my.domain \
--to=kristaps@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).