Split pdftool into separate mini-tools again.

4 files changed, 736 insertions, 1102 deletions

diff --git a/apps/Jamfile b/apps/Jamfile
index f7b5391d..1c70f554 100644
--- a/apps/Jamfile
+++ b/apps/Jamfile
@@ -3,8 +3,18 @@
 FITZLIBS = libmupdf libfitz libfitzdraw libfonts libcmaps ;
 
 SubDir TOP apps ;
-Main mupdftool : pdftool.c ;
-LinkLibraries mupdftool : $(FITZLIBS) ;
+
+Main pdfshow : pdfshow.c ;
+LinkLibraries pdfshow : $(FITZLIBS) ;
+
+Main pdfclean : pdfclean.c ;
+LinkLibraries pdfclean : $(FITZLIBS) ;
+
+Main pdfdraw : pdfdraw.c ;
+LinkLibraries pdfdraw : $(FITZLIBS) ;
+
+Main pdfinfo : pdfinfo.c ;
+LinkLibraries pdfinfo : $(FITZLIBS) ;
 
 SubDir TOP apps common ;
 Library libpdfapp : pdfapp.c ;
diff --git a/apps/pdfclean.c b/apps/pdfclean.c
new file mode 100644
index 00000000..7a8cc0fc
--- /dev/null
+++ b/apps/pdfclean.c
@@ -0,0 +1,504 @@
+/*
+ * PDF cleaning tool: general purpose pdf syntax washer.
+ *
+ * Rewrite PDF with pretty printed objects.
+ * Garbage collect unreachable objects.
+ * Inflate compressed streams.
+ * Encrypt output.
+ */
+
+#include "fitz.h"
+#include "mupdf.h"
+
+static pdf_xref *xref = NULL;
+static fz_obj *id = NULL;
+
+static pdf_crypt *outcrypt = NULL;
+static FILE *out = NULL;
+
+static char *uselist = NULL;
+static int *ofslist = NULL;
+static int *genlist = NULL;
+
+int doencrypt = 0;
+int dogarbage = 0;
+int doexpand = 0;
+
+void die(fz_error *eo)
+{
+    fflush(stdout);
+    fz_printerror(eo);
+    fz_droperror(eo);
+    fflush(stderr);
+    exit(1);
+}
+
+void openxref(char *filename, char *password)
+{
+    fz_error *error;
+    fz_obj *obj;
+
+    error = pdf_newxref(&xref);
+    if (error)
+	die(error);
+
+    error = pdf_loadxref(xref, filename);
+    if (error)
+    {
+	fz_printerror(error);
+	fz_droperror(error);
+	fz_warn("trying to repair");
+	error = pdf_repairxref(xref, filename);
+	if (error)
+	    die(error);
+    }
+
+    error = pdf_decryptxref(xref);
+    if (error)
+	die(error);
+
+    if (xref->crypt)
+    {
+	int okay = pdf_setpassword(xref->crypt, password);
+	if (!okay)
+	    die(fz_throw("invalid password"));
+    }
+
+    /* TODO: move into mupdf lib, see pdfapp_open in pdfapp.c */
+    obj = fz_dictgets(xref->trailer, "Root");
+    if (!obj)
+	die(error);
+
+    error = pdf_loadindirect(&xref->root, xref, obj);
+    if (error)
+	die(error);
+
+    obj = fz_dictgets(xref->trailer, "Info");
+    if (obj)
+    {
+	error = pdf_loadindirect(&xref->info, xref, obj);
+	if (error)
+	    die(error);
+    }
+}
+
+/*
+ * Garbage collect objects not reachable from the trailer.
+ */
+
+static fz_error *sweepref(pdf_xref *xref, fz_obj *ref);
+
+static fz_error *sweepobj(pdf_xref *xref, fz_obj *obj)
+{
+    fz_error *error;
+    int i;
+
+    if (fz_isdict(obj))
+    {
+	for (i = 0; i < fz_dictlen(obj); i++)
+	{
+	    error = sweepobj(xref, fz_dictgetval(obj, i));
+	    if (error)
+		return error; /* too deeply nested for rethrow */
+	}
+    }
+
+    if (fz_isarray(obj))
+    {
+	for (i = 0; i < fz_arraylen(obj); i++)
+	{
+	    error = sweepobj(xref, fz_arrayget(obj, i));
+	    if (error)
+		return error; /* too deeply nested for rethrow */
+	}
+    }
+
+    if (fz_isindirect(obj))
+	return sweepref(xref, obj);
+
+    return fz_okay;
+}
+
+static fz_error *sweepref(pdf_xref *xref, fz_obj *ref)
+{
+    fz_error *error;
+    fz_obj *obj;
+    fz_obj *len;
+    int oid, gen;
+
+    oid = fz_tonum(ref);
+    gen = fz_tonum(ref);
+
+    if (oid < 0 || oid >= xref->len)
+	return fz_throw("object out of range (%d %d R)", oid, gen);
+
+    if (uselist[oid])
+	return fz_okay;
+
+    uselist[oid] = 1;
+
+    error = pdf_loadindirect(&obj, xref, ref);
+    if (error)
+	return fz_rethrow(error, "cannot load indirect object");
+
+    /* Bake in /Length in stream objects */
+    if (xref->table[oid].stmofs)
+    {
+	len = fz_dictgets(obj, "Length");
+	if (fz_isindirect(len))
+	{
+	    pdf_loadindirect(&len, xref, len);
+	    fz_dictputs(obj, "Length", len);
+	}
+    }
+
+    error = sweepobj(xref, obj);
+    if (error)
+    {
+	fz_dropobj(obj);
+	return error; /* too deeply nested for rethrow */
+    }
+
+    fz_dropobj(obj);
+    return fz_okay;
+}
+
+void preloadobjstms(void)
+{
+    fz_error *error;
+    fz_obj *obj;
+    int oid;
+
+    for (oid = 0; oid < xref->len; oid++)
+    {
+	if (xref->table[oid].type == 'o')
+	{
+	    error = pdf_loadobject(&obj, xref, oid, 0);
+	    if (error)
+		die(error);
+	    fz_dropobj(obj);
+	}
+    }
+}
+
+void copystream(fz_obj *obj, int oid, int gen)
+{
+    fz_error *error;
+    fz_buffer *buf;
+
+    error = pdf_loadrawstream(&buf, xref, oid, gen);
+    if (error)
+	die(error);
+
+    if (doencrypt)
+	pdf_cryptbuffer(outcrypt, buf, oid, gen);
+
+    fprintf(out, "%d %d obj\n", oid, gen);
+    if (doencrypt)
+	pdf_cryptobj(outcrypt, obj, oid, gen);
+    fz_fprintobj(out, obj, !doexpand);
+    if (doencrypt)
+	pdf_cryptobj(outcrypt, obj, oid, gen);
+    fprintf(out, "stream\n");
+    fwrite(buf->rp, 1, buf->wp - buf->rp, out);
+    fprintf(out, "endstream\nendobj\n\n");
+
+    fz_dropbuffer(buf);
+}
+
+void expandstream(fz_obj *obj, int oid, int gen)
+{
+    fz_error *error;
+    fz_buffer *buf;
+    fz_obj *newdict, *newlen;
+
+    error = pdf_loadstream(&buf, xref, oid, gen);
+    if (error)
+	die(error);
+
+    if (doencrypt)
+	pdf_cryptbuffer(outcrypt, buf, oid, gen);
+
+    fz_copydict(&newdict, obj);
+    fz_dictdels(newdict, "Filter");
+    fz_dictdels(newdict, "DecodeParms");
+
+    fz_newint(&newlen, buf->wp - buf->rp);
+    fz_dictputs(newdict, "Length", newlen);
+    fz_dropobj(newlen);
+
+    fprintf(out, "%d %d obj\n", oid, gen);
+    if (doencrypt)
+	pdf_cryptobj(outcrypt, obj, oid, gen);
+    fz_fprintobj(out, newdict, !doexpand);
+    if (doencrypt)
+	pdf_cryptobj(outcrypt, obj, oid, gen);
+    fprintf(out, "stream\n");
+    fwrite(buf->rp, 1, buf->wp - buf->rp, out);
+    fprintf(out, "endstream\nendobj\n\n");
+
+    fz_dropobj(newdict);
+
+    fz_dropbuffer(buf);
+}
+
+void saveobject(int oid, int gen)
+{
+    fz_error *error;
+    fz_obj *obj;
+    fz_obj *type;
+
+    error = pdf_loadobject(&obj, xref, oid, gen);
+    if (error)
+	die(error);
+
+    /* skip ObjStm and XRef objects */
+    if (fz_isdict(obj))
+    {
+	type = fz_dictgets(obj, "Type");
+	if (fz_isname(type) && !strcmp(fz_toname(type), "ObjStm"))
+	{
+	    uselist[oid] = 0;
+	    fz_dropobj(obj);
+	    return;
+	}
+	if (fz_isname(type) && !strcmp(fz_toname(type), "XRef"))
+	{
+	    uselist[oid] = 0;
+	    fz_dropobj(obj);
+	    return;
+	}
+    }
+
+
+    if (!xref->table[oid].stmofs)
+    {
+	fprintf(out, "%d %d obj\n", oid, gen);
+	if (doencrypt)
+	    pdf_cryptobj(outcrypt, obj, oid, gen);
+	fz_fprintobj(out, obj, !doexpand);
+	if (doencrypt)
+	    pdf_cryptobj(outcrypt, obj, oid, gen);
+	fprintf(out, "endobj\n\n");
+    }
+    else
+    {
+	if (doexpand)
+	    expandstream(obj, oid, gen);
+	else
+	    copystream(obj, oid, gen);
+    }
+
+
+    fz_dropobj(obj);
+}
+
+void savexref(void)
+{
+    fz_obj *trailer;
+    fz_obj *obj;
+    int startxref;
+    int oid;
+
+    startxref = ftell(out);
+
+    fprintf(out, "xref\n0 %d\n", xref->len + doencrypt);
+    for (oid = 0; oid < xref->len + doencrypt; oid++)
+    {
+	if (uselist[oid])
+	    fprintf(out, "%010d %05d n \n", ofslist[oid], genlist[oid]);
+	else
+	    fprintf(out, "%010d %05d f \n", ofslist[oid], genlist[oid]);
+    }
+    fprintf(out, "\n");
+
+    fz_newdict(&trailer, 5);
+
+    fz_newint(&obj, xref->len);
+    fz_dictputs(trailer, "Size", obj);
+    fz_dropobj(obj);
+
+    obj = fz_dictgets(xref->trailer, "Info");
+    if (obj)
+	fz_dictputs(trailer, "Info", obj);
+
+    obj = fz_dictgets(xref->trailer, "Root");
+    if (obj)
+	fz_dictputs(trailer, "Root", obj);
+
+    if (doencrypt)
+    {
+	fz_newindirect(&obj, xref->len, 0);
+	fz_dictputs(trailer, "Encrypt", obj);
+	fz_dropobj(obj);
+    }
+
+    fz_dictputs(trailer, "ID", id);
+
+    fprintf(out, "trailer\n");
+    fz_fprintobj(out, trailer, !doexpand);
+    fprintf(out, "\n");
+
+    fprintf(out, "startxref\n%d\n%%%%EOF\n", startxref);
+}
+
+void cleanusage(void)
+{
+    fprintf(stderr,
+	    "usage: pdfclean [options] input.pdf [outfile.pdf]\n"
+	    "  -d -\tpassword for decryption\n"
+	    "  -g  \tgarbage collect unused objects\n"
+	    "  -x  \texpand compressed streams\n"
+	    "  -e  \tencrypt output\n"
+	    "    -u -\tset user password for encryption\n"
+	    "    -o -\tset owner password\n"
+	    "    -p -\tset permissions (combine letters 'pmca')\n"
+	    "    -n -\tkey length in bits: 40 <= n <= 128\n");
+    exit(1);
+}
+
+int main(int argc, char **argv)
+{
+    char *infile;
+    char *outfile = "out.pdf";
+    char *userpw = "";
+    char *ownerpw = "";
+    unsigned perms = 0xfffff0c0;	/* nothing allowed */
+    int keylen = 40;
+    char *password = "";
+    fz_error *error;
+    int c, oid;
+    int lastfree;
+
+
+    while ((c = getopt(argc, argv, "d:egn:o:p:u:x")) != -1)
+    {
+	switch (c)
+	{
+	    case 'p':
+		/* see TABLE 3.15 User access permissions */
+		perms = 0xfffff0c0;
+		if (strchr(optarg, 'p')) /* print */
+		    perms |= (1 << 2) | (1 << 11);
+		if (strchr(optarg, 'm')) /* modify */
+		    perms |= (1 << 3) | (1 << 10);
+		if (strchr(optarg, 'c')) /* copy */
+		    perms |= (1 << 4) | (1 << 9);
+		if (strchr(optarg, 'a')) /* annotate / forms */
+		    perms |= (1 << 5) | (1 << 8);
+		break;
+	    case 'd': password = optarg; break;
+	    case 'e': doencrypt ++; break;
+	    case 'g': dogarbage ++; break;
+	    case 'n': keylen = atoi(optarg); break;
+	    case 'o': ownerpw = optarg; break;
+	    case 'u': userpw = optarg; break;
+	    case 'x': doexpand ++; break;
+	    default: cleanusage(); break;
+	}
+    }
+
+    if (argc - optind < 1)
+	cleanusage();
+
+    infile = argv[optind++];
+    if (argc - optind > 0)
+	outfile = argv[optind++];
+
+    openxref(infile, password);
+
+    id = fz_dictgets(xref->trailer, "ID");
+    if (!id)
+    {
+	error = fz_packobj(&id, "[(ABCDEFGHIJKLMNOP)(ABCDEFGHIJKLMNOP)]");
+	if (error)
+	    die(error);
+    }
+    else
+    {
+	fz_keepobj(id);
+    }
+
+    if (doencrypt)
+    {
+	error = pdf_newencrypt(&outcrypt, userpw, ownerpw, perms, keylen, id);
+	if (error)
+	    die(error);
+    }
+
+    out = fopen(outfile, "wb");
+    if (!out)
+	die(fz_throw("cannot open output file '%s'", outfile));
+
+    fprintf(out, "%%PDF-%d.%d\n", xref->version / 10, xref->version % 10);
+    fprintf(out, "%%\342\343\317\323\n\n");
+
+    uselist = malloc(sizeof (char) * (xref->len + 1));
+    ofslist = malloc(sizeof (int) * (xref->len + 1));
+    genlist = malloc(sizeof (int) * (xref->len + 1));
+
+    for (oid = 0; oid < xref->len; oid++)
+    {
+	uselist[oid] = 0;
+	ofslist[oid] = 0;
+	genlist[oid] = 0;
+    }
+
+    /* Make sure any objects hidden in compressed streams have been loaded */
+    preloadobjstms();
+
+    /* Sweep & mark objects from the trailer */
+    error = sweepobj(xref, xref->trailer);
+    if (error)
+	die(fz_rethrow(error, "cannot mark used objects"));
+
+    for (oid = 0; oid < xref->len; oid++)
+    {
+	if (xref->table[oid].type == 'f')
+	    uselist[oid] = 0;
+
+	if (xref->table[oid].type == 'f')
+	    genlist[oid] = xref->table[oid].gen;
+	if (xref->table[oid].type == 'n')
+	    genlist[oid] = xref->table[oid].gen;
+	if (xref->table[oid].type == 'o')
+	    genlist[oid] = 0;
+
+	if (dogarbage && !uselist[oid])
+	    continue;
+
+	if (xref->table[oid].type == 'n' || xref->table[oid].type == 'o')
+	{
+	    ofslist[oid] = ftell(out);
+	    saveobject(oid, genlist[oid]);
+	}
+    }
+
+    /* add new encryption dictionary to xref */
+    if (doencrypt)
+    {
+	ofslist[xref->len] = ftell(out);
+	genlist[xref->len] = 0;
+	uselist[xref->len] = 1;
+	fprintf(out, "%d %d obj\n", xref->len, 0);
+	fz_fprintobj(out, outcrypt->encrypt, !doexpand);
+	fprintf(out, "endobj\n\n");
+    }
+
+    /* construct linked list of free object slots */
+    lastfree = 0;
+    for (oid = 0; oid < xref->len + doencrypt; oid++)
+    {
+	if (!uselist[oid])
+	{
+	    genlist[oid]++;
+	    ofslist[lastfree] = oid;
+	    lastfree = oid;
+	}
+    }
+
+    savexref();
+
+    pdf_closexref(xref);
+}
+
diff --git a/apps/pdftool.c b/apps/pdfinfo.c
index cedc4412..374b39c6 100644
--- a/apps/pdftool.c
+++ b/apps/pdfinfo.c
@@ -1,12 +1,6 @@
 /*
- * Swiss army knife for manipulating and debugging PDFs.
- *
- * There are a few major modes of operation:
- *
- *   show -- pretty-print objects and streams
- *   draw -- render pages to bitmap
- *   clean -- simple rewrite of pdf file
- *   edit -- edit pages (impose and copy operations)
+ * Information tool.
+ * Print information about the input pdf.
  */
 
 #include "fitz.h"
