Mercurial > octave

changeset 25950:52ff6e691e49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Fri, 19 Oct 2018 12:28:29 -0400
parents 700b3f415ebe (current diff) c2bf210ac94f (diff)
children 12d4271aed87
files scripts/ode/ode15s.m scripts/plot/util/private/__gnuplot_draw_axes__.m
diffstat 5 files changed, 15 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/+containers/Map.m	Fri Oct 19 12:19:49 2018 -0400
+++ b/scripts/+containers/Map.m	Fri Oct 19 12:28:29 2018 -0400
@@ -138,8 +138,8 @@
     function this = Map (varargin)
       if (nargin == 0)
         ## Empty object with "char" key type and "any" value type.
-      elseif (nargin == 2 ||
-              (nargin == 4 && strcmpi (varargin{3}, "UniformValues")))
+      elseif (nargin == 2 || (nargin == 4
+                              && strcmpi (varargin{3}, "UniformValues")))
         ## Get Map keys
         keys = varargin{1};
         if (isempty (keys))
--- a/scripts/ode/ode15s.m	Fri Oct 19 12:19:49 2018 -0400
+++ b/scripts/ode/ode15s.m	Fri Oct 19 12:28:29 2018 -0400
@@ -197,8 +197,8 @@
       endif
     elseif (ismatrix (options.Mass))
       options.havemasssparse = issparse (options.Mass);
-      if (any (size (options.Mass) != [n n]) ||
-          ! isnumeric (options.Mass) || ! isreal (options.Mass))
+      if (any (size (options.Mass) != [n n])
+          || ! isnumeric (options.Mass) || ! isreal (options.Mass))
         error ("Octave:invalid-input-arg",
                [solver ": invalid value assigned to field 'Mass'"]);
       endif
--- a/scripts/plot/appearance/legend.m	Fri Oct 19 12:19:49 2018 -0400
+++ b/scripts/plot/appearance/legend.m	Fri Oct 19 12:28:29 2018 -0400
@@ -1219,8 +1219,8 @@
 function cb_restore_axes (~, ~, ca, pos, outpos, htdel, hplots)
 
   hf = ancestor (ca(1), "figure");
-  if (strcmp (get (hf, "beingdeleted"), "on") ||
-      strcmp (get (ca(1), "beingdeleted"), "on"))
+  if (strcmp (get (hf, "beingdeleted"), "on")
+      || strcmp (get (ca(1), "beingdeleted"), "on"))
     ## Skip restoring axes if entire figure or axes is being destroyed.
     return;
   endif
--- a/scripts/plot/appearance/material.m	Fri Oct 19 12:19:49 2018 -0400
+++ b/scripts/plot/appearance/material.m	Fri Oct 19 12:28:29 2018 -0400
@@ -73,8 +73,8 @@
 
 function retval = material (varargin)
 
-  if (! ((nargout == 0 && (nargin == 1 || nargin == 2)) ||
-         (nargout == 1 && (nargin == 0 || nargin == 1))) )
+  if (! ((nargout == 0 && (nargin == 1 || nargin == 2))
+         || (nargout == 1 && (nargin == 0 || nargin == 1))))
     print_usage ();
   endif
 
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m	Fri Oct 19 12:19:49 2018 -0400
+++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m	Fri Oct 19 12:28:29 2018 -0400
@@ -117,9 +117,9 @@
 
   ## Code above uses axis size for the data aspect ratio, which isn't
   ## quite correct.  The only fine control is to set all axes units equal.
-  if (nd == 3 &&
-      strcmp (axis_obj.dataaspectratiomode, "manual") &&
-      axis_obj.dataaspectratio(1) == axis_obj.dataaspectratio(2))
+  if (nd == 3
+      && strcmp (axis_obj.dataaspectratiomode, "manual")
+      && axis_obj.dataaspectratio(1) == axis_obj.dataaspectratio(2))
     if (axis_obj.dataaspectratio(1) == axis_obj.dataaspectratio(3))
       zstr = "z";
     else
@@ -1338,8 +1338,10 @@
 
           for np = 1:num_pass
             for i_stl = 1:length (style)
-              has_ccol = ((strncmp (style{i_stl}, "lines", 5) && flat_interp_edge) ||
-                          (strncmp (style{i_stl}, "points", 6) && flat_marker));
+              has_ccol = ((strncmp (style{i_stl}, "lines", 5)
+                           && flat_interp_edge)
+                          || (strncmp (style{i_stl}, "points", 6)
+                              && flat_marker));
               if (has_ccol)
                 ccol = ":($4)";
                 N_tup = 4;