Combine all small tools into mubusy and remove the separate executables.

27 files changed, 155 insertions, 1464 deletions

diff --git a/Makefile b/Makefile
index 62bf4aab..d2045d1c 100644
--- a/Makefile
+++ b/Makefile
@@ -133,19 +133,16 @@ $(OUT)/cmapdump.o : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c
 
 # --- Tools and Apps ---
 
-MU_APPS := $(addprefix $(OUT)/, mudraw mupdfclean mupdfextract mupdfinfo mupdfshow mupdfposter)
+MUDRAW := $(addprefix $(OUT)/, mudraw)
+$(MUDRAW) : $(FITZ_LIB) $(THIRD_LIBS)
 
-$(MU_APPS) : $(FITZ_LIB) $(THIRD_LIBS)
-
-BUSY_SRC := $(notdir $(wildcard apps/mubusy_*.c))
-BUSY_APP := $(addprefix $(OUT)/, mubusy)
-$(BUSY_APP) : $(addprefix $(OUT)/, $(BUSY_SRC:%.c=%.o))
-$(BUSY_APP) : $(FITZ_LIB) $(THIRD_LIBS)
+MUBUSY := $(addprefix $(OUT)/, mubusy)
+$(MUBUSY) : $(addprefix $(OUT)/, mupdfclean.o mupdfextract.o mupdfinfo.o mupdfposter.o mupdfshow.o) $(FITZ_LIB) $(THIRD_LIBS)
 
 ifeq "$(NOX11)" ""
-MUPDF := $(OUT)/mupdf
-$(MUPDF) : $(FITZ_LIB) $(THIRD_LIBS)
-$(MUPDF) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
+MUVIEW := $(OUT)/mupdf
+$(MUVIEW) : $(FITZ_LIB) $(THIRD_LIBS)
+$(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
 	$(LINK_CMD) $(X11_LIBS)
 endif
 
@@ -167,16 +164,16 @@ libdir ?= $(prefix)/lib
 incdir ?= $(prefix)/include
 mandir ?= $(prefix)/share/man
 
-install: $(FITZ_LIB) $(MU_APPS) $(MUPDF)
+install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUBUSY)
 	install -d $(bindir) $(libdir) $(incdir) $(mandir)/man1
 	install $(FITZ_LIB) $(libdir)
 	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(incdir)