@@ -136,763 +130,6 @@ void opensrc(char *filename, char *password, int loadpages)
 		die(error);
 }
 
-void preloadobjstms(void)
-{
-	fz_error *error;
-	fz_obj *obj;
-	int i;
-
-	for (i = 0; i < src->len; i++)
-	{
-		if (src->table[i].type == 'o')
-		{
-			error = pdf_loadobject(&obj, src, i, 0);
-			if (error) die(error);
-			fz_dropobj(obj);
-		}
-	}
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Debug print parts of the PDF.
- */
-
-int showbinary = 0;
-int showdecode = 0;
-int showcolumn;
-
-void showusage(void)
-{
-	fprintf(stderr, "usage: mupdftool show [-bd] <file> [xref] [trailer] [object numbers]\n");
-	fprintf(stderr, "  -b  \tprint streams as raw binary data\n");
-	fprintf(stderr, "  -d  \tdecode streams\n");
-	exit(1);
-}
-
-void showtrailer(void)
-{
-	if (!src)
-		die(fz_throw("no file specified"));
-	printf("trailer\n");
-	fz_debugobj(src->trailer);
-	printf("\n");
-}
-
-void showxref(void)
-{
-	if (!src)
-		die(fz_throw("no file specified"));
-	pdf_debugxref(src);
-	printf("\n");
-}
-
-void showsafe(unsigned char *buf, int n)
-{
-	int i;
-	for (i = 0; i < n; i++) {
-		if (buf[i] == '\r' || buf[i] == '\n') {
-			putchar('\n');
-			showcolumn = 0;
-		}
-		else if (buf[i] < 32 || buf[i] > 126) {
-			putchar('.');
-			showcolumn ++;
-		}
-		else {
-			putchar(buf[i]);
-			showcolumn ++;
-		}
-		if (showcolumn == 79) {
-			putchar('\n');
-			showcolumn = 0;
-		}
-	}
-}
-
-void showstream(int num, int gen)
-{
-	fz_error *error;
-	fz_stream *stm;
-	unsigned char buf[2048];
-	int n;
-
-	showcolumn = 0;
-
-	if (showdecode)
-		error = pdf_openstream(&stm, src, num, gen);
-	else
-		error = pdf_openrawstream(&stm, src, num, gen);
-	if (error)
-		die(error);
-
-	while (1)
-	{
-		error = fz_read(&n, stm, buf, sizeof buf);
-		if (error)
-			die(error);
-		if (n == 0)
-			break;
-		if (showbinary)
-			fwrite(buf, 1, n, stdout);
-		else
-			showsafe(buf, n);
-	}
-
-	fz_dropstream(stm);
-}
-
-void showobject(int num, int gen)
-{
-	fz_error *error;
-	fz_obj *obj;
-
-	if (!src)
-		die(fz_throw("no file specified"));
-
-	error = pdf_loadobject(&obj, src, num, gen);
-	if (error)
-		die(error);
-
-	printf("%d %d obj\n", num, gen);
-	fz_debugobj(obj);
-
-	if (pdf_isstream(src, num, gen))
-	{
-		printf("stream\n");
-		showstream(num, gen);
-		printf("endstream\n");
-	}
-
-	printf("endobj\n\n");
-
-	fz_dropobj(obj);
-}
-
-void
-showmain(int argc, char **argv)
-{
-	int c;
-
-	while ((c = getopt(argc, argv, "bd")) != -1)
-	{
-		switch (c)
-		{
-		case 'b': showbinary ++; break;
-		case 'd': showdecode ++; break;
-		default:
-			  showusage();
-			  break;
-		}
-	}
-
-	if (optind == argc)
-		showusage();
-
-	opensrc(argv[optind++], "", 0);
-
-	if (optind == argc)
-		showtrailer();
-
-	while (optind < argc)
-	{
-		if (!strcmp(argv[optind], "trailer"))
-			showtrailer();
-		else if (!strcmp(argv[optind], "xref"))
-			showxref();
-		else
-			showobject(atoi(argv[optind]), 0);
-		optind++;
-	}
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Clean tool.
- * Rewrite PDF.
- * Garbage collect.
- * Decompress streams.
- * Encrypt or decrypt.
- */
-
-void
-cleanusage(void)
-{
-	fprintf(stderr,
-			"usage: mupdftool clean [options] input.pdf [outfile.pdf]\n"
-			"  -d -\tpassword for decryption\n"
-			"  -g  \tgarbage collect unused objects\n"
-			"  -x  \texpand compressed streams\n"
-			"  -e  \tencrypt output\n"
-			"    -u -\tset user password for encryption\n"
-			"    -o -\tset owner password\n"
-			"    -p -\tset permissions (combine letters 'pmca')\n"
-			"    -n -\tkey length in bits: 40 <= n <= 128\n");
-	exit(1);
-}
-
-void
-cleanexpand(void)
-{
-	fz_error *error;
-	fz_obj *stmobj;
-	fz_buffer *buf;
-	fz_obj *stmlen;
-	int i, gen;
-
-	for (i = 0; i < src->len; i++)
-	{
-		if (src->table[i].type == 'n')
-		{
-			gen = src->table[i].gen;
-
-			if (pdf_isstream(src, i, gen))
-			{
-				error = pdf_loadobject(&stmobj, src, i, gen);
-				if (error) die(error);
-
-				error = pdf_loadstream(&buf, src, i, gen);
-				if (error) die(error);
-
-				fz_dictdels(stmobj, "Filter");
-				fz_dictdels(stmobj, "DecodeParms");
-
-				error = fz_newint(&stmlen, buf->wp - buf->rp);
-				if (error) die(error);
-				error = fz_dictputs(stmobj, "Length", stmlen);
-				if (error) die(error);
-				fz_dropobj(stmlen);
-
-				pdf_updateobject(src, i, gen, stmobj);
-				pdf_updatestream(src, i, gen, buf);
-
-				fz_dropobj(stmobj);
-			}
-		}
-	}
-}
-
-void
-cleanmain(int argc, char **argv)
-{
-	int doencrypt = 0;
-	int dogarbage = 0;
-	int doexpand = 0;
-	pdf_crypt *encrypt = nil;
-	char *infile;
-	char *outfile = "out.pdf";
-	char *userpw = "";
-	char *ownerpw = "";
-	unsigned perms = 0xfffff0c0;	/* nothing allowed */
-	int keylen = 40;
-	char *password = "";
-	fz_error *error;
-	int c;
-
-	while ((c = getopt(argc, argv, "d:egn:o:p:u:x")) != -1)
-	{
-		switch (c)
-		{
-		case 'p':
-			/* see TABLE 3.15 User access permissions */
-			perms = 0xfffff0c0;
-			if (strchr(optarg, 'p')) /* print */
-				perms |= (1 << 2) | (1 << 11);
-			if (strchr(optarg, 'm')) /* modify */
-				perms |= (1 << 3) | (1 << 10);
-			if (strchr(optarg, 'c')) /* copy */
-				perms |= (1 << 4) | (1 << 9);
-			if (strchr(optarg, 'a')) /* annotate / forms */
-				perms |= (1 << 5) | (1 << 8);
-			break;
-		case 'd': password = optarg; break;
-		case 'e': doencrypt ++; break;
-		case 'g': dogarbage ++; break;
-		case 'n': keylen = atoi(optarg); break;
-		case 'o': ownerpw = optarg; break;
-		case 'u': userpw = optarg; break;
-		case 'x': doexpand ++; break;
-		default: cleanusage(); break;
-		}
-	}
-
-	if (argc - optind < 1)
-		cleanusage();
-
-	infile = argv[optind++];
-	if (argc - optind > 0)
-		outfile = argv[optind++];
-
-	opensrc(infile, password, 0);
-
-	if (doencrypt)
-	{
-		fz_obj *id = fz_dictgets(src->trailer, "ID");
-		if (!id)
-		{
-			error = fz_packobj(&id, "[(ABCDEFGHIJKLMNOP)(ABCDEFGHIJKLMNOP)]");
-			if (error)
-				die(error);
-		}
-		else
-			fz_keepobj(id);
-
-		error = pdf_newencrypt(&encrypt, userpw, ownerpw, perms, keylen, id);
-		if (error)
-			die(error);
-
-		fz_dropobj(id);
-	}
-
-	if (doexpand)
-		cleanexpand();
-
-	if (dogarbage)
-	{
-		preloadobjstms();
-		pdf_garbagecollect(src);
-	}
-
-	error = pdf_savexref(src, outfile, encrypt);
-	if (error)
-		die(error);
-
-	if (encrypt)
-		pdf_dropcrypt(encrypt);
-
-	pdf_closexref(src);
-}
-
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Draw pages to PPM bitmaps.
- */
-
-enum { DRAWPNM, DRAWTXT, DRAWXML };
-
-struct benchmark
-{
-    int pages;
-    long min;
-    int minpage;
-    long avg;
-    long max;
-    int maxpage;
-};
-
-int drawmode = DRAWPNM;
-char *drawpattern = nil;
-pdf_page *drawpage = nil;
-float drawzoom = 1.0;
-int drawrotate = 0;
-int drawbands = 1;
-int drawcount = 0;
-int benchmark = 0;
-
-void
-drawusage(void)
-{
-	fprintf(stderr,
-			"usage: mupdftool draw [options] [file.pdf pages ... ]\n"
-			"  -b -\tdraw page in N bands\n"
-			"  -d -\tpassword for decryption\n"
-			"  -o -\tpattern (%%d for page number) for output file\n"
-			"  -r -\tresolution in dpi\n"
-			"  -t  \tutf-8 text output instead of graphics\n"
-			"  -x  \txml dump of display tree\n"
-			"  -m  \tprint benchmark results\n"
-			"  example:\n"
-			"    mupdftool draw -o out%%03d.pnm a.pdf 1-3,5,9-\n");
-	exit(1);
-}
-
-void
-gettime(long *time_)
-{
-    struct timeval tv;
-
-    if (gettimeofday(&tv, NULL) < 0)
-	    abort();
-
-    *time_ = tv.tv_sec * 1000000 + tv.tv_usec;
-}
-
-void
-drawloadpage(int pagenum, struct benchmark *loadtimes)
-{
-	fz_error *error;
-	fz_obj *pageobj;
-	long start;
-	long end;
-	long elapsed;
-
-	char *basename;
-
-	basename = strrchr(srcname, '/');
-	if (!basename)
-	    basename = srcname;
-	else
-	    basename ++;
-
-	fprintf(stderr, "draw %s:%03d ", basename, pagenum);
-	if (benchmark && loadtimes)
-	{
-		fflush(stderr);
-		gettime(&start);
-	}
-
-	pageobj = pdf_getpageobject(srcpages, pagenum - 1);
-	error = pdf_loadpage(&drawpage, src, pageobj);
-	if (error)
-		die(error);
-
-	if (benchmark && loadtimes)
-	{
-	    gettime(&end);
-	    elapsed = end - start;
-
-	    if (elapsed < loadtimes->min)
-	    {
-		loadtimes->min = elapsed;
-		loadtimes->minpage = pagenum;
-	    }
-	    if (elapsed > loadtimes->max)
-	    {
-		loadtimes->max = elapsed;
-		loadtimes->maxpage = pagenum;
-	    }
-	    loadtimes->avg += elapsed;
-	    loadtimes->pages++;
-	}
-
-	if (benchmark)
-		fflush(stderr);
-}
-
-void
-drawfreepage(void)
-{
-	pdf_droppage(drawpage);
-	drawpage = nil;
-
-	/* Flush resources between pages.
-	 * TODO: should check memory usage before deciding to do this.
-	 */
-	if (src && src->store)
-	{
-		fflush(stderr);
-		/* pdf_debugstore(src->store); */
-		pdf_emptystore(src->store);
-	}
-}
-
-void
-drawpnm(int pagenum, struct benchmark *loadtimes, struct benchmark *drawtimes)
-{
-	fz_error *error;
-	fz_matrix ctm;
-	fz_irect bbox;
-	fz_pixmap *pix;
-	char name[256];
-	char pnmhdr[256];
-	int i, x, y, w, h, b, bh;
-	int fd = -1;
-	long start;
-	long end;
-	long elapsed;
-
-	fz_md5 digest;
-
-	fz_md5init(&digest);
-
-	drawloadpage(pagenum, loadtimes);
-
-	if (benchmark)
-		gettime(&start);
-
-	ctm = fz_identity();
-	ctm = fz_concat(ctm, fz_translate(0, -drawpage->mediabox.y1));
-	ctm = fz_concat(ctm, fz_scale(drawzoom, -drawzoom));
-	ctm = fz_concat(ctm, fz_rotate(drawrotate + drawpage->rotate));
-
-	bbox = fz_roundrect(fz_transformaabb(ctm, drawpage->mediabox));
-	w = bbox.x1 - bbox.x0;
-	h = bbox.y1 - bbox.y0;
-	bh = h / drawbands;
-
-	if (drawpattern)
-	{
-		sprintf(name, drawpattern, drawcount++);
-		fd = open(name, O_BINARY|O_WRONLY|O_CREAT|O_TRUNC, 0666);
-		if (fd < 0)
-			die(fz_throw("ioerror: could not open file '%s'", name));
-
-		sprintf(pnmhdr, "P6\n%d %d\n255\n", w, h);
-		write(fd, pnmhdr, strlen(pnmhdr));
-	}
-
-	error = fz_newpixmap(&pix, bbox.x0, bbox.y0, w, bh, 4);
-	if (error)
-		die(error);
-
-	memset(pix->samples, 0xff, pix->h * pix->w * pix->n);
-
-	for (b = 0; b < drawbands; b++)
-	{
-		if (drawbands > 1)
-			fprintf(stderr, "drawing band %d / %d\n", b + 1, drawbands);
-
-		error = fz_rendertreeover(drawgc, pix, drawpage->tree, ctm);
-		if (error)
-			die(error);
-
-		if (drawpattern)
-		{
-			for (y = 0; y < pix->h; y++)
-			{
-				unsigned char *src = pix->samples + y * pix->w * 4;
-				unsigned char *dst = src;
-
-				for (x = 0; x < pix->w; x++)
-				{
-					dst[x * 3 + 0] = src[x * 4 + 1];
-					dst[x * 3 + 1] = src[x * 4 + 2];
-					dst[x * 3 + 2] = src[x * 4 + 3];
-				}
-
-				write(fd, dst, pix->w * 3);
-
-				memset(src, 0xff, pix->w * 4);
-			}
-		}
-
-		fz_md5update(&digest, pix->samples, pix->h * pix->w * 4);
-
-		pix->y += bh;
-		if (pix->y + pix->h > bbox.y1)
-			pix->h = bbox.y1 - pix->y;
-	}
-
-	fz_droppixmap(pix);
-
-	{
-	    unsigned char buf[16];
-	    fz_md5final(&digest, buf);
-	    for (i = 0; i < 16; i++)
-		fprintf(stderr, "%02x", buf[i]);
-	}
-
-	if (drawpattern)
-		close(fd);
-
-	drawfreepage();
-
-	if (benchmark)
-	{
-	    gettime(&end);
-	    elapsed = end - start;
-
-	    if (elapsed < drawtimes->min)
-	    {
-		drawtimes->min = elapsed;
-		drawtimes->minpage = pagenum;
-	    }
-	    if (elapsed > drawtimes->max)
-	    {
-		drawtimes->max = elapsed;
-		drawtimes->maxpage = pagenum;
-	    }
-	    drawtimes->avg += elapsed;
-	    drawtimes->pages++;
-
-	    fprintf(stderr, " time %.3fs",
-		    elapsed / 1000000.0);
-	}
-
-	fprintf(stderr, "\n");
-}
-
-void
-drawtxt(int pagenum)
-{
-#if 0 /* removed temporarily pending rewrite of pdf_loadtextfromtree */
-	fz_error *error;
-	pdf_textline *line;
-	fz_matrix ctm;
-
-	drawloadpage(pagenum, NULL);
-
-	ctm = fz_concat(
-			fz_translate(0, -drawpage->mediabox.y1),
-			fz_scale(drawzoom, -drawzoom));
-
-	error = pdf_loadtextfromtree(&line, drawpage->tree, ctm);
-	if (error)
-		die(error);
-
-	pdf_debugtextline(line);
-	pdf_droptextline(line);
-
-	drawfreepage();
-#endif
-}
-
-void
-drawxml(int pagenum)
-{
-	drawloadpage(pagenum, NULL);
-	fz_debugtree(drawpage->tree);
-	drawfreepage();
-}
-
-void
-drawpages(char *pagelist)
-{
-	int page, spage, epage;
-	char *spec, *dash;
-	struct benchmark loadtimes, drawtimes;
-
-	if (!src)
-		drawusage();
-
-	if (benchmark)
-	{
-		memset(&loadtimes, 0x00, sizeof (loadtimes));
-		loadtimes.min = LONG_MAX;
-		memset(&drawtimes, 0x00, sizeof (drawtimes));
-		drawtimes.min = LONG_MAX;
-	}
-
-	spec = strsep(&pagelist, ",");
-	while (spec)
-	{
-		dash = strchr(spec, '-');
-
-		if (dash == spec)
-			spage = epage = 1;
-		else
-			spage = epage = atoi(spec);
-
-		if (dash)
-		{
-			if (strlen(dash) > 1)
-				epage = atoi(dash + 1);
-			else
-				epage = pdf_getpagecount(srcpages);
-		}
-
-		if (spage > epage)
-			page = spage, spage = epage, epage = page;
-
-		if (spage < 1)
-			spage = 1;
-		if (epage > pdf_getpagecount(srcpages))
-			epage = pdf_getpagecount(srcpages);
-
-		printf("Drawing pages %d-%d...\n", spage, epage);
-		for (page = spage; page <= epage; page++)
-		{
-			switch (drawmode)
-			{
-			case DRAWPNM: drawpnm(page, &loadtimes, &drawtimes); break;
-			case DRAWTXT: drawtxt(page); break;
-			case DRAWXML: drawxml(page); break;
-			}
-		}
-
-		spec = strsep(&pagelist, ",");
-	}
-
-	if (benchmark)
-	{
-		if (loadtimes.pages > 0)
-		{
-			loadtimes.avg /= loadtimes.pages;
-			drawtimes.avg /= drawtimes.pages;
-
-			printf("benchmark[load]: min: %6.3fs (page % 4d), avg: %6.3fs, max: %6.3fs (page % 4d)\n",
-				loadtimes.min / 1000000.0, loadtimes.minpage,
-				loadtimes.avg / 1000000.0,
-				loadtimes.max / 1000000.0, loadtimes.maxpage);
-			printf("benchmark[draw]: min: %6.3fs (page % 4d), avg: %6.3fs, max: %6.3fs (page % 4d)\n",
-				drawtimes.min / 1000000.0, drawtimes.minpage,
-				drawtimes.avg / 1000000.0,
-				drawtimes.max / 1000000.0, drawtimes.maxpage);
-		}
-	}
-}
-
-void
-drawmain(int argc, char **argv)
-{
-	fz_error *error;
-	char *password = "";
-	int c;
-	enum { NO_FILE_OPENED, NO_PAGES_DRAWN, DREW_PAGES } state;
-
-	while ((c = getopt(argc, argv, "b:d:o:r:txm")) != -1)
-	{
-		switch (c)
-		{
-		case 'b': drawbands = atoi(optarg); break;
-		case 'd': password = optarg; break;
-		case 'o': drawpattern = optarg; break;
-		case 'r': drawzoom = atof(optarg) / 72.0; break;
-		case 't': drawmode = DRAWTXT; break;
-		case 'x': drawmode = DRAWXML; break;
-		case 'm': benchmark = 1; break;
-		default:
-			  drawusage();
-			  break;
-		}
-	}
-
-	if (optind == argc)
-		drawusage();
-
-	error = fz_newrenderer(&drawgc, pdf_devicergb, 0, 1024 * 512);
-	if (error)
-		die(error);
-
-	state = NO_FILE_OPENED;
-	while (optind < argc)
-	{
-		if (strstr(argv[optind], ".pdf") ||
-		    strstr(argv[optind], ".PDF"))
-		{
-			if (state == NO_PAGES_DRAWN)
-				drawpages("1-");
-
-			opensrc(argv[optind], password, 1);
-			state = NO_PAGES_DRAWN;
-		}
-		else
-		{
-			drawpages(argv[optind]);
-			state = DREW_PAGES;
-		}
-		optind++;
-	}
-
-	if (state == NO_PAGES_DRAWN)
-		drawpages("1-");
-
-	closesrc();
-
-	fz_droprenderer(drawgc);
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Information tool.
- * Print some information on input pdf.
- */
-
 enum
 {
 	DIMENSIONS = 0x01,
@@ -2037,8 +1274,7 @@ showinfo(char *filename, int show, char *pagelist)
 		printinfo(filename, show, -1);
 }
 
-void
-infomain(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	enum { NO_FILE_OPENED, NO_INFO_GATHERED, INFO_SHOWN } state;
 	char *filename = "";
@@ -2102,336 +1338,3 @@ infomain(int argc, char **argv)
 	closesrc();
 }
 
-/* --------------------------------------------------------------------- */
-
-/*
- * Edit tool.
- * Copy or impose pages from other pdf files into output pdf.
- */
-
-/* for each source pdf, build a list of objects to transplant.
- * for each source pdf, do the transplants at the end of object collecting.
- * build a new page tree structure for output.
- * change page nodes into xobjects for over and n-up modes.
- * create new page nodes.
- * create new page tree.
- */
-
-enum { COPY, OVER, NUP2, NUP4, NUP8 };
-
-pdf_xref *editxref = nil;
-fz_obj *editpagelist = nil;
-fz_obj *editmodelist = nil;
-fz_obj *editobjects = nil;
-int editmode = COPY;
-
-void
-editusage(void)
-{
-	fprintf(stderr, "usage: mupdftool edit [-o file.pdf] [mode file.pdf pages ... ]\n");
-	fprintf(stderr, "  mode is one of: copy over 2up 4up 8up\n");
-	fprintf(stderr, "  pages is a comma separated list of ranges\n");
-	fprintf(stderr, "  example:\n");
-	fprintf(stderr, "    mupdftool edit -o output.pdf copy one.pdf 1-3,5,9 two.pdf 1-\n");
-	exit(1);
-}
-
-void
-editcopy(int pagenum)
-{
-	fz_error *error;
-	fz_obj *obj;
-	fz_obj *ref;
-	fz_obj *num;
-
-	printf("copy %s page %d\n", srcname, pagenum);
-
-	ref = srcpages->pref[pagenum - 1];
-	obj = pdf_getpageobject(srcpages, pagenum - 1);
-
-	fz_dictdels(obj, "Parent");
-	/*
-	fz_dictdels(obj, "B");
-	fz_dictdels(obj, "PieceInfo");
-	fz_dictdels(obj, "Metadata");
-	fz_dictdels(obj, "Annots");
-	fz_dictdels(obj, "Tabs");
-	*/
-
-	pdf_updateobject(src, fz_tonum(ref), fz_togen(ref), obj);
-
-	error = fz_arraypush(editobjects, ref);
-	if (error)
-		die(error);
-
-	error = fz_newint(&num, editmode);
-	if (error)
-		die(error);
-
-	error = fz_arraypush(editmodelist, num);
-	if (error)
-		die(error);
-
-	fz_dropobj(num);
-}
-
-void
-editflushobjects(void)
-{
-	fz_error *error;
-	fz_obj *results;
-	int i;
-
-	error = pdf_transplant(editxref, src, &results, editobjects);
-	if (error)
-		die(error);
-
-	for (i = 0; i < fz_arraylen(results); i++)
-	{
-		error = fz_arraypush(editpagelist, fz_arrayget(results, i));
-		if (error)
-			die(error);
-	}
-
-	fz_dropobj(results);
-}
-
-void
-editflushpagetree(void)
-{
-
-	/* TODO: merge pages where editmode != COPY by turning them into XObjects
-	   and creating a new page object with resource dictionary and content
-	   stream placing the xobjects on the page. */
-}
-
-void
-editflushcatalog(void)
-{
-	fz_error *error;
-	int rootnum, rootgen;
-	int listnum, listgen;
-	fz_obj *listref;
-	fz_obj *obj;
-	int i;
-
-	/* Create page tree and add back-links */
-
-	error = pdf_allocobject(editxref, &listnum, &listgen);
-	if (error)
-		die(error);
-
-	error = fz_packobj(&obj, "<</Type/Pages/Count %i/Kids %o>>",
-			fz_arraylen(editpagelist),
-			editpagelist);
-	if (error)
-		die(error);
-
-	pdf_updateobject(editxref, listnum, listgen, obj);
-
-	fz_dropobj(obj);
-
-	error = fz_newindirect(&listref, listnum, listgen);
-	if (error)
-		die(error);
-
-	for (i = 0; i < fz_arraylen(editpagelist); i++)
-	{
-		int num = fz_tonum(fz_arrayget(editpagelist, i));
-		int gen = fz_togen(fz_arrayget(editpagelist, i));
-
-		error = pdf_loadobject(&obj, editxref, num, gen);
-		if (error)
-			die(error);
-
-		error = fz_dictputs(obj, "Parent", listref);
-		if (error)
-			die(error);
-
-		pdf_updateobject(editxref, num, gen, obj);
-
-		fz_dropobj(obj);
-	}
-
-	/* Create catalog */
-
-	error = pdf_allocobject(editxref, &rootnum, &rootgen);
-	if (error)
-		die(error);
-
-	error = fz_packobj(&obj, "<</Type/Catalog/Pages %r>>", listnum, listgen);
-	if (error)
-		die(error);
-
-	pdf_updateobject(editxref, rootnum, rootgen, obj);
-
-	fz_dropobj(obj);
-
-	/* Create trailer */
-
-	error = fz_packobj(&editxref->trailer, "<</Root %r>>", rootnum, rootgen);
-	if (error)
-		die(error);
-}
-
-void
-editpages(char *pagelist)
-{
-	int page, spage, epage;
-	char *spec, *dash;
-
-	if (!src)
-		editusage();
-
-	spec = strsep(&pagelist, ",");
-	while (spec)
-	{
-		dash = strchr(spec, '-');
-
-		if (dash == spec)
-			spage = epage = 1;
-		else
-			spage = epage = atoi(spec);
-
-		if (dash)
-		{
-			if (strlen(dash) > 1)
-				epage = atoi(dash + 1);
-			else
-				epage = pdf_getpagecount(srcpages);
-		}
-
-		if (spage > epage)
-			page = spage, spage = epage, epage = page;
-
-		for (page = spage; page <= epage; page++)
-		{
-			if (page < 1 || page > pdf_getpagecount(srcpages))
-				continue;
-			editcopy(page);
-		}
-
-		spec = strsep(&pagelist, ",");
-	}
-}
-
-void
-editmain(int argc, char **argv)
-{
-	char *outfile = "out.pdf";
-	fz_error *error;
-	int c;
-
-	while ((c = getopt(argc, argv, "o:")) != -1)
-	{
-		switch (c)
-		{
-		case 'o':
-			outfile = optarg;
-			break;
-		default:
-			editusage();
-			break;
-		}
-	}
-
-	if (optind == argc)
-		editusage();
-
-	error = pdf_newxref(&editxref);
-	if (error)
-		die(error);
-
-	error = pdf_initxref(editxref);
-	if (error)
-		die(error);
-
-	error = fz_newarray(&editpagelist, 100);
-	if (error)
-		die(error);
-
-	error = fz_newarray(&editmodelist, 100);
-	if (error)
-		die(error);
-
-	while (optind < argc)
-	{
-		if (strstr(argv[optind], ".pdf"))
-		{
-			if (editobjects)
-				editflushobjects();
-
-			opensrc(argv[optind], "", 1);
-
-			error = fz_newarray(&editobjects, 100);
-			if (error)
-				die(error);
-		}
-		else if (!strcmp(argv[optind], "copy"))
-			editmode = COPY;
-		else if (!strcmp(argv[optind], "over"))
-			editmode = OVER;
-		else if (!strcmp(argv[optind], "2up"))
-			editmode = NUP2;
-		else if (!strcmp(argv[optind], "4up"))
-			editmode = NUP4;
-		else if (!strcmp(argv[optind], "8up"))
-			editmode = NUP8;
-		else
-			editpages(argv[optind]);
-		optind++;
-	}
-
-	if (editobjects)
-		editflushobjects();
-
-	closesrc();
-
-	editflushpagetree();
-	editflushcatalog();
-
-	error = pdf_savexref(editxref, outfile, nil);
-	if (error)
-		die(error);
-
-	pdf_closexref(editxref);
-}
-
-/* --------------------------------------------------------------------- */
-
-/*
- * Main!
- */
-
-void
-mainusage(void)
-{
-	fprintf(stderr, "usage: mupdftool <command> [options...]\n");
-	fprintf(stderr, "  command is one of: show, draw, clean, edit, info\n");
-	exit(1);
-}
-
-int
-main(int argc, char **argv)
-{
-	if (argc >= 2)
-	{
-		optind = 2;
-		if (!strcmp(argv[1], "show"))
-			showmain(argc, argv);
-		else if (!strcmp(argv[1], "draw"))
-			drawmain(argc, argv);
-		else if (!strcmp(argv[1], "clean"))
-			cleanmain(argc, argv);
-		else if (!strcmp(argv[1], "edit"))
-			editmain(argc, argv);
-		else if (!strcmp(argv[1], "info"))
-			infomain(argc, argv);
-		else
-			mainusage();
-	}
-	else
-		mainusage();
-	return 0;
-}
-
diff --git a/apps/pdfshow.c b/apps/pdfshow.c
new file mode 100644
index 00000000..b3239978
--- /dev/null
+++ b/apps/pdfshow.c
@@ -0,0 +1,217 @@
+/*
+ * pdfshow -- the ultimate pdf debugging tool
+ */
+
+#include "fitz.h"
+#include "mupdf.h"
+
+pdf_xref *xref = NULL;
+
+void die(fz_error *eo)
+{
+    fflush(stdout);
+    fz_printerror(eo);
+    fz_droperror(eo);
+    fflush(stderr);
+    exit(1);
+}
+
+void openxref(char *filename, char *password)
+{
+    fz_error *error;
+    fz_obj *obj;
+
+    error = pdf_newxref(&xref);
+    if (error)
+	die(error);
+
+    error = pdf_loadxref(xref, filename);
+    if (error)
+    {
+	fz_printerror(error);
+	fz_droperror(error);
+	fz_warn("trying to repair");
+	error = pdf_repairxref(xref, filename);
+	if (error)
+	    die(error);
+    }
+
+    error = pdf_decryptxref(xref);
+    if (error)
+	die(error);
+
+    if (xref->crypt)
+    {
+	int okay = pdf_setpassword(xref->crypt, password);
+	if (!okay)
+	    die(fz_throw("invalid password"));
+    }
+
+    /* TODO: move into mupdf lib, see pdfapp_open in pdfapp.c */
+    obj = fz_dictgets(xref->trailer, "Root");
+    if (!obj)
+	die(error);
+
+    error = pdf_loadindirect(&xref->root, xref, obj);
+    if (error)
+	die(error);
+
+    obj = fz_dictgets(xref->trailer, "Info");
+    if (obj)
+    {
+	error = pdf_loadindirect(&xref->info, xref, obj);
+	if (error)
+	    die(error);
+    }
+}
+
+int showbinary = 0;
+int showdecode = 0;
+int showcolumn;
+
+void showusage(void)
+{
+    fprintf(stderr, "usage: pdfshow [-bd] [-p password] <file> [xref] [trailer] [object numbers]\n");
+    fprintf(stderr, "  -b  \tprint streams as raw binary data\n");
+    fprintf(stderr, "  -x  \tdecompress streams\n");
+    fprintf(stderr, "  -d  \tdecrypt password\n");
+    exit(1);
+}
+
+void showtrailer(void)
+{
+    if (!xref)
+	die(fz_throw("no file specified"));
+    printf("trailer\n");
+    fz_debugobj(xref->trailer);
+    printf("\n");
+}
+
+void showxref(void)
+{
+    if (!xref)
+	die(fz_throw("no file specified"));
+    pdf_debugxref(xref);
+    printf("\n");
+}
+
+void showsafe(unsigned char *buf, int n)
+{
+    int i;
+    for (i = 0; i < n; i++) {
+	if (buf[i] == '\r' || buf[i] == '\n') {
+	    putchar('\n');
+	    showcolumn = 0;
+	}
+	else if (buf[i] < 32 || buf[i] > 126) {
+	    putchar('.');
+	    showcolumn ++;
+	}
+	else {
+	    putchar(buf[i]);
+	    showcolumn ++;
+	}
+	if (showcolumn == 79) {
+	    putchar('\n');
+	    showcolumn = 0;
+	}
+    }
+}
+
+void showstream(int num, int gen)
+{
+    fz_error *error;
+    fz_stream *stm;
+    unsigned char buf[2048];
+    int n;
+
+    showcolumn = 0;
+
+    if (showdecode)
+	error = pdf_openstream(&stm, xref, num, gen);
+    else
+	error = pdf_openrawstream(&stm, xref, num, gen);
+    if (error)
+	die(error);
+
+    while (1)
+    {
+	error = fz_read(&n, stm, buf, sizeof buf);
+	if (error)
+	    die(error);
+	if (n == 0)
+	    break;
+	if (showbinary)
+	    fwrite(buf, 1, n, stdout);
+	else
+	    showsafe(buf, n);
+    }
+
+    fz_dropstream(stm);
+}
+
+void showobject(int num, int gen)
+{
+    fz_error *error;
+    fz_obj *obj;
+
+    if (!xref)
+	die(fz_throw("no file specified"));
+
+    error = pdf_loadobject(&obj, xref, num, gen);
+    if (error)
+	die(error);
+
+    printf("%d %d obj\n", num, gen);
+    fz_debugobj(obj);
+
+    if (pdf_isstream(xref, num, gen))
+    {
+	printf("stream\n");
+	showstream(num, gen);
+	printf("endstream\n");
+    }
+
+    printf("endobj\n\n");
+
+    fz_dropobj(obj);
+}
+
+int main(int argc, char **argv)
+{
+    char *password = "";
+    int c;
+
+    while ((c = getopt(argc, argv, "bdp:")) != -1)
+    {
+	switch (c)
+	{
+	    case 'd': password = optarg; break;
+	    case 'b': showbinary ++; break;
+	    case 'x': showdecode ++; break;
+	    default:
+		      showusage();
+		      break;
+	}
+    }
+
+    if (optind == argc)
+	showusage();
+
+    openxref(argv[optind++], password);
+
+    if (optind == argc)
+	showtrailer();
+
+    while (optind < argc)
+    {
+	if (!strcmp(argv[optind], "trailer"))
+	    showtrailer();
+	else if (!strcmp(argv[optind], "xref"))
+	    showxref();
+	else
+	    showobject(atoi(argv[optind]), 0);
+	optind++;
+    }
+}
+