Mercurial > octave
changeset 23563:614d71cdf614
maint: Strip trailing whitespace from files.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 08 Jun 2017 18:21:07 -0400 |
| parents | 35ee7e8fb33b |
| children | 7049da1648c0 |
| files | NEWS configure.ac doc/interpreter/container.txi doc/interpreter/plot.txi libgui/graphics/ObjectProxy.cc libinterp/corefcn/graphics.in.h libinterp/dldfcn/__init_fltk__.cc libinterp/genprops.awk libinterp/parse-tree/pt-eval.cc m4/acinclude.m4 scripts/image/getframe.m scripts/optimization/fsolve.m scripts/polynomial/deconv.m test/for.tst |
| diffstat | 14 files changed, 59 insertions(+), 53 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Thu Jun 08 18:20:45 2017 -0400 +++ b/NEWS Thu Jun 08 18:21:07 2017 -0400 @@ -48,11 +48,11 @@ ** Deprecated graphics properties. - The following properties or allowed corresponding values have been - deprecated in Octave 4.4 and will be removed from Octave 4.8 (or whatever + The following properties or allowed corresponding values have been + deprecated in Octave 4.4 and will be removed from Octave 4.8 (or whatever version is the second major release after 4.4): - Object | Property | Value + Object | Property | Value ---------------------|-------------------------|------------------- figure | doublebuffer | | mincolormap |
--- a/configure.ac Thu Jun 08 18:20:45 2017 -0400 +++ b/configure.ac Thu Jun 08 18:21:07 2017 -0400 @@ -3,17 +3,17 @@ dnl Copyright (C) 1993-2017 John W. Eaton ### ### This file is part of Octave. -### +### ### Octave is free software; you can redistribute it and/or modify it ### under the terms of the GNU General Public License as published by ### the Free Software Foundation; either version 3 of the License, or ### (at your option) any later version. -### +### ### Octave is distributed in the hope that it will be useful, but ### WITHOUT ANY WARRANTY; without even the implied warranty of ### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ### GNU General Public License for more details. -### +### ### You should have received a copy of the GNU General Public License ### along with Octave; see the file COPYING. If not, see ### <http://www.gnu.org/licenses/>. @@ -340,7 +340,7 @@ else ENABLE_64=no fi - + AC_ARG_ENABLE(64, [AS_HELP_STRING([--disable-64], [don't use 64-bit integers for array dimensions and indexing])],
--- a/doc/interpreter/container.txi Thu Jun 08 18:20:45 2017 -0400 +++ b/doc/interpreter/container.txi Thu Jun 08 18:21:07 2017 -0400 @@ -545,7 +545,7 @@ @cindex hash table @c FIXME: Need to fill in documentation on what a Map is, when to use it over -@c other container types, how to perform basic operations with a Map. +@c other container types, how to perform basic operations with a Map. @c FIXME: Currently have trouble getting documentation for classdef functions. @DOCSTRING(containers.Map) @@ -1056,15 +1056,15 @@ @result{} out = @{ [1,1] = - + 10 20 30 - + [2,1] = Inf [3,1] = last [4,1] = - + 10 20 30 - + [5,1] = Inf [6,1] = first @}
--- a/doc/interpreter/plot.txi Thu Jun 08 18:20:45 2017 -0400 +++ b/doc/interpreter/plot.txi Thu Jun 08 18:21:07 2017 -0400 @@ -1808,13 +1808,13 @@ @end example @noindent -where @code{hsrc} is a handle to the source of the callback, and @code{evt} -gives some event specific data. - -The function can be provided as a function handle to a plain Octave function, -as an anonymous function or as a string representing an Octvae command. The -latter syntax is not recommended since syntax errors will only occur when the -string is evaluated. +where @code{hsrc} is a handle to the source of the callback, and @code{evt} +gives some event specific data. + +The function can be provided as a function handle to a plain Octave function, +as an anonymous function or as a string representing an Octvae command. The +latter syntax is not recommended since syntax errors will only occur when the +string is evaluated. @xref{Function Handles Anonymous Functions Inline Functions, , Function Handles section}. This can then be associated @@ -1846,26 +1846,32 @@ are @itemize @bullet -@item CreateFcn: -called at the moment of the objects creation. It is not called if the object is altered in any way, and so it only makes sense to define this callback in the function call that defines the object. Callbacks that are added to @code{CreateFcn} later with the @code{set} function will never be executed. - -@item DeleteFcn: +@item CreateFcn: +called at the moment of the objects creation. It is not called if the +object is altered in any way, and so it only makes sense to define this +callback in the function call that defines the object. Callbacks that +are added to @code{CreateFcn} later with the @code{set} function will +never be executed. + +@item DeleteFcn: called at the moment an object is deleted. -@item ButtonDownFcn: -called if a mouse button is pressed while the pointer is over this object. Note, that the gnuplot interface does not respect this callback. +@item ButtonDownFcn: +called if a mouse button is pressed while the pointer is over this +object. Note, that the gnuplot interface does not respect this +callback. @end itemize -@strong{Caution:} the second @code{evt} argument in callback functions is only +@strong{Caution:} the second @code{evt} argument in callback functions is only loosely implemented in the Qt graphics toolkit: @itemize @bullet @item Mouse click events: -@code{evt} is a class @code{double} value, 1 for left, 2 for middle and 3 +@code{evt} is a class @code{double} value, 1 for left, 2 for middle and 3 for right click. @item Key press events: -@code{evt} is a structure with fields @code{Key} (string), @code{Character} +@code{evt} is a structure with fields @code{Key} (string), @code{Character} (string) and @code{Modifier} (cell array of strings). @item Other events:
--- a/libgui/graphics/ObjectProxy.cc Thu Jun 08 18:20:45 2017 -0400 +++ b/libgui/graphics/ObjectProxy.cc Thu Jun 08 18:21:07 2017 -0400 @@ -116,10 +116,10 @@ { uint8NDArray retval; - // The ObjectProxy is generally ran from the interpreter thread while the - // actual Figure (Object) lives in the gui thread. The following ensures - // synchronous execution of the Figure method and allows retrieving a - // return value. + // The ObjectProxy is generally ran from the interpreter thread + // while the actual Figure (Object) lives in the gui thread. The + // following ensures synchronous execution of the Figure method and + // allows retrieving a return value. Qt::ConnectionType t = Qt::BlockingQueuedConnection;
--- a/libinterp/corefcn/graphics.in.h Thu Jun 08 18:20:45 2017 -0400 +++ b/libinterp/corefcn/graphics.in.h Thu Jun 08 18:21:07 2017 -0400 @@ -2199,7 +2199,7 @@ { gripe_if_tkit_invalid ("print_figure"); } virtual uint8NDArray get_pixels (const graphics_object&) const - { + { gripe_if_tkit_invalid ("get_pixels"); return uint8NDArray (); }
--- a/libinterp/dldfcn/__init_fltk__.cc Thu Jun 08 18:20:45 2017 -0400 +++ b/libinterp/dldfcn/__init_fltk__.cc Thu Jun 08 18:21:07 2017 -0400 @@ -1968,7 +1968,7 @@ uint8NDArray retval; if (instance_ok ()) retval = instance->do_get_pixels (hnd2idx (gh)); - + return retval; }
--- a/libinterp/genprops.awk Thu Jun 08 18:20:45 2017 -0400 +++ b/libinterp/genprops.awk Thu Jun 08 18:21:07 2017 -0400 @@ -823,7 +823,7 @@ if (index (quals, "U")) updater[idx] = "extern"; - ## The property is deprecated + ## The property is deprecated if (index (quals, "d")) deprecated[idx] = 1;
--- a/libinterp/parse-tree/pt-eval.cc Thu Jun 08 18:20:45 2017 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Thu Jun 08 18:21:07 2017 -0400 @@ -828,7 +828,7 @@ if (quit_loop_now ()) break; } - } + } else { // Handle empty cases, while still assigning to loop var.
--- a/m4/acinclude.m4 Thu Jun 08 18:20:45 2017 -0400 +++ b/m4/acinclude.m4 Thu Jun 08 18:21:07 2017 -0400 @@ -1545,7 +1545,7 @@ else MOC="$MOC_QTVER" fi - + AC_CHECK_TOOLS(UIC_QTVER, [uic-qt$qt_version]) if test -z "$UIC_QTVER"; then AC_CHECK_TOOLS(UIC, [uic])
--- a/scripts/image/getframe.m Thu Jun 08 18:20:45 2017 -0400 +++ b/scripts/image/getframe.m Thu Jun 08 18:21:07 2017 -0400 @@ -1,15 +1,15 @@ ## Copyright (C) 2017 Pantxo Diribarne -## +## ## This program is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. -## +## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -## +## ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. @@ -38,7 +38,7 @@ ## inside the figure corresponding to @var{hfig} or the parent figure of ## @var{hax} to be catured. Whatever the figure @qcode{"units"} property, ## @var{rect} must be defined in @strong{pixels}. -## +## ## @seealso{im2frame, frame2im} ## @end deftypefn @@ -80,7 +80,7 @@ unwind_protect_cleanup set (htmp, "units", units) end_unwind_protect - + if (! isempty (rect)) xv = [pos(1); pos(1)+pos(3); pos(1)+pos(3); pos(1)]; yv = [pos(2); pos(2); pos(2)+pos(4); pos(2)+pos(4)]; @@ -103,16 +103,16 @@ else cdata = __get_frame__ (hf); endif - + i1 = max (floor (pos(1)), 1); i2 = min (ceil (pos(1)+pos(3)-1), columns (cdata)); idxx = i1:i2; i1 = max (floor (pos(2)), 1); i2 = min (ceil (pos(2)+pos(4)-1), rows (cdata)); idxy = fliplr (rows (cdata) - (i1:i2) + 1); - + im = struct ("cdata", cdata(idxy,idxx,:), "colormap", []); - + endfunction %!demo @@ -176,10 +176,10 @@ %! fvc = [1 0 0; 0 1 0; 0 0 1; 1 0 1]; %! patch ("vertices", verts, "faces", faces, "facevertexcdata", fvc, ... %! "facecolor", "flat"); -%! +%! %! kk = 1; %! pos = get (hf, "position"); -%! +%! %! for jj = [0.05 0.55] %! for ii = [0.05 0.55] %! rect = [ii jj .4 .4].*[pos(3:4) pos(3:4)];
--- a/scripts/optimization/fsolve.m Thu Jun 08 18:20:45 2017 -0400 +++ b/scripts/optimization/fsolve.m Thu Jun 08 18:21:07 2017 -0400 @@ -235,7 +235,7 @@ ## Calculate function value and Jacobian (possibly via FD). if (has_jac) [fvec, fjac] = fcn (reshape (x, xsiz)); - if (! all (size (fjac) == [m, n])) + if (! all (size (fjac) == [m, n])) error ("fsolve: Jacobian size should be (%d,%d), not (%d,%d)", m, n, rows (fjac), columns (fjac)); endif
--- a/scripts/polynomial/deconv.m Thu Jun 08 18:20:45 2017 -0400 +++ b/scripts/polynomial/deconv.m Thu Jun 08 18:21:07 2017 -0400 @@ -45,7 +45,7 @@ endif ## Ensure A is oriented as Y. - if ((isrow (y) && iscolumn (a)) || (iscolumn (y) && isrow (a))) + if ((isrow (y) && iscolumn (a)) || (iscolumn (y) && isrow (a))) a = a.'; endif
--- a/test/for.tst Thu Jun 08 18:20:45 2017 -0400 +++ b/test/for.tst Thu Jun 08 18:21:07 2017 -0400 @@ -124,7 +124,7 @@ %! assert (__prog_output_assert__ ("1234")); %!test <50893> -%! cnt = 0; +%! cnt = 0; %! for k = zeros (0,3); %! cnt++; %! endfor @@ -132,7 +132,7 @@ %! assert (k, zeros (0,1)); %!test <50893> -%! cnt = 0; +%! cnt = 0; %! for k = zeros (3,0); %! cnt++; %! endfor @@ -140,7 +140,7 @@ %! assert (k, zeros (1,0)); %!test <50893> -%! cnt = 0; +%! cnt = 0; %! for k = zeros (3,0, "uint32"); %! cnt++; %! endfor @@ -148,7 +148,7 @@ %! assert (k, zeros (1,0, "uint32")); %!test <50893> -%! cnt = 0; +%! cnt = 0; %! for k = cell (0,3); %! cnt++; %! endfor