Update to resolve conflicts

Author: markmikkelsen

GannetLoad.m

@@ -18,7 +18,7 @@
     error('MATLAB:minrhs', 'Not enough input arguments.');
 end
 
-MRS_struct.version.Gannet = '3.3.2';
+MRS_struct.version.Gannet = '3.3.1';
 MRS_struct.version.load   = '230728';
 VersionCheck(0, MRS_struct.version.Gannet);
 ToolboxCheck;

VersionCheck.m

@@ -15,7 +15,7 @@
 if nargin < 2
     loadFile = which('GannetLoad');
     if isempty(loadFile)
-        error('Cannot find GannetLoad.m; please ensure that your Gannet directory is included in your MATLAB search path.')
+        error('Cannot find GannetLoad; please ensure that your Gannet folder is included in the MATLAB search path.')
     end
     fileID = fopen(loadFile, 'rt');
     if fileID == -1
@@ -34,11 +34,12 @@
 
 newVersionAvailable = 0;
 if nargin < 2 || isempty(lastCheckTime) || (datetime('now') - lastCheckTime) > days(1)
+
     url = 'https://raw.githubusercontent.com/markmikkelsen/Gannet/main/GannetLoad.m';
     str = readURL(url);
     if isempty(str)
         if ~silent
-            warning('Unable to check for Gannet updates; this may happen if your system has limited internet access.');
+            warning('Unable to check for Gannet updates; this may happen if your system has limited internet access');
         end
         newVersionAvailable = 0;
     else
@@ -51,7 +52,7 @@
                    '***********************************************************************************************\n', ...
                    'A newer version of Gannet (%s) is available. You are currently using version %s.\n' ...
                    'You can download the newer version from GitHub or run UpdateGannet to install it directly.\n', ...
-                   '***********************************************************************************************\n'];
+                   '***********************************************************************************************\n\n'];
             msg = hyperlink('https://github.com/markmikkelsen/Gannet', 'GitHub', msg);
             msg = hyperlink('matlab:UpdateGannet', 'UpdateGannet', msg);
             if ~silent
@@ -87,8 +88,8 @@
             if ~isempty(strfind(err.message,'404'))
                 rethrow(err);
             else
-                warning(err.message);
-                str = '';
+              warning(err.message);
+              str = '';
             end
         end
     end

export_fig/append_pdfs.m

@@ -42,7 +42,6 @@ function append_pdfs(varargin)
 % 29/03/20: Accept a cell-array of input files (issue #299); accept both "strings", 'chars'
 % 25/01/22: Improved handling of missing input files & folder with non-ASCII chars (issue #349)
 % 07/06/23: Fixed (hopefully) unterminated quote run-time error (issues #367, #378); fixed handling of pathnames with non-ASCII chars (issue #349); display ghostscript command upon run-time invocation error
-% 06/07/23: Another attempt to fix issue #378 (remove unnecessary quotes from ghostscript cmdfile)
 %}
 
     if nargin < 2,  return;  end  % sanity check
@@ -155,7 +154,6 @@ function prepareCmdFile(cmdfile, output, varargin)
     str = ['-q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -dPDFSETTINGS=/prepress ' ...
            '-sOutputFile="' output '" -f ' sprintf('"%s" ',varargin{:})];
     str = regexprep(str, ' "?" ',' ');  % remove empty strings (issues #367,#378)
-    str = regexprep(str, '"([^ ]*)"', '$1');  % remove unnecessary quotes
     str = strtrim(str);  % trim extra spaces
 
     fh = fopen(cmdfile, 'w');

export_fig/export_fig.m

@@ -386,7 +386,6 @@
 % 23/04/23: (3.37) Fixed run-time error with old Matlab releases (issue #374); -notify console message about exported image now displays black (STDOUT) not red (STDERR)
 % 15/05/23: (3.38) Fixed endless recursion when using export_fig in Live Scripts (issue #375); don't warn about exportgraphics/copygraphics alternatives in deployed mode
 % 30/05/23: (3.39) Fixed exported bgcolor of uifigures or figures in Live Scripts (issue #377)
-% 06/07/23: (3.40) For Tiff compression, use AdobeDeflate codec (if available) instead of Deflate (issue #379)
 %}
 
     if nargout
@@ -424,7 +423,7 @@
     [fig, options] = parse_args(nargout, fig, argNames, varargin{:});
 
     % Check for newer version and exportgraphics/copygraphics compatibility
-    currentVersion = 3.40;
+    currentVersion = 3.39;
     if options.version  % export_fig's version requested - return it and bail out
         imageData = currentVersion;
         return
@@ -660,8 +659,6 @@
 
     % Main processing 
     try
-        oldWarn = warning;
-
         % Export bitmap formats first
         if isbitmap(options)
             if abs(options.bb_padding) > 1
@@ -921,13 +918,7 @@
                     t.setTag('ImageLength',    size(img,1));
                     t.setTag('ImageWidth',     size(img,2)); 
                     t.setTag('Photometric',         Tiff.Photometric.RGB);
-                    try %issue #379 use Tiff.Compression.AdobeDeflate by default
-                        compressionMode = Tiff.Compression.AdobeDeflate;
-                    catch
-                        warning off imageio:tiffmexutils:libtiffWarning  %issue #379
-                        compressionMode = Tiff.Compression.Deflate;
-                    end
-                    t.setTag('Compression',         compressionMode); 
+                    t.setTag('Compression',         Tiff.Compression.Deflate); 
                     t.setTag('PlanarConfiguration', Tiff.PlanarConfiguration.Chunky);
                     t.setTag('ExtraSamples',        Tiff.ExtraSamples.AssociatedAlpha);
                     t.setTag('ResolutionUnit',      Tiff.ResolutionUnit.Inch);
@@ -1537,12 +1528,7 @@
         if ~nargout
             clear imageData alpha
         end
-
-        % Revert warnings state
-        warning(oldWarn);
     catch err
-        % Revert warnings state
-        warning(oldWarn);
         % Revert figure properties in case they were changed
         try set(fig,'Units',oldFigUnits, 'Position',pos, 'Color',tcol_orig); catch, end
         % Display possible workarounds before the error message