Skip to content

Commit af5e0eb

Browse files
altmanyaltmany
committed
(3.31) Fixed PDF quality issues as suggested by @scholnik (issues #285, #368); minor fixes for MacOS/Linux; use figure's FileName property (if available) as the default export filename; added -gif optional format parameter
1 parent 8d49f10 commit af5e0eb

File tree

2 files changed

+147
-50
lines changed

2 files changed

+147
-50
lines changed

‎eps2pdf.m

+38-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function eps2pdf(source, dest, crop, append, gray, quality, gs_options)
1+
function eps2pdf(source, dest, crop, append, gray, quality, gs_options) %#ok<*RGXPI>
22
%EPS2PDF Convert an eps file to pdf format using ghostscript
33
%
44
% Examples:
@@ -60,9 +60,14 @@ function eps2pdf(source, dest, crop, append, gray, quality, gs_options)
6060
% 20/01/20: Attempted fix for issue #285: unsupported patch transparency in some Ghostscript versions
6161
% 12/02/20: Improved fix for issue #285: add -dNOSAFER and -dALLOWPSTRANSPARENCY (thanks @linasstonys)
6262
% 26/08/21: Added GS version to error message; fixed some problems with PDF append (issue #339)
63+
% 20/02/23: Added GS fixes suggested by @scholnik (issues #285, #368)
6364

6465
% Intialise the options string for ghostscript
65-
options = ['-q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -dPDFSETTINGS=/prepress -sOutputFile="' dest '"'];
66+
downsampleOptions = ['-dDownsampleColorImages=false ' ...
67+
'-dDownsampleGrayImages=false ' ...
68+
'-dDownsampleMonoImages=false']; %issue #368
69+
options = ['-q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -dPDFSETTINGS=/prepress ' ...
70+
downsampleOptions ' -sOutputFile="' dest '"'];
6671

6772
% Set crop option
6873
if nargin < 3 || crop
@@ -217,15 +222,44 @@ function eps2pdf(source, dest, crop, append, gray, quality, gs_options)
217222
end
218223
end
219224

220-
% Retry without quality options (may solve problems with GS 9.51+, issue #285)
225+
% Retry with updated or no quality options (may solve problems with GS 9.51+, issue #285)
221226
if ~isempty(qualityOptions)
227+
% First try replacing .setpdfwrite as suggested in ghostscript error (issue #285)
228+
options = strrep(orig_options, '.setpdfwrite', '3000000 setvmthreshold');
229+
if ~ghostscript(options) % hurray! (no error)
230+
% No warning: there's no known drawback when this works so no need to inform the user
231+
%warning('export_fig:GS:setpdfwrite','Successfully worked around deprecated .setpdfwrite')
232+
return
233+
end
234+
% Well, we tried. Fall back to no quality options.
222235
options = strrep(orig_options, qualityOptions, '');
236+
if ~ghostscript(options) % hurray! (no error)
237+
warning('export_fig:GS:quality','Export_fig quality option ignored - not supported by your Ghostscript version')
238+
return
239+
end
240+
% Hmm, perhaps the problem is just with the downsampleOptions?
241+
options = strrep(orig_options, downsampleOptions, '');
242+
if ~ghostscript(options) % hurray! (no error)
243+
warning('export_fig:GS:downsample','Export_fig quality option ignored - not supported by your Ghostscript version')
244+
return
245+
end
246+
% Nope, last attempt: remove both downsampleOptions & qualityOptions
247+
options = strrep(orig_options, qualityOptions, '');
248+
options = strrep(options, downsampleOptions, '');
223249
[status, message] = ghostscript(options);
224250
if ~status % hurray! (no error)
225-
warning('export_fig:GS:quality','Export_fig quality option is ignored - not supported by your Ghostscript version')
251+
warning('export_fig:GS:quality2','Export_fig quality option ignored - not supported by your Ghostscript version')
252+
return
253+
end
254+
else % no quality options, the problem lies elsewhere...
255+
% Hmm, perhaps the problem is just with the downsampleOptions?
256+
options = strrep(orig_options, downsampleOptions, '');
257+
if ~ghostscript(options) % hurray! (no error)
258+
warning('export_fig:GS:downsample','Export_fig quality option ignored - not supported by your Ghostscript version')
226259
return
227260
end
228261
end
262+
% Any other ideas, anyone?
229263

230264
% Report error
231265
if isempty(message)

‎export_fig.m

+109-46
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% imageData = export_fig
66
% [imageData, alpha] = export_fig
77
% export_fig filename
8-
% export_fig filename -format1 -format2
8+
% export_fig ... -<format>
99
% export_fig ... -nocrop
1010
% export_fig ... -c[<val>,<val>,<val>,<val>]
1111
% export_fig ... -transparent
@@ -93,13 +93,14 @@
9393
% Inputs:
9494
% filename - string containing the name (optionally including full or
9595
% relative path) of the file the figure is to be saved as. If
96-
% a path is not specified, the figure is saved in the current
97-
% directory. If no name and no output arguments are specified,
98-
% the default name, 'export_fig_out', is used. If neither a
99-
% file extension nor a format are specified, a ".png" is added
100-
% and the figure saved in that format.
96+
% no path is specified, the figure is saved in the current folder.
97+
% If no name and no output arguments are specified, the figure's
98+
% FileName property is used. If this property is empty, then the
99+
% default name 'export_fig_out' is used. If neither file extension
100+
% nor a format parameter are specified, a ".png" is added to the
101+
% filename and the figure saved in PNG format.
101102
% -<format> - string(s) containing the output file extension(s). Options:
102-
% '-pdf', '-eps', 'emf', '-svg', '-png', '-tif', '-jpg' and '-bmp'.
103+
% '-pdf','-eps','emf','-svg','-png','-tif','-jpg','-gif' and '-bmp'.
103104
% Multiple formats can be specified, without restriction.
104105
% For example: export_fig('-jpg', '-pdf', '-png', ...)
105106
% Note: '-tif','-tiff' are equivalent, and so are '-jpg','-jpeg'.
@@ -355,6 +356,7 @@
355356
% 04/12/22: (3.28) Added -metadata option to add custom info to PDF files; fixed -clipboard export (transparent and gray-scale images; deployed apps; old Matlabs)
356357
% 03/01/23: (3.29) Use silent mode by default in deployed apps; suggest installing ghostscript/pdftops if required yet missing; fixed invalid chars in export filename; reuse existing figure toolbar if available
357358
% 03/02/23: (3.30) Added -contextmenu option to add interactive context-menu items; fixed: -menubar,-toolbar created the full default figure menubar/toolbar if not shown; enlarged toolbar icon; support adding export_fig icon to custom toolbars; alert if specifying multiple or invalid handle(s)
359+
% 20/02/23: (3.31) Fixed PDF quality issues as suggested by @scholnik (issues #285, #368); minor fixes for MacOS/Linux; use figure's FileName property (if available) as the default export filename; added -gif optional format parameter
358360
%}
359361

360362
if nargout
@@ -392,7 +394,7 @@
392394
[fig, options] = parse_args(nargout, fig, argNames, varargin{:});
393395

394396
% Check for newer version and exportgraphics/copygraphics compatibility
395-
currentVersion = 3.30;
397+
currentVersion = 3.31;
396398
if options.version % export_fig's version requested - return it and bail out
397399
imageData = currentVersion;
398400
return
@@ -1440,10 +1442,13 @@
14401442
url = 'http://ghostscript.com';
14411443
end
14421444
fpath = user_string('ghostscript');
1445+
fpath_link = fpath;
1446+
if ispc % winopen only works on Windows
1447+
fpath_link = hyperlink(['matlab:winopen(''' fileparts(fpath) ''')'], fpath);
1448+
end
14431449
fprintf(2, ' * and that %s is properly installed in %s\n', ...
1444-
hyperlink(url,'ghostscript'), ...
1445-
hyperlink(['matlab:winopen(''' fileparts(fpath) ''')'], fpath));
1446-
if isempty(fpath)
1450+
hyperlink(url,'ghostscript'), fpath_link);
1451+
if isempty(strtrim(char(fpath)))
14471452
selectUtilityPath('Ghostscript',url,'Exporting to vector format (EPS, PDF etc.)');
14481453
return
14491454
end
@@ -1452,9 +1457,12 @@
14521457
if options.eps
14531458
url = 'http://xpdfreader.com/download.html';
14541459
fpath = user_string('pdftops');
1460+
fpath_link = fpath;
1461+
if ispc % winopen only works on Windows
1462+
fpath_link = hyperlink(['matlab:winopen(''' fileparts(fpath) ''')'], fpath);
1463+
end
14551464
fprintf(2, ' * and that %s is properly installed in %s\n', ...
1456-
hyperlink(url,'pdftops'), ...
1457-
hyperlink(['matlab:winopen(''' fileparts(fpath) ''')'], fpath));
1465+
hyperlink(url,'pdftops'), fpath_link);
14581466
if isempty(fpath)
14591467
selectUtilityPath('pdftops',url,'Exporting to EPS format');
14601468
return
@@ -1484,6 +1492,7 @@
14841492
function isOk = selectUtilityPath(utilName,url,msg)
14851493
isOk = false;
14861494
msg = [msg ' requires the ' utilName ' utility from ' url];
1495+
fprintf(2,'\n%s\n',msg);
14871496
while ~isOk
14881497
answer = questdlg(msg,utilName,'Use local installation','Go to website','Cancel','Cancel');
14891498
drawnow; pause(0.01); % avoid Matlab hang
@@ -1504,7 +1513,7 @@
15041513
function options = default_options()
15051514
% Default options used by export_fig
15061515
options = struct(...
1507-
'name', 'export_fig_out', ...
1516+
'name', '', ...
15081517
'crop', true, ...
15091518
'crop_amounts', nan(1,4), ... % auto-crop all 4 image sides
15101519
'transparent', false, ...
@@ -1608,6 +1617,8 @@
16081617
options.jpg = true;
16091618
case 'bmp'
16101619
options.bmp = true;
1620+
case 'gif'
1621+
options.gif = true;
16111622
case 'rgb'
16121623
options.colourspace = 0;
16131624
case 'cmyk'
@@ -1793,28 +1804,16 @@
17931804
if ~isempty(p) % export folder name/path was specified
17941805
% Issue #221: alert if the requested folder does not exist
17951806
if exist(p,'dir')
1796-
options.name = fullfile(p, options.name);
1807+
options.name = fullfile(p, options.name); %without ext
17971808
elseif ~isFigName
17981809
error('export_fig:BadPath','Folder %s does not exist, nor is it the name of any active figure!',p);
17991810
else % isFigName
18001811
% specified a figure name so ignore the bad folder part
18011812
end
18021813
end
1803-
switch lower(ext)
1804-
case {'.tif', '.tiff'}
1805-
options.tif = true;
1806-
case {'.jpg', '.jpeg'}
1807-
options.jpg = true;
1808-
case '.png'
1809-
options.png = true;
1810-
case '.bmp'
1811-
options.bmp = true;
1812-
case '.eps'
1813-
options.eps = true;
1814-
case '.emf'
1815-
options.emf = true;
1816-
case '.pdf'
1817-
options.pdf = true;
1814+
switch lower(ext(2:end))
1815+
case {'tif', 'tiff','jpg', 'jpeg','png','bmp','eps','emf','pdf','svg','gif'}
1816+
options = setOptionsFormat(options, ext);
18181817
case '.fig'
18191818
% If no open figure, then load the specified .fig file and continue
18201819
figFilename = thisArg;
@@ -1829,10 +1828,6 @@
18291828
fig = -1;
18301829
return
18311830
end
1832-
case '.svg'
1833-
options.svg = true;
1834-
case '.gif'
1835-
options.gif = true;
18361831
otherwise
18371832
options.name = thisArg;
18381833
end
@@ -1863,6 +1858,27 @@
18631858
warning('export_fig:AntiAliasing','You requested anti-aliased export_fig output of an aliased figure (''GraphicsSmoothing''=''off''). You will see better results if you set your figure''s GraphicsSmoothing property to ''on'' before calling export_fig.')
18641859
end
18651860

1861+
% Use the figure's FileName property as the default export filename
1862+
if isempty(options.name)
1863+
options.name = get(fig,'FileName');
1864+
options.name = regexprep(options.name,'[*?"<>|:]+','-'); %remove illegal filename chars, but not folder seperators!
1865+
if isempty(options.name)
1866+
% No FileName property specified for the figure, use 'export_fig_out'
1867+
options.name = 'export_fig_out';
1868+
else
1869+
% Ensure the filepath is valid
1870+
[p, options.name, ext] = fileparts(options.name);
1871+
options = setOptionsFormat(options, ext);
1872+
if ~isempty(p) % export folder name/path was specified
1873+
if exist(p,'dir')
1874+
options.name = fullfile(p, options.name); %without ext
1875+
else % only warn, don't error
1876+
warning('export_fig:BadPath','Folder %s does not exist - exporting %s%s to current folder',p,options.name,ext);
1877+
end
1878+
end
1879+
end
1880+
end
1881+
18661882
% Convert user dir '~' to full path
18671883
if numel(options.name) > 2 && options.name(1) == '~' && (options.name(2) == '/' || options.name(2) == '\')
18681884
options.name = fullfile(char(java.lang.System.getProperty('user.home')), options.name(2:end));
@@ -1939,6 +1955,20 @@
19391955
end
19401956
end
19411957
end
1958+
function options = setOptionsFormat(options, ext)
1959+
switch lower(ext(2:end))
1960+
case {'tif', 'tiff'}, options.tif = true;
1961+
case {'jpg', 'jpeg'}, options.jpg = true;
1962+
case 'png', options.png = true;
1963+
case 'bmp', options.bmp = true;
1964+
case 'eps', options.eps = true;
1965+
case 'emf', options.emf = true;
1966+
case 'pdf', options.pdf = true;
1967+
case 'svg', options.svg = true;
1968+
case 'gif', options.gif = true;
1969+
otherwise % do nothing
1970+
end
1971+
end
19421972

19431973
% Convert a possible string => char (issue #245)
19441974
function value = str2char(value)
@@ -2268,10 +2298,12 @@ function updateInstalledVersion()
22682298
fprintf('Downloading latest version of %s from %s...\n', mfilename, zipFileName);
22692299
folderName = fileparts(which(mfilename('fullpath')));
22702300
targetFileName = fullfile(folderName, datestr(now,'yyyy-mm-dd.zip'));
2271-
try
2272-
folder = hyperlink(['matlab:winopen(''' folderName ''')'], folderName);
2273-
catch % hyperlink.m is not properly installed
2274-
folder = folderName;
2301+
folder = folderName;
2302+
if ispc % winopen only works on Windows
2303+
try
2304+
folder = hyperlink(['matlab:winopen(''' folderName ''')'], folderName);
2305+
catch % hyperlink.m is not properly installed
2306+
end
22752307
end
22762308
try
22772309
urlwrite(zipFileName,targetFileName); %#ok<URLWR>
@@ -2643,9 +2675,16 @@ function addToolbarButton(hFig, options)
26432675
try jButtonMenu.setToolTipText(tooltip); catch, end
26442676
try jButton.getComponentPeer.getComponent(1).setToolTipText(tooltip); catch, end
26452677

2646-
defaultFname = get(hFig,'Name');
2647-
defaultFname = regexprep(defaultFname,{'[*?"<>|:/\\]'},'-');
2678+
[folder,defaultFname] = fileparts(get(hFig,'FileName'));
2679+
if ~isempty(folder) && exist(folder,'dir')
2680+
folder = regexprep(folder,'[/\]$','');
2681+
else
2682+
folder = pwd;
2683+
end
2684+
if isempty(defaultFname), defaultFname = get(hFig,'Name'); end
2685+
defaultFname = regexprep(defaultFname,'[*?"<>|:/\\]','-'); %remove illegal filename chars
26482686
if isempty(defaultFname), defaultFname = 'figure'; end
2687+
defaultFname = fullfile(folder,defaultFname);
26492688
imFormats = {'pdf','eps','emf','svg','png','tif','jpg','bmp','gif'};
26502689
for idx = 1 : numel(imFormats)
26512690
thisFormat = imFormats{idx};
@@ -2655,6 +2694,12 @@ function addToolbarButton(hFig, options)
26552694
set(jMenuItem,'ActionPerformedCallback',@(h,e)export_fig(hFig,filename));
26562695
end
26572696
jButtonMenu.addSeparator();
2697+
if ispc % winopen only works on Windows
2698+
label = ['Open export folder: ' folder];
2699+
jMenuItem = handle(jButtonMenu.add(label),'CallbackProperties');
2700+
set(jMenuItem,'ActionPerformedCallback',@(h,e)winopen(folder));
2701+
jButtonMenu.addSeparator();
2702+
end
26582703
cbFormats = {'image','bitmap','meta','pdf'};
26592704
for idx = 1 : numel(cbFormats)
26602705
thisFormat = cbFormats{idx};
@@ -2664,7 +2709,7 @@ function addToolbarButton(hFig, options)
26642709
set(jMenuItem,'ActionPerformedCallback',@(h,e)export_fig(hFig,exFormat));
26652710
end
26662711
jButtonMenu.addSeparator();
2667-
jMenuItem = handle(jButtonMenu.add('Select filename and format'),'CallbackProperties');
2712+
jMenuItem = handle(jButtonMenu.add('Select file name, location and format'),'CallbackProperties');
26682713
set(jMenuItem,'ActionPerformedCallback',@(h,e)interactiveExport(hFig));
26692714
catch % revert to a simple documented toolbar pushbutton
26702715
warning(oldWarn);
@@ -2699,16 +2744,27 @@ function addMenubarMenu(hFig, options)
26992744

27002745
% Add export_fig menu item to a parent menu
27012746
function addMenuItems(hMainMenu, hFig)
2702-
defaultFname = get(hFig,'Name');
2703-
defaultFname = regexprep(defaultFname,{'[*?"<>|:/\\]'},'-');
2747+
[folder,defaultFname] = fileparts(get(hFig,'FileName'));
2748+
if ~isempty(folder) && exist(folder,'dir')
2749+
folder = regexprep(folder,'[/\]$','');
2750+
else
2751+
folder = pwd;
2752+
end
2753+
if isempty(defaultFname), defaultFname = get(hFig,'Name'); end
2754+
defaultFname = regexprep(defaultFname,'[*?"<>|:/\\]','-'); %remove illegal filename chars
27042755
if isempty(defaultFname), defaultFname = 'figure'; end
2756+
defaultFname = fullfile(folder,defaultFname);
27052757
imFormats = {'pdf','eps','emf','svg','png','tif','jpg','bmp','gif'};
27062758
for idx = 1 : numel(imFormats)
27072759
thisFormat = imFormats{idx};
27082760
filename = [defaultFname '.' thisFormat];
27092761
label = [upper(thisFormat) ' image file (' filename ')'];
27102762
uimenu(hMainMenu, 'Text',label, 'MenuSelectedFcn',@(h,e)export_fig(hFig,filename));
27112763
end
2764+
if ispc % winopen only works on Windows
2765+
uimenu(hMainMenu, 'Text',['Open export folder: ' folder], 'Separator','on', ...
2766+
'MenuSelectedFcn',@(h,e)winopen(folder));
2767+
end
27122768
cbFormats = {'image','bitmap','meta','pdf'};
27132769
for idx = 1 : numel(cbFormats)
27142770
thisFormat = cbFormats{idx};
@@ -2718,7 +2774,7 @@ function addMenuItems(hMainMenu, hFig)
27182774
uimenu(hMainMenu, 'Text',label, 'Separator',sep, ...
27192775
'MenuSelectedFcn',@(h,e)export_fig(hFig,exFormat));
27202776
end
2721-
uimenu(hMainMenu, 'Text','Select filename and format', 'Separator','on', ...
2777+
uimenu(hMainMenu, 'Text','Select file name, location and format', 'Separator','on', ...
27222778
'MenuSelectedFcn',@interactiveExport);
27232779
end
27242780

@@ -2778,9 +2834,16 @@ function interactiveExport(hObject, varargin)
27782834
end
27792835

27802836
% Display a Save-as dialog to let the user select the export name & type
2781-
defaultFname = get(hFig,'Name');
2782-
defaultFname = regexprep(defaultFname,{'[*?"<>|:/\\]'},'-');
2837+
[folder,defaultFname] = fileparts(get(hFig,'FileName'));
2838+
if ~isempty(folder) && exist(folder,'dir')
2839+
folder = regexprep(folder,'[/\]$','');
2840+
else
2841+
folder = pwd;
2842+
end
2843+
if isempty(defaultFname), defaultFname = get(hFig,'Name'); end
2844+
defaultFname = regexprep(defaultFname,'[*?"<>|:/\\]+','-'); %remove illegal filename chars
27832845
if isempty(defaultFname), defaultFname = 'figure'; end
2846+
defaultFname = fullfile(folder,defaultFname);
27842847
%formats = imformats;
27852848
formats = {'pdf','eps','emf','svg','png','tif','jpg','bmp','gif', ...
27862849
'clipboard:image','clipboard:bitmap','clipboard:meta','clipboard:pdf'};

0 commit comments

Comments
 (0)