-	install $(MU_APPS) $(MUPDF) $(bindir)
+	install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(bindir)
 	install $(wildcard apps/man/*.1) $(mandir)/man1
 
 # --- Clean and Default ---
 
-all: $(THIRD_LIBS) $(FITZ_LIB) $(MU_APPS) $(MUPDF) $(BUSY_APP)
+all: $(THIRD_LIBS) $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUBUSY)
 
 clean:
 	rm -rf $(OUT)
diff --git a/android/jni/Core.mk b/android/jni/Core.mk
index dbe0e39d..9fe01db0 100644
--- a/android/jni/Core.mk
+++ b/android/jni/Core.mk
@@ -73,7 +73,6 @@ LOCAL_SRC_FILES := \
 	$(MY_ROOT)/draw/draw_path.c \
 	$(MY_ROOT)/draw/draw_simple_scale.c \
 	$(MY_ROOT)/draw/draw_unpack.c \
-	$(MY_ROOT)/pdf/base_object.c \
 	$(MY_ROOT)/pdf/pdf_annot.c \
 	$(MY_ROOT)/pdf/pdf_cmap.c \
 	$(MY_ROOT)/pdf/pdf_cmap_load.c \
@@ -90,6 +89,7 @@ LOCAL_SRC_FILES := \
 	$(MY_ROOT)/pdf/pdf_lex.c \
 	$(MY_ROOT)/pdf/pdf_metrics.c \
 	$(MY_ROOT)/pdf/pdf_nametree.c \
+	$(MY_ROOT)/pdf/pdf_object.c \
 	$(MY_ROOT)/pdf/pdf_outline.c \
 	$(MY_ROOT)/pdf/pdf_page.c \
 	$(MY_ROOT)/pdf/pdf_parse.c \
diff --git a/apps/man/mubusy.1 b/apps/man/mubusy.1
new file mode 100644
index 00000000..435dba4d
--- /dev/null
+++ b/apps/man/mubusy.1
@@ -0,0 +1,77 @@
+.TH "MUBUSY" "1" "May 10, 2012"
+.\" Please adjust this date whenever revising the manpage.
+.\" no hyphenation
+.nh
+.\" adjust left
+.ad l
+.SH NAME
+mubusy \- all purpose tool for dealing with PDF files
+.SH SYNOPSIS
+mubusy <sub-command> [options]
+.SH DESCRIPTION
+mubusy is a tool based on MuPDF for dealing with PDF files in various manners.
+There are several sub commands available, as described below.
+.SH CLEAN
+mubusy clean [options] input.pdf [output.pdf] [pages]
+.PP
+The clean command pretty prints and rewrites the syntax of a PDF file.
+It can be used to repair broken files, expand compressed streams, filter
+out a range of pages, etc.
+.PP
+If no output file is specified, it will write the cleaned PDF to "out.pdf"
+in the current directory.
+.TP
+.B \-p password
+Use the specified password if the file is encrypted.
+.TP
+.B \-g
+Garbage collect objects that have no references from other objects.
+Give the option twice to renumber all objects and compact the cross reference table.
+Give it three times to merge and reuse duplicate objects.
+.TP
+.B \-d
+Decompress streams. This will make the output file larger, but provides
+easy access for reading and editing the contents with a text editor.
+.TP
+.B pages
+Comma separated list of page ranges to include.
+.SH EXTRACT
+TODO
+.SH INFO
+TODO
+.SH POSTER
+TODO
+.SH SHOW
+mubusy show [options] file.pdf [object numbers ...]
+.PP
+The show command will print the specified objects and streams to stdout.
+Streams are decoded and non-printable characters are represented
+with a period by default.
+.TP
+.B \-b
+Print streams as binary data and omit the object header.
+.TP
+.B \-e
+Print streams in their original encoded (or compressed) form.
+.TP
+.B \-p password
+Use the specified password if the file is encrypted.
+.PP
+Specify objects by number, or use one of the following special names:
+.TP
+.B 'xref' or 'x'
+Print the cross reference table.
+.TP
+.B 'trailer' or 't'
+Print the trailer dictionary.
+.TP
+.B 'pages' or 'p'
+List the object numbers for every page.
+.TP
+.B 'grep' or 'g'
+Print all the objects in the file in a compact one-line format suitable for piping to grep.
+.SH SEE ALSO
+.BR mupdf (1),
+.BR mudraw (1).
+.SH AUTHOR
+MuPDF is Copyright 2006-2012 Artifex Software, Inc.
diff --git a/apps/man/mudraw.1 b/apps/man/mudraw.1
index 41bee152..cbe1b613 100644
--- a/apps/man/mudraw.1
+++ b/apps/man/mudraw.1
@@ -86,5 +86,4 @@ Comma separated list of ranges to render.
 .BR mupdfclean (1).
 .BR mupdfshow (1).
 .SH AUTHOR
-MuPDF was written by Tor Andersson <tor@ghostscript.com>.
 MuPDF is Copyright 2006-2012 Artifex Software, Inc.
diff --git a/apps/man/mupdf.1 b/apps/man/mupdf.1
index fc8e9640..dc2dfca1 100644
--- a/apps/man/mupdf.1
+++ b/apps/man/mupdf.1
@@ -86,7 +86,4 @@ Toggle between normal and inverted color rendering.
 .BR mupdfdraw (1),
 .BR mupdfshow (1).
 .SH AUTHOR
-MuPDF was written by Tor Andersson <tor@ghostscript.com>.
 MuPDF is Copyright 2006-2012 Artifex Software, Inc.
-.PP
-This manual page was written by Sebastian Rasmussen <sebras@hotmail.com>.
diff --git a/apps/man/mupdfclean.1 b/apps/man/mupdfclean.1
deleted file mode 100644
index 91e796ac..00000000
--- a/apps/man/mupdfclean.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH PDFCLEAN 1 "January 27, 2012"
-.\" Please adjust this date whenever revising the manpage.
-.SH NAME
-mupdfclean \- pretty print, decompress and garbage collect PDF files
-.SH SYNOPSIS
-.B mupdfclean
-.RI [ options ]
-.RI input.pdf
-.RI [ output.pdf ]
-.RI [ pages ]
-.SH DESCRIPTION
-.B mupdfclean
-pretty prints and rewrites the contents of a PDF file.
-If no output file is specified, the new file will be written to "out.pdf" in
-the current directory.
-.PP
-.SH OPTIONS
-.TP
-.B \-p password
-Use the specified password if the file is encrypted.
-.TP
-.B \-g
-Garbage collect objects that have no references from other objects.
-Give the option twice to renumber all objects and compact the cross reference table.
-Give it three times to merge and reuse duplicate objects.
-.TP
-.B \-d
-Decompress streams. This will make the output file larger, but provides
-easy access for reading and editing the contents with a text editor.
-.TP
-.B pages
-Comma separated list of ranges to clean.
-.SH SEE ALSO
-.BR mupdf (1),
-.BR mupdfdraw (1).
-.BR mupdfshow (1).
-.SH AUTHOR
-MuPDF was written by Tor Andersson <tor@ghostscript.com>.
-MuPDF is Copyright 2006-2010 Artifex Software, Inc.
diff --git a/apps/man/mupdfshow.1 b/apps/man/mupdfshow.1
deleted file mode 100644
index 451dac6b..00000000
--- a/apps/man/mupdfshow.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.TH PDFSHOW 1 "January 27, 2012"
-.\" Please adjust this date whenever revising the manpage.
-.SH NAME
-mupdfshow \- show objects and streams that make up a PDF document
-.SH SYNOPSIS
-.B mupdfshow
-.RI [ options ]
-.RI file.pdf
-.RI [ xref ]
-.RI [ trailer ]
-.RI [ pages ]
-.RI [ grep ]
-.RI [ object-number... ]
-.SH DESCRIPTION
-.B mupdfshow
-pretty prints the objects and streams specified on the command line.
-Streams are decoded and non-printable characters are represented
-with a period.
-Specify objects with their number.
-The special names xref, trailer and pages will
-respectively print the cross reference, trailer,
-and the object numbers for all pages.
-The special name grep will print all objects in the file
-in a compact one-line format suitable for piping to grep.
-.PP
-.SH OPTIONS
-.TP
-.B \-b
-Print streams as binary data and omit the object header.
-.TP
-.B \-e
-Print streams in their original encoded form.
-.TP
-.B \-p password
-Use the specified password if the file is encrypted.
-.SH SEE ALSO
-.BR mupdf (1),
-.BR mupdfclean (1).
-.BR mupdfdraw (1).
-.SH AUTHOR
-MuPDF was written by Tor Andersson <tor@ghostscript.com>.
-MuPDF is copyright 2006-2012 Artifex Software, Inc.
diff --git a/apps/mubusy.c b/apps/mubusy.c
index a9df26fa..5030f7a0 100644
--- a/apps/mubusy.c
+++ b/apps/mubusy.c
@@ -1,62 +1,84 @@
 /*
- * pdfbusy -- combined exe build
+ * mubusy -- swiss army knife of pdf manipulation tools
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#define nelem(x) (sizeof(x)/sizeof((x)[0]))
+
 int pdfclean_main(int argc, char *argv[]);
-int draw_main(int argc, char *argv[]);
 int pdfextract_main(int argc, char *argv[]);
 int pdfinfo_main(int argc, char *argv[]);
+int pdfposter_main(int argc, char *argv[]);
 int pdfshow_main(int argc, char *argv[]);
 
+static struct {
+	int (*func)(int argc, char *argv[]);
+	char *name;
+	char *desc;
+} tools[] = {
+	{ pdfclean_main, "clean", "rewrite pdf file" },
+	{ pdfextract_main, "extract", "extract font and image resources" },
+	{ pdfinfo_main, "info", "show information about pdf resources" },
+	{ pdfposter_main, "poster", "split large page into many tiles" },
+	{ pdfshow_main, "show", "show internal pdf objects" },
+};
+
 static int
-namematch(const char *end, const char *start, const char *match, int len)
+namematch(const char *end, const char *start, const char *match)
 {
+	int len = strlen(match);
 	return ((end-len >= start) && (strncmp(end-len, match, len) == 0));
 }
 
 int main(int argc, char **argv)
 {
 	char *start, *end;
+	char buf[32];
+	int i;
+
 	if (argc == 0)
 	{
 		fprintf(stderr, "No command name found!\n");
-		exit(EXIT_FAILURE);
+		return 1;
+	}
+
+	/* Check argv[0] */
+
+	if (argc > 0)
+	{
+		end = start = argv[0];
+		while (*end)
+			end++;
+		if ((end-4 >= start) && (end[-4] == '.') && (end[-3] == 'e') && (end[-2] == 'x') && (end[-1] == 'e'))
+			end = end-4;
+		for (i = 0; i < nelem(tools); i++)
+		{
+			strcpy(buf, "mupdf");
+			strcat(buf, tools[i].name);
+			if (namematch(end, start, buf))
+				return tools[i].func(argc, argv);
+		}
 	}
 
-	end = start = argv[0];
-	while (*end)
-		end++;
-	if ((end-4 >= start) && (end[-4] == '.') && (end[-3] == 'e') && (end[-2] == 'x') && (end[-1] == 'e'))
-		end = end-4;
-	if (namematch(end, start, "mupdfdraw", 9) || namematch(end, start, "muxpsdraw", 9) || namematch(end, start, "mudraw", 6))
-		return draw_main(argc, argv);
-	if (namematch(end, start, "mupdfclean", 10))
-		return pdfclean_main(argc, argv);
-	if (namematch(end, start, "mupdfextract", 12))
-		return pdfextract_main(argc, argv);
-	if (namematch(end, start, "mupdfshow", 9))
-		return pdfshow_main(argc, argv);
-	if (namematch(end, start, "mupdfinfo", 9))
-		return pdfinfo_main(argc, argv);
-	/* And include old names for backward compatibility */
-	if (namematch(end, start, "pdfdraw", 7) || namematch(end, start, "xpsdraw", 7))
-		return draw_main(argc, argv);
-	if (namematch(end, start, "pdfclean", 8))
-		return pdfclean_main(argc, argv);
-	if (namematch(end, start, "pdfextract", 10))
-		return pdfextract_main(argc, argv);
-	if (namematch(end, start, "pdfshow", 7))
-		return pdfshow_main(argc, argv);
-	if (namematch(end, start, "pdfinfo", 7))
-		return pdfinfo_main(argc, argv);
-
-	fprintf(stderr, "mubusy: Combined build of mupdf/mudraw tools.\n\n");
-	fprintf(stderr, "Invoke as one of the following:\n");
-	fprintf(stderr, "\tmupdfclean, mudraw, mupdfextract, mupdfinfo, mupdfshow.\n");
-
-	return 0;
+	/* Check argv[1] */
+
+	if (argc > 1)
+	{
+		for (i = 0; i < nelem(tools); i++)
+			if (!strcmp(tools[i].name, argv[1]))
+				return tools[i].func(argc - 1, argv + 1);
+	}
+
+	/* Print usage */
+
+	fprintf(stderr, "usage: mubusy <command> [options]\n");
+	fprintf(stderr, "Available commands:\n");
+
+	for (i = 0; i < nelem(tools); i++)
+		fprintf(stderr, "\t%s\t-- %s\n", tools[i].name, tools[i].desc);
+
+	return 1;
 }
