Mercurial > octave-nkf

changeset 11149:fe3c3dfc07eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fix: break lines before && and ||, not after
author John W. Eaton <jwe@octave.org>
date Sat, 23 Oct 2010 03:00:31 -0400
parents c9ec943ebe65
children 564e998017f5
files scripts/ChangeLog scripts/deprecated/intwarning.m scripts/general/bicubic.m scripts/general/postpad.m scripts/general/prepad.m scripts/general/private/__splinen__.m scripts/general/shift.m scripts/miscellaneous/swapbytes.m scripts/pkg/pkg.m scripts/plot/clabel.m scripts/plot/colorbar.m scripts/plot/fill.m scripts/plot/legend.m scripts/plot/plotmatrix.m scripts/plot/plotyy.m scripts/plot/private/__clabel__.m scripts/plot/private/__ezplot__.m scripts/plot/private/__quiver__.m scripts/plot/subplot.m scripts/signal/unwrap.m scripts/statistics/base/histc.m scripts/statistics/base/iqr.m scripts/statistics/base/kurtosis.m scripts/statistics/base/mode.m scripts/statistics/base/ranks.m scripts/statistics/base/run_count.m scripts/statistics/base/skewness.m scripts/statistics/base/statistics.m scripts/statistics/base/studentize.m scripts/statistics/distributions/exprnd.m scripts/statistics/distributions/frnd.m scripts/statistics/distributions/geornd.m scripts/statistics/distributions/lognrnd.m scripts/statistics/distributions/nbinrnd.m scripts/statistics/distributions/poissrnd.m scripts/statistics/distributions/trnd.m scripts/statistics/distributions/wblrnd.m scripts/strings/strcat.m scripts/time/datestr.m scripts/time/datetick.m
diffstat 40 files changed, 160 insertions(+), 134 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/ChangeLog	Sat Oct 23 03:00:31 2010 -0400
@@ -1,3 +1,30 @@
+2010-10-23  John W. Eaton  <jwe@octave.org>
+
+	* statistics/distributions/nbinrnd.m: Use | instead of || in
+	argument to find.
+
+	* deprecated/intwarning.m, general/bicubic.m, general/postpad.m,
+	general/prepad.m, general/private/__splinen__.m,
+	general/shift.m, miscellaneous/swapbytes.m, pkg/pkg.m,
+	plot/clabel.m, plot/colorbar.m, plot/fill.m, plot/legend.m,
+	plot/plotmatrix.m, plot/plotyy.m, plot/private/__clabel__.m,
+	plot/private/__ezplot__.m, plot/private/__quiver__.m,
+	plot/subplot.m, signal/unwrap.m, statistics/base/histc.m,
+	statistics/base/iqr.m, statistics/base/kurtosis.m,
+	statistics/base/mode.m, statistics/base/ranks.m,
+	statistics/base/run_count.m, statistics/base/skewness.m,
+	statistics/base/statistics.m, statistics/base/studentize.m,
+	statistics/distributions/exprnd.m,
+	statistics/distributions/frnd.m,
+	statistics/distributions/geornd.m,
+	statistics/distributions/lognrnd.m,
+	statistics/distributions/nbinrnd.m,
+	statistics/distributions/poissrnd.m,
+	statistics/distributions/trnd.m,
+	statistics/distributions/wblrnd.m, strings/strcat.m,
+	time/datestr.m, time/datetick.m: Break lines before && and ||,
+	not before.
+
 2010-10-23  John W. Eaton  <jwe@octave.org>
 
 	* io/strread.m: Docstring fixes.
--- a/scripts/deprecated/intwarning.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/deprecated/intwarning.m	Sat Oct 23 03:00:31 2010 -0400
@@ -108,10 +108,10 @@
       endif
     elseif (isstruct(x))
       for fld = fieldnames (x)
-        if (strcmp ("Octave:int-convert-nan") || 
-            strcmp ("Octave:int-convert-non-int-val") || 
-            strcmp ("Octave:int-convert-overflow") ||
-            strcmp ("Octave:int-cmath-overflow"))
+        if (strcmp ("Octave:int-convert-nan")
+            || strcmp ("Octave:int-convert-non-int-val")
+            || strcmp ("Octave:int-convert-overflow")
+            || strcmp ("Octave:int-cmath-overflow"))
           s = getfield (x, fld);
           if (! ischar (s) || !(strcmpi("s","on") || strcmpi("s","off")))
             error ("intwarning: unexpected warning state");
