Mercurial > octave
changeset 22295:12f1d273d22a
maint: Remove trailing spaces from code.
* graphics.cc, help.cc, ov-oncleanup.cc, material.m, __axis_label__.m,
title.m, isocaps.m, reducepatch.m, reducevolume.m:
Remove trailing spaces from code.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 14 Aug 2016 20:16:09 -0700 |
| parents | 446b542fd082 |
| children | 8b18f46f6427 |
| files | libinterp/corefcn/graphics.cc libinterp/corefcn/help.cc libinterp/octave-value/ov-oncleanup.cc scripts/plot/appearance/material.m scripts/plot/appearance/private/__axis_label__.m scripts/plot/appearance/title.m scripts/plot/draw/isocaps.m scripts/plot/draw/reducepatch.m scripts/plot/draw/reducevolume.m |
| diffstat | 9 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc Sun Aug 14 20:07:51 2016 -0700 +++ b/libinterp/corefcn/graphics.cc Sun Aug 14 20:16:09 2016 -0700 @@ -4827,8 +4827,8 @@ gridcolor = color_values (0.15, 0.15, 0.15); gridcolormode = "auto"; gridlinestyle = "-"; - - labelfontsizemultiplier = 1.1; + + labelfontsizemultiplier = 1.1; layer = "bottom"; @@ -4858,8 +4858,8 @@ tightinset = Matrix (1, 4, 0.0); - titlefontsizemultiplier = 1.1; - titlefontweight = "bold"; + titlefontsizemultiplier = 1.1; + titlefontweight = "bold"; Matrix tview (1, 2, 0.0); tview(1) = 90;
--- a/libinterp/corefcn/help.cc Sun Aug 14 20:07:51 2016 -0700 +++ b/libinterp/corefcn/help.cc Sun Aug 14 20:16:09 2016 -0700 @@ -419,7 +419,7 @@ // Skip help text. file.ignore (std::numeric_limits<std::streamsize>::max(), 0x1d); - + // Position of end of help text. std::streamoff len = file.tellg () - beg - 1;
--- a/libinterp/octave-value/ov-oncleanup.cc Sun Aug 14 20:07:51 2016 -0700 +++ b/libinterp/octave-value/ov-oncleanup.cc Sun Aug 14 20:16:09 2016 -0700 @@ -94,7 +94,7 @@ std::string msg = last_error_message (); warning ("onCleanup: error caught while executing cleanup function:\n%s\n", msg.c_str ()); - + } catch (...) // Yes, the black hole. We're in a d-tor. {
--- a/scripts/plot/appearance/material.m Sun Aug 14 20:07:51 2016 -0700 +++ b/scripts/plot/appearance/material.m Sun Aug 14 20:16:09 2016 -0700 @@ -304,7 +304,7 @@ %!error <incorrect number of elements in material vector> material ([1 2 3 4 5 6]) %!error <MTYPE must be a named material or a vector> material ({}) -%!error <Invalid call to material.> +%!error <Invalid call to material.> %! hf = figure ("visible", "off"); %! unwind_protect %! material (hf);
--- a/scripts/plot/appearance/private/__axis_label__.m Sun Aug 14 20:07:51 2016 -0700 +++ b/scripts/plot/appearance/private/__axis_label__.m Sun Aug 14 20:16:09 2016 -0700 @@ -36,9 +36,9 @@ "string", txt, varargin{:}); - ## FIXME: It would be better to delete only the listener that [xyz]label + ## FIXME: It would be better to delete only the listener that [xyz]label ## installed. But this didn't work, so instead it deletes all - ## listener's on the [xyz]color property. + ## listener's on the [xyz]color property. dellistener (hax, [caller(1) "color"]); addlistener (hax, [caller(1) "color"], {@cb_color, h, caller(1)});
--- a/scripts/plot/appearance/title.m Sun Aug 14 20:07:51 2016 -0700 +++ b/scripts/plot/appearance/title.m Sun Aug 14 20:16:09 2016 -0700 @@ -49,7 +49,7 @@ endif htmp = get (hax, "title"); - + set (htmp, "fontangle", get (hax, "fontangle"), "fontname", get (hax, "fontname"), "fontunits", get (hax, "fontunits"), # must precede fontsize
--- a/scripts/plot/draw/isocaps.m Sun Aug 14 20:07:51 2016 -0700 +++ b/scripts/plot/draw/isocaps.m Sun Aug 14 20:16:09 2016 -0700 @@ -398,7 +398,7 @@ %! isoval = .5; %! x = 1:3:22; y = -14:5:11; z = linspace (16, 18, 4); %! [xx, yy, zz] = meshgrid (x, y, z); -%! clf; +%! clf; %! %% two arguments, no output %! subplot (2, 2, 1); %! isocaps (v, isoval); @@ -529,7 +529,7 @@ ## five arguments + three strings (different order), three outputs %!test -%! [faces, vertices, fvcdata] = isocaps (x, y, z, val, iso, +%! [faces, vertices, fvcdata] = isocaps (x, y, z, val, iso, %! "below", "v", "zmax"); %! assert (columns (faces), 3); %! assert (columns (vertices), 3);
--- a/scripts/plot/draw/reducepatch.m Sun Aug 14 20:07:51 2016 -0700 +++ b/scripts/plot/draw/reducepatch.m Sun Aug 14 20:16:09 2016 -0700 @@ -201,7 +201,7 @@ endif ## get reduction_factor - if (nargin - num_string_inputs > i_fv) + if (nargin - num_string_inputs > i_fv) reduction_factor = varargin{i_fv + 1}; if (! isscalar (reduction_factor) || reduction_factor <= 0) error ("reducepatch: REDUCTION_FACTOR must be a positive scalar");
--- a/scripts/plot/draw/reducevolume.m Sun Aug 14 20:07:51 2016 -0700 +++ b/scripts/plot/draw/reducevolume.m Sun Aug 14 20:16:09 2016 -0700 @@ -197,7 +197,7 @@ ## two inputs, one output %!test %! nv = reducevolume (v, [4 3 2]); -%! nv_expected = [1 25; 4 28]; nv_expected(:,:,2) = [97 121; 100 124]; +%! nv_expected = [1 25; 4 28]; nv_expected(:,:,2) = [97 121; 100 124]; %! assert (nv, nv_expected); ## two inputs, four outputs @@ -206,7 +206,7 @@ %! nx_expected(1:2,1,1:2) = 1; nx_expected(:,2,:) = 5; %! ny_expected(1,1:2,1:2) = 1; ny_expected(2,:,:) = 4; %! nz_expected(1:2,1:2,1) = 1; nz_expected(:,:,2) = 3; -%! nv_expected = [1 25; 4 28]; nv_expected(:,:,2) = [97 121; 100 124]; +%! nv_expected = [1 25; 4 28]; nv_expected(:,:,2) = [97 121; 100 124]; %! assert (nx, nx_expected); %! assert (ny, ny_expected); %! assert (nz, nz_expected); @@ -215,7 +215,7 @@ ## five inputs, one output %!test %! nv = reducevolume (x, y, z, v, [4 3 2]); -%! nv_expected = [1 25; 4 28]; nv_expected(:,:,2) = [97 121; 100 124]; +%! nv_expected = [1 25; 4 28]; nv_expected(:,:,2) = [97 121; 100 124]; %! assert (nv, nv_expected); ## five inputs, four outputs (coordinates are vectors) @@ -224,7 +224,7 @@ %! nx_expected(1:2,1,1:2) = x(1); nx_expected(:,2,:) = x(5); %! ny_expected(1,1:2,1:2) = y(1); ny_expected(2,:,:) = y(4); %! nz_expected(1:2,1:2,1) = z(1); nz_expected(:,:,2) = z(3); -%! nv_expected = [1 25; 4 28]; nv_expected(:,:,2) = [97 121; 100 124]; +%! nv_expected = [1 25; 4 28]; nv_expected(:,:,2) = [97 121; 100 124]; %! assert (nx, nx_expected); %! assert (ny, ny_expected); %! assert (nz, nz_expected); @@ -236,7 +236,7 @@ %! nx_expected(1:2,1,1:2) = x(1); nx_expected(:,2,:) = x(5); %! ny_expected(1,1:2,1:2) = y(1); ny_expected(2,:,:) = y(4); %! nz_expected(1:2,1:2,1) = z(1); nz_expected(:,:,2) = z(3); -%! nv_expected = [1 25; 4 28]; nv_expected(:,:,2) = [97 121; 100 124]; +%! nv_expected = [1 25; 4 28]; nv_expected(:,:,2) = [97 121; 100 124]; %! assert (nx, nx_expected); %! assert (ny, ny_expected); %! assert (nz, nz_expected); @@ -250,7 +250,7 @@ %! ny_expected(1,1:3,1:2) = y(1); ny_expected(2,:,:) = y(4); %! nz_expected(1:2,1:3,1) = z(1); nz_expected(:,:,2) = z(4); %! nv_expected = [1 19 37; 4 22 40]; -%! nv_expected(:,:,2) = [145 163 181; 148 166 184]; +%! nv_expected(:,:,2) = [145 163 181; 148 166 184]; %! assert (nx, nx_expected); %! assert (ny, ny_expected); %! assert (nz, nz_expected);