diff --git a/apps/mubusy_draw.c b/apps/mubusy_draw.c
deleted file mode 100644
index 26b9bd6d..00000000
--- a/apps/mubusy_draw.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MUPDF_COMBINED_EXE
-#include "mudraw.c"
diff --git a/apps/mubusy_pdfclean.c b/apps/mubusy_pdfclean.c
deleted file mode 100644
index bc3456d1..00000000
--- a/apps/mubusy_pdfclean.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MUPDF_COMBINED_EXE
-#include "mupdfclean.c"
diff --git a/apps/mubusy_pdfextract.c b/apps/mubusy_pdfextract.c
deleted file mode 100644
index 30f661a3..00000000
--- a/apps/mubusy_pdfextract.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MUPDF_COMBINED_EXE
-#include "mupdfextract.c"
diff --git a/apps/mubusy_pdfinfo.c b/apps/mubusy_pdfinfo.c
deleted file mode 100644
index df947543..00000000
--- a/apps/mubusy_pdfinfo.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MUPDF_COMBINED_EXE
-#include "mupdfinfo.c"
diff --git a/apps/mubusy_pdfshow.c b/apps/mubusy_pdfshow.c
deleted file mode 100644
index 320b93aa..00000000
--- a/apps/mubusy_pdfshow.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MUPDF_COMBINED_EXE
-#include "mupdfshow.c"
diff --git a/apps/mupdfclean.c b/apps/mupdfclean.c
index f1e43b2d..a1064f57 100644
--- a/apps/mupdfclean.c
+++ b/apps/mupdfclean.c
@@ -151,11 +151,7 @@ static void retainpages(int argc, char **argv)
 	}
 }
 