--- a/scripts/general/bicubic.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/general/bicubic.m	Sat Oct 23 03:00:31 2010 -0400
@@ -48,8 +48,8 @@
     extrapval = NaN;
   endif
 
-  if (isa (X, "single") || isa (Y, "single") || isa (Z, "single") || 
-      isa (XI, "single") || isa (YI, "single"))
+  if (isa (X, "single") || isa (Y, "single") || isa (Z, "single")
+      || isa (XI, "single") || isa (YI, "single"))
     myeps = eps("single");
   else
     myeps = eps;
--- a/scripts/general/postpad.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/general/postpad.m	Sat Oct 23 03:00:31 2010 -0400
@@ -49,8 +49,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == fix (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == fix (dim))
+        || !(1 <= dim && dim <= nd))
       error ("postpad: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/general/prepad.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/general/prepad.m	Sat Oct 23 03:00:31 2010 -0400
@@ -60,8 +60,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == fix (dim)) ||
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == fix (dim))
+        || !(1 <= dim && dim <= nd))
       error ("prepad: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/general/private/__splinen__.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/general/private/__splinen__.m	Sat Oct 23 03:00:31 2010 -0400
@@ -31,8 +31,8 @@
   endif
   ## ND isvector function.
   isvec = @(x) numel (x) == length (x);
-  if (!iscell (x) || length(x) < ndims(y) || any (! cellfun (isvec, x)) ||
-      !iscell (xi) || length(xi) < ndims(y) || any (! cellfun (isvec, xi)))
+  if (!iscell (x) || length(x) < ndims(y) || any (! cellfun (isvec, x))
+      || !iscell (xi) || length(xi) < ndims(y) || any (! cellfun (isvec, xi)))
     error ("__splinen__: %s: non gridded data or dimensions inconsistent", f);
   endif
   yi = y;
--- a/scripts/general/shift.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/general/shift.m	Sat Oct 23 03:00:31 2010 -0400
@@ -46,8 +46,8 @@
   sz = size (x);
 
   if (nargin == 3)
-    if (!(isscalar (dim) && dim == round (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == round (dim))
+        || !(1 <= dim && dim <= nd))
       error ("shift: DIM must be an integer and a valid dimension");
     endif
   else
--- a/scripts/miscellaneous/swapbytes.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/miscellaneous/swapbytes.m	Sat Oct 23 03:00:31 2010 -0400
@@ -44,8 +44,8 @@
       nb = 2;
     elseif (strcmp (clx, "int32") || strcmp (clx, "uint32"))
       nb = 4;
-    elseif (strcmp (clx, "int64") || strcmp (clx, "uint64") ||
-            strcmp (clx, "double"))
+    elseif (strcmp (clx, "int64") || strcmp (clx, "uint64")
+            || strcmp (clx, "double"))
       nb = 8;
     else
       error ("swapbytes: invalid class of object");
--- a/scripts/pkg/pkg.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/pkg/pkg.m	Sat Oct 23 03:00:31 2010 -0400
@@ -828,8 +828,8 @@
   ## Check if the installed directory is empty. If it is remove it
   ## from the list.
   for i = length (descriptions):-1:1
-    if (dirempty (descriptions{i}.dir, {"packinfo", "doc"}) &&
-        dirempty (getarchdir (descriptions{i})))
+    if (dirempty (descriptions{i}.dir, {"packinfo", "doc"})
+        && dirempty (getarchdir (descriptions{i})))
       warning ("package %s is empty\n", descriptions{i}.name);
       rm_rf (descriptions{i}.dir);
       rm_rf (getarchdir (descriptions{i}));
@@ -1512,8 +1512,8 @@
       rm_rf (desc.dir);
       error ("couldn't copy files to the installation directory");
     endif
-    if (exist (fullfile (desc.dir, getarch ()), "dir") &&
-        ! strcmp (fullfile (desc.dir, getarch ()), octfiledir))
+    if (exist (fullfile (desc.dir, getarch ()), "dir")
+        && ! strcmp (fullfile (desc.dir, getarch ()), octfiledir))
       if (! exist (octfiledir, "dir"))
         ## Can be required to create upto three levels of dirs.
         octm1 = fileparts (octfiledir);
@@ -2254,8 +2254,8 @@
   newdesc = {};
   for i = 1 : length(desc)
     deps = desc{i}.depends;
-    if (isempty (deps) || (length (deps) == 1 && 
-                          strcmp(deps{1}.package, "octave")))
+    if (isempty (deps)
+        || (length (deps) == 1 && strcmp(deps{1}.package, "octave")))
       newdesc {end + 1} = desc{i};
     else
       tmpdesc = {};
@@ -2319,14 +2319,14 @@
 
 function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst)
   for i = lidx
-    if (isfield (installed_pkgs_lst{i}, "loaded") &&
-        installed_pkgs_lst{i}.loaded)
+    if (isfield (installed_pkgs_lst{i}, "loaded")
+        && installed_pkgs_lst{i}.loaded)
       continue;
     else
       if (handle_deps)
         deps = installed_pkgs_lst{i}.depends;
-        if ((length (deps) > 1) || (length (deps) == 1 && 
-                          ! strcmp(deps{1}.package, "octave")))
+        if ((length (deps) > 1)
+            || (length (deps) == 1 && ! strcmp(deps{1}.package, "octave")))
           tmplidx = [];
           for k = 1 : length (deps)
             for j = 1 : length (installed_pkgs_lst)
--- a/scripts/plot/clabel.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/plot/clabel.m	Sat Oct 23 03:00:31 2010 -0400
@@ -66,8 +66,8 @@
     hparent = gca ();
   else
     arg = varargin{1};
-    if (isscalar (arg) && ishandle(arg) && 
-        strcmp (get (arg, "type"), "hggroup"))
+    if (isscalar (arg) && ishandle(arg)
+        && strcmp (get (arg, "type"), "hggroup"))
       obj = get (arg);
       if (! isfield (obj, "contourmatrix"))
         error ("clabel: expecting the handle to be a contour group");
--- a/scripts/plot/colorbar.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/plot/colorbar.m	Sat Oct 23 03:00:31 2010 -0400
@@ -178,13 +178,13 @@
 function deletecolorbar (h, d, hc, orig_props)
   ## Don't delete the colorbar and reset the axis size if the
   ## parent figure is being deleted.
-  if (ishandle (hc) && strcmp (get (hc, "type"), "axes") && 
-      (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")))
+  if (ishandle (hc) && strcmp (get (hc, "type"), "axes")
+      && (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")))
     if (strcmp (get (hc, "beingdeleted"), "off"))
       delete (hc);
     endif
-    if (!isempty (ancestor (h, "axes")) &&
-        strcmp (get (ancestor (h, "axes"), "beingdeleted"), "off"))
+    if (!isempty (ancestor (h, "axes"))
+        && strcmp (get (ancestor (h, "axes"), "beingdeleted"), "off"))
       set (ancestor (h, "axes"), "position", orig_props.position, ...
                             "outerposition", orig_props.outerposition, ...
                     "activepositionproperty", orig_props.activepositionproperty);
@@ -193,9 +193,9 @@
 endfunction
 
 function resetaxis (h, d, orig_props)
-  if (ishandle (h) && strcmp (get (h, "type"), "axes") && 
-      (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")) &&
-      ishandle (get (h, "axes")))
+  if (ishandle (h) && strcmp (get (h, "type"), "axes")
+      && (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off"))
+      && ishandle (get (h, "axes")))
      set (get (h, "axes"), "position", orig_props.position, ...
                            "outerposition", orig_props.outerposition, ...
                    "activepositionproperty", orig_props.activepositionproperty);
@@ -203,8 +203,8 @@
 endfunction
 
 function update_colorbar_clim (h, d, hi, vert)
-  if (ishandle (h) && strcmp (get (h, "type"), "image") && 
-      (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")))
+  if (ishandle (h) && strcmp (get (h, "type"), "image")
+      && (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")))
     clen = rows (get (get (h, "parent"), "colormap"));
     cext = get (h, "clim");
     cdiff = (cext(2) - cext(1)) / clen / 2;
@@ -223,8 +223,8 @@
 
 function update_colorbar_axis (h, d, cax, orig_props)
 
-  if (ishandle (cax) && strcmp (get (cax, "type"), "axes") && 
-      (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")))
+  if (ishandle (cax) && strcmp (get (cax, "type"), "axes")
+      && (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")))
     loc = get (cax, "location");
     obj = get (h);
     obj.__my_handle__ = h;
--- a/scripts/plot/fill.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/plot/fill.m	Sat Oct 23 03:00:31 2010 -0400
@@ -74,9 +74,9 @@
 
     if (i <= nargin)
       while (true);
-        if (ischar (varargin{i}) && 
-            (strcmpi (varargin{i}, "faces")
-             || strcmpi (varargin{i}, "vertices")))
+        if (ischar (varargin{i})
+            && (strcmpi (varargin{i}, "faces")
+                || strcmpi (varargin{i}, "vertices")))
           break;
         elseif (isnumeric (varargin{i}))
           ## Assume its the colorspec
--- a/scripts/plot/legend.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/plot/legend.m	Sat Oct 23 03:00:31 2010 -0400
@@ -766,9 +766,9 @@
   endif
 
   for i = 1 : numel (ca)
-    if (ishandle (ca(i)) && strcmp (get (ca(i), "type"), "axes") && 
-      (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")) &&
-        strcmp (get (ca(i), "beingdeleted"), "off"))
+    if (ishandle (ca(i)) && strcmp (get (ca(i), "type"), "axes")
+        && (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off"))
+        && strcmp (get (ca(i), "beingdeleted"), "off"))
       units = get (ca(i), "units");
       unwind_protect
         set (ca(i), "units", "points");
@@ -785,18 +785,18 @@
 endfunction
 
 function deletelegend1 (h, d, ca)
-  if (ishandle (ca) && strcmp (get (ca, "type"), "axes") && 
-      (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")) &&
-      strcmp (get (ca, "beingdeleted"), "off"))
+  if (ishandle (ca) && strcmp (get (ca, "type"), "axes")
+      && (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off"))
+      && strcmp (get (ca, "beingdeleted"), "off"))
     delete (ca);
   endif
 endfunction
 
 function deletelegend2 (h, d, ca, pos, outpos, t1)
   for i = 1 : numel (ca)
-    if (ishandle (ca(i)) && strcmp (get (ca(i), "type"), "axes") && 
-      (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")) &&
-        strcmp (get (ca(i), "beingdeleted"), "off"))
+    if (ishandle (ca(i)) && strcmp (get (ca(i), "type"), "axes")
+        && (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off"))
+        && strcmp (get (ca(i), "beingdeleted"), "off"))
       if (!isempty (pos) && !isempty(outpos))
         units = get (ca(i), "units");
         unwind_protect
--- a/scripts/plot/plotmatrix.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/plot/plotmatrix.m	Sat Oct 23 03:00:31 2010 -0400
@@ -101,8 +101,8 @@
 function plotmatrixdelete (h, d, ax)
   for i = 1 : numel (ax)
     hc = ax(i);
-    if (ishandle (hc) && strcmp (get (hc, "type"), "axes") && 
-        strcmpi (get (hc, "beingdeleted"), "off"))
+    if (ishandle (hc) && strcmp (get (hc, "type"), "axes")
+        && strcmpi (get (hc, "beingdeleted"), "off"))
       parent = get (hc, "parent");
       ## If the parent is invalid or being deleted, then do nothing
       if (ishandle (parent) && strcmpi (get (parent, "beingdeleted"), "off"))
--- a/scripts/plot/plotyy.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/plot/plotyy.m	Sat Oct 23 03:00:31 2010 -0400
@@ -57,8 +57,8 @@
 
   ## Don't use __plt_get_axis_arg__ here as ax is a two vector for plotyy
   if (nargin > 1 && length (varargin{1}) == 2 && ishandle(varargin{1}(1)) 
-      &&  ishandle(varargin{1}(2)) && 
-      all (floor (varargin{1}) != varargin{1}))
+      && ishandle(varargin{1}(2))
+      && all (floor (varargin{1}) != varargin{1}))
     obj1 = get (varargin{1}(1));
     obj2 = get (varargin{1}(2));
     if (strcmp (obj1.type, "axes") || strcmp (obj2.type, "axes"))
@@ -237,9 +237,9 @@
 %! axis square
 
 function deleteplotyy (h, d, ax2, t2)
-  if (ishandle (ax2) && strcmp (get (ax2, "type"), "axes") && 
-      (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off")) &&
-      strcmp (get (ax2, "beingdeleted"), "off"))
+  if (ishandle (ax2) && strcmp (get (ax2, "type"), "axes")
+      && (isempty (gcbf()) || strcmp (get (gcbf(), "beingdeleted"),"off"))
+      && strcmp (get (ax2, "beingdeleted"), "off"))
     set (t2, "deletefcn", []);
     delete (ax2);
   endif
--- a/scripts/plot/private/__clabel__.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/plot/private/__clabel__.m	Sat Oct 23 03:00:31 2010 -0400
@@ -28,8 +28,8 @@
   xspacing = 72 * 4 / abs(lims(1) - lims(2));
   yspacing = 72 * 3 / abs(lims(3) - lims(4));
 
-  if (isscalar (hparent) && ishandle(hparent) && 
-        strcmp (get (hparent, "type"), "hggroup"))
+  if (isscalar (hparent) && ishandle(hparent)
+      && strcmp (get (hparent, "type"), "hggroup"))
     x = get (hparent, "xdata");
     xmin = min (x(:));
     xmax = max (x(:));
@@ -89,8 +89,8 @@
       endwhile
       tpos = sum(c(:,i1+j1-1:i1+j1), 2) ./ 2;
 
-      if (tpos(1) != xmin &&  tpos(1) != xmax && 
-          tpos(2) != ymin &&  tpos(2) != ymax)
+      if (tpos(1) != xmin &&  tpos(1) != xmax
+          && tpos(2) != ymin &&  tpos(2) != ymax)
         trot = 180 / pi * atan2 (diff (c(2,i1+j1-1:i1+j1)),
                                  diff (c(1,i1+j1-1:i1+j1)));
 
--- a/scripts/plot/private/__ezplot__.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/plot/private/__ezplot__.m	Sat Oct 23 03:00:31 2010 -0400
@@ -197,8 +197,8 @@
 
     if (!isplot && parametric)
       funz = varargin {3};
-      if (ischar (funz) && ! strcmp (funz, "circ") && 
-          ! strcmp (funz, "animate"))
+      if (ischar (funz) && ! strcmp (funz, "circ")
+          && ! strcmp (funz, "animate"))
         if (exist (funz, "file") || exist (funz, "builtin"))
           funz = vectorize (inline (cstrcat (funz, "(t)")));
         else
@@ -350,8 +350,8 @@
     fstr = regexprep (regexprep (regexprep (fstr,'\s*\.?\^\s*','^'), '\./', '/'), 
                       '\.?\*', '');
     if (isplot && nargs == 2)
-      if (strcmp (typeinfo (fun), "inline function") && 
-          !isempty (strfind (formula (fun) , "=")))
+      if (strcmp (typeinfo (fun), "inline function")
+          && !isempty (strfind (formula (fun) , "=")))
         fun = inline (cstrcat (strrep (formula (fun), "=", "- ("), ")"));
       else
         fstr = cstrcat (fstr, " = 0");
--- a/scripts/plot/private/__quiver__.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/plot/private/__quiver__.m	Sat Oct 23 03:00:31 2010 -0400
@@ -211,8 +211,8 @@
     endif
 
     if (have_line_spec)
-      if (isfield (linespec, "marker") && 
-        ! strncmp (linespec.marker, "none", 4))
+      if (isfield (linespec, "marker")
+          && ! strncmp (linespec.marker, "none", 4))
         if (is3d)
           h2 = plot3 ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:),
                       [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:),
--- a/scripts/plot/subplot.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/plot/subplot.m	Sat Oct 23 03:00:31 2010 -0400
@@ -118,8 +118,8 @@
       endif
       if (strcmp (get (child, "type"), "axes"))
         ## Skip legend and colorbar objects.
-        if (strcmp (get (child, "tag"), "legend") || 
-            strcmp (get (child, "tag"), "colorbar"))
+        if (strcmp (get (child, "tag"), "legend")
+            || strcmp (get (child, "tag"), "colorbar"))
           continue;
         endif
         objpos = get (child, "position");
--- a/scripts/signal/unwrap.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/signal/unwrap.m	Sat Oct 23 03:00:31 2010 -0400
@@ -50,8 +50,8 @@
   nd = ndims (a);
   sz = size (a);
   if (nargin == 3)
-    if (!(isscalar (dim) && dim == fix (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == fix (dim))
+        || !(1 <= dim && dim <= nd))
       error ("unwrap: DIM must be an integer and a valid dimension");
     endif
   else
--- a/scripts/statistics/base/histc.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/base/histc.m	Sat Oct 23 03:00:31 2010 -0400
@@ -78,8 +78,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == round (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == round (dim))
+        || !(1 <= dim && dim <= nd))
       error ("histc: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/statistics/base/iqr.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/base/iqr.m	Sat Oct 23 03:00:31 2010 -0400
@@ -50,8 +50,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == round (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == round (dim))
+        || !(1 <= dim && dim <= nd))
       error ("iqr: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/statistics/base/kurtosis.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/base/kurtosis.m	Sat Oct 23 03:00:31 2010 -0400
@@ -62,8 +62,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == round (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == round (dim))
+        || !(1 <= dim && dim <= nd))
       error ("kurtosis: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/statistics/base/mode.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/base/mode.m	Sat Oct 23 03:00:31 2010 -0400
@@ -53,8 +53,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == round (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == round (dim))
+        || !(1 <= dim && dim <= nd))
       error ("mode: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/statistics/base/ranks.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/base/ranks.m	Sat Oct 23 03:00:31 2010 -0400
@@ -50,8 +50,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == round (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == round (dim))
+        || !(1 <= dim && dim <= nd))
       error ("ranks: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/statistics/base/run_count.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/base/run_count.m	Sat Oct 23 03:00:31 2010 -0400
@@ -51,8 +51,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == round (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == round (dim))
+        || !(1 <= dim && dim <= nd))
       error ("run_count: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/statistics/base/skewness.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/base/skewness.m	Sat Oct 23 03:00:31 2010 -0400
@@ -63,8 +63,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == round (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == round (dim))
+        || !(1 <= dim && dim <= nd))
       error ("skewness: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/statistics/base/statistics.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/base/statistics.m	Sat Oct 23 03:00:31 2010 -0400
@@ -51,8 +51,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == round (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == round (dim))
+        || !(1 <= dim && dim <= nd))
       error ("statistics: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/statistics/base/studentize.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/base/studentize.m	Sat Oct 23 03:00:31 2010 -0400
@@ -49,8 +49,8 @@
       dim = 1;
     endif
   else
-    if (!(isscalar (dim) && dim == round (dim)) || 
-        !(1 <= dim && dim <= nd))
+    if (!(isscalar (dim) && dim == round (dim))
+        || !(1 <= dim && dim <= nd))
       error ("studentize: DIM must be an integer and a valid dimension");
     endif
   endif
--- a/scripts/statistics/distributions/exprnd.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/distributions/exprnd.m	Sat Oct 23 03:00:31 2010 -0400
@@ -42,8 +42,8 @@
     endif
     sz = [r, c];
 
-    if (any (size (l) != 1) && 
-        (length (size (l)) != length (sz) || any (size (l) != sz)))
+    if (any (size (l) != 1)
+        && (length (size (l)) != length (sz) || any (size (l) != sz)))
       error ("exprnd: lambda must be scalar or of size [r, c]");
     endif
   elseif (nargin == 2)
@@ -55,8 +55,8 @@
       error ("exprnd: r must be a positive integer or vector");
     endif
 
-    if (any (size (l) != 1) && 
-        ((length (size (l)) != length (sz)) || any (size (l) != sz)))
+    if (any (size (l) != 1)
+        && ((length (size (l)) != length (sz)) || any (size (l) != sz)))
       error ("exprnd: lambda must be scalar or of size sz");
     endif
   elseif (nargin == 1)
--- a/scripts/statistics/distributions/frnd.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/distributions/frnd.m	Sat Oct 23 03:00:31 2010 -0400
@@ -53,8 +53,8 @@
     endif
     sz = [r, c];
 
-    if (any (size (m) != 1) && 
-        ((length (size (m)) != length (sz)) || any (size (m) != sz)))
+    if (any (size (m) != 1)
+        && ((length (size (m)) != length (sz)) || any (size (m) != sz)))
       error ("frnd: m and n must be scalar or of size [r,c]");
     endif
   elseif (nargin == 3)
@@ -66,8 +66,8 @@
       error ("frnd: r must be a positive integer or vector");
     endif
 
-    if (any (size (m) != 1) && 
-        ((length (size (m)) != length (sz)) || any (size (m) != sz)))
+    if (any (size (m) != 1)
+        && ((length (size (m)) != length (sz)) || any (size (m) != sz)))
       error ("frnd: m and n must be scalar or of size sz");
     endif
   elseif (nargin == 2)
--- a/scripts/statistics/distributions/geornd.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/distributions/geornd.m	Sat Oct 23 03:00:31 2010 -0400
@@ -42,8 +42,8 @@
     endif
     sz = [r, c];
 
-    if (any (size (p) != 1) && ((length (size (p)) != length (sz)) ||
-                                any (size (p) != sz)))
+    if (any (size (p) != 1)
+        && ((length (size (p)) != length (sz)) || any (size (p) != sz)))
       error ("geornd: p must be scalar or of size [r, c]");
     endif
   elseif (nargin == 2)
@@ -55,8 +55,8 @@
       error ("geornd: r must be a positive integer or vector");
     endif
 
-    if (any (size (p) != 1) && ((length (size (p)) != length (sz)) ||
-                                any (size (p) != sz)))
+    if (any (size (p) != 1)
+        && ((length (size (p)) != length (sz)) || any (size (p) != sz)))
       error ("geornd: n must be scalar or of size sz");
     endif
   elseif (nargin == 1)
--- a/scripts/statistics/distributions/lognrnd.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/distributions/lognrnd.m	Sat Oct 23 03:00:31 2010 -0400
@@ -51,8 +51,8 @@
     endif
     sz = [r, c];
 
-    if (any (size (mu) != 1) && 
-        ((length (size (mu)) != length (sz)) || any (size (mu) != sz)))
+    if (any (size (mu) != 1)
+        && ((length (size (mu)) != length (sz)) || any (size (mu) != sz)))
       error ("lognrnd: mu and sigma must be scalar or of size [r, c]");
     endif
 
@@ -65,8 +65,8 @@
       error ("lognrnd: r must be a positive integer or vector");
     endif
 
-    if (any (size (mu) != 1) && 
-        ((length (size (mu)) != length (sz)) || any (size (mu) != sz)))
+    if (any (size (mu) != 1)
+        && ((length (size (mu)) != length (sz)) || any (size (mu) != sz)))
       error ("lognrnd: mu and sigma must be scalar or of size sz");
     endif
   elseif (nargin == 2)
--- a/scripts/statistics/distributions/nbinrnd.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/distributions/nbinrnd.m	Sat Oct 23 03:00:31 2010 -0400
@@ -51,8 +51,8 @@
     endif
     sz = [r, c];
 
-    if (any (size (n) != 1) && 
-        ((length (size (n)) != length (sz)) || any (size (n) != sz)))
+    if (any (size (n) != 1)
+        && ((length (size (n)) != length (sz)) || any (size (n) != sz)))
       error ("nbinrnd: n and p must be scalar or of size [r, c]");
     endif
 
@@ -65,8 +65,8 @@
       error ("nbinrnd: r must be a positive integer or vector");
     endif
 
-    if (any (size (n) != 1) && 
-        ((length (size (n)) != length (sz)) || any (size (n) != sz)))
+    if (any (size (n) != 1)
+        && ((length (size (n)) != length (sz)) || any (size (n) != sz)))
       error ("nbinrnd: n and p must be scalar or of size sz");
     endif
   elseif (nargin == 2)
@@ -78,8 +78,8 @@
   if (isscalar (n) && isscalar (p))
     if ((n < 1) || (n == Inf) || (n != round (n)) || (p <= 0) || (p > 1));
       rnd = NaN (sz);
-    elseif ((n > 0) && (n < Inf) && (n == round (n)) && 
-            (p > 0) && (p <= 1))
+    elseif ((n > 0) && (n < Inf) && (n == round (n))
+            && (p > 0) && (p <= 1))
       rnd = randp ((1 - p) ./ p .* randg (n, sz));
     else
       rnd = zeros (sz);
@@ -87,8 +87,7 @@
   else
     rnd = zeros (sz);
 
-    k = find ((n < 1) || (n == Inf) || (n != round (n)) || 
-              (p <= 0) || (p > 1));
+    k = find ((n < 1) | (n == Inf) | (n != round (n)) | (p <= 0) | (p > 1));
     if (any (k))
       rnd(k) = NaN;
     endif
--- a/scripts/statistics/distributions/poissrnd.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/distributions/poissrnd.m	Sat Oct 23 03:00:31 2010 -0400
@@ -40,8 +40,8 @@
     endif
     sz = [r, c];
 
-    if (any (size (l) != 1) && 
-        ((length (size (l)) != length (sz)) || any (size (l) != sz)))
+    if (any (size (l) != 1)
+        && ((length (size (l)) != length (sz)) || any (size (l) != sz)))
       error ("poissrnd: lambda must be scalar or of size [r, c]");
     endif
   elseif (nargin == 2)
@@ -53,8 +53,8 @@
       error ("poissrnd: r must be a positive integer or vector");
     endif
 
-    if (any (size (l) != 1) && 
-        ((length (size (l)) != length (sz)) || any (size (l) != sz)))
+    if (any (size (l) != 1)
+        && ((length (size (l)) != length (sz)) || any (size (l) != sz)))
       error ("poissrnd: lambda must be scalar or of size sz");
     endif
   elseif (nargin == 1)
--- a/scripts/statistics/distributions/trnd.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/distributions/trnd.m	Sat Oct 23 03:00:31 2010 -0400
@@ -42,8 +42,8 @@
     endif
     sz = [r, c];
 
-    if (any (size (n) != 1) && 
-        ((length (size (n)) != length (sz)) || any (size (n) != sz)))
+    if (any (size (n) != 1)
+        && ((length (size (n)) != length (sz)) || any (size (n) != sz)))
       error ("trnd: n must be scalar or of size sz");
     endif
   elseif (nargin == 2)
@@ -55,8 +55,8 @@
       error ("trnd: r must be a positive integer or vector");
     endif
 
-    if (any (size (n) != 1) && 
-        ((length (size (n)) != length (sz)) || any (size (n) != sz)))
+    if (any (size (n) != 1)
+        && ((length (size (n)) != length (sz)) || any (size (n) != sz)))
       error ("trnd: n must be scalar or of size sz");
     endif
   elseif (nargin == 1)
--- a/scripts/statistics/distributions/wblrnd.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/statistics/distributions/wblrnd.m	Sat Oct 23 03:00:31 2010 -0400
@@ -51,9 +51,9 @@
     endif
     sz = [r, c];
 
-    if (any (size (scale) != 1) && 
-        ((length (size (scale)) != length (sz))
-         || any (size (scale) != sz)))
+    if (any (size (scale) != 1)
+        && ((length (size (scale)) != length (sz))
+            || any (size (scale) != sz)))
       error ("wblrnd: scale and shape must be scalar or of size [r, c]");
     endif
   elseif (nargin == 3)
@@ -65,9 +65,9 @@
       error ("wblrnd: r must be a positive integer or vector");
     endif
 
-    if (any (size (scale) != 1) && 
-        ((length (size (scale)) != length (sz))
-         || any (size (scale) != sz)))
+    if (any (size (scale) != 1)
+        && ((length (size (scale)) != length (sz))
+            || any (size (scale) != sz)))
       error ("wblrnd: scale and shape must be scalar or of size sz");
     endif
   elseif (nargin == 2)
--- a/scripts/strings/strcat.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/strings/strcat.m	Sat Oct 23 03:00:31 2010 -0400
@@ -107,8 +107,8 @@
 %!assert(strcat(["ab ";"cde"], ["ab ";"cde"]), ["abab  ";"cdecde"])
 
 ## test for deblanking implied trailing spaces of character input
-%!assert((strcmp (strcat ("foo", "bar"), "foobar") &&
-%!        strcmp (strcat (["a"; "bb"], ["foo"; "bar"]), ["afoo "; "bbbar"])));
+%!assert((strcmp (strcat ("foo", "bar"), "foobar")
+%!        && strcmp (strcat (["a"; "bb"], ["foo"; "bar"]), ["afoo "; "bbbar"])));
 
 ## test for mixing character and cell inputs
 %!assert(all (strcmp (strcat ("a", {"bc", "de"}, "f"), {"abcf", "adef"})))
--- a/scripts/time/datestr.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/time/datestr.m	Sat Oct 23 03:00:31 2010 -0400
@@ -197,8 +197,8 @@
       ## Make sure that the input really is a datevec.
       maxdatevec = [Inf, 12, 31, 23, 59, 60];
       for i = 1:numel (maxdatevec)
-        if (any (date(:,i) > maxdatevec(i)) || 
-            (i != 6 && any (floor (date(:, i)) != date (:, i))))
+        if (any (date(:,i) > maxdatevec(i))
+            || (i != 6 && any (floor (date(:,i)) != date(:,i))))
           v = datevec (date, p);
           break;
         endif
--- a/scripts/time/datetick.m	Sat Oct 23 02:31:08 2010 -0400
+++ b/scripts/time/datetick.m	Sat Oct 23 03:00:31 2010 -0400
@@ -92,8 +92,8 @@
 
   if (nargin != 0)
     arg = varargin{1};
-    if (ischar(arg) && (strcmp (arg, "x") || strcmp (arg, "y") || 
-      strcmp (arg, "z")))
+    if (ischar (arg) && (strcmp (arg, "x") || strcmp (arg, "y")
+                         || strcmp (arg, "z")))
       ax = arg;
       if (nargin > 1)
         form = varargin{2};