Rename pdfdraw to mupdfdraw etc.

This a) improves our branding, and b) avoids conflicts with
other pdf tools out there (pdfinfo etc).

17 files changed, 44 insertions, 31 deletions

diff --git a/apps/man/mupdf.1 b/apps/man/mupdf.1
index a4162a6f..e22d0ba9 100644
--- a/apps/man/mupdf.1
+++ b/apps/man/mupdf.1
@@ -1,4 +1,4 @@
-.TH MUPDF 1 "March 15, 2010"
+.TH MUPDF 1 "January 27, 2012"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
 mupdf \- MuPDF is a lightweight PDF viewer written in portable C
@@ -76,11 +76,11 @@ Find the next/previous search result.
 .B c
 Toggle between color and grayscale rendering.
 .SH SEE ALSO
-.BR pdfclean (1),
-.BR pdfdraw (1),
-.BR pdfshow (1).
+.BR mupdfclean (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.
+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/pdfclean.1 b/apps/man/mupdfclean.1
index aa9047af..91e796ac 100644
--- a/apps/man/pdfclean.1
+++ b/apps/man/mupdfclean.1
@@ -1,15 +1,15 @@
-.TH PDFCLEAN 1 "September  4, 2011"
+.TH PDFCLEAN 1 "January 27, 2012"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
-pdfclean \- pretty print, decompress and garbage collect PDF files
+mupdfclean \- pretty print, decompress and garbage collect PDF files
 .SH SYNOPSIS
-.B pdfclean
+.B mupdfclean
 .RI [ options ]
 .RI input.pdf
 .RI [ output.pdf ]
 .RI [ pages ]
 .SH DESCRIPTION
-.B pdfclean
+.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.
@@ -32,8 +32,8 @@ easy access for reading and editing the contents with a text editor.
 Comma separated list of ranges to clean.
 .SH SEE ALSO
 .BR mupdf (1),
-.BR pdfdraw (1).
-.BR pdfshow (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/pdfdraw.1 b/apps/man/mupdfdraw.1
index 7fa0e81c..ea58d570 100644
--- a/apps/man/pdfdraw.1
+++ b/apps/man/mupdfdraw.1
@@ -1,14 +1,14 @@
-.TH PDFDRAW 1 "September  4, 2011"
+.TH PDFDRAW 1 "January 27, 2012"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
-pdfdraw \- render PDF documents
+mupdfdraw \- render PDF documents
 .SH SYNOPSIS
-.B pdfdraw
+.B mupdfdraw
 .RI [ options ]
 .RI input.pdf
 .RI [ pages]
 .SH DESCRIPTION
-.B pdfdraw
+.B mupdfdraw
 will render a PDF document to image files.
 The supported image formats are: pgm, ppm, pam and png.
 Select the pages to be rendered by specifying a comma
@@ -71,8 +71,8 @@ Invert the output image colors.
 Comma separated list of ranges to render.
 .SH SEE ALSO
 .BR mupdf (1),
-.BR pdfclean (1).
-.BR pdfshow (1).
+.BR mupdfclean (1).
+.BR mupdfshow (1).
 .SH AUTHOR
 MuPDF was written by Tor Andersson <tor@ghostscript.com>.
-MuPDF is Copyright 2006-2010 Artifex Software, Inc.
+MuPDF is Copyright 2006-2012 Artifex Software, Inc.
diff --git a/apps/man/pdfshow.1 b/apps/man/mupdfshow.1
index 7574f297..451dac6b 100644
--- a/apps/man/pdfshow.1
+++ b/apps/man/mupdfshow.1
@@ -1,9 +1,9 @@
-.TH PDFSHOW 1 "July 19, 2010"
+.TH PDFSHOW 1 "January 27, 2012"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
-pdfshow \- show objects and streams that make up a PDF document
+mupdfshow \- show objects and streams that make up a PDF document
 .SH SYNOPSIS
-.B pdfshow
+.B mupdfshow
 .RI [ options ]
 .RI file.pdf
 .RI [ xref ]
@@ -12,7 +12,7 @@ pdfshow \- show objects and streams that make up a PDF document
 .RI [ grep ]
 .RI [ object-number... ]
 .SH DESCRIPTION
-.B pdfshow
+.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.
@@ -35,8 +35,8 @@ Print streams in their original encoded form.
 Use the specified password if the file is encrypted.
 .SH SEE ALSO
 .BR mupdf (1),
-.BR pdfclean (1).
-.BR pdfdraw (1).
+.BR mupdfclean (1).
+.BR mupdfdraw (1).
 .SH AUTHOR
 MuPDF was written by Tor Andersson <tor@ghostscript.com>.
-MuPDF is copyright 2006-2010 Artifex Software, Inc.
+MuPDF is copyright 2006-2012 Artifex Software, Inc.
diff --git a/apps/mubusy.c b/apps/mubusy.c
index 8e215959..0e12d53c 100644
--- a/apps/mubusy.c
+++ b/apps/mubusy.c
@@ -33,6 +33,19 @@ int main(int argc, char **argv)
 		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))