-#ifdef MUPDF_COMBINED_EXE
 int pdfclean_main(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
 {
 	char *infile;
 	char *outfile = "out.pdf";
diff --git a/apps/mupdfextract.c b/apps/mupdfextract.c
index a6a677cd..a46e0d88 100644
--- a/apps/mupdfextract.c
+++ b/apps/mupdfextract.c
@@ -142,11 +142,7 @@ static void showobject(int num)
 	pdf_drop_obj(obj);
 }
 
-#ifdef MUPDF_COMBINED_EXE
 int pdfextract_main(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
 {
 	char *infile;
 	char *password = "";
diff --git a/apps/mupdfinfo.c b/apps/mupdfinfo.c
index b9f07ea9..52018a9c 100644
--- a/apps/mupdfinfo.c
+++ b/apps/mupdfinfo.c
@@ -946,11 +946,7 @@ static int arg_is_page_range(const char *arg)
 	return 1;
 }
 
-#ifdef MUPDF_COMBINED_EXE
 int pdfinfo_main(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
 {
 	enum { NO_FILE_OPENED, NO_INFO_GATHERED, INFO_SHOWN } state;
 	char *filename = "";
diff --git a/apps/mupdfposter.c b/apps/mupdfposter.c
index 78dc388d..415e3175 100644
--- a/apps/mupdfposter.c
+++ b/apps/mupdfposter.c
@@ -119,11 +119,7 @@ static void decimatepages(pdf_document *xref)
 	pdf_drop_obj(kids);
 }
 
-#ifdef MUPDF_COMBINED_EXE
 int pdfposter_main(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
 {
 	char *infile;
 	char *outfile = "out.pdf";
diff --git a/apps/mupdfshow.c b/apps/mupdfshow.c
index e9268090..1c198e8d 100644
--- a/apps/mupdfshow.c
+++ b/apps/mupdfshow.c
@@ -171,11 +171,7 @@ static void showgrep(char *filename)
 	pdf_fprint_obj(stdout, doc->trailer, 1);
 }
 
-#ifdef MUPDF_COMBINED_EXE
 int pdfshow_main(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
 {
 	char *password = NULL; /* don't throw errors if encrypted */
 	char *filename;
diff --git a/pdf/base_object.c b/pdf/pdf_object.c
index 2a5e6d78..2a5e6d78 100644
--- a/pdf/base_object.c
+++ b/pdf/pdf_object.c
diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj
index 98b1aa5e..03b1bbd1 100644
--- a/win32/libmupdf.vcproj
+++ b/win32/libmupdf.vcproj
@@ -210,10 +210,6 @@
 			Name="pdf"
 			>
 			<File
-				RelativePath="..\pdf\base_object.c"
-				>
-			</File>
-			<File
 				RelativePath="..\pdf\data_encodings.h"
 				>
 			</File>
@@ -294,6 +290,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\pdf\pdf_object.c"
+				>
+			</File>
+			<File
 				RelativePath="..\pdf\pdf_outline.c"
 				>
 			</File>
diff --git a/win32/mubusy.vcproj b/win32/mubusy.vcproj
index f7d27360..c905681e 100644
--- a/win32/mubusy.vcproj
+++ b/win32/mubusy.vcproj
@@ -241,23 +241,23 @@
 			>
 		</File>
 		<File
-			RelativePath="..\apps\mubusy_draw.c"
+			RelativePath="..\apps\mupdfclean.c"
 			>
 		</File>
 		<File
-			RelativePath="..\apps\mubusy_pdfclean.c"
+			RelativePath="..\apps\mupdfextract.c"
 			>
 		</File>
 		<File
-			RelativePath="..\apps\mubusy_pdfextract.c"
+			RelativePath="..\apps\mupdfinfo.c"
 			>
 		</File>
 		<File
-			RelativePath="..\apps\mubusy_pdfinfo.c"
+			RelativePath="..\apps\mupdfposter.c"
 			>
 		</File>
 		<File
-			RelativePath="..\apps\mubusy_pdfshow.c"
+			RelativePath="..\apps\mupdfshow.c"
 			>
 		</File>
 	</Files>
diff --git a/win32/mupdf.sln b/win32/mupdf.sln
index 01014d6a..30207a1b 100644
--- a/win32/mupdf.sln
+++ b/win32/mupdf.sln
@@ -21,30 +21,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mudraw", "mudraw.vcproj", "
 		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfclean", "mupdfclean.vcproj", "{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfshow", "mupdfshow.vcproj", "{50644121-C85F-4EE9-9C54-F7D1BDFAE354}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfextract", "mupdfextract.vcproj", "{BD4473E7-2DBE-4568-A0FC-38EED70182DC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfinfo", "mupdfinfo.vcproj", "{E7578F65-AA5B-43A3-981A-D3632C2A3C04}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mubusy", "mubusy.vcproj", "{00811970-815B-4F64-BC9D-219078B1F3AA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
@@ -53,12 +29,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mubusy", "mubusy.vcproj", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generated", "generated.vcproj", "{A5053AA7-02E5-4903-B596-04F17AEB1526}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfposter", "mupdfposter.vcproj", "{495EC73D-30C5-4F38-8B78-955E0FDBE5E9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -90,30 +60,6 @@ Global
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Memento|Win32.Build.0 = Memento|Win32
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|Win32.ActiveCfg = Release|Win32
 		{0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|Win32.Build.0 = Release|Win32
-		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Debug|Win32.Build.0 = Debug|Win32
-		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Memento|Win32.ActiveCfg = Memento|Win32
-		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Memento|Win32.Build.0 = Memento|Win32
-		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Release|Win32.ActiveCfg = Release|Win32
-		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Release|Win32.Build.0 = Release|Win32
-		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Debug|Win32.ActiveCfg = Debug|Win32
-		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Debug|Win32.Build.0 = Debug|Win32
-		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Memento|Win32.ActiveCfg = Memento|Win32
-		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Memento|Win32.Build.0 = Memento|Win32
-		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Release|Win32.ActiveCfg = Release|Win32
-		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Release|Win32.Build.0 = Release|Win32
-		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Debug|Win32.Build.0 = Debug|Win32
-		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Memento|Win32.ActiveCfg = Memento|Win32
-		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Memento|Win32.Build.0 = Memento|Win32
-		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Release|Win32.ActiveCfg = Release|Win32
-		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Release|Win32.Build.0 = Release|Win32
-		{E7578F65-AA5B-43A3-981A-D3632C2A3C04}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E7578F65-AA5B-43A3-981A-D3632C2A3C04}.Debug|Win32.Build.0 = Debug|Win32
-		{E7578F65-AA5B-43A3-981A-D3632C2A3C04}.Memento|Win32.ActiveCfg = Memento|Win32
-		{E7578F65-AA5B-43A3-981A-D3632C2A3C04}.Memento|Win32.Build.0 = Memento|Win32
-		{E7578F65-AA5B-43A3-981A-D3632C2A3C04}.Release|Win32.ActiveCfg = Release|Win32
-		{E7578F65-AA5B-43A3-981A-D3632C2A3C04}.Release|Win32.Build.0 = Release|Win32
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.Debug|Win32.Build.0 = Debug|Win32
 		{00811970-815B-4F64-BC9D-219078B1F3AA}.Memento|Win32.ActiveCfg = Memento|Win32
@@ -126,12 +72,6 @@ Global
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Memento|Win32.Build.0 = Memento|Win32
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|Win32.ActiveCfg = Release|Win32
 		{A5053AA7-02E5-4903-B596-04F17AEB1526}.Release|Win32.Build.0 = Release|Win32
-		{495EC73D-30C5-4F38-8B78-955E0FDBE5E9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{495EC73D-30C5-4F38-8B78-955E0FDBE5E9}.Debug|Win32.Build.0 = Debug|Win32
-		{495EC73D-30C5-4F38-8B78-955E0FDBE5E9}.Memento|Win32.ActiveCfg = Memento|Win32
-		{495EC73D-30C5-4F38-8B78-955E0FDBE5E9}.Memento|Win32.Build.0 = Memento|Win32
-		{495EC73D-30C5-4F38-8B78-955E0FDBE5E9}.Release|Win32.ActiveCfg = Release|Win32
-		{495EC73D-30C5-4F38-8B78-955E0FDBE5E9}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32/mupdfclean.vcproj b/win32/mupdfclean.vcproj
deleted file mode 100644
index db8c8f3c..00000000
--- a/win32/mupdfclean.vcproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mupdfclean"
-	ProjectGUID="{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}"
-	RootNamespace="mupdf"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				PreprocessorDefinitions="DEBUG=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Memento|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\apps\mupdfclean.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/mupdfextract.vcproj b/win32/mupdfextract.vcproj
deleted file mode 100644
index 04251c15..00000000
--- a/win32/mupdfextract.vcproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mupdfextract"
-	ProjectGUID="{BD4473E7-2DBE-4568-A0FC-38EED70182DC}"
-	RootNamespace="mupdf"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				PreprocessorDefinitions="DEBUG=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Memento|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\apps\mupdfextract.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/mupdfinfo.vcproj b/win32/mupdfinfo.vcproj
deleted file mode 100644
index ad8b960b..00000000
--- a/win32/mupdfinfo.vcproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mupdfinfo"
-	ProjectGUID="{E7578F65-AA5B-43A3-981A-D3632C2A3C04}"
-	RootNamespace="mupdf"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				PreprocessorDefinitions="DEBUG=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Memento|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\apps\mupdfinfo.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/mupdfposter.vcproj b/win32/mupdfposter.vcproj
deleted file mode 100644
index 86a0505e..00000000
--- a/win32/mupdfposter.vcproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mupdfposter"
-	ProjectGUID="{495EC73D-30C5-4F38-8B78-955E0FDBE5E9}"
-	RootNamespace="mupdf"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				PreprocessorDefinitions="DEBUG=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Memento|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\apps\mupdfposter.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/mupdfshow.vcproj b/win32/mupdfshow.vcproj
deleted file mode 100644
index 49a3f2b6..00000000
--- a/win32/mupdfshow.vcproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="mupdfshow"
-	ProjectGUID="{50644121-C85F-4EE9-9C54-F7D1BDFAE354}"
-	RootNamespace="mupdf"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				PreprocessorDefinitions="DEBUG=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Memento|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\fitz;..\pdf"
-				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\apps\mupdfshow.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>