Mercurial > octave
changeset 24208:eec262017c6a
maint: Strip trailing whitespace from source files.
line wrap: on
line diff
--- a/NEWS Wed Nov 08 16:34:23 2017 +0100 +++ b/NEWS Wed Nov 08 10:32:23 2017 -0500 @@ -64,7 +64,7 @@ an OpenGL toolkit. ** An initial implementation of alpha transparency has been made for - patch and surface objects. Printing to svg and pdf is supported. + patch and surface objects. Printing to svg and pdf is supported. ** Other new functions added in 4.4:
--- a/doc/interpreter/plot.txi Wed Nov 08 16:34:23 2017 +0100 +++ b/doc/interpreter/plot.txi Wed Nov 08 10:32:23 2017 -0500 @@ -285,8 +285,8 @@ The @code{xticks}, @code{yticks}, @code{zticks}, @code{rticks}, and @code{thetaticks} functions may be used to get or set the tick mark locations -and modes on the respective axis. Each has the same form, although mode -options are not currently avaliable for @code{rticks}, and @code{thetaticks}. +and modes on the respective axis. Each has the same form, although mode +options are not currently avaliable for @code{rticks}, and @code{thetaticks}. @c FIXME: Update this section if polarplot and polar axes changes change the @c associated axis properties. @@ -302,7 +302,7 @@ The @code{xticklabels}, @code{yticklabels}, and @code{zticklabels} functions may be used to get or set the label assigned to each tick location and the -labeling mode on the respective axis. Each has the same form. +labeling mode on the respective axis. Each has the same form. @c FIXME: Update this section if polarplot and polar axes changes change the @c associated axis properties.
--- a/libinterp/corefcn/gl2ps-print.cc Wed Nov 08 16:34:23 2017 +0100 +++ b/libinterp/corefcn/gl2ps-print.cc Wed Nov 08 10:32:23 2017 -0500 @@ -93,7 +93,7 @@ int halign, int valign, double rotation = 0.0); void set_font (const base_properties& props); - + static bool has_alpha (const graphics_handle& h) { bool retval = false; @@ -115,7 +115,7 @@ else if (go.isa ("patch") || go.isa ("surface")) { octave_value fa = go.get ("facealpha"); - if (fa.is_scalar_type () && fa.is_double_type () + if (fa.is_scalar_type () && fa.is_double_type () && fa.double_value () < 1) retval = true; } @@ -137,7 +137,7 @@ if (has_alpha (props.get___myhandle__ ())) { opts &= ~GL2PS_OCCLUSION_CULL; - // FIXME: currently the GL2PS_BLEND (which is more an equivalent of + // FIXME: currently the GL2PS_BLEND (which is more an equivalent of // GL_ALPHA_TEST than GL_BLEND) is not working on a per primitive // basis. We thus set it once per viewport. gl2psEnable (GL2PS_BLEND); @@ -150,7 +150,7 @@ gl2psSetOptions (opts); - // Draw and finish () or there may be primitives missing in the gl2ps + // Draw and finish () or there may be primitives missing in the gl2ps // output. opengl_renderer::draw_axes (props); finish (); @@ -164,7 +164,7 @@ buffer_overflow |= (state == GL2PS_OVERFLOW); - // Don't draw background for subsequent viewports (legends, subplots, + // Don't draw background for subsequent viewports (legends, subplots, // etc.) gl2psGetOptions (&opts); opts &= ~GL2PS_DRAW_BACKGROUND; @@ -385,7 +385,7 @@ include_graph = "foobar-inc"; // GL2PS_SILENT was removed to allow gl2ps to print errors on stderr - GLint ret = gl2psBeginPage ("gl2ps_renderer figure", "Octave", + GLint ret = gl2psBeginPage ("gl2ps_renderer figure", "Octave", nullptr, gl2ps_term, gl2ps_sort, (GL2PS_BEST_ROOT | gl2ps_text
--- a/libinterp/corefcn/octave-link.cc Wed Nov 08 16:34:23 2017 +0100 +++ b/libinterp/corefcn/octave-link.cc Wed Nov 08 10:32:23 2017 -0500 @@ -394,12 +394,12 @@ print_usage (); if (! args(0).is_string ()) - error ("openvar: NAME must be a string"); + error ("openvar: NAME must be a string"); std::string name = args(0).string_value (); if (! (Fisguirunning ())(0).is_true ()) - warning ("openvar: GUI is not running, can't start Variable Editor"); + warning ("openvar: GUI is not running, can't start Variable Editor"); else octave_link::openvar (name);
--- a/libinterp/corefcn/quadcc.cc Wed Nov 08 16:34:23 2017 +0100 +++ b/libinterp/corefcn/quadcc.cc Wed Nov 08 10:32:23 2017 -0500 @@ -1668,7 +1668,7 @@ error ("quadcc: relative tolerance must be >=0"); } } - + if (nargin < 5) nivals = 1; else if (! (args(4).is_real_scalar () || args(4).is_real_matrix ()))
--- a/libinterp/octave-value/ov-null-mat.cc Wed Nov 08 16:34:23 2017 +0100 +++ b/libinterp/octave-value/ov-null-mat.cc Wed Nov 08 10:32:23 2017 -0500 @@ -128,7 +128,7 @@ str(7:end) = nm # indexed assignment @result{} str = Hello Wally str(7:end) = "" # indexed deletion - @result{} str = Hello + @result{} str = Hello @end group @end example @seealso{isempty, isindex}
--- a/liboctave/array/Sparse.h Wed Nov 08 16:34:23 2017 +0100 +++ b/liboctave/array/Sparse.h Wed Nov 08 10:32:23 2017 -0500 @@ -330,7 +330,7 @@ T& checkelem (octave_idx_type n) { if (n < 0 || n >= numel ()) - // FIXME: Why should we "return" when range_error is OCTAVE_NORETURN? + // FIXME: Why should we "return" when range_error is OCTAVE_NORETURN? return range_error ("T& Sparse<T>::checkelem", n); else {
--- a/scripts/general/integral2.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/general/integral2.m Wed Nov 08 10:32:23 2017 -0500 @@ -108,7 +108,7 @@ ## Programming Notes: If there are singularities within the integration region ## it is best to split the integral and place the singularities on the ## boundary. -## +## ## Known @sc{matlab} incompatibility: If tolerances are left unspecified, and ## any integration limits are of type @code{single}, then Octave's integral ## functions automatically reduce the default absolute and relative error
--- a/scripts/general/quadgk.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/general/quadgk.m Wed Nov 08 10:32:23 2017 -0500 @@ -120,7 +120,7 @@ ## Computational and Applied Mathematics, pp. 131--140, Vol 211, Issue 2, ## Feb 2008. ## -## @seealso{quad, quadv, quadl, quadcc, trapz, dblquad, triplequad, integral, +## @seealso{quad, quadv, quadl, quadcc, trapz, dblquad, triplequad, integral, ## integral2, integral3} ## @end deftypefn
--- a/scripts/general/quadl.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/general/quadl.m Wed Nov 08 10:32:23 2017 -0500 @@ -54,7 +54,7 @@ ## Reference: @nospell{W. Gander and W. Gautschi}, @cite{Adaptive Quadrature - ## Revisited}, BIT Vol. 40, No. 1, March 2000, pp. 84--101. ## @url{http://www.inf.ethz.ch/personal/gander/} -## @seealso{quad, quadv, quadgk, quadcc, trapz, dblquad, triplequad, integral, +## @seealso{quad, quadv, quadgk, quadcc, trapz, dblquad, triplequad, integral, ## integral2, integral3} ## @end deftypefn
--- a/scripts/general/quadv.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/general/quadv.m Wed Nov 08 10:32:23 2017 -0500 @@ -57,7 +57,7 @@ ## Note: @code{quadv} is written in Octave's scripting language and can be ## used recursively in @code{dblquad} and @code{triplequad}, unlike the ## @code{quad} function. -## @seealso{quad, quadl, quadgk, quadcc, trapz, dblquad, triplequad, integral, +## @seealso{quad, quadl, quadgk, quadcc, trapz, dblquad, triplequad, integral, ## integral2, integral3} ## @end deftypefn
--- a/scripts/general/repelem.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/general/repelem.m Wed Nov 08 10:32:23 2017 -0500 @@ -50,7 +50,7 @@ ## @result{} 1 1 2 4 5 5 ## @end group ## @end example -## +## ## @example ## @group ## A = magic (3) @@ -198,7 +198,7 @@ error (["repelem: R1 must either be scalar or have the same " ... "number of elements as the vector to be replicated"]); endif - + ## Basic run-length decoding in function prepareIdx returns ## idx2 as a row vector of element indices in the right positions. idx2 = prepareIdx (R);
--- a/scripts/plot/appearance/camlookat.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/appearance/camlookat.m Wed Nov 08 10:32:23 2017 -0500 @@ -100,7 +100,7 @@ endfor dar = daspect (hax); - + ## current view direction curdir = (camtarget (hax) - campos (hax)) ./ dar; curdir /= norm (curdir); @@ -117,7 +117,7 @@ x1 y0 z1; x1 y1 z0; x1 y1 z1] ./ dar; - + ## Find corner of bounding box with maximum opening angle. ## Make sure temporary pov is well outside boundary of bounding box. bb_diag = norm ([x0-x1, y0-y1, z0-z1] ./ dar); @@ -126,7 +126,7 @@ bb_cp ./= norm (bb_cp, 2, "rows"); aperture = norm (curdir .* bb_cp, 2, "rows"); max_corner = find (aperture == max (aperture), 1, "first"); - + ## projection of corner on line of sight sz = curdir * (bb(max_corner,:) - mid)'; bb_proj = mid + sz * curdir;
--- a/scripts/plot/appearance/module.mk Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/appearance/module.mk Wed Nov 08 10:32:23 2017 -0500 @@ -54,7 +54,6 @@ %reldir%/zlim.m \ %reldir%/zticks.m \ %reldir%/zticklabels.m - %canon_reldir%dir = $(fcnfiledir)/plot/appearance
--- a/scripts/plot/appearance/rticks.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/appearance/rticks.m Wed Nov 08 10:32:23 2017 -0500 @@ -57,7 +57,7 @@ retval = get (varargin{1}, "rtick"); return; else - arg = varargin{1}; + arg = varargin{1}; endif case 2
--- a/scripts/plot/appearance/thetaticks.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/appearance/thetaticks.m Wed Nov 08 10:32:23 2017 -0500 @@ -61,7 +61,7 @@ retval = get (varargin{1}, "ttick"); return; else - arg = varargin{1}; + arg = varargin{1}; endif case 2
--- a/scripts/plot/appearance/xticklabels.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/appearance/xticklabels.m Wed Nov 08 10:32:23 2017 -0500 @@ -65,7 +65,7 @@ retval = get (varargin{1}, "xticklabel"); return; else - arg = varargin{1}; + arg = varargin{1}; endif case 2
--- a/scripts/plot/appearance/xticks.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/appearance/xticks.m Wed Nov 08 10:32:23 2017 -0500 @@ -62,7 +62,7 @@ retval = get (varargin{1}, "xtick"); return; else - arg = varargin{1}; + arg = varargin{1}; endif case 2
--- a/scripts/plot/appearance/yticklabels.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/appearance/yticklabels.m Wed Nov 08 10:32:23 2017 -0500 @@ -65,7 +65,7 @@ retval = get (varargin{1}, "yticklabel"); return; else - arg = varargin{1}; + arg = varargin{1}; endif case 2
--- a/scripts/plot/appearance/yticks.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/appearance/yticks.m Wed Nov 08 10:32:23 2017 -0500 @@ -62,7 +62,7 @@ retval = get (varargin{1}, "ytick"); return; else - arg = varargin{1}; + arg = varargin{1}; endif case 2
--- a/scripts/plot/appearance/zticklabels.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/appearance/zticklabels.m Wed Nov 08 10:32:23 2017 -0500 @@ -65,7 +65,7 @@ retval = get (varargin{1}, "zticklabel"); return; else - arg = varargin{1}; + arg = varargin{1}; endif case 2
--- a/scripts/plot/appearance/zticks.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/appearance/zticks.m Wed Nov 08 10:32:23 2017 -0500 @@ -62,7 +62,7 @@ retval = get (varargin{1}, "ztick"); return; else - arg = varargin{1}; + arg = varargin{1}; endif case 2
--- a/scripts/plot/draw/patch.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/draw/patch.m Wed Nov 08 10:32:23 2017 -0500 @@ -65,7 +65,7 @@ ## object. ## ## Implementation Note: Patches are highly configurable objects. To truly -## customize them requires setting patch properties directly +## customize them requires setting patch properties directly ## (@pxref{Patch Properties}). Useful patch properties include: @qcode{"cdata"}, ## @qcode{"edgecolor"}, @qcode{"facecolor"}, @qcode{"faces"}, ## @qcode{"facevertexcdata"}.
--- a/scripts/plot/util/print.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/plot/util/print.m Wed Nov 08 10:32:23 2017 -0500 @@ -416,7 +416,7 @@ endif endfor endif - + ## print() requires figure units to be "pixels" props(end+1).h = opts.figure; props(end).name = "units";
--- a/scripts/statistics/base/lscov.m Wed Nov 08 16:34:23 2017 +0100 +++ b/scripts/statistics/base/lscov.m Wed Nov 08 10:32:23 2017 -0500 @@ -98,10 +98,10 @@ dof = n - p; # degrees of freedom remaining after fit SSE = sumsq (b - A * x); mse = SSE / dof; - + s = pinv_A * pinv_A'; stdx = sqrt (diag (s) * mse); - + if (nargout > 3) if (k == 1) S = mse * s;
--- a/test/bug-35881/bug-35881.tst Wed Nov 08 16:34:23 2017 +0100 +++ b/test/bug-35881/bug-35881.tst Wed Nov 08 10:32:23 2017 -0500 @@ -20,12 +20,12 @@ %! global _tstvar_; # Final test does "clear all" which removes this var. %! %! _tstvar_ = struct ("init1",-1, "a1",-1, "init2",-1, "a2",-1); -%! bug35881 (0); +%! bug35881 (0); %! assert (_tstvar_, struct ("init1",true, "a1",1, "init2",false, "a2",1)); %! clear -f bug35881 %! %! _tstvar_ = struct ("init1",-1, "a1",-1, "init2",-1, "a2",-1); -%! bug35881 (1); +%! bug35881 (1); %! assert (_tstvar_, struct ("init1",true, "a1",1, "init2",false, "a2",1)); %! %! _tstvar_ = struct ("init1",-1, "a1",-1, "init2",-1, "a2",-1);
--- a/test/bug-35881/bug35881.m Wed Nov 08 16:34:23 2017 +0100 +++ b/test/bug-35881/bug35881.m Wed Nov 08 10:32:23 2017 -0500 @@ -55,6 +55,6 @@ subf: INIT, a=1 subf: Reference to a cleared variable a. Error in test_clear_inside_function (line 13) -subf (); fprintf ('a=%d\n', a); +subf (); fprintf ('a=%d\n', a); #}