+		return pdfdraw_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);
+	if (namematch(end, start, "muxpsdraw", 9))
+		return xpsdraw_main(argc, argv);
+	/* And include old names for backward compatibility */
 	if (namematch(end, start, "pdfdraw", 7))
 		return pdfdraw_main(argc, argv);
 	if (namematch(end, start, "pdfclean", 8))
diff --git a/apps/mubusy_pdfclean.c b/apps/mubusy_pdfclean.c
index 225f30c8..bc3456d1 100644
--- a/apps/mubusy_pdfclean.c
+++ b/apps/mubusy_pdfclean.c
@@ -1,2 +1,2 @@
 #define MUPDF_COMBINED_EXE
-#include "pdfclean.c"
+#include "mupdfclean.c"
diff --git a/apps/mubusy_pdfdraw.c b/apps/mubusy_pdfdraw.c
index 638b0206..aadde1c9 100644
--- a/apps/mubusy_pdfdraw.c
+++ b/apps/mubusy_pdfdraw.c
@@ -1,2 +1,2 @@
 #define MUPDF_COMBINED_EXE
-#include "pdfdraw.c"
+#include "mupdfdraw.c"
diff --git a/apps/mubusy_pdfextract.c b/apps/mubusy_pdfextract.c
index aa07f78f..30f661a3 100644
--- a/apps/mubusy_pdfextract.c
+++ b/apps/mubusy_pdfextract.c
@@ -1,2 +1,2 @@
 #define MUPDF_COMBINED_EXE
-#include "pdfextract.c"
+#include "mupdfextract.c"
diff --git a/apps/mubusy_pdfinfo.c b/apps/mubusy_pdfinfo.c
index 0c9eaa97..df947543 100644
--- a/apps/mubusy_pdfinfo.c
+++ b/apps/mubusy_pdfinfo.c
@@ -1,2 +1,2 @@
 #define MUPDF_COMBINED_EXE
-#include "pdfinfo.c"
+#include "mupdfinfo.c"
diff --git a/apps/mubusy_pdfshow.c b/apps/mubusy_pdfshow.c
index e1a6d573..320b93aa 100644
--- a/apps/mubusy_pdfshow.c
+++ b/apps/mubusy_pdfshow.c
@@ -1,2 +1,2 @@
 #define MUPDF_COMBINED_EXE
-#include "pdfshow.c"
+#include "mupdfshow.c"
diff --git a/apps/mubusy_xpsdraw.c b/apps/mubusy_xpsdraw.c
index 76a3f7df..9e2f8b87 100644
--- a/apps/mubusy_xpsdraw.c
+++ b/apps/mubusy_xpsdraw.c
@@ -1,2 +1,2 @@
 #define MUPDF_COMBINED_EXE
-#include "xpsdraw.c"
+#include "muxpsdraw.c"
diff --git a/apps/pdfclean.c b/apps/mupdfclean.c
index 8a163502..8a163502 100644
--- a/apps/pdfclean.c
+++ b/apps/mupdfclean.c
diff --git a/apps/pdfdraw.c b/apps/mupdfdraw.c
index 552fe31a..552fe31a 100644
--- a/apps/pdfdraw.c
+++ b/apps/mupdfdraw.c
diff --git a/apps/pdfextract.c b/apps/mupdfextract.c
index 1407f7f3..1407f7f3 100644
--- a/apps/pdfextract.c
+++ b/apps/mupdfextract.c
diff --git a/apps/pdfinfo.c b/apps/mupdfinfo.c
index c6c6b35c..c6c6b35c 100644
--- a/apps/pdfinfo.c
+++ b/apps/mupdfinfo.c
diff --git a/apps/pdfshow.c b/apps/mupdfshow.c
index 53578fd7..53578fd7 100644
--- a/apps/pdfshow.c
+++ b/apps/mupdfshow.c
diff --git a/apps/xpsdraw.c b/apps/muxpsdraw.c
index 8fec8efa..8fec8efa 100644
--- a/apps/xpsdraw.c
+++ b/apps/muxpsdraw.c