diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | apps/man/mupdf.1 | 10 | ||||
| -rw-r--r-- | apps/man/mupdfclean.1 (renamed from apps/man/pdfclean.1) | 12 | ||||
| -rw-r--r-- | apps/man/mupdfdraw.1 (renamed from apps/man/pdfdraw.1) | 14 | ||||
| -rw-r--r-- | apps/man/mupdfshow.1 (renamed from apps/man/pdfshow.1) | 14 | ||||
| -rw-r--r-- | apps/mubusy.c | 13 | ||||
| -rw-r--r-- | apps/mubusy_pdfclean.c | 2 | ||||
| -rw-r--r-- | apps/mubusy_pdfdraw.c | 2 | ||||
| -rw-r--r-- | apps/mubusy_pdfextract.c | 2 | ||||
| -rw-r--r-- | apps/mubusy_pdfinfo.c | 2 | ||||
| -rw-r--r-- | apps/mubusy_pdfshow.c | 2 | ||||
| -rw-r--r-- | apps/mubusy_xpsdraw.c | 2 | ||||
| -rw-r--r-- | apps/mupdfclean.c (renamed from apps/pdfclean.c) | 0 | ||||
| -rw-r--r-- | apps/mupdfdraw.c (renamed from apps/pdfdraw.c) | 0 | ||||
| -rw-r--r-- | apps/mupdfextract.c (renamed from apps/pdfextract.c) | 0 | ||||
| -rw-r--r-- | apps/mupdfinfo.c (renamed from apps/pdfinfo.c) | 0 | ||||
| -rw-r--r-- | apps/mupdfshow.c (renamed from apps/pdfshow.c) | 0 | ||||
| -rw-r--r-- | apps/muxpsdraw.c (renamed from apps/xpsdraw.c) | 0 | ||||
| -rw-r--r-- | debian/mupdf-tools.install | 6 | ||||
| -rw-r--r-- | debian/mupdf-tools.manpages | 6 | ||||
| -rw-r--r-- | win32/mupdf.sln | 12 | ||||
| -rw-r--r-- | win32/mupdfclean.vcproj (renamed from win32/pdfclean.vcproj) | 4 | ||||
| -rw-r--r-- | win32/mupdfdraw.vcproj (renamed from win32/pdfdraw.vcproj) | 4 | ||||
| -rw-r--r-- | win32/mupdfextract.vcproj (renamed from win32/pdfextract.vcproj) | 4 | ||||
| -rw-r--r-- | win32/mupdfinfo.vcproj (renamed from win32/pdfinfo.vcproj) | 4 | ||||
| -rw-r--r-- | win32/mupdfshow.vcproj (renamed from win32/pdfshow.vcproj) | 4 | ||||
| -rw-r--r-- | win32/muxpsdraw.vcproj (renamed from win32/xpsdraw.vcproj) | 4 |
27 files changed, 70 insertions, 57 deletions
@@ -122,8 +122,8 @@ $(OUT)/cmapdump.o : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c # --- Tools and Apps --- -PDF_APPS := $(addprefix $(OUT)/, pdfdraw pdfclean pdfextract pdfinfo pdfshow) -XPS_APPS := $(addprefix $(OUT)/, xpsdraw) +PDF_APPS := $(addprefix $(OUT)/, mupdfdraw mupdfclean mupdfextract mupdfinfo mupdfshow) +XPS_APPS := $(addprefix $(OUT)/, muxpsdraw) BUSY_APP := $(addprefix $(OUT)/, mubusy) BUSY_SRC := $(notdir $(wildcard apps/mubusy_*.c)) BUSY_LIBS := $(addprefix $(OUT)/, $(BUSY_SRC:%.c=%.o)) 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 diff --git a/debian/mupdf-tools.install b/debian/mupdf-tools.install index 255de9dd..4381407a 100644 --- a/debian/mupdf-tools.install +++ b/debian/mupdf-tools.install @@ -1,3 +1,3 @@ -debian/tmp/usr/bin/pdfclean -debian/tmp/usr/bin/pdfdraw -debian/tmp/usr/bin/pdfshow +debian/tmp/usr/bin/mupdfclean +debian/tmp/usr/bin/mupdfdraw +debian/tmp/usr/bin/mupdfshow diff --git a/debian/mupdf-tools.manpages b/debian/mupdf-tools.manpages index 3bc20b69..7ffbd1a8 100644 --- a/debian/mupdf-tools.manpages +++ b/debian/mupdf-tools.manpages @@ -1,3 +1,3 @@ -apps/man/pdfclean.1 -apps/man/pdfdraw.1 -apps/man/pdfshow.1 +apps/man/mupdfclean.1 +apps/man/mupdfdraw.1 +apps/man/mupdfshow.1 diff --git a/win32/mupdf.sln b/win32/mupdf.sln index df4c8a81..a954c867 100644 --- a/win32/mupdf.sln +++ b/win32/mupdf.sln @@ -11,37 +11,37 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdpa EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj", "{5F615F91-DFF8-4F05-BF48-6222B7D86519}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfdraw", "pdfdraw.vcproj", "{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfdraw", "mupdfdraw.vcproj", "{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}" 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}") = "pdfclean", "pdfclean.vcproj", "{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}" +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}") = "pdfshow", "pdfshow.vcproj", "{50644121-C85F-4EE9-9C54-F7D1BDFAE354}" +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}") = "pdfextract", "pdfextract.vcproj", "{BD4473E7-2DBE-4568-A0FC-38EED70182DC}" +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}") = "xpsdraw", "xpsdraw.vcproj", "{E6A93617-41BD-45B2-BF61-4F7ED263CDF2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "muxpsdraw", "muxpsdraw.vcproj", "{E6A93617-41BD-45B2-BF61-4F7ED263CDF2}" 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}") = "pdfinfo", "pdfinfo.vcproj", "{E7578F65-AA5B-43A3-981A-D3632C2A3C04}" +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} diff --git a/win32/pdfclean.vcproj b/win32/mupdfclean.vcproj index b3bdcb6c..db8c8f3c 100644 --- a/win32/pdfclean.vcproj +++ b/win32/mupdfclean.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="8.00" - Name="pdfclean" + Name="mupdfclean" ProjectGUID="{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}" RootNamespace="mupdf" > @@ -237,7 +237,7 @@ </References> <Files> <File - RelativePath="..\apps\pdfclean.c" + RelativePath="..\apps\mupdfclean.c" > </File> </Files> diff --git a/win32/pdfdraw.vcproj b/win32/mupdfdraw.vcproj index 5ae5bdfe..1f1913d3 100644 --- a/win32/pdfdraw.vcproj +++ b/win32/mupdfdraw.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="8.00" - Name="pdfdraw" + Name="mupdfdraw" ProjectGUID="{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}" RootNamespace="mupdf" > @@ -237,7 +237,7 @@ </References> <Files> <File - RelativePath="..\apps\pdfdraw.c" + RelativePath="..\apps\mupdfdraw.c" > </File> </Files> diff --git a/win32/pdfextract.vcproj b/win32/mupdfextract.vcproj index 1d14b6c6..04251c15 100644 --- a/win32/pdfextract.vcproj +++ b/win32/mupdfextract.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="8.00" - Name="pdfextract" + Name="mupdfextract" ProjectGUID="{BD4473E7-2DBE-4568-A0FC-38EED70182DC}" RootNamespace="mupdf" > @@ -237,7 +237,7 @@ </References> <Files> <File - RelativePath="..\apps\pdfextract.c" + RelativePath="..\apps\mupdfextract.c" > </File> </Files> diff --git a/win32/pdfinfo.vcproj b/win32/mupdfinfo.vcproj index e5dabd7e..ad8b960b 100644 --- a/win32/pdfinfo.vcproj +++ b/win32/mupdfinfo.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="8.00" - Name="pdfinfo" + Name="mupdfinfo" ProjectGUID="{E7578F65-AA5B-43A3-981A-D3632C2A3C04}" RootNamespace="mupdf" > @@ -237,7 +237,7 @@ </References> <Files> <File - RelativePath="..\apps\pdfinfo.c" + RelativePath="..\apps\mupdfinfo.c" > </File> </Files> diff --git a/win32/pdfshow.vcproj b/win32/mupdfshow.vcproj index 30fd1784..49a3f2b6 100644 --- a/win32/pdfshow.vcproj +++ b/win32/mupdfshow.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="8.00" - Name="pdfshow" + Name="mupdfshow" ProjectGUID="{50644121-C85F-4EE9-9C54-F7D1BDFAE354}" RootNamespace="mupdf" > @@ -237,7 +237,7 @@ </References> <Files> <File - RelativePath="..\apps\pdfshow.c" + RelativePath="..\apps\mupdfshow.c" > </File> </Files> diff --git a/win32/xpsdraw.vcproj b/win32/muxpsdraw.vcproj index d2db91fa..c27a9cf2 100644 --- a/win32/xpsdraw.vcproj +++ b/win32/muxpsdraw.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="8.00" - Name="xpsdraw" + Name="muxpsdraw" ProjectGUID="{E6A93617-41BD-45B2-BF61-4F7ED263CDF2}" RootNamespace="mupdf" > @@ -237,7 +237,7 @@ </References> <Files> <File - RelativePath="..\apps\xpsdraw.c" + RelativePath="..\apps\muxpsdraw.c" > </File> </Files> |