Mercurial > octave-nkf
changeset 11589:b0084095098e
missing semicolons in script files
line wrap: on
line diff
--- a/scripts/@ftp/loadobj.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/@ftp/loadobj.m Thu Jan 20 18:26:09 2011 -0500 @@ -27,7 +27,7 @@ if (! isempty (b.dir)) __ftp_cwd__ (b.curlhandle, b.dir); endif - b = rmfield (b, "dir") + b = rmfield (b, "dir"); elseif (isfield (b, "remotePwd")) ## FIXME: Can we read matlab java stringBuffer objects? warning ("can not change remote directory in loqded FTP object");
--- a/scripts/@ftp/saveobj.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/@ftp/saveobj.m Thu Jan 20 18:26:09 2011 -0500 @@ -18,6 +18,6 @@ function b = saveobj (a) b = a; - b = rmfield (b, "curlhandle") + b = rmfield (b, "curlhandle"); b.dir = __ftp_pwd (a.curlhandle); endfunction
--- a/scripts/ChangeLog Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/ChangeLog Thu Jan 20 18:26:09 2011 -0500 @@ -1,3 +1,34 @@ +2011-01-20 John W. Eaton <jwe@octave.org> + + * @ftp/loadobj.m, @ftp/saveobj.m, audio/record.m, + general/accumarray.m, general/accumdim.m, general/arrayfun.m, + general/bicubic.m, general/curl.m, general/divergence.m, + general/gradient.m, general/interp2.m, general/rat.m, + image/imagesc.m, io/strread.m, io/textscan.m, + linear-algebra/krylov.m, miscellaneous/getappdata.m, + miscellaneous/isappdata.m, miscellaneous/rmappdata.m, + miscellaneous/setappdata.m, miscellaneous/what.m, + optimization/qp.m, path/savepath.m, pkg/pkg.m, + plot/__fltk_print__.m, plot/__gnuplot_print__.m, + plot/__go_draw_axes__.m, plot/__print_parse_opts__.m, + plot/axis.m, plot/caxis.m, plot/cla.m, plot/clabel.m, + plot/clf.m, plot/colorbar.m, plot/cylinder.m, plot/daspect.m, + plot/gnuplot_drawnow.m, plot/meshc.m, plot/newplot.m, + plot/orient.m, plot/pbaspect.m, plot/plotyy.m, plot/print.m, + plot/private/__actual_axis_position__.m, + plot/private/__axis_label__.m, plot/private/__bar__.m, + plot/private/__clabel__.m, plot/private/__errplot__.m, + plot/private/__ezplot__.m, plot/private/__ghostscript__.m, + plot/private/__patch__.m, plot/private/__pie__.m, + plot/private/__quiver__.m, plot/private/__scatter__.m, + plot/private/__stem__.m, plot/private/__tight_eps_bbox__.m, + plot/refresh.m, plot/spinmap.m, plot/subplot.m, plot/surfc.m, + plot/uigetfile.m, polynomial/polyout.m, sparse/spaugment.m, + sparse/svds.m, sparse/treeplot.m, statistics/base/histc.m, + statistics/distributions/hygecdf.m, + statistics/distributions/hygeinv.m, statistics/tests/manova.m, + strings/deblank.m, testfun/runtests.m: Add missing semicolons. + 2011-01-20 John W. Eaton <jwe@octave.org> * deprecated/cellidx.m, deprecated/dmult.m,
--- a/scripts/audio/record.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/audio/record.m Thu Jan 20 18:26:09 2011 -0500 @@ -44,7 +44,7 @@ input ("Please hit ENTER and speak afterwards!\n", 1); cmd = sprintf ("dd if=/dev/dsp of=\"%s\" bs=%d count=%d", - file, sampling_rate, sec) + file, sampling_rate, sec); system (cmd);
--- a/scripts/general/accumarray.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/general/accumarray.m Thu Jan 20 18:26:09 2011 -0500 @@ -139,7 +139,7 @@ elseif (length (sz) == 2) A = sparse (subs(:,1), subs(:,2), vals, sz(1), sz(2), mode); else - error ("accumarray: dimensions mismatch") + error ("accumarray: dimensions mismatch"); endif else @@ -153,7 +153,7 @@ sz = max (subs, [], 1); endif elseif (ndims != length (sz)) - error ("accumarray: dimensions mismatch") + error ("accumarray: dimensions mismatch"); endif ## Convert multidimensional subscripts.
--- a/scripts/general/accumdim.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/general/accumdim.m Thu Jan 20 18:26:09 2011 -0500 @@ -71,7 +71,7 @@ if (n == 0) n = m; elseif (n < m) - error ("accumdim: N index out of range") + error ("accumdim: N index out of range"); endif endif
--- a/scripts/general/arrayfun.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/general/arrayfun.m Thu Jan 20 18:26:09 2011 -0500 @@ -162,7 +162,7 @@ endfunction function arg_class_error (S, X) - error ("arrayfun: invalid argument of class %s", class (X)) + error ("arrayfun: invalid argument of class %s", class (X)); endfunction %% Test function to check the "Errorhandler" option
--- a/scripts/general/bicubic.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/general/bicubic.m Thu Jan 20 18:26:09 2011 -0500 @@ -39,7 +39,7 @@ endif if (nargin == 7 && isscalar(spline_alpha)) - a = spline_alpha + a = spline_alpha; else a = 0.5; endif
--- a/scripts/general/curl.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/general/curl.m Thu Jan 20 18:26:09 2011 -0500 @@ -96,12 +96,12 @@ varargout{1} = rot_z; varargout{2} = av; else - error ("curl: number of output arguments must be 1 or 2") + error ("curl: number of output arguments must be 1 or 2"); endif elseif ((nargin == 6) || (nargin == 3)) if (!size_equal (varargin{fidx}, varargin{fidx + 1}, varargin{fidx + 2})) - error ("curl: size of X, Y, and Z must match") + error ("curl: size of X, Y, and Z must match"); elseif (ndims (varargin{fidx}) != 3) error ("curl: expected two-dimensional matrices X, Y, and Z"); elseif ((length (dx) != size (varargin{fidx}, 2))
--- a/scripts/general/divergence.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/general/divergence.m Thu Jan 20 18:26:09 2011 -0500 @@ -86,7 +86,7 @@ elseif ((nargin == 6) || (nargin == 3)) if (!size_equal (varargin{fidx},varargin{fidx + 1},varargin{fidx + 2})) - error ("divergence: size of X, Y, and Z must match") + error ("divergence: size of X, Y, and Z must match"); elseif (ndims (varargin{fidx}) != 3) error ("divergence: expected two-dimensional matrices X, Y, and Z"); elseif ((length (dx) != size (varargin{fidx}, 2))
--- a/scripts/general/gradient.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/general/gradient.m Thu Jan 20 18:26:09 2011 -0500 @@ -67,7 +67,7 @@ function varargout = gradient (m, varargin) if (nargin < 1) - print_usage () + print_usage (); endif nargout_with_ans = max(1,nargout); @@ -98,7 +98,7 @@ endif if (nargin > 2 && nargin != nd + 1) - print_usage () + print_usage (); endif ## cell d stores a spacing vector for each dimension
--- a/scripts/general/interp2.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/general/interp2.m Thu Jan 20 18:26:09 2011 -0500 @@ -229,7 +229,7 @@ ## Get 2D index. idx = sub2ind (size (a), yidx, xidx); ## We can dispose of the 1D indices at this point to save memory. - clear xidx yidx + clear xidx yidx; ## apply plane equation ZI = a(idx) + b(idx).*Xsc + c(idx).*Ysc + d(idx).*Xsc.*Ysc; @@ -243,7 +243,7 @@ elseif (strcmp (method, "pchip")) if (length (X) < 2 || length (Y) < 2) - error ("interp2: pchip2 requires at least 2 points in each dimension") + error ("interp2: pchip2 requires at least 2 points in each dimension"); endif ## first order derivatives
--- a/scripts/general/rat.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/general/rat.m Thu Jan 20 18:26:09 2011 -0500 @@ -141,7 +141,7 @@ n_nc = columns (n); s_nc = columns (s); if (n_nc > s_nc) - s(:,s_nc+1:n_nc) = " " + s(:,s_nc+1:n_nc) = " "; elseif (s_nc > n_nc) n(:,n_nc+1:s_nc) = " "; endif
--- a/scripts/image/imagesc.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/image/imagesc.m Thu Jan 20 18:26:09 2011 -0500 @@ -108,7 +108,7 @@ endif ret = image (ax, x, y, A); - set (ret, "cdatamapping", "scaled") + set (ret, "cdatamapping", "scaled"); ## use given limits or guess them from the matrix if (length (limits) == 2 && limits(2) >= limits(1))
--- a/scripts/io/strread.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/io/strread.m Thu Jan 20 18:26:09 2011 -0500 @@ -232,7 +232,7 @@ ## Ensure descriptive content is consistent if (numel (unique (data)) > 1 || ! strcmpi (unique (data), fmt_words{m})) - error ("strread: FORMAT does not match data") + error ("strread: FORMAT does not match data"); endif endswitch endfor
--- a/scripts/io/textscan.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/io/textscan.m Thu Jan 20 18:26:09 2011 -0500 @@ -77,7 +77,7 @@ if (ischar (format)) if (ischar (fid)) if (nargout == 2) - error ("textscan: cannot provide position information for character input") + error ("textscan: cannot provide position information for character input"); endif str = fid; else
--- a/scripts/linear-algebra/krylov.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/linear-algebra/krylov.m Thu Jan 20 18:26:09 2011 -0500 @@ -59,7 +59,7 @@ function [Uret, H, nu] = krylov (A, V, k, eps1, pflg); if (isa (A, "single") || isa (V, "single")) - defeps = 1e-6 + defeps = 1e-6; else defeps = 1e-12; endif @@ -88,7 +88,7 @@ [m, kb] = size (V); if (m != na) error ("krylov: A(%d x %d), V(%d x %d): argument dimensions do not match", - na, na, m, kb) + na, na, m, kb); endif if (! isscalar (k)) @@ -181,9 +181,9 @@ ## Trim to size. V = V(:,1:na); elseif (columns(V) > na) - krylov_V = V - krylov_na = na - krylov_length_alpha = length (alpha) + krylov_V = V; + krylov_na = na; + krylov_length_alpha = length (alpha); error ("krylov: this case should never happen; submit a bug report"); endif
--- a/scripts/miscellaneous/getappdata.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/miscellaneous/getappdata.m Thu Jan 20 18:26:09 2011 -0500 @@ -26,7 +26,7 @@ function val = getappdata (h, name) if (! (all (ishandle (h)) && ischar (name))) - error ("getappdata: invalid input") + error ("getappdata: invalid input"); endif appdata(numel(h)) = struct();
--- a/scripts/miscellaneous/isappdata.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/miscellaneous/isappdata.m Thu Jan 20 18:26:09 2011 -0500 @@ -27,7 +27,7 @@ function res = isappdata (h, name) if (! (all (ishandle (h)) && ischar (name))) - error ("isappdata: invalid input") + error ("isappdata: invalid input"); endif for nh = 1:numel(h)
--- a/scripts/miscellaneous/rmappdata.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/miscellaneous/rmappdata.m Thu Jan 20 18:26:09 2011 -0500 @@ -26,7 +26,7 @@ function rmappdata (h, varargin) if (! (all (ishandle (h)) && iscellstr (varargin))) - error ("rmappdata: invalid input") + error ("rmappdata: invalid input"); endif for nh = 1:numel(h)
--- a/scripts/miscellaneous/setappdata.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/miscellaneous/setappdata.m Thu Jan 20 18:26:09 2011 -0500 @@ -27,7 +27,7 @@ function setappdata (h, varargin) if (! (all (ishandle (h)) && mod (numel (varargin), 2) == 0)) - error ("setappdata: invalid input") + error ("setappdata: invalid input"); endif for nh = 1:numel(h) @@ -44,7 +44,7 @@ elseif (ischar (varargin{narg})) appdata.(varargin{narg}) = varargin{narg+1}; else - error ("setappdata: invalid input") + error ("setappdata: invalid input"); endif endfor set (h(nh), "__appdata__", appdata);
--- a/scripts/miscellaneous/what.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/miscellaneous/what.m Thu Jan 20 18:26:09 2011 -0500 @@ -89,7 +89,7 @@ function __display_filenames__ (msg, p, f) if (length (f) > 0) - printf ("%s %s:\n\n", msg, p) + printf ("%s %s:\n\n", msg, p); maxlen = max (cellfun (@length, f)); ncols = max (1, floor (terminal_size()(2) / (maxlen + 3)));
--- a/scripts/optimization/qp.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/optimization/qp.m Thu Jan 20 18:26:09 2011 -0500 @@ -321,7 +321,7 @@ ## constraints. if (eq_infeasible) if (rank (A) < n_eq) - error ("qp: equality constraint matrix must be full row rank") + error ("qp: equality constraint matrix must be full row rank"); endif xbar = pinv (A) * b; else
--- a/scripts/path/savepath.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/path/savepath.m Thu Jan 20 18:26:09 2011 -0500 @@ -108,7 +108,7 @@ endif unwind_protect for i = 1:length (pre) - fprintf (fid, "%s\n", pre{i}) + fprintf (fid, "%s\n", pre{i}); endfor ## Remove the portion of the path defined via the command line @@ -174,18 +174,18 @@ ## Use single quotes for PATH argument to avoid string escape ## processing. Since we are using single quotes around the arg, ## double any single quote characters found in the string. - fprintf (fid, "%s\n", beginstring) + fprintf (fid, "%s\n", beginstring); if (! isempty (path_to_save_begin)) n = find (path_to_save_begin != pathsep, 1, "last"); fprintf (fid, " addpath ('%s', '-begin');\n", - strrep (path_to_save_begin(1:n), "'", "''")) + strrep (path_to_save_begin(1:n), "'", "''")); endif if (! isempty (path_to_save_end)) n = find (path_to_save_end != pathsep, 1, "last"); fprintf (fid, " addpath ('%s', '-end');\n", - strrep (path_to_save_end(1:n), "'", "''")) + strrep (path_to_save_end(1:n), "'", "''")); endif - fprintf (fid, "%s\n", endstring) + fprintf (fid, "%s\n", endstring); for i = 1:length (post) fprintf (fid, "%s\n", post{i});
--- a/scripts/pkg/pkg.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/pkg/pkg.m Thu Jan 20 18:26:09 2011 -0500 @@ -669,7 +669,7 @@ endif if (length (dirlist) > 3) - error ("bundles of packages are not allowed") + error ("bundles of packages are not allowed"); endif endif @@ -2243,7 +2243,7 @@ if (have_sh) [status, output] = system (cstrcat ("sh.exe -c \"", cmd, "\"")); else - error ("Can not find the command shell") + error ("Can not find the command shell"); endif else [status, output] = system (cmd);
--- a/scripts/plot/__fltk_print__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/__fltk_print__.m Thu Jan 20 18:26:09 2011 -0500 @@ -25,8 +25,8 @@ dos_shell = (ispc () && ! isunix ()); - figure (opts.figure) - drawnow ("expose") + figure (opts.figure); + drawnow ("expose"); __fltk_redraw__ (); if (! isempty (opts.fig2dev_binary)) @@ -111,7 +111,7 @@ case {"corel", "gif"} error ("print:unsupporteddevice", "print.m: %s output is not available for the FLTK graphics toolkit", - upper (opts.devopt)) + upper (opts.devopt)); case opts.ghostscript.device opts.ghostscript.source = "-"; opts.ghostscript.output = opts.name; @@ -140,14 +140,14 @@ otherwise error (sprintf ("print:no%soutput", opts.devopt), "print.m: %s output is not available for GL2PS output", - upper (opts.devopt)) + upper (opts.devopt)); endswitch opts.pipeline = pipeline; for n = 1:numel(pipeline) if (opts.debug) - fprintf ("fltk-pipeline: '%s'\n", pipeline{n}) + fprintf ("fltk-pipeline: '%s'\n", pipeline{n}); endif pid = popen (pipeline{n}, "w"); if (pid < 0)
--- a/scripts/plot/__gnuplot_print__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/__gnuplot_print__.m Thu Jan 20 18:26:09 2011 -0500 @@ -87,14 +87,14 @@ suffix = "eps"; endif local_drawnow (sprintf ("%s %s", term, gp_opts), - strcat (name, ".", suffix), opts) + strcat (name, ".", suffix), opts); case "tikz" if (__gnuplot_has_terminal__ ("tikz")) local_drawnow (sprintf ("lua tikz %s", gp_opts), opts.name, opts); else error (sprintf ("print:no%soutput", opts.devopt), "print.m: '%s' output is not available for gnuplot-%s", - upper (opts.devopt), __gnuplot_version__ ()) + upper (opts.devopt), __gnuplot_version__ ()); endif case "svg" local_drawnow (sprintf ("svg dynamic %s", gp_opts), opts.name, opts); @@ -106,10 +106,10 @@ else error (sprintf ("print:no%soutput", opts.devopt), "print.m: '%s' output is not available for gnuplot-%s", - upper (opts.devopt), __gnuplot_version__ ()) + upper (opts.devopt), __gnuplot_version__ ()); endif case {"canvas", "dxf", "hpgl", "mf", "gif", "pstricks", "texdraw"} - local_drawnow (sprintf ("%s %s", opts.devopt, gp_opts), opts.name, opts) + local_drawnow (sprintf ("%s %s", opts.devopt, gp_opts), opts.name, opts); case opts.ghostscript.device gp_opts = font_spec (opts, "devopt", "eps"); opts.ghostscript.output = opts.name; @@ -139,7 +139,7 @@ otherwise error (sprintf ("print:no%soutput", opts.devopt), "print.m: %s output is not available for the Gnuplot graphics toolkit", - upper (opts.devopt)) + upper (opts.devopt)); endswitch @@ -147,7 +147,7 @@ for n = 1:numel(pipeline) if (opts.debug) - fprintf ("gnuplot-pipeline: '%s'\n", pipeline{n}) + fprintf ("gnuplot-pipeline: '%s'\n", pipeline{n}); endif [status, output] = system (pipeline{n}); if (status) @@ -155,7 +155,7 @@ "---------- output begin ----------", output, "----------- output end -----------"); - error ("gnuplot:failedpipe", "print: failed to print") + error ("gnuplot:failedpipe", "print: failed to print"); endif endfor @@ -181,7 +181,7 @@ else mono = false; endif - figure (opts.figure) + figure (opts.figure); if (isempty (opts.debug_file) || ! opts.debug) drawnow (term, file, mono); else
--- a/scripts/plot/__go_draw_axes__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/__go_draw_axes__.m Thu Jan 20 18:26:09 2011 -0500 @@ -117,11 +117,11 @@ sz_str = sprintf ("%s %.15g, %.15g;\n", sz_str, pos(3), pos(4)); endif else ## activepositionproperty == outerposition - fprintf (plot_stream, "unset tmargin;\n") - fprintf (plot_stream, "unset bmargin;\n") - fprintf (plot_stream, "unset lmargin;\n") - fprintf (plot_stream, "unset rmargin;\n") - fprintf (plot_stream, "set origin %g, %g;\n", pos(1:2)) + fprintf (plot_stream, "unset tmargin;\n"); + fprintf (plot_stream, "unset bmargin;\n"); + fprintf (plot_stream, "unset lmargin;\n"); + fprintf (plot_stream, "unset rmargin;\n"); + fprintf (plot_stream, "set origin %g, %g;\n", pos(1:2)); sz_str = ""; if (strcmpi (axis_obj.dataaspectratiomode, "manual")) sz_str = sprintf ("ratio %g", -dr); @@ -396,10 +396,10 @@ if (isfield (obj, "units")) units = obj.units; unwind_protect - set (kids(end), "units", "data") + set (kids(end), "units", "data"); obj = get (kids(end)); unwind_protect_cleanup - set (kids(end), "units", units) + set (kids(end), "units", units); end_unwind_protect endif kids = kids(1:(end-1));
--- a/scripts/plot/__print_parse_opts__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/__print_parse_opts__.m Thu Jan 20 18:26:09 2011 -0500 @@ -123,7 +123,7 @@ arg_st.ghostscript.binary = file_in_path (getenv ("PATH"), arg(3:end)); if (isempty (arg_st.ghostscript.binary)) error ("print: Ghostscript binary ""%s"" could not be located", - arg(3:end)) + arg(3:end)); else arg_st.ghostscript_binary = __quote_path__ (arg_st.ghostscript_binary); endif @@ -261,11 +261,11 @@ endif else arg_st.append_to_file = false; - warning ("print.m: appended output requires ghostscript to be installed") + warning ("print.m: appended output requires ghostscript to be installed"); endif else warning ("print.m: appended output is not supported for device '%s'", - arg_st.devopt) + arg_st.devopt); arg_st.append_to_file = false; endif endif @@ -344,16 +344,16 @@ if (warn_on_missing_binary) if (isempty (arg_st.ghostscript.binary)) - warning ("print:missinggs", "print.m: Ghostscript binary is not available") + warning ("print:missinggs", "print.m: Ghostscript binary is not available"); endif if (isempty (arg_st.epstool_binary)) - warning ("print:missinggs", "print.m: epstool binary is not available") + warning ("print:missinggs", "print.m: epstool binary is not available"); endif if (isempty (arg_st.fig2dev_binary)) - warning ("print:missinggs", "print.m: fig2dev binary is not available") + warning ("print:missinggs", "print.m: fig2dev binary is not available"); endif if (isempty (arg_st.pstoedit_binary)) - warning ("print:missinggs", "print.m: pstoedit binary is not available") + warning ("print:missinggs", "print.m: pstoedit binary is not available"); endif warn_on_missing_binary = false; endif @@ -436,7 +436,7 @@ gs_binaries = {GSC}; elseif (! isempty (GSC) && warn_on_bad_gsc) warning ("print:badgscenv", - "print.m: GSC environment variable not set properly") + "print.m: GSC environment variable not set properly"); warn_on_bad_gsc = false; gs_binaries = {}; else @@ -456,7 +456,7 @@ endwhile if (warn_on_no_ghostscript && isempty (ghostscript_binary)) warning ("print:noghostscript", - "print.m: ghostscript not found in PATH") + "print.m: ghostscript not found in PATH"); warn_on_no_ghostscript = false; endif endif @@ -490,7 +490,7 @@ endwhile if (isempty (data.(binary).bin) && data.(binary).warn_on_absence) warning (sprintf ("print:no%s", binary), - "print.m: '%s' not found in PATH", binary) + "print.m: '%s' not found in PATH", binary); data.(binary).warn_on_absence = false; endif endif @@ -571,7 +571,7 @@ value = value * 72 / 25.4; case "normalized" error ("print:customnormalized", - "print.m: papersize=='<custom>' and paperunits='normalized' may not be combined") + "print.m: papersize=='<custom>' and paperunits='normalized' may not be combined"); endswitch endfunction
--- a/scripts/plot/axis.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/axis.m Thu Jan 20 18:26:09 2011 -0500 @@ -176,7 +176,7 @@ ## aspect ratio elseif (strcmpi (ax, "image")) - __axis__ (ca, "equal") + __axis__ (ca, "equal"); __do_tight_option__ (ca); elseif (strcmpi (ax, "square")) set (ca, "plotboxaspectratio", [1, 1, 1]); @@ -189,9 +189,9 @@ ## (useful with the x11 gnuplot terminal after a window resize) set (ca, "dataaspectratiomode", "auto"); endif - set (ca, "dataaspectratio", [1, 1, 1]) + set (ca, "dataaspectratio", [1, 1, 1]); elseif (strcmpi (ax, "normal")) - set (ca, "plotboxaspectratio", [1, 1, 1]) + set (ca, "plotboxaspectratio", [1, 1, 1]); set (ca, "plotboxaspectratiomode", "auto"); ## axis limits
--- a/scripts/plot/caxis.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/caxis.m Thu Jan 20 18:26:09 2011 -0500 @@ -81,7 +81,7 @@ endif if (nargin > 2) - __caxis__ (ca, varargin{:})' + __caxis__ (ca, varargin{:})'; endif endfunction
--- a/scripts/plot/cla.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/cla.m Thu Jan 20 18:26:09 2011 -0500 @@ -82,7 +82,7 @@ ## approximation. axes (hax); - axis auto + axis ("auto"); ## Set the current axis back to where it was upon entry. axes (oldhax);
--- a/scripts/plot/clabel.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/clabel.m Thu Jan 20 18:26:09 2011 -0500 @@ -61,7 +61,7 @@ have_labelspacing = false; if (nargin < 1) - print_usage() + print_usage (); elseif (nargin == 1) hparent = gca (); else
--- a/scripts/plot/clf.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/clf.m Thu Jan 20 18:26:09 2011 -0500 @@ -65,7 +65,7 @@ if (do_reset) ## Select all the children, including the one with hidden handles. hc = allchild (hfig); - reset (hfig) + reset (hfig); else ## Select only the chilren with visible handles. hc = get (hfig, "children");
--- a/scripts/plot/colorbar.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/colorbar.m Thu Jan 20 18:26:09 2011 -0500 @@ -96,13 +96,13 @@ showhiddenhandles = get (0, "showhiddenhandles"); unwind_protect - set (0, "showhiddenhandles", "on") + set (0, "showhiddenhandles", "on"); cax = findobj (get (ax, "parent"), "tag", "colorbar", "type", "axes", "axes", ax); if (! isempty (cax)) delete (cax); endif unwind_protect_cleanup - set (0, "showhiddenhandles", showhiddenhandles) + set (0, "showhiddenhandles", showhiddenhandles); end_unwind_protect if (! deleting) @@ -163,12 +163,12 @@ set (cax, "deletefcn", {@resetaxis, obj}); - addlistener (ax, "clim", {@update_colorbar_clim, hi, vertical}) - addlistener (ax, "plotboxaspectratio", {@update_colorbar_axis, cax, obj}) - addlistener (ax, "plotboxaspectratiomode", {@update_colorbar_axis, cax, obj}) - addlistener (ax, "dataaspectratio", {@update_colorbar_axis, cax, obj}) - addlistener (ax, "dataaspectratiomode", {@update_colorbar_axis, cax, obj}) - addlistener (ax, "position", {@update_colorbar_axis, cax, obj}) + addlistener (ax, "clim", {@update_colorbar_clim, hi, vertical}); + addlistener (ax, "plotboxaspectratio", {@update_colorbar_axis, cax, obj}); + addlistener (ax, "plotboxaspectratiomode", {@update_colorbar_axis, cax, obj}); + addlistener (ax, "dataaspectratio", {@update_colorbar_axis, cax, obj}); + addlistener (ax, "dataaspectratiomode", {@update_colorbar_axis, cax, obj}); + addlistener (ax, "position", {@update_colorbar_axis, cax, obj}); endif
--- a/scripts/plot/cylinder.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/cylinder.m Thu Jan 20 18:26:09 2011 -0500 @@ -65,7 +65,7 @@ endif if (length (r) < 2) - error ("cylinder: length(R) must be larger than 2") + error ("cylinder: length(R) must be larger than 2"); endif phi = linspace (0, 2*pi, n+1);
--- a/scripts/plot/daspect.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/daspect.m Thu Jan 20 18:26:09 2011 -0500 @@ -56,7 +56,7 @@ varargout{1} = get (hax, "dataaspectratiomode"); return else - error ("daspect: only one output is allowed") + error ("daspect: only one output is allowed"); endif case "manual" set (hax, "dataaspectratiomode", "manual"); @@ -64,14 +64,14 @@ set (hax, "dataaspectratiomode", "auto"); endswitch elseif (isreal (varargin{1}) && numel (varargin{1}) == 2) - set (hax, "dataaspectratio", [varargin{1}, 1]) + set (hax, "dataaspectratio", [varargin{1}, 1]); elseif (isreal (varargin{1}) && numel (varargin{1}) == 3) - set (hax, "dataaspectratio", varargin{1}) + set (hax, "dataaspectratio", varargin{1}); else - error ("daspect: invalid input") + error ("daspect: invalid input"); endif elseif (numel (varargin) > 1) - error ("daspect: too many inputs") + error ("daspect: too many inputs"); endif elseif (nargout == 0) print_usage (); @@ -80,7 +80,7 @@ if (nargout == 1) varargout{1} = get (hax, "dataaspectratio"); elseif (nargout > 1) - error ("daspect: only one output is allowed") + error ("daspect: only one output is allowed"); endif endfunction
--- a/scripts/plot/gnuplot_drawnow.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/gnuplot_drawnow.m Thu Jan 20 18:26:09 2011 -0500 @@ -52,7 +52,7 @@ endif else error ("gnuplot_drawnow: the gnuplot terminal, \"%s\", is not available", - gnuplot_trim_term (term)) + gnuplot_trim_term (term)); endif unwind_protect_cleanup set (h, "__plot_stream__", default_plot_stream); @@ -251,7 +251,7 @@ endif else size_str = ""; - warning ("gnuplot_set_term: size is zero") + warning ("gnuplot_set_term: size is zero"); endif else ## A specified size take priority over the figure properies. @@ -259,9 +259,9 @@ endif else if isempty (h) - disp ("gnuplot_set_term: figure handle is empty") + disp ("gnuplot_set_term: figure handle is empty"); elseif !isfigure(h) - disp ("gnuplot_set_term: not a figure handle") + disp ("gnuplot_set_term: not a figure handle"); endif title_str = ""; size_str = "";
--- a/scripts/plot/meshc.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/meshc.m Thu Jan 20 18:26:09 2011 -0500 @@ -43,7 +43,7 @@ "xgrid", "on", "ygrid", "on", "zgrid", "on"); endif - drawnow + drawnow (); zmin = get (ax, "zlim")(1); [c, tmp2] = __contour__ (ax, zmin, varargin{:});
--- a/scripts/plot/newplot.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/newplot.m Thu Jan 20 18:26:09 2011 -0500 @@ -34,7 +34,7 @@ case "new" case "add" case "replacechildren" - delete (get (cf, "children")) + delete (get (cf, "children")); case "replace" otherwise error ("newplot: unrecognized nextplot property for current figure"); @@ -52,7 +52,7 @@ case "new" case "add" case "replacechildren" - delete (get (ca, "children")) + delete (get (ca, "children")); case "replace" __go_axes_init__ (ca, "replace"); __request_drawnow__ ();
--- a/scripts/plot/orient.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/orient.m Thu Jan 20 18:26:09 2011 -0500 @@ -53,12 +53,12 @@ ## the papersize and paperpostion here. papersize = get (cf, "papersize"); paperposition = get (cf, "paperposition"); - set (cf, "paperorientation", orientation) + set (cf, "paperorientation", orientation); set (cf, "papersize", papersize([2, 1])); set (cf, "paperposition", paperposition([2, 1, 4, 3])); endif elseif (strcmpi (varargin{1}, 'tall')) - orient ("portrait") + orient ("portrait"); papersize = get (cf, "papersize"); set (cf, "paperposition", [0.25, 0.25, (papersize - 0.5)]); else
--- a/scripts/plot/pbaspect.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/pbaspect.m Thu Jan 20 18:26:09 2011 -0500 @@ -56,7 +56,7 @@ varargout{1} = get (hax, "plotboxaspectratiomode"); return else - error ("pbaspect: only one output is allowed") + error ("pbaspect: only one output is allowed"); endif case "manual" set (hax, "plotboxaspectratiomode", "manual"); @@ -64,14 +64,14 @@ set (hax, "plotboxaspectratiomode", "auto"); endswitch elseif (isreal (varargin{1}) && numel (varargin{1}) == 2) - set (hax, "plotboxaspectratio", [varargin{1}, 1]) + set (hax, "plotboxaspectratio", [varargin{1}, 1]); elseif (isreal (varargin{1}) && numel (varargin{1}) == 3) - set (hax, "plotboxaspectratio", varargin{1}) + set (hax, "plotboxaspectratio", varargin{1}); else - error ("pbaspect: invalid input") + error ("pbaspect: invalid input"); endif elseif (numel (varargin) > 1) - error ("pbaspect: too many inputs") + error ("pbaspect: too many inputs"); endif elseif (nargout == 0) print_usage (); @@ -80,7 +80,7 @@ if (nargout == 1) varargout{1} = get (hax, "plotboxaspectratio"); elseif (nargout > 1) - error ("pbaspect: only one output is allowed") + error ("pbaspect: only one output is allowed"); endif endfunction
--- a/scripts/plot/plotyy.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/plotyy.m Thu Jan 20 18:26:09 2011 -0500 @@ -113,7 +113,7 @@ endif end_unwind_protect - set (ax, "activepositionproperty", "position") + set (ax, "activepositionproperty", "position"); if (nargout > 0) Ax = ax; @@ -192,7 +192,7 @@ ## Tag the plotyy axes, so we can use that information ## not to mirror the y axis tick marks - set (ax, "tag", "plotyy") + set (ax, "tag", "plotyy"); ## Cross-reference one axis to the other in the userdata set (ax(1), "userdata", ax(2)); @@ -265,7 +265,7 @@ oldplotboxaspectratio = get (ax2, "plotboxaspectratio"); oldplotboxaspectratiomode = get (ax2, "plotboxaspectratiomode"); if (! (isequal (position, oldposition) && isequal (view, oldview))) - set (ax2, "position", position, "view", view) + set (ax2, "position", position, "view", view); endif if (! (isequal (plotboxaspectratio, oldplotboxaspectratio) && isequal (plotboxaspectratiomode, oldplotboxaspectratiomode)))
--- a/scripts/plot/print.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/print.m Thu Jan 20 18:26:09 2011 -0500 @@ -266,11 +266,11 @@ opts.epstool_cmd = @epstool; if (! isfigure (opts.figure)) - error ("print: no figure to print") + error ("print: no figure to print"); endif orig_figure = get (0, "currentfigure"); - figure (opts.figure) + figure (opts.figure); if (opts.append_to_file) [~, ~, ext] = fileparts (opts.ghostscript.output); @@ -289,7 +289,7 @@ props(1).name = "position"; props(1).value = {fpos}; fpos(3:4) = opts.canvas_size; - set (opts.figure, "position", fpos) + set (opts.figure, "position", fpos); ## Set figure background to none. This is done both for ## consistency with Matlab and to elliminate the visible @@ -312,7 +312,7 @@ else linestyle = "--"; endif - set (h, "linestyle", linestyle) + set (h, "linestyle", linestyle); endif if (opts.use_color < 0 @@ -335,7 +335,7 @@ ## convert RGB color to RGB gray scale xfer = repmat ([0.30, 0.59, 0.11], size (rgb, 1), 1); ggg = repmat (sum (xfer .* rgb, 2), 1, 3); - set (h(n), color_props{c}, ggg) + set (h(n), color_props{c}, ggg); endif endif endfor @@ -362,7 +362,7 @@ endif endfor if (! isempty (opts.font)) - set (h(ishandle(h)), "fontname", opts.font) + set (h(ishandle(h)), "fontname", opts.font); endif if (! isempty (opts.fontsize)) if (ischar (opts.fontsize)) @@ -370,7 +370,7 @@ else fontsize = opts.fontsize; endif - set (h(ishandle(h)), "fontsize", fontsize) + set (h(ishandle(h)), "fontsize", fontsize); endif endif @@ -387,7 +387,7 @@ if (isstruct (props)) for n = 1:numel(props) if (ishandle (props(n).h)) - set (props(n).h, props(n).name, props(n).value{1}) + set (props(n).h, props(n).name, props(n).value{1}); endif endfor endif @@ -396,7 +396,7 @@ for n = 1:numel(opts.unlink) [status, output] = unlink (opts.unlink{n}); if (status != 0) - warning ("print.m: %s, '%s'", output, opts.unlink{n}) + warning ("print.m: %s, '%s'", output, opts.unlink{n}); endif endfor end_unwind_protect @@ -454,7 +454,7 @@ if (! isempty (opts.preview) && opts.tight_flag) warning ("print:previewandtight", - "print.m: eps preview may not be combined with -tight") + "print.m: eps preview may not be combined with -tight"); endif if (! isempty (opts.preview) || opts.tight_flag) if (! isempty (opts.epstool_binary)) @@ -491,7 +491,7 @@ gs_cmd = __ghostscript__ ("binary", opts.ghostscript.binary, "device", "epswrite", "source", "-", - "output", filein) + "output", filein); cmd = sprintf ("%s %s & %s", gs_cmd, filein, cmd); else cmd = sprintf ("cat > %s ; %s", filein, cmd); @@ -507,7 +507,7 @@ if (! isempty (cleanup)) if (pipeout && dos_shell) error ("print:epstoolpipe", - "print.m: cannot pipe output of 'epstool' for DOS shell") + "print.m: cannot pipe output of 'epstool' for DOS shell"); elseif (pipeout) cmd = sprintf ("( %s %s )", cmd, cleanup); else @@ -515,7 +515,7 @@ endif endif elseif (isempty (opts.epstool_binary)) - error ("print:noepstool", "print.m: 'epstool' not found in PATH") + error ("print:noepstool", "print.m: 'epstool' not found in PATH"); endif else if (pipein && pipeout) @@ -553,7 +553,7 @@ endif endif if (opts.debug) - fprintf ("epstool command: '%s'\n", cmd) + fprintf ("epstool command: '%s'\n", cmd); endif endfunction @@ -570,10 +570,10 @@ cmd = sprintf ("%s -L %s 2> /dev/null", opts.fig2dev_binary, devopt); endif elseif (isempty (opts.fig2dev_binary)) - error ("print:nofig2dev", "print.m: 'fig2dev' not found in PATH") + error ("print:nofig2dev", "print.m: 'fig2dev' not found in PATH"); endif if (opts.debug) - fprintf ("fig2dev command: '%s'\n", cmd) + fprintf ("fig2dev command: '%s'\n", cmd); endif endfunction @@ -589,11 +589,11 @@ status = fclose (fid); if (status != 0) error ("print:errorclosingfile", - "print.m: error closing file '%s'", latexfile) + "print.m: error closing file '%s'", latexfile); endif else error ("print:erroropeningfile", - "print.m: error opening file '%s'", latexfile) + "print.m: error opening file '%s'", latexfile); endif fid = fopen (latexfile, "w"); if (fid >= 0) @@ -603,11 +603,11 @@ status = fclose (fid); if (status != 0) error ("print:errorclosingfile", - "print.m: error closing file '%s'", latexfile) + "print.m: error closing file '%s'", latexfile); endif else error ("print:erroropeningfile", - "print.m: error opening file '%s'", latexfile) + "print.m: error opening file '%s'", latexfile); endif endfunction @@ -624,10 +624,10 @@ cmd = sprintf ("%s -P %s", cmd, opts.printer); endif elseif (isempty (opts.lpr_binary)) - error ("print:nolpr", "print.m: 'lpr' not found in PATH") + error ("print:nolpr", "print.m: 'lpr' not found in PATH"); endif if (opts.debug) - fprintf ("lpr command: '%s'\n", cmd) + fprintf ("lpr command: '%s'\n", cmd); endif endfunction @@ -644,10 +644,10 @@ cmd = sprintf ("%s -f %s 2> /dev/null", opts.pstoedit_binary, devopt); endif elseif (isempty (opts.pstoedit_binary)) - error ("print:nopstoedit", "print.m: 'pstoedit' not found in PATH") + error ("print:nopstoedit", "print.m: 'pstoedit' not found in PATH"); endif if (opts.debug) - fprintf ("pstoedit command: '%s'\n", cmd) + fprintf ("pstoedit command: '%s'\n", cmd); endif endfunction
--- a/scripts/plot/private/__actual_axis_position__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__actual_axis_position__.m Thu Jan 20 18:26:09 2011 -0500 @@ -37,11 +37,11 @@ orig_fig_units = get (axis_obj.parent, "units"); orig_fig_position = get (axis_obj.parent, "position"); unwind_protect - set (axis_obj.parent, "units", "pixels") + set (axis_obj.parent, "units", "pixels"); fig_position = get (axis_obj.parent, "position"); unwind_protect_cleanup - set (axis_obj.parent, "units", orig_fig_units) - set (axis_obj.parent, "position", orig_fig_position) + set (axis_obj.parent, "units", orig_fig_units); + set (axis_obj.parent, "position", orig_fig_position); end_unwind_protect ## Get axes size in pixels if (strcmp (get (axis_obj.parent, "__graphics_toolkit__"), "gnuplot")
--- a/scripts/plot/private/__axis_label__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__axis_label__.m Thu Jan 20 18:26:09 2011 -0500 @@ -37,7 +37,8 @@ "fontweight", get (ca, "fontweight"), "string", txt, varargin{:}); - __fltk_redraw__() + + __fltk_redraw__(); if (nargout > 0) retval = h;
--- a/scripts/plot/private/__bar__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__bar__.m Thu Jan 20 18:26:09 2011 -0500 @@ -202,7 +202,7 @@ else if (! have_color_spec) if (ycols == 1) - lev = clim(1) + lev = clim(1); else lev = (i - 1) * (clim(2) - clim(1)) / (ycols - 1) - clim(1); endif @@ -238,9 +238,9 @@ addproperty ("barlayout", hg, "radio", "{stacked}|grouped", "stacked"); endif if (vertical) - addproperty ("horizontal", hg, "radio", "on|{off}", "off") + addproperty ("horizontal", hg, "radio", "on|{off}", "off"); else - addproperty ("horizontal", hg, "radio", "{on}|off", "on") + addproperty ("horizontal", hg, "radio", "{on}|off", "on"); endif addlistener (hg, "barwidth", @update_group);
--- a/scripts/plot/private/__clabel__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__clabel__.m Thu Jan 20 18:26:09 2011 -0500 @@ -41,7 +41,7 @@ while (i1 < length (c)) clev = c(1,i1); clen = c(2,i1); - p = c(:, i1+1:i1+clen) + p = c(:, i1+1:i1+clen); xmin = min (c(1,:)); xmax = max (c(1,:));
--- a/scripts/plot/private/__errplot__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__errplot__.m Thu Jan 20 18:26:09 2011 -0500 @@ -149,24 +149,24 @@ error ("errorbar: error plot requires 2, 3, 4 or 6 arguments"); endswitch - addproperty ("xdata", hg, "data", xdata(:)) - addproperty ("ydata", hg, "data", ydata(:)) - addproperty ("ldata", hg, "data", ldata(:)) - addproperty ("udata", hg, "data", udata(:)) - addproperty ("xldata", hg, "data", xldata(:)) - addproperty ("xudata", hg, "data", xudata(:)) + addproperty ("xdata", hg, "data", xdata(:)); + addproperty ("ydata", hg, "data", ydata(:)); + addproperty ("ldata", hg, "data", ldata(:)); + addproperty ("udata", hg, "data", udata(:)); + addproperty ("xldata", hg, "data", xldata(:)); + addproperty ("xudata", hg, "data", xudata(:)); addproperty ("format", hg, "string", ifmt); - addproperty ("color", hg, "linecolor", get (hl(1), "color")) - addproperty ("linewidth", hg, "linelinewidth", get (hl(1), "linewidth")) - addproperty ("linestyle", hg, "linelinestyle", get (hl(1), "linestyle")) - addproperty ("marker", hg, "linemarker", get (hl(1), "marker")) + addproperty ("color", hg, "linecolor", get (hl(1), "color")); + addproperty ("linewidth", hg, "linelinewidth", get (hl(1), "linewidth")); + addproperty ("linestyle", hg, "linelinestyle", get (hl(1), "linestyle")); + addproperty ("marker", hg, "linemarker", get (hl(1), "marker")); addproperty ("markerfacecolor", hg, "linemarkerfacecolor", - get (hl(1), "markerfacecolor")) + get (hl(1), "markerfacecolor")); addproperty ("markeredgecolor", hg, "linemarkerfacecolor", - get (hl(1), "markeredgecolor")) + get (hl(1), "markeredgecolor")); addproperty ("markersize", hg, "linemarkersize", - get (hl(1), "markersize")) + get (hl(1), "markersize")); fcn = {@update_props, hl}; addlistener (hg, "color", fcn); @@ -189,7 +189,7 @@ addlistener (hax, "xscale", fcn); addlistener (hax, "yscale", fcn); - update_data (hg, [], hl) + update_data (hg, [], hl); endfor @@ -257,7 +257,7 @@ ydata = [y1; y2]; return else - error ("errorbar: valid error bar types are xerr, yerr, boxxy, and xyerr") + error ("errorbar: valid error bar types are xerr, yerr, boxxy, and xyerr"); endif xdata = xdata.'(:); ydata = ydata.'(:);
--- a/scripts/plot/private/__ezplot__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__ezplot__.m Thu Jan 20 18:26:09 2011 -0500 @@ -418,10 +418,10 @@ for i = 1 : length (XX) h = [h; plot(XX{i}, YY{i})]; if (i == 1) - set (ax, "nextplot", "add") + set (ax, "nextplot", "add"); endif endfor - set (ax, "nextplot", hold_state) + set (ax, "nextplot", hold_state); elseif (ispolar || isplot) h = feval (pfunc, X, Z); if (isplot && !parametric)
--- a/scripts/plot/private/__ghostscript__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__ghostscript__.m Thu Jan 20 18:26:09 2011 -0500 @@ -97,7 +97,7 @@ gs_opts = sprintf ("%s -dNORANGEPAGESIZE", gs_opts); endif else - error ("print:badpapersize", "__ghostscript__.m: invalid 'papersize'") + error ("print:badpapersize", "__ghostscript__.m: invalid 'papersize'"); endif gs_opts = sprintf ("%s -dFIXEDMEDIA", gs_opts); ## "pageoffset" is relative to the coordinates, not the BBox LLHC. @@ -116,7 +116,7 @@ if (fid == -1) error ("print:fopenfailed", "__ghostscript__.m: fopen() failed"); endif - fprintf (fid, "%s\n", offset_ps{:}) + fprintf (fid, "%s\n", offset_ps{:}); unwind_protect_cleanup status = fclose (fid); if (status == -1) @@ -124,9 +124,9 @@ endif end_unwind_protect if (opts.debug) - fprintf ("---- begin %s ----\n", offsetfile) - fprintf ("%s\n", offset_ps{:}) - fprintf ("----- end %s -----\n", offsetfile) + fprintf ("---- begin %s ----\n", offsetfile); + fprintf ("%s\n", offset_ps{:}); + fprintf ("----- end %s -----\n", offsetfile); endif endif
--- a/scripts/plot/private/__patch__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__patch__.m Thu Jan 20 18:26:09 2011 -0500 @@ -106,7 +106,7 @@ else ## Color Vectors if (rows (c) != rows (x) || rows (c) != length (y)) - error ("patch: size of x, y, and c must be equal") + error ("patch: size of x, y, and c must be equal"); else args{7} = "facecolor"; args{8} = "interp";
--- a/scripts/plot/private/__pie__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__pie__.m Thu Jan 20 18:26:09 2011 -0500 @@ -146,7 +146,7 @@ addlistener(gca, "view", {@update_text_pos, hlist}); if (strncmp (caller, "pie3", 4)) - axis ([-1.25, 1.25, -1.25, 1.25, -0.05, 0.4], "equal", "off") + axis ([-1.25, 1.25, -1.25, 1.25, -0.05, 0.4], "equal", "off"); view (-37.5, 30); elseif (strncmp (caller, "pie", 3)) axis ([-1.5, 1.5, -1.5, 1.5], "square", "off"); @@ -184,16 +184,16 @@ for i = 1 : length (tobj) if (is_pie3) if (ud_mask(i)) - set (tobj(i), "position", [pos(i,1), pos(i,2), -0.05]) + set (tobj(i), "position", [pos(i,1), pos(i,2), -0.05]); else - set (tobj(i), "position", [pos(i,1), pos(i,2), 0.40]) + set (tobj(i), "position", [pos(i,1), pos(i,2), 0.40]); endif endif if (lr_mask(i)) - set (tobj(i), "horizontalalignment", "right") + set (tobj(i), "horizontalalignment", "right"); else - set (tobj(i), "horizontalalignment", "left") + set (tobj(i), "horizontalalignment", "left"); endif endfor endif
--- a/scripts/plot/private/__quiver__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__quiver__.m Thu Jan 20 18:26:09 2011 -0500 @@ -42,7 +42,7 @@ u = varargin{ioff++}; v = varargin{ioff++}; if (is3d) - w = varargin{ioff++} + w = varargin{ioff++}; [x, y, z] = meshgrid (1:size(u,2), 1:size(u,1), 1:max(size(w))); else [x, y] = meshgrid (1:size(u,2), 1:size(u,1)); @@ -275,15 +275,15 @@ ## Set up the hggroup properties and listeners if (autoscale) addproperty ("autoscale", hg, "radio", "{on}|off", "on"); - addproperty ("autoscalefactor", hg, "data", autoscale) + addproperty ("autoscalefactor", hg, "data", autoscale); else addproperty ("autoscale", hg, "radio", "{on}|off", "off"); - addproperty ("autoscalefactor", hg, "data", 1.0) + addproperty ("autoscalefactor", hg, "data", 1.0); endif - addlistener (hg, "autoscale", @update_data) - addlistener (hg, "autoscalefactor", @update_data) + addlistener (hg, "autoscale", @update_data); + addlistener (hg, "autoscalefactor", @update_data); - addproperty ("maxheadsize", hg, "data", arrowsize) + addproperty ("maxheadsize", hg, "data", arrowsize); addlistener (hg, "maxheadsize", @update_data); addproperty ("showarrowhead", hg, "radio", "{on}|off", "on");
--- a/scripts/plot/private/__scatter__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__scatter__.m Thu Jan 20 18:26:09 2011 -0500 @@ -242,7 +242,7 @@ addlistener (hg, "markeredgecolor", @update_props); if (! isempty (newargs)) - set (hg, newargs{:}) + set (hg, newargs{:}); endif endfunction @@ -330,7 +330,7 @@ for i = 1 : numel (kids) set (kids (i), "linewidth", lw, "marker", m, "markerfacecolor", fc, - "edgecolor", ec) + "edgecolor", ec); endfor endfunction
--- a/scripts/plot/private/__stem__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__stem__.m Thu Jan 20 18:26:09 2011 -0500 @@ -551,7 +551,7 @@ endif kids = get (h, "children"); - set (kids(2), "xdata", xt, "ydata", yt, "zdata", zt) - set (kids(1), "xdata", x, "ydata", y, "zdata", z) + set (kids(2), "xdata", xt, "ydata", yt, "zdata", zt); + set (kids(1), "xdata", x, "ydata", y, "zdata", z); endif endfunction
--- a/scripts/plot/private/__tight_eps_bbox__.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/private/__tight_eps_bbox__.m Thu Jan 20 18:26:09 2011 -0500 @@ -35,7 +35,7 @@ orig_bbox_line = get_bbox (output); else error ("print:noboundingbox", - "print.m: no bounding box found in '%s'", eps_file_name) + "print.m: no bounding box found in '%s'", eps_file_name); endif ghostscript_options = "-q -dBATCH -dSAFER -dNOPAUSE -dTextAlphaBits=4 -sDEVICE=bbox"; @@ -48,7 +48,7 @@ else warning ("print:nogsboundingbox", "print.m: ghostscript failed to determine the bounding for '%s'", - eps_file_name) + eps_file_name); endif ## Attempt to fix the bbox in place. @@ -96,7 +96,7 @@ n = n(1); elseif (isempty (n)) error ("print:noboundingbox", ... - "print.m: no bounding box found in '%s'.", eps_file_name) + "print.m: no bounding box found in '%s'.", eps_file_name); endif m = numel (orig_bbox_line); data = horzcat (data(1:(n-1)), tight_bbox_line, data((n+m):end));
--- a/scripts/plot/refresh.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/refresh.m Thu Jan 20 18:26:09 2011 -0500 @@ -37,6 +37,6 @@ h = gcf (); endif - set(h,"__modified__", "on") + set(h,"__modified__", "on"); drawnow (); endfunction
--- a/scripts/plot/spinmap.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/spinmap.m Thu Jan 20 18:26:09 2011 -0500 @@ -46,12 +46,12 @@ while (etime (clock, t0) < t) for n = 1:inc:clen newmap = shift (cmap, n, 1); - set (gcf (), "colormap", newmap) + set (gcf (), "colormap", newmap); drawnow (); endfor endwhile - set (gcf (), "colormap", cmap) + set (gcf (), "colormap", cmap); endfunction
--- a/scripts/plot/subplot.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/subplot.m Thu Jan 20 18:26:09 2011 -0500 @@ -95,7 +95,7 @@ elseif (! (isscalar (cols) && isscalar (rows))) error ("subplot: COLS, and ROWS must be scalars"); elseif (any (index < 1) || any (index > rows*cols)) - error ("subplot: INDEX value must be greater than 1 and less than ROWS*COLS") + error ("subplot: INDEX value must be greater than 1 and less than ROWS*COLS"); endif cols = round (cols); @@ -112,7 +112,7 @@ units = get (0, "defaultaxesunits"); unwind_protect - set (0, "defaultaxesunits", "normalized") + set (0, "defaultaxesunits", "normalized"); pos = subplot_position (rows, cols, index, "position", units); cf = gcf ();
--- a/scripts/plot/surfc.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/surfc.m Thu Jan 20 18:26:09 2011 -0500 @@ -42,7 +42,7 @@ "xgrid", "on", "ygrid", "on", "zgrid", "on"); endif - drawnow + drawnow (); zmin = get (ax, "zlim")(1); [c, tmp2] = __contour__ (ax, zmin, varargin{:});
--- a/scripts/plot/uigetfile.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/plot/uigetfile.m Thu Jan 20 18:26:09 2011 -0500 @@ -133,13 +133,13 @@ if (ismatrix (val) && length(val) == 2) outargs{4} = val; else - error ("uigetfile: expecting 2-element vector for position argument") + error ("uigetfile: expecting 2-element vector for position argument"); endif elseif (strncmp (tolower (prop), "multiselect", 11)) if (ischar (val)) outargs{5} = tolower (val); else - error ("uigetfile: expecting string argument (on/off) for multiselect") + error ("uigetfile: expecting string argument (on/off) for multiselect"); endif else error ("uigetfile: unknown argument");
--- a/scripts/polynomial/polyout.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/polynomial/polyout.m Thu Jan 20 18:26:09 2011 -0500 @@ -79,7 +79,7 @@ endif if(nargout == 0) - disp (tmp) + disp (tmp); else y = tmp; endif
--- a/scripts/sparse/spaugment.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/sparse/spaugment.m Thu Jan 20 18:26:09 2011 -0500 @@ -78,7 +78,7 @@ c = max (max (abs (A))) / 1000; else if (ndims (A) != 2) - error ("spaugment: expecting 2-dimenisional matrix") + error ("spaugment: expecting 2-dimenisional matrix"); else c = max (abs (A(:))) / 1000; endif
--- a/scripts/sparse/svds.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/sparse/svds.m Thu Jan 20 18:26:09 2011 -0500 @@ -99,7 +99,7 @@ endif if (ndims(A) > 2) - error ("svds: A must be a 2D matrix") + error ("svds: A must be a 2D matrix"); endif if (nargin < 4)
--- a/scripts/sparse/treeplot.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/sparse/treeplot.m Thu Jan 20 18:26:09 2011 -0500 @@ -190,7 +190,7 @@ continue; endif plot (x_coordinate(skelet(istart:istop)), - y_coordinate(skelet(istart:istop)), edge_style) + y_coordinate(skelet(istart:istop)), edge_style); endfor ## Set axis and graph size.
--- a/scripts/statistics/base/histc.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/statistics/base/histc.m Thu Jan 20 18:26:09 2011 -0500 @@ -54,7 +54,7 @@ num_edges = numel (edges); if (num_edges == 0) - error ("histc: EDGES must not be empty") + error ("histc: EDGES must not be empty"); endif if (!isreal (edges))
--- a/scripts/statistics/distributions/hygecdf.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/statistics/distributions/hygecdf.m Thu Jan 20 18:26:09 2011 -0500 @@ -44,7 +44,7 @@ if (t < 0 || m < 0 || n <= 0 || t != round (t) || m != round (m) || n != round (n) || m > t || n > t) - cdf = NaN (size (x)) + cdf = NaN (size (x)); else cdf = discrete_cdf (x, 0 : n, hygepdf (0 : n, t, m, n)); endif
--- a/scripts/statistics/distributions/hygeinv.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/statistics/distributions/hygeinv.m Thu Jan 20 18:26:09 2011 -0500 @@ -41,7 +41,7 @@ if (t < 0 || m < 0 || n <= 0 || t != round (t) || m != round (m) || n != round (n) || m > t || n > t) - inv = NaN (size (x)) + inv = NaN (size (x)); else inv = discrete_inv (x, 0 : n, hygepdf (0 : n, t, m, n)); endif
--- a/scripts/statistics/tests/manova.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/statistics/tests/manova.m Thu Jan 20 18:26:09 2011 -0500 @@ -94,19 +94,19 @@ Lambda = prod (1 ./ (1 + l)); - delta = n_w + n_b - (p + n_b + 1) / 2 - df_num = p * n_b + delta = n_w + n_b - (p + n_b + 1) / 2; + df_num = p * n_b; W_pval_1 = 1 - chi2cdf (- delta * log (Lambda), df_num); if (p < 3) eta = p; else - eta = sqrt ((p^2 * n_b^2 - 4) / (p^2 + n_b^2 - 5)) + eta = sqrt ((p^2 * n_b^2 - 4) / (p^2 + n_b^2 - 5)); endif - df_den = delta * eta - df_num / 2 + 1 + df_den = delta * eta - df_num / 2 + 1; - WT = exp (- log (Lambda) / eta) - 1 + WT = exp (- log (Lambda) / eta) - 1; W_pval_2 = 1 - f_cdf (WT * df_den / df_num, df_num, df_den); if (0)
--- a/scripts/strings/deblank.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/strings/deblank.m Thu Jan 20 18:26:09 2011 -0500 @@ -41,7 +41,7 @@ if (char_arg) k = find (! isspace (s) & s != "\0"); else - warning ("deblank: expecting character string argument") + warning ("deblank: expecting character string argument"); k = find (s != 0); endif
--- a/scripts/testfun/runtests.m Thu Jan 20 17:51:13 2011 -0500 +++ b/scripts/testfun/runtests.m Thu Jan 20 18:26:09 2011 -0500 @@ -62,7 +62,7 @@ if (has_tests (ff)) print_test_file_name (f); [p, n, xf, sk] = test (ff, "quiet"); - print_pass_fail (n, p) + print_pass_fail (n, p); fflush (stdout); else no_tests{end+1} = f;