--- a/scripts/audio/@audioplayer/audioplayer.m
+++ b/scripts/audio/@audioplayer/audioplayer.m
@@ -107,6 +107,7 @@
 
 endfunction
 
+
 %!demo
 %! fs = 44100;
 %! audio = randn (2, 2*fs) - 0.5;

--- a/scripts/audio/@audiorecorder/audiorecorder.m
+++ b/scripts/audio/@audiorecorder/audiorecorder.m
@@ -51,6 +51,7 @@
 
 endfunction
 
+
 %!demo
 %! recorder = audiorecorder (44100, 16, 2);
 %! record (recorder, 1);

--- a/scripts/audio/mu2lin.m
+++ b/scripts/audio/mu2lin.m
@@ -63,7 +63,7 @@
   ## Set the shape of y to that of x overwrites the contents of y with
   ## ulaw of x.
   y = x;
-  y(:) = ulaw (x + 1);
+  y(:) = ulaw(x + 1);
 
   ## Convert to real or 8-bit.
   if (n == 0)

--- a/scripts/audio/record.m
+++ b/scripts/audio/record.m
@@ -62,7 +62,7 @@
 
 %!assert (isempty (record (0)))
 
-%% Test input validation
+## Test input validation
 %!error record ()
 %!error record (1,2,3)
 %!error record (-1)

--- a/scripts/audio/sound.m
+++ b/scripts/audio/sound.m
@@ -59,7 +59,7 @@
 
 ## Tests of sound must not actually play anything.
 
-%% Test input validation
+## Test input validation
 %!error sound ()
 %!error sound (1,2,3,4)
 %!error sound (1, -1)

--- a/scripts/audio/soundsc.m
+++ b/scripts/audio/soundsc.m
@@ -50,7 +50,7 @@
 
   if (nargin < 2 || isempty (fs))
     fs = 8000;
-  elseif ((nargin == 2) && (numel (fs) > 1))
+  elseif (nargin == 2 && numel (fs) > 1)
     yrange = fs;
     fs = 8000;
   elseif (! (isscalar (fs) && (fs > 0)))
@@ -59,7 +59,7 @@
 
   if (nargin < 3 || isempty (nbits))
     nbits = 8;
-  elseif ((nargin == 3) && (numel (nbits) > 1))
+  elseif (nargin == 3 && numel (nbits) > 1)
     yrange = nbits;
     nbits = 8;
   elseif (! (isscalar (nbits) && (nbits == 8 || nbits == 16 || nbits == 24)))
@@ -92,7 +92,7 @@
 
 ## Tests of soundsc must not actually play anything.
 
-%% Test input validation
+## Test input validation
 %!error soundsc ()
 %!error soundsc (1,2,3,4,5)
 %!error soundsc (1, -1)

--- a/scripts/audio/wavread.m
+++ b/scripts/audio/wavread.m
@@ -103,7 +103,7 @@
 
 ## Functional tests for wavread/wavwrite pair are in wavwrite.m.
 
-%% Test input validation
+## Test input validation
 %!error wavread ()
 %!error wavread (1)
 %!error wavread ("foo.wav", 2, 3, 4)

--- a/scripts/audio/wavwrite.m
+++ b/scripts/audio/wavwrite.m
@@ -168,7 +168,7 @@
 %!   unlink (fname);
 %! end_unwind_protect
 
-%% Test input validation
+## Test input validation
 %!error wavwrite ()
 %!error wavwrite (1)
 %!error wavwrite (1,2,3,4,5)

--- a/scripts/deprecated/delaunay3.m
+++ b/scripts/deprecated/delaunay3.m
@@ -86,5 +86,5 @@
 %! x = [-1, -1, 1, 0, -1]; y = [-1, 1, 1, 0, -1]; z = [0, 0, 0, 1, 1];
 %! assert (sortrows (sort (delaunay3 (x, y, z), 2)), [1,2,3,4;1,2,4,5])
 
-%% FIXME: Need input validation tests
+## FIXME: Need input validation tests
 

--- a/scripts/deprecated/interp1q.m
+++ b/scripts/deprecated/interp1q.m
@@ -55,7 +55,7 @@
   dy = diff (y);
   dx = diff (x);
   idx = lookup (x, xi, "lr");
-  s = (xi - x (idx)) ./ dx (idx);
+  s = (xi - x(idx)) ./ dx(idx);
   yi = bsxfun (@times, s, dy(idx,:)) + y(idx,:);
   range = xi < x(1) | !(xi <= x(nx));
   yi(range,:) = NA;

--- a/scripts/deprecated/java_convert_matrix.m
+++ b/scripts/deprecated/java_convert_matrix.m
@@ -22,7 +22,7 @@
 ## @deftypefnx {Built-in Function} {} java_convert_matrix (@var{new_val}, "local")
 ## Query or set the internal variable that controls whether Java arrays are
 ## automatically converted to Octave matrices.  The default value is false.
-## 
+##
 ## When called from inside a function with the @qcode{"local"} option, the
 ## variable is changed locally for the function and any subroutines it calls.
 ##  The original variable value is restored when exiting the function.

--- a/scripts/deprecated/java_debug.m
+++ b/scripts/deprecated/java_debug.m
@@ -23,7 +23,7 @@
 ## Query or set the internal variable that determines whether extra debugging
 ## information regarding the initialization of the JVM and any Java exceptions
 ## is printed.
-## 
+##
 ## When called from inside a function with the @qcode{"local"} option, the
 ## variable is changed locally for the function and any subroutines it calls.
 ##  The original variable value is restored when exiting the function.

--- a/scripts/deprecated/java_invoke.m
+++ b/scripts/deprecated/java_invoke.m
@@ -21,20 +21,20 @@
 ## @deftypefnx {Built-in Function} {@var{ret} =} java_invoke (@var{obj}, @var{methodname}, @var{arg1}, @dots{})
 ## Invoke the method @var{methodname} on the Java object @var{obj} with the
 ## arguments @var{arg1}, @dots{}  For static methods, @var{obj} can be a
-## string representing the fully qualified name of the corresponding class. 
+## string representing the fully qualified name of the corresponding class.
 ## The function returns the result of the method invocation.
-## 
+##
 ## When @var{obj} is a regular Java object, structure-like indexing can be
 ## used as a shortcut syntax.  For instance, the two following statements are
 ## equivalent
-## 
+##
 ## @example
 ## @group
 ##   ret = java_invoke (x, "method1", 1.0, "a string")
 ##   ret = x.method1 (1.0, "a string")
 ## @end group
 ## @end example
-## 
+##
 ## @seealso{javaMethod, javaObject}
 ## @end deftypefn
 
@@ -46,7 +46,7 @@
     warning ("Octave:deprecated-function",
              "java_invoke is obsolete and will be removed from a future version of Octave, please use javaMethod instead");
   endif
-  
+
   if (nargin < 2)
     print_usage ();
   endif

--- a/scripts/deprecated/java_new.m
+++ b/scripts/deprecated/java_new.m
@@ -21,14 +21,14 @@
 ## @deftypefnx {Loadable Function} {@var{obj} =} java_new (@var{name}, @var{arg1}, @dots{})
 ## Create a Java object of class @var{name}, by calling the class constructor
 ## with the arguments @var{arg1}, @dots{}
-## 
+##
 ## @example
 ## @group
 ##   x = java_new ("java.lang.StringBuffer")
 ##   x = java_new ("java.lang.StringBuffer", "Initial string")
 ## @end group
 ## @end example
-## 
+##
 ## @seealso{javaObject, javaMethod}
 ## @end deftypefn
 

--- a/scripts/deprecated/java_unsigned_conversion.m
+++ b/scripts/deprecated/java_unsigned_conversion.m
@@ -24,7 +24,7 @@
 ## converted when Java matrix autoconversion is enabled.  When enabled, Java
 ## arrays of class Byte or Integer are converted to matrices of class uint8 or
 ## uint32 respectively.
-## 
+##
 ## When called from inside a function with the @qcode{"local"} option, the
 ## variable is changed locally for the function and any subroutines it calls.
 ##  The original variable value is restored when exiting the function.

--- a/scripts/deprecated/javafields.m
+++ b/scripts/deprecated/javafields.m
@@ -20,7 +20,7 @@
 ## @deftypefn  {Function File} {} javafields (@var{javaobj})
 ## @deftypefnx {Function File} {} javafields ("@var{classname}")
 ## @deftypefnx {Function File} {@var{fld_names} =} javafields (@dots{})
-## Return the fields of a Java object or Java class in the form of a cell 
+## Return the fields of a Java object or Java class in the form of a cell
 ## array of strings.  If no output is requested, print the result
 ## to the standard output.
 ## @seealso{fieldnames, methods, javaObject}
@@ -34,11 +34,11 @@
     warning ("Octave:deprecated-function",
              "javafields is obsolete and will be removed from a future version of Octave, please use fieldnames instead");
   endif
-  
+
   if (nargin != 1)
     print_usage ();
   endif
-  
+
   c_methods = javaMethod ("getFields", "org.octave.ClassHelper", javaobj);
   method_list = ostrsplit (c_methods, ';');
 

--- a/scripts/deprecated/javamethods.m
+++ b/scripts/deprecated/javamethods.m
@@ -20,7 +20,7 @@
 ## @deftypefn  {Function File} {} javamethods (@var{javaobj})
 ## @deftypefnx {Function File} {} javamethods ("@var{classname}")
 ## @deftypefnx {Function File} {@var{mtd_names} =} javamethods (@dots{})
-## Return the methods of a Java object or Java class in the form of a cell 
+## Return the methods of a Java object or Java class in the form of a cell
 ## array of strings.  If no output is requested, print the result to the
 ## standard output.
 ## @seealso{methods, fieldnames, javaMethod, javaObject}
@@ -34,7 +34,7 @@
     warning ("Octave:deprecated-function",
              "javamethods is obsolete and will be removed from a future version of Octave, please use methods instead");
   endif
-  
+
   if (nargin != 1)
     print_usage ();
   endif

--- a/scripts/deprecated/playaudio.m
+++ b/scripts/deprecated/playaudio.m
@@ -90,7 +90,7 @@
 endfunction
 
 
-%% Test input validation
+## Test input validation
 %!error playaudio ()
 %!error playaudio (1,2,3)
 %!error <X must be a vector> playaudio (magic (3))

--- a/scripts/deprecated/strmatch.m
+++ b/scripts/deprecated/strmatch.m
@@ -119,7 +119,7 @@
 %!assert (strmatch ("", {"", "foo", "bar", ""}), [1, 4])
 %!assert (strmatch ('', { '', '% comment', 'var a = 5', ''}, 'exact'), [1,4])
 
-%% Test input validation
+## Test input validation
 %!error <Invalid call to strmatch> strmatch ()
 %!error <Invalid call to strmatch> strmatch ("a")
 %!error <Invalid call to strmatch> strmatch ("a", "aaa", "exact", 1)

--- a/scripts/general/accumdim.m
+++ b/scripts/general/accumdim.m
@@ -149,7 +149,7 @@
 endfunction
 
 
-%% Test accumdim vs. accumarray
+## Test accumdim vs. accumarray
 %!shared a
 %! a = rand (5, 5, 5);
 
@@ -158,12 +158,12 @@
 %!assert (accumdim ([2;3;2;1;2], a, 3, 3, @min)(1,5,:), accumarray ([2;3;2;1;2], a(1,5,:), [1,1,3], @min))
 %!assert (accumdim ([1;3;2;2;1], a, 2, 3, @median)(4,:,5), accumarray ([1;3;2;2;1], a(4,:,5), [1,3], @median))
 
-%% Test fillval
+## Test fillval
 %!assert (accumdim ([1;3;1;3;3], a)(2,:,:), zeros (1,5,5))
 %!assert (accumdim ([1;3;1;3;3], a, 1, 4)([2 4],:,:), zeros (2,5,5))
 %!assert (accumdim ([1;3;1;3;3], a, 1, 4, [], pi)([2 4],:,:), pi (2,5,5))
 
-%% Test input validation
+## Test input validation
 %!error accumdim (1)
 %!error accumdim (1,2,3,4,5,6,7)
 %!error <SUBS must be a subscript vector> accumdim (ones (2,2), ones (2,2))

--- a/scripts/general/bincoeff.m
+++ b/scripts/general/bincoeff.m
@@ -112,7 +112,7 @@
 
 %!assert (bincoeff ([4 NaN 4], [-1, 2, 2.5]), NaN (1, 3))
 
-%% Test input validation
+## Test input validation
 %!error bincoeff ()
 %!error bincoeff (1, 2, 3)
 %!error bincoeff (ones (3),ones (2))

--- a/scripts/general/blkdiag.m
+++ b/scripts/general/blkdiag.m
@@ -76,7 +76,7 @@
 ## tests involving sparse matrices
 %!assert (blkdiag (sparse ([1,2;3,4]),[5,6;7,8]), sparse ([1,2,0,0;3,4,0,0;0,0,5,6;0,0,7,8]))
 %!assert (blkdiag (sparse ([1,2;3,4]),[5,6]), sparse ([1,2,0,0;3,4,0,0;0,0,5,6]))
-# sanity checks
+## sanity checks
 %!test
 %! A = rand (round (rand (1, 2) * 10));
 %! assert (blkdiag (A), A);

--- a/scripts/general/circshift.m
+++ b/scripts/general/circshift.m
@@ -42,7 +42,7 @@
 ##     9, 7, 8
 ## @end group
 ## @end example
-## @seealso {permute, ipermute, shiftdim}
+## @seealso{permute, ipermute, shiftdim}
 ## @end deftypefn
 
 function y = circshift (x, n)
@@ -94,7 +94,7 @@
 %!assert (circshift (eye (3), 1), circshift (eye (3), 1))
 %!assert (circshift (eye (3), 1), [0,0,1;1,0,0;0,1,0])
 
-%% Test input validation
+## Test input validation
 %!error circshift ()
 %!error circshift (1)
 %!error circshift (1,2,3)

--- a/scripts/general/common_size.m
+++ b/scripts/general/common_size.m
@@ -67,7 +67,7 @@
     else
       errorcode = 0;
       if (nargout > 1)
-        scal = !nscal;
+        scal = ! nscal;
         varargout = varargin;
         if (any (nscal))
           dims = size (varargin{find (nscal, 1)});

--- a/scripts/general/cplxpair.m
+++ b/scripts/general/cplxpair.m
@@ -92,7 +92,7 @@
   perm = [dim:nd, 1:dim-1];
   z = permute (z, perm);
   sz = size (z);
-  n = sz (1);
+  n = sz(1);
   m = prod (sz) / n;
   z = reshape (z, n, m);
 

--- a/scripts/general/cumtrapz.m
+++ b/scripts/general/cumtrapz.m
@@ -90,7 +90,7 @@
   if (! have_xy)
     z = 0.5 * cumsum (x(idx1{:}) + x(idx2{:}), dim);
   else
-    if (isvector (x) && !isvector (y))
+    if (isvector (x) && ! isvector (y))
       if (length (x) != sz(dim))
         error ("cumtrapz: length of X and length of Y along DIM must match");
       endif
@@ -117,17 +117,20 @@
 %! x1 = [0,0,0;2,2,2];
 %! x2 = [0,2,4;0,2,4];
 %! y = [1,2,3;4,5,6];
+%!
 %!assert (cumtrapz (y), [0,0,0;2.5,3.5,4.5])
 %!assert (cumtrapz (x1,y), [0,0,0;5,7,9])
 %!assert (cumtrapz (y,1), [0,0,0;2.5,3.5,4.5])
 %!assert (cumtrapz (x1,y,1), [0,0,0;5,7,9])
 %!assert (cumtrapz (y,2), [0,1.5,4;0,4.5,10])
 %!assert (cumtrapz (x2,y,2), [0,3,8;0,9,20])
-%% Test ND-array implementation
+
+## Test ND-array implementation
 %!shared x1,x2,y
 %! x1 = 1:3;
 %! x2 = reshape ([0,2,4;0,2,4], [1 2 3]);
 %! y = reshape ([1,2,3;4,5,6], [1 2 3]);
+%!
 %!assert (cumtrapz (y,3), reshape ([0,1.5,4;0,4.5,10],[1 2 3]))
 %!assert (cumtrapz (x1,y,3), reshape ([0,1.5,4;0,4.5,10],[1 2 3]))
 %!assert (cumtrapz (x2,y,3), reshape ([0,3,8;0,9,20],[1 2 3]))

--- a/scripts/general/curl.m
+++ b/scripts/general/curl.m
@@ -74,8 +74,8 @@
     print_usage ();
   endif
 
-  if ((nargin == 4) || (nargin == 2))
-    if (!size_equal (varargin{fidx}, varargin{fidx + 1}))
+  if (nargin == 4 || nargin == 2)
+    if (! size_equal (varargin{fidx}, varargin{fidx + 1}))
       error ("curl: size of X and Y must match");
     elseif (ndims (varargin{fidx}) != 2)
       error ("curl: expected two-dimensional matrices X and Y");
@@ -95,8 +95,8 @@
       varargout{2} = av;
     endif
 
-  elseif ((nargin == 6) || (nargin == 3))
-    if (!size_equal (varargin{fidx}, varargin{fidx + 1}, varargin{fidx + 2}))
+  elseif (nargin == 6 || nargin == 3)
+    if (! size_equal (varargin{fidx}, varargin{fidx + 1}, varargin{fidx + 2}))
       error ("curl: size of X, Y, and Z must match");
     elseif (ndims (varargin{fidx}) != 3)
       error ("curl: expected two-dimensional matrices X, Y, and Z");

--- a/scripts/general/dblquad.m
+++ b/scripts/general/dblquad.m
@@ -75,7 +75,7 @@
 endfunction
 
 
-%% Nasty integrand to show quadcc off
+## Nasty integrand to show quadcc off
 %!assert (dblquad (@(x,y) 1 ./ (x+y), 0, 1, 0, 1), 2*log (2), 1e-6)
 
 %!assert (dblquad (@(x,y) exp (-x.^2 - y.^2) , -1, 1, -1, 1, 1e-6, @quadgk), pi * erf (1).^2, 1e-6)

--- a/scripts/general/del2.m
+++ b/scripts/general/del2.m
@@ -140,15 +140,15 @@
         idx1{i} = 1;
         idx2{i} = 2;
         idx3{i} = 3;
-        DD(idx1{:}) = (dx{i}(1) + dx{i}(2)) / dx{i}(2) * DD (idx2{:}) - ...
-            dx{i}(1) / dx{i}(2) * DD (idx3{:});
+        DD(idx1{:}) = (dx{i}(1) + dx{i}(2)) / dx{i}(2) * DD(idx2{:}) - ...
+            dx{i}(1) / dx{i}(2) * DD(idx3{:});
 
         idx1{i} = sz(i);
         idx2{i} = sz(i) - 1;
         idx3{i} = sz(i) - 2;
-        DD(idx1{:}) =  (dx{i}(sz(i) - 1) + dx{i}(sz(i) - 2)) / ...
-            dx{i}(sz(i) - 2) * DD (idx2{:}) - ...
-            dx{i}(sz(i) - 1) / dx{i}(sz(i) - 2) * DD (idx3{:});
+        DD(idx1{:}) = (dx{i}(sz(i) - 1) + dx{i}(sz(i) - 2)) / ...
+            dx{i}(sz(i) - 2) * DD(idx2{:}) - ...
+            dx{i}(sz(i) - 1) / dx{i}(sz(i) - 2) * DD(idx3{:});
       endif
 
       D += DD;

--- a/scripts/general/divergence.m
+++ b/scripts/general/divergence.m
@@ -72,20 +72,21 @@
     print_usage ();
   endif
 
-  if ((nargin == 4) || (nargin == 2))
-    if (!size_equal (varargin{fidx},varargin{fidx + 1}))
+  if (nargin == 4 || nargin == 2)
+    if (! size_equal (varargin{fidx},varargin{fidx + 1}))
       error ("divergence: size of X and Y must match");
     elseif (ndims (varargin{fidx}) != 2)
       error ("divergence: expected two-dimensional matrices X and Y");
-    elseif ((length (dx) != columns (varargin{fidx})) || (length (dy) != rows (varargin{fidx})))
+    elseif (length (dx) != columns (varargin{fidx})
+            || length (dy) != rows (varargin{fidx}))
       error ("divergence: size of dx and dy must match the respective dimension of X and Y");
     endif
 
     retval = gradient (varargin{fidx}, dx, dy);
     retval += gradient (varargin{fidx + 1}.', dy, dx).';
 
-  elseif ((nargin == 6) || (nargin == 3))
-    if (!size_equal (varargin{fidx},varargin{fidx + 1},varargin{fidx + 2}))
+  elseif (nargin == 6 || nargin == 3)
+    if (! size_equal (varargin{fidx},varargin{fidx + 1},varargin{fidx + 2}))
       error ("divergence: size of X, Y, and Z must match");
     elseif (ndims (varargin{fidx}) != 3)
       error ("divergence: expected two-dimensional matrices X, Y, and Z");

--- a/scripts/general/gradient.m
+++ b/scripts/general/gradient.m
@@ -76,7 +76,8 @@
   elseif (isa (m, "function_handle"))
     [varargout{1:nargout_with_ans}] = handle_gradient (m, varargin{:});
   elseif (ischar (m))
-    [varargout{1:nargout_with_ans}] = handle_gradient (str2func (m), varargin{:});
+    [varargout{1:nargout_with_ans}] = handle_gradient (str2func (m), ...
+                                                       varargin{:});
   else
     error ("gradient: first input must be an array or a function");
   endif
@@ -179,7 +180,7 @@
   endif
 
   if (any (p0_size == 1))
-    p0 = p0 (:);
+    p0 = p0(:);
     dim = 1;
     num_points = numel (p0);
   else
@@ -201,7 +202,7 @@
 
   if (isscalar (delta))
     delta = repmat (delta, 1, dim);
-  elseif (!isvector (delta))
+  elseif (! isvector (delta))
     error ("gradient: spacing values must be scalars or a vector");
   endif
 
@@ -209,7 +210,7 @@
   p0 = mat2cell (p0, num_points, ones (1, dim));
   varargout = cell (1, dim);
   for d = 1:dim
-    s = delta (d);
+    s = delta(d);
     df_dx = (f (p0{1:d-1}, p0{d}+s, p0{d+1:end})
            - f (p0{1:d-1}, p0{d}-s, p0{d+1:end})) ./ (2*s);
     if (dim == 1)

--- a/scripts/general/idivide.m
+++ b/scripts/general/idivide.m
@@ -83,7 +83,7 @@
       typ = class (x);
     else
       typ = class (x);
-      if (!strcmp (class (x), class (y)))
+      if (! strcmp (class (x), class (y)))
         error ("idivide: incompatible types");
       endif
     endif

--- a/scripts/general/inputParser.m
+++ b/scripts/general/inputParser.m
@@ -2,7 +2,7 @@
 ##
 ## This file is part of Octave.
 ##
-# Octave is free software; you can redistribute it and/or modify it
+## 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.
@@ -111,7 +111,7 @@
 ##
 ## check ("mech");           # valid, use defaults for other arguments
 ## check ();                 # error, one argument is mandatory
-## check (1);                # error, since !ischar
+## check (1);                # error, since ! ischar
 ## check ("mech", "~/dev");  # valid, use defaults for other arguments
 ##
 ## check ("mech", "~/dev", [0 1 0 0], "type", "linear");  # valid
@@ -242,29 +242,29 @@
 classdef inputParser < handle
   properties
     ## TODO set input checking for this properties
-    CaseSensitive   = false;
-    FunctionName    = "";
-    KeepUnmatched   = false;
-#    PartialMatching = true;   # TODO unimplemented
-#    StructExpand    = true;   # TODO unimplemented
+    CaseSensitive     = false;
+    FunctionName      = "";
+    KeepUnmatched     = false;
+    # PartialMatching = true;   # TODO unimplemented
+    # StructExpand    = true;   # TODO unimplemented
   endproperties
 
   properties (SetAccess = protected)
-    Parameters      = cell ();
-    Results         = struct ();
-    Unmatched       = struct ();
-    UsingDefaults   = cell ();
+    Parameters    = cell ();
+    Results       = struct ();
+    Unmatched     = struct ();
+    UsingDefaults = cell ();
   endproperties
 
   properties (Access = protected)
     ## Since Required and Optional are ordered, they get a cell array of
     ## structs with the fields "name", "def" (default), and "val" (validator).
-    Required    = cell ();
-    Optional    = cell ();
+    Required   = cell ();
+    Optional   = cell ();
     ## ParamValue and Swicth are unordered so we have a struct whose fieldnames
     ## are the argname, and values are a struct with fields "def" and "val"
-    ParamValue  = struct ();
-    Switch      = struct ();
+    ParamValue = struct ();
+    Switch     = struct ();
 
     ## List of ParamValues and Switch names to ease searches
     ParamValueNames = cell ();
@@ -273,7 +273,7 @@
     ## When checking for fieldnames in a Case Insensitive way, this variable
     ## holds the correct identifier for the last searched named using the
     ## is_argname method.
-    last_name = "";
+    last_name  = "";
   endproperties
 
   properties (Access = protected, Constant = true)
@@ -385,7 +385,8 @@
             this.error (sprintf ("no matching value for option '%s'",
                                  toupper (name)));
           endif
-          this.validate_arg (this.last_name, this.ParamValue.(this.last_name).val,
+          this.validate_arg (this.last_name,
+                             this.ParamValue.(this.last_name).val,
                              varargin{vidx});
         elseif (this.is_argname ("Switch", name))
           this.Results.(this.last_name) = true;

--- a/scripts/general/interp1.m
+++ b/scripts/general/interp1.m
@@ -560,8 +560,8 @@
 %!assert (isempty (interp1 (xp,yp,[],style)))
 %!assert (interp1 (xp,[yp',yp'],xi(:),style),...
 %!        [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)])
-# %!assert (interp1 (xp,yp,xi,style),...
-# %!        interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps)
+#%!assert (interp1 (xp,yp,xi,style),...
+#%!        interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps)
 %!assert (ppval (interp1 (xp,yp,style,"pp"),xi),
 %!        interp1 (xp,yp,xi,style,"extrap"),10*eps)
 %!error interp1 (1,1,1, style)
@@ -578,8 +578,8 @@
 %!assert (isempty (interp1 (xp,yp,[],style)))
 %!assert (interp1 (xp,[yp',yp'],xi(:),style),...
 %!        [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)])
-# %!assert (interp1 (xp,yp,xi,style),...
-# %!        interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps)
+#%!assert (interp1 (xp,yp,xi,style),...
+#%!        interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps)
 %!assert (ppval (interp1 (xp,yp,style,"pp"),xi),
 %!        interp1 (xp,yp,xi,style,"extrap"),10*eps)
 %!error interp1 (1,1,1, style)
@@ -595,8 +595,8 @@
 %!assert (isempty (interp1 (xp,yp,[],style)))
 %!assert (interp1 (xp,[yp',yp'],xi(:),style),...
 %!        [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)])
-# %!assert (interp1 (xp,yp,xi,style),...
-# %!        interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps)
+#%!assert (interp1 (xp,yp,xi,style),...
+#%!        interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps)
 %!assert (ppval (interp1 (xp,yp,style,"pp"),xi),
 %!        interp1 (xp,yp,xi,style,"extrap"),10*eps)
 %!error interp1 (1,1,1, style)
@@ -780,7 +780,7 @@
 %!assert (interp1 ([1,2,2,3,4],[0,1,4,2,1],[-1,1.5,2,2.5,3.5], "linear", "extrap", "right"), [-2,0.5,4,3,1.5])
 %!assert (interp1 ([1,2,2,3,4],[0,1,4,2,1],[-1,1.5,2,2.5,3.5], "linear", "extrap", "left"), [-2,0.5,1,3,1.5])
 
-%% Test input validation
+## Test input validation
 %!error interp1 ()
 %!error interp1 (1,2,3,4,5,6,7)
 %!error <minimum of 2 points required> interp1 (1,1,1, "linear")

--- a/scripts/general/interp2.m
+++ b/scripts/general/interp2.m
@@ -314,11 +314,11 @@
 
   endif
 
-  ## extrapolation 'extrap' 
+  ## extrapolation 'extrap'
   if (isempty (extrap))
     extrap = NA;
   endif
-  
+
   if (X(1) < X(end))
     if (Y(1) < Y(end))
       ZI(XI < X(1,1) | XI > X(end) | YI < Y(1,1) | YI > Y(end)) = extrap;
@@ -562,7 +562,7 @@
 %!assert (interp2 (z, [2 3 1], [2 2 2], "cubic"), [5 7 3], 10 * tol)
 %!assert (interp2 (z, [2 3 1], [2 2 2], "spline"), [5 7 3], tol)
 
-%% Test input validation
+## Test input validation
 %!error interp2 (1, 1, 1, 1, 1, 2)    #only 5 numeric inputs
 %!error interp2 (1, 1, 1, 1, 1, 2, 2) #only 5 numeric inputs
 %!error <Z must be a 2-D matrix> interp2 ({1})

--- a/scripts/general/interp3.m
+++ b/scripts/general/interp3.m
@@ -192,7 +192,7 @@
 endfunction
 
 
-%% FIXME: Need some demo blocks here to show off the function like interp2.m.
+## FIXME: Need some demo blocks here to show off the function like interp2.m.
 
 %!test  # basic test
 %! x = y = z = -1:1;  y = y + 2;
@@ -255,7 +255,7 @@
 %! V(:,:,2) = V(:,:,1) + 2;
 %! V(:,:,3) = V(:,:,2) + 2;
 %! tol = 10 * eps;
-%! x=[-0.1,0,0.1]; y=x; z=x; 
+%! x=[-0.1,0,0.1]; y=x; z=x;
 %! assert(interp3(X,Y,Z,V,x,y,z,"spline"), [-0.2, 1.0, 2.2]',tol);
 %! assert(interp3(X,Y,Z,V,x,y,z,"linear"), [NA, 1.0, 2.2]',tol);
 %! assert(interp3(X,Y,Z,V,x,y,z,"spline", 0), [0, 1.0, 2.2]',tol);
@@ -280,7 +280,7 @@
 %!assert (interp3 (z, "linear"), zout, tol)
 %!assert (interp3 (z, "spline"), zout, tol)
 
-%% Test input validation
+## Test input validation
 %!error interp3 ()
 %!error interp3 ({1})
 %!error <EXTRAPVAL must be a numeric scalar> interp3 (1,2,3,4,1,2,3,"linear", {1})

--- a/scripts/general/interpft.m
+++ b/scripts/general/interpft.m
@@ -120,19 +120,19 @@
 %!assert (interpft (y', n), y', 20*eps);
 %!assert (interpft ([y,y],n), [y,y], 20*eps);
 
-%% Test case with complex input from bug #39566
+## Test case with complex input from bug #39566
 %!test
 %! x = (1 + j) * [1:4]';
 %! y = ifft ([15 + 15*j; -6; -1.5 - 1.5*j; 0; -1.5 - 1.5*j; -6*j]);
 %! assert (interpft (x, 6), y, 10*eps);
 
-%% Test for correct spectral symmetry with even/odd lengths
+## Test for correct spectral symmetry with even/odd lengths
 %!assert (max (abs (imag (interpft ([1:8], 20)))), 0, 20*eps);
 %!assert (max (abs (imag (interpft ([1:8], 21)))), 0, 21*eps);
 %!assert (max (abs (imag (interpft ([1:9], 20)))), 0, 20*eps);
 %!assert (max (abs (imag (interpft ([1:9], 21)))), 0, 21*eps);
 
-%% Test input validation
+## Test input validation
 %!error interpft ()
 %!error interpft (1)
 %!error interpft (1,2,3)

--- a/scripts/general/interpn.m
+++ b/scripts/general/interpn.m
@@ -181,7 +181,8 @@
     endfor
     idx = cell (1,nd);
     for i = 1 : nd
-      idx{i} = yidx{i} + (y{i} - x{i}(yidx{i})(:) >= x{i}(yidx{i} + 1)(:) - y{i});
+      idx{i} = yidx{i} ...
+               + (y{i} - x{i}(yidx{i})(:) >= x{i}(yidx{i} + 1)(:) - y{i});
     endfor
     vi = v(sub2ind (sz, idx{:}));
     idx = zeros (prod (yshape), 1);
@@ -338,6 +339,6 @@
 %! assert (interpn (z, "linear"), zout, tol);
 %! assert (interpn (z, "spline"), zout, tol);
 
-%% Test input validation
+## Test input validation
 %!warning <ignoring unsupported '\*' flag> interpn (rand (3,3), 1, "*linear");
 

--- a/scripts/general/logspace.m
+++ b/scripts/general/logspace.m
@@ -90,7 +90,7 @@
 %! assert (size (x3) == [1, 10] && abs (x3(1) - 10) < eps && abs (x3(10) - 0.01) < eps);
 %! assert (size (x4) == [1, 10] && abs (x4(1) - 10) < eps && abs (x4(10) - pi) < sqrt (eps));
 
-%% Test input validation
+## Test input validation
 %!error logspace ()
 %!error logspace (1, 2, 3, 4)
 %!error logspace ([1, 2; 3, 4], 5, 6)

--- a/scripts/general/narginchk.m
+++ b/scripts/general/narginchk.m
@@ -37,9 +37,9 @@
 
   if (nargin != 2)
     print_usage;
-  elseif (!isnumeric (minargs) || !isscalar (minargs))
+  elseif (! isnumeric (minargs) || ! isscalar (minargs))
     error ("minargs must be a numeric scalar");
-  elseif (!isnumeric (maxargs) || !isscalar (maxargs))
+  elseif (! isnumeric (maxargs) || ! isscalar (maxargs))
     error ("maxargs must be a numeric scalar");
   elseif (minargs > maxargs)
     error ("minargs cannot be larger than maxargs");

--- a/scripts/general/nargoutchk.m
+++ b/scripts/general/nargoutchk.m
@@ -50,7 +50,8 @@
   ## message in a string). With 2011b, it no longer returns anything, it simply
   ## gives an error if the args number is incorrect.
   ## To try to keep compatibility with both versions, check nargout and nargin
-  ## to guess if the caller is expecting a value (old syntax) or none (new syntax)
+  ## to guess if the caller is expecting a value (old syntax)
+  ## or none (new syntax).
 
   if (nargout == 1 && (nargin == 3 || nargin == 4))
 
@@ -82,9 +83,9 @@
 
   elseif (nargout == 0 && nargin == 2)
 
-    if (!isnumeric (minargs) || !isscalar (minargs))
+    if (! isnumeric (minargs) || ! isscalar (minargs))
       error ("minargs must be a numeric scalar");
-    elseif (!isnumeric (maxargs) || !isscalar (maxargs))
+    elseif (! isnumeric (maxargs) || ! isscalar (maxargs))
       error ("maxargs must be a numeric scalar");
     elseif (minargs > maxargs)
       error ("minargs cannot be larger than maxargs");

--- a/scripts/general/num2str.m
+++ b/scripts/general/num2str.m
@@ -91,7 +91,7 @@
     else
       if (isnumeric (x))
         ## Setup a suitable format string, ignoring inf entries
-        dgt = floor (log10 (max (abs (x(!isinf (x(:)))))));
+        dgt = floor (log10 (max (abs (x(! isinf (x(:)))))));
         if (isempty (dgt))
           ## If the whole input array is inf...
           dgt = 1;
@@ -129,8 +129,8 @@
       endif
     else
       ## Setup a suitable format string
-      dgt = floor (log10 (max (max (abs (real (x(!isinf (real (x(:))))))),
-                               max (abs (imag (x(!isinf (imag (x(:))))))))));
+      dgt = floor (log10 (max (max (abs (real (x(! isinf (real (x(:))))))),
+                               max (abs (imag (x(! isinf (imag (x(:))))))))));
       if (isempty (dgt))
         ## If the whole input array is inf...
         dgt = 1;

--- a/scripts/general/postpad.m
+++ b/scripts/general/postpad.m
@@ -72,14 +72,14 @@
     sz(nd+1:dim) = 1;
   endif
 
-  d = sz (dim);
+  d = sz(dim);
 
   if (d >= l)
     idx = repmat ({':'}, nd, 1);
     idx{dim} = 1:l;
     y = x(idx{:});
   else
-    sz (dim) = l - d;
+    sz(dim) = l - d;
     y = cat (dim, x, c(ones (sz)));
   endif
 

--- a/scripts/general/prepad.m
+++ b/scripts/general/prepad.m
@@ -72,14 +72,14 @@
     sz(nd+1:dim) = 1;
   endif
 
-  d = sz (dim);
+  d = sz(dim);
 
   if (d >= l)
     idx = repmat ({':'}, nd, 1);
     idx{dim} = d-l+1:d;
     y = x(idx{:});
   else
-    sz (dim) = l - d;
+    sz(dim) = l - d;
     y = cat (dim, c(ones (sz)), x);
   endif
 

--- a/scripts/general/private/__splinen__.m
+++ b/scripts/general/private/__splinen__.m
@@ -28,8 +28,9 @@
 function yi = __splinen__ (x, y, xi, extrapval, f)
   ## 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;
@@ -38,7 +39,7 @@
   endfor
 
   [xi{:}] = ndgrid (cellfun (@(x) x(:), xi, "uniformoutput", false){:});
-  if (!isempty (extrapval))
+  if (! isempty (extrapval))
     idx = zeros (size (xi{1}));
     for i = 1 : length (x)
       idx |= xi{i} < min (x{i}(:)) | xi{i} > max (x{i}(:));

--- a/scripts/general/profile.m
+++ b/scripts/general/profile.m
@@ -147,7 +147,7 @@
 %! assert (size (hier), [0, 1]);
 %! assert (fieldnames (hier), {"Index"; "SelfTime"; "NumCalls"; "Children"});
 
-%% Test input validation
+## Test input validation
 %!error profile ()
 %!error profile ("on", 2)
 %!error profile ("INVALID_OPTION")

--- a/scripts/general/quadgk.m
+++ b/scripts/general/quadgk.m
@@ -163,7 +163,7 @@
             elseif (strcmpi (str, "waypoints"))
               waypoints = varargin{idx++} (:);
               if (isreal (waypoints))
-                waypoints (waypoints < a | waypoints > b) = [];
+                waypoints(waypoints < a | waypoints > b) = [];
               endif
             elseif (strcmpi (str, "maxintervalcount"))
               maxint = varargin{idx++};

--- a/scripts/general/quadv.m
+++ b/scripts/general/quadv.m
@@ -152,12 +152,12 @@
 %!assert (quadv (@sin, 0, 2 * pi), 0, 1e-5)
 %!assert (quadv (@sin, 0, pi), 2, 1e-5)
 
-%% Handles weak singularities at the edge
+## Handles weak singularities at the edge
 %!assert (quadv (@(x) 1 ./ sqrt (x), 0, 1), 2, 1e-5)
 
-%% Handles vector-valued functions
+## Handles vector-valued functions
 %!assert (quadv (@(x) [(sin (x)), (sin (2 * x))], 0, pi), [2, 0], 1e-5)
 
-%% Handles matrix-valued functions
+## Handles matrix-valued functions
 %!assert (quadv (@(x) [ x, x, x; x, 1./sqrt(x), x; x, x, x ], 0, 1 ), [0.5, 0.5, 0.5; 0.5, 2, 0.5; 0.5, 0.5, 0.5], 1e-5)
 

--- a/scripts/general/randi.m
+++ b/scripts/general/randi.m
@@ -129,7 +129,7 @@
 %!
 %!assert (size (randi (10, 3,1,2)), [3, 1, 2])
 
-%% Test input validation
+## Test input validation
 %!error (randi ())
 %!error (randi ("test"))
 %!error (randi (10+2i))

--- a/scripts/general/repmat.m
+++ b/scripts/general/repmat.m
@@ -68,7 +68,7 @@
     endif
   else
     if (nargin > 3)
-      # input check for m and varargin
+      ## input check for m and varargin
       if (isscalar (m) && all (cellfun ("numel", varargin) == 1))
         m = [m varargin{:}];
         n = [];
@@ -137,7 +137,7 @@
 endfunction
 
 
-# Tests for ML compatibility
+## Tests for ML compatibility
 %!shared x
 %! x = [1 2 3];
 %!assert (repmat (x, [3, 1]), repmat (x, 3, []))
@@ -152,7 +152,7 @@
 %!assert (repmat (x, [1 1], 4), repmat (x, [1 1 4]));
 %!assert (repmat (x, [1 1], 4), repmat (x, 1, [1 4]));
 
-# Test various methods of providing size parameters
+## Test various methods of providing size parameters
 %!shared x
 %! x = [1 2;3 4];
 %!assert (repmat (x, [1 1]), repmat (x, 1))
@@ -163,7 +163,7 @@
 %!assert (repmat (x, [3 3]), repmat (x, 3, 3))
 %!assert (repmat (pi, [1,2,3,4]), repmat (pi, 1,2,3,4))
 
-# Tests for numel==1 case:
+## Tests for numel==1 case:
 %!shared x, r
 %! x = [ 65 ];
 %! r = kron (ones (2,2), x);
@@ -171,7 +171,7 @@
 %!assert (char (r), repmat (char (x), [2 2]))
 %!assert (int8 (r), repmat (int8 (x), [2 2]))
 
-# Tests for ndims==2 case:
+## Tests for ndims==2 case:
 %!shared x, r
 %! x = [ 65 66 67 ];
 %! r = kron (ones (2,2), x);
@@ -179,7 +179,7 @@
 %!assert (char (r), repmat (char (x), [2 2]))
 %!assert (int8 (r), repmat (int8 (x), [2 2]))
 
-# Tests for dim>2 case:
+## Tests for dim>2 case:
 %!shared x, r
 %! x = [ 65 66 67 ];
 %! r = kron (ones (2,2), x);
@@ -188,7 +188,7 @@
 %!assert (char (r), repmat (char (x), [2 2 2]))
 %!assert (int8 (r), repmat (int8 (x), [2 2 2]))
 
-# Test that sparsity is kept
+## Test that sparsity is kept
 %!assert (sparse (4,4), repmat (sparse (2,2),[2 2]))
 
 %!assert (size (repmat (".", -1, 1)), [0, 1])

--- a/scripts/general/rot90.m
+++ b/scripts/general/rot90.m
@@ -132,7 +132,7 @@
 %! assert (rot90 (a, 2), rot90 (b, 1))
 %! assert (rot90 (a, 3), rot90 (b, 2))
 
-%% Test input validation
+## Test input validation
 %!error rot90 ()
 %!error rot90 (1, 2, 3)
 %!error rot90 (1, ones (2))

--- a/scripts/general/rotdim.m
+++ b/scripts/general/rotdim.m
@@ -61,7 +61,7 @@
   endif
 
   if (nargin > 1 && ! isempty (n))
-    if (!isscalar (n) || !isreal (n) || fix (n) != n)
+    if (! isscalar (n) || ! isreal (n) || fix (n) != n)
       error ("rotdim: N must be a scalar integer");
     endif
   else

--- a/scripts/general/shift.m
+++ b/scripts/general/shift.m
@@ -87,7 +87,7 @@
 %! assert (shift (m, 1), [c; a; b]);
 %! assert (shift (m, -2), [c; a; b]);
 
-%% Test input validation
+## Test input validation
 %!error shift ()
 %!error shift (1, 2, 3, 4)
 %!error shift ([], 1)

--- a/scripts/general/shiftdim.m
+++ b/scripts/general/shiftdim.m
@@ -44,7 +44,7 @@
 ##    @result{} ns = 1
 ## @end group
 ## @end example
-## @seealso {reshape, permute, ipermute, circshift, squeeze}
+## @seealso{reshape, permute, ipermute, circshift, squeeze}
 ## @end deftypefn
 
 function [y, ns]  = shiftdim (x, n)
@@ -93,7 +93,7 @@
 
 %!assert (size (shiftdim (rand (0, 1, 2))), [0 1 2])
 
-%% Test input validation
+## Test input validation
 %!error (shiftdim ())
 %!error (shiftdim (1,2,3))
 %!error (shiftdim (1, ones (2)))

--- a/scripts/general/sortrows.m
+++ b/scripts/general/sortrows.m
@@ -127,7 +127,7 @@
 %! assert (x, full (sx));
 %! assert (idx, sidx);
 
-%% Test input validation
+## Test input validation
 %!error sortrows ()
 %!error sortrows (1, 2, 3)
 %!error sortrows (1, "ascend")

--- a/scripts/general/structfun.m
+++ b/scripts/general/structfun.m
@@ -106,7 +106,8 @@
   [varargout{:}] = cellfun (func, struct2cell (S), varargin{:});
 
   if (! uniform_output)
-    varargout = cellfun ("cell2struct", varargout, {fieldnames(S)}, {1}, uo_str, false);
+    varargout = cellfun ("cell2struct", varargout, {fieldnames(S)}, {1}, ...
+                         uo_str, false);
   endif
 endfunction
 

--- a/scripts/general/trapz.m
+++ b/scripts/general/trapz.m
@@ -104,7 +104,7 @@
   if (! have_xy)
     z = 0.5 * sum (x(idx1{:}) + x(idx2{:}), dim);
   else
-    if (isvector (x) && !isvector (y))
+    if (isvector (x) && ! isvector (y))
       if (length (x) != sz(dim))
         error ("trapz: length of X and length of Y along DIM must match");
       endif

--- a/scripts/general/triplequad.m
+++ b/scripts/general/triplequad.m
@@ -65,7 +65,8 @@
     varargin = {};
   endif
 
-  q = dblquad (@(y, z) inner (y, z, f, xa, xb, tol, quadf, varargin{:}), ya, yb, za, zb, tol);
+  q = dblquad (@(y, z) inner (y, z, f, xa, xb, tol, quadf, varargin{:}), ...
+               ya, yb, za, zb, tol);
 
 endfunction
 
@@ -79,7 +80,7 @@
 
 %!assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadcc), pi^(3/2) * erf (1).^3, 1e-6)
 
-%% These tests are too expensive to run normally (~30 sec each).  Disable them
+## These tests are too expensive to run normally (~30 sec each).  Disable them
 #%!assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadgk), pi^(3/2) * erf (1).^3, 1e-6)
 #%!#assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadl), pi^(3/2) * erf (1).^3, 1e-6)
 #%!#assert (triplequad (@(x,y,z) exp (-x.^2 - y.^2 - z.^2) , -1, 1, -1, 1, -1, 1, [], @quadv), pi^(3/2) * erf (1).^3, 1e-6)

--- a/scripts/general/validateattributes.m
+++ b/scripts/general/validateattributes.m
@@ -338,6 +338,7 @@
   endif
 endfunction
 
+
 %!error <double> validateattributes (rand (5), {"uint8"}, {})
 %!error <single> validateattributes (uint8 (rand (5)), {"float"}, {})
 %!error <2d> validateattributes (rand (5, 5, 5), {}, {"2d"})

--- a/scripts/geometry/convhull.m
+++ b/scripts/geometry/convhull.m
@@ -100,5 +100,5 @@
 %! y = abs (sin (x));
 %! assert (convhull (x, y), [1;7;13;12;11;10;4;3;2;1]);
 
-%% FIXME: Need input validation tests
+## FIXME: Need input validation tests
 

--- a/scripts/geometry/delaunay.m
+++ b/scripts/geometry/delaunay.m
@@ -197,7 +197,7 @@
 %! x = [-1, -1, 1, 0, -1]; y = [-1, 1, 1, 0, -1]; z = [0, 0, 0, 1, 1];
 %! assert (sortrows (sort (delaunay (x, y, z), 2)), [1,2,3,4;1,2,4,5])
 
-%% Input validation tests
+## Input validation tests
 %!error delaunay ()
 %!error delaunay (1,2,3,4,5)
 %!error <X must be a matrix with 2 or 3 columns> delaunay (ones (2,4))

--- a/scripts/geometry/delaunayn.m
+++ b/scripts/geometry/delaunayn.m
@@ -96,8 +96,8 @@
 %! x = [-1, -1, 1, 0, -1]; y = [-1, 1, 1, 0, -1]; z = [0, 0, 0, 1, 1];
 %! assert (sortrows (sort (delaunayn ([x(:) y(:) z(:)]), 2)), [1,2,3,4;1,2,4,5])
 
-%% FIXME: Need tests for delaunayn
+## FIXME: Need tests for delaunayn
 
-%% Input validation tests
+## Input validation tests
 %!error delaunayn ()
 

--- a/scripts/geometry/griddata.m
+++ b/scripts/geometry/griddata.m
@@ -89,7 +89,7 @@
   elseif (strcmp (method, "nearest"))
     ## Search index of nearest point.
     idx = dsearch (x, y, tri, xi, yi);
-    valid = !isnan (idx);
+    valid = ! isnan (idx);
     zi(valid) = z(idx(valid));
 
   elseif (strcmp (method, "linear"))
@@ -97,7 +97,7 @@
     tri_list = tsearch (x, y, tri, xi(:), yi(:));
 
     ## Only keep the points within triangles.
-    valid = !isnan (tri_list);
+    valid = ! isnan (tri_list);
     tri_list = tri_list(valid);
     nr_t = rows (tri_list);
 
@@ -187,7 +187,7 @@
 %! zz2(isnan (zz)) = NaN;
 %! assert (zz, zz2, 100*eps);
 
-%% Test input validation
+## Test input validation
 %!error griddata ()
 %!error griddata (1)
 %!error griddata (1,2)

--- a/scripts/geometry/griddatan.m
+++ b/scripts/geometry/griddatan.m
@@ -62,7 +62,7 @@
   if (strcmp (method, "nearest"))
     ## search index of nearest point
     idx = dsearchn (x, tri, xi);
-    valid = !isnan (idx);
+    valid = ! isnan (idx);
     yi(valid) = y(idx(valid));
 
   elseif (strcmp (method, "linear"))
@@ -70,13 +70,13 @@
     [tri_list, bary_list] = tsearchn (x, tri, xi);
 
     ## only keep the points within triangles.
-    valid = !isnan (tri_list);
-    tri_list = tri_list(!isnan (tri_list));
-    bary_list = bary_list(!isnan (tri_list), :);
+    valid = ! isnan (tri_list);
+    tri_list = tri_list(! isnan (tri_list));
+    bary_list = bary_list(! isnan (tri_list), :);
     nr_t = rows (tri_list);
 
     ## assign x,y for each point of simplex
-    xt =  reshape (x(tri(tri_list,:),:), [nr_t, n+1, n]);
+    xt = reshape (x(tri(tri_list,:),:), [nr_t, n+1, n]);
     yt = y(tri(tri_list,:));
 
     ## Use barycentric coordinate of point to calculate yi

--- a/scripts/geometry/inpolygon.m
+++ b/scripts/geometry/inpolygon.m
@@ -70,14 +70,14 @@
     ##        AND (x,y) on the left of the edge ?
     idx1 = (((yv(i) <= y & y < yv(j)) | (yv(j) <= y & y < yv(i)))
             & 0 < distance.*delta_yv);
-    in (idx1) = !in (idx1);
+    in(idx1) = ! in(idx1);
 
     ## Check if (x,y) are actually on the boundary of the polygon.
     if (do_boundary)
        idx2 = (((yv(i) <= y & y <= yv(j)) | (yv(j) <= y & y <= yv(i)))
                & ((xv(i) <= x & x <= xv(j)) | (xv(j) <= x & x <= xv(i)))
                & (0 == distance | !delta_xv));
-       on (idx2) = true;
+       on(idx2) = true;
     endif
     j = i;
   endfor
@@ -138,7 +138,7 @@
 %! assert (in, [false, true]);
 %! assert (on, [true, false]);
 
-%% Test input validation
+## Test input validation
 %!error inpolygon ()
 %!error inpolygon (1, 2)
 %!error inpolygon (1, 2, 3)

--- a/scripts/geometry/voronoi.m
+++ b/scripts/geometry/voronoi.m
@@ -203,7 +203,7 @@
 %! assert (vx, [-0.7; 1.7], eps);
 %! assert (vy, [-0.7; 1.7], eps);
 
-%% Input validation tests
+## Input validation tests
 %!error voronoi ()
 %!error voronoi (ones (3,1))
 %!error voronoi (ones (3,1), ones (3,1), "bogus1", "bogus2", "bogus3")

--- a/scripts/geometry/voronoin.m
+++ b/scripts/geometry/voronoin.m
@@ -75,7 +75,7 @@
 endfunction
 
 
-%% FIXME: Need functional tests
+## FIXME: Need functional tests
 
 %!error voronoin ()
 %!error voronoin (1,2,3)

--- a/scripts/gui/guidata.m
+++ b/scripts/gui/guidata.m
@@ -59,7 +59,7 @@
 endfunction
 
 
-%% Test input validation
+## Test input validation
 %!error guidata ()
 %!error guidata (1,2,3)
 %!error <H must be a valid object handle> guidata ({1})

--- a/scripts/gui/private/__get_funcname__.m
+++ b/scripts/gui/private/__get_funcname__.m
@@ -31,8 +31,10 @@
   if (! __octave_link_enabled__ ())
     tk = graphics_toolkit ();
     funcname = strcat ("__", basename, "_", tk, "__");
-    if ((numel (tk) > 0) && (! strcmp(tk, "fltk")) && (! __is_function__ (funcname)))
-      warning ("%s: no implementation for toolkit '%s', using 'fltk' instead",basename, tk);
+    if (numel (tk) > 0 && ! strcmp (tk, "fltk")
+        && ! __is_function__ (funcname)))
+      warning ("%s: no implementation for toolkit '%s', using 'fltk' instead",
+               basename, tk);
     endif
     funcname = strcat ("__", basename, "_fltk__");
   else

--- a/scripts/gui/private/__uigetdir_fltk__.m
+++ b/scripts/gui/private/__uigetdir_fltk__.m
@@ -29,7 +29,8 @@
     error ("uigetdir: fltk graphics toolkit required");
   endif
 
-  dirname = __fltk_uigetfile__ ("", dialog_title, start_path, [240, 120], "dir");
+  dirname = __fltk_uigetfile__ ("", dialog_title,
+                                start_path, [240, 120], "dir");
 
 endfunction
 

--- a/scripts/gui/private/__uigetfile_fltk__.m
+++ b/scripts/gui/private/__uigetfile_fltk__.m
@@ -33,7 +33,8 @@
   if (length (defdir) > 0)
     defval = fullfile (defdir, defval);
   endif
-  [retval, retpath, retindex] = __fltk_uigetfile__ (filters, title, defval, position, multiselect);
+  [retval, retpath, retindex] = ...
+    __fltk_uigetfile__ (filters, title, defval, position, multiselect);
 
 endfunction
 

--- a/scripts/gui/private/__uiobject_split_args__.m
+++ b/scripts/gui/private/__uiobject_split_args__.m
@@ -55,7 +55,8 @@
   endif
 
   if (! isempty (parent))
-    if (! isempty (parent_type) && isempty (find (strcmpi (get (parent, "type"), parent_type))))
+    if (! isempty (parent_type)
+        && isempty (find (strcmpi (get (parent, "type"), parent_type))))
       error ("%s: invalid parent, the parent type must be: %s", ...
              who, sprintf ("%s, ", parent_type{:})(1:end-2));
     endif

--- a/scripts/gui/private/__uiputfile_fltk__.m
+++ b/scripts/gui/private/__uiputfile_fltk__.m
@@ -33,7 +33,8 @@
   if (length (defdir) > 0)
     defval = fullfile (defdir, defval);
   endif
-  [retval, retpath, retindex] = __fltk_uigetfile__ (filters, title, defval, position, tag);
+  [retval, retpath, retindex] = ...
+    __fltk_uigetfile__ (filters, title, defval, position, tag);
 
 endfunction
 

--- a/scripts/gui/uicontextmenu.m
+++ b/scripts/gui/uicontextmenu.m
@@ -17,15 +17,15 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {@var{handle} =} uicontextmenu ("Name", value, @dots{})
+## @deftypefn {Function File} {@var{hui} =} uicontextmenu ("Name", value, @dots{})
 ## @end deftypefn
 
 ## Author: goffioul
 
-function handle = uicontextmenu (varargin)
+function hui = uicontextmenu (varargin)
 
   [h, args] = __uiobject_split_args__ ("uicontextmenu", varargin, {"figure"});
-  handle = __go_uicontextmenu__ (h, args{:});
+  hui = __go_uicontextmenu__ (h, args{:});
 
 endfunction
 

--- a/scripts/gui/uicontrol.m
+++ b/scripts/gui/uicontrol.m
@@ -17,21 +17,23 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn  {Function File} {@var{handle} =} uicontrol ("Name", value, @dots{})
-## @deftypefnx {Function File} {@var{handle} =} uicontrol (@var{parent}, "Name", value, @dots{})
-## @deftypefnx {Function File} {} uicontrol (@var{handle})
+## @deftypefn  {Function File} {@var{hui} =} uicontrol ("Name", value, @dots{})
+## @deftypefnx {Function File} {@var{hui} =} uicontrol (@var{parent}, "Name", value, @dots{})
+## @deftypefnx {Function File} {} uicontrol (@var{h})
 ## @end deftypefn
 
 ## Author: goffioul
 
-function handle = uicontrol (varargin)
+function hui = uicontrol (varargin)
 
-  if (nargin == 1 && ishandle (varargin{1}) && strcmpi (get (varargin{1}, "type"), "uicontrol"))
+  if (nargin == 1 && ishandle (varargin{1})
+      && strcmpi (get (varargin{1}, "type"), "uicontrol"))
     error ("uicontrol focusing not implemented yet.");
-  else
-    [h, args] = __uiobject_split_args__ ("uicontrol", varargin, {"figure", "uipanel", "uibuttongroup"});
-    handle = __go_uicontrol__ (h, args{:});
   endif
 
+  [h, args] = __uiobject_split_args__ ("uicontrol", varargin,
+                                       {"figure", "uipanel", "uibuttongroup"});
+  hui = __go_uicontrol__ (h, args{:});
+
 endfunction
 

--- a/scripts/gui/uigetdir.m
+++ b/scripts/gui/uigetdir.m
@@ -20,9 +20,10 @@
 ## @deftypefn  {Function File} {@var{dirname} =} uigetdir ()
 ## @deftypefnx {Function File} {@var{dirname} =} uigetdir (@var{init_path})
 ## @deftypefnx {Function File} {@var{dirname} =} uigetdir (@var{init_path}, @var{dialog_name})
-## Open a GUI dialog for selecting a directory.  If @var{init_path} is not
-## given the current working directory is used.  @var{dialog_name} may be
-## used to customize the dialog title.
+## Open a GUI dialog for selecting a directory.
+##
+## If @var{init_path} is not given the current working directory is used.
+## @var{dialog_name} may be used to customize the dialog title.
 ## @seealso{uigetfile, uiputfile}
 ## @end deftypefn
 
@@ -30,17 +31,15 @@
 
 function dirname = uigetdir (init_path = pwd, dialog_name = "Select Directory to Open")
 
-  funcname = __get_funcname__ (mfilename ());
-
   if (nargin > 2)
     print_usage ();
   endif
 
-  if (!ischar (init_path) || !ischar (dialog_name))
+  if (! ischar (init_path) || ! ischar (dialog_name))
     error ("uigetdir: INIT_PATH and DIALOG_NAME must be string arguments");
   endif
 
-  if (!isdir (init_path))
+  if (! isdir (init_path))
     init_path = fileparts (init_path);
   endif
 
@@ -55,8 +54,10 @@
                                      default_file_name, dialog_position,
                                      dialog_mode, init_path);
   else
+    funcname = __get_funcname__ (mfilename ());
     dirname = feval (funcname, init_path, dialog_name);
   endif
+
 endfunction
 
 

--- a/scripts/gui/uigetfile.m
+++ b/scripts/gui/uigetfile.m
@@ -26,6 +26,7 @@
 ##
 ## Open a GUI dialog for selecting a file and return the filename @var{fname},
 ## the path to this file @var{fpath}, and the filter index @var{fltidx}.
+##
 ## @var{flt} contains a (list of) file filter string(s) in one of the following
 ## formats:
 ##
@@ -66,23 +67,17 @@
 
 function [retfile, retpath, retindex] = uigetfile (varargin)
 
-  funcname = __get_funcname__ (mfilename ());
-
   if (nargin > 7)
     error ("uigetfile: number of input arguments must be less than eight");
   endif
 
-  defaultvals = {cell(0, 2),         # File Filter
-                 "Open File",        # Dialog Title
-                 "",                 # Default file name
-                 [240, 120],         # Dialog Position (pixel x/y)
-                 "off",              # MultiSelect on/off
-                 pwd};               # Default directory
-
-  outargs = cell (6, 1);
-  for i = 1 : 6
-    outargs{i} = defaultvals{i};
-  endfor
+  ## Preset default values
+  outargs = {cell(0, 2),         # File Filter
+             "Open File",        # Dialog Title
+             "",                 # Default file name
+             [240, 120],         # Dialog Position (pixel x/y)
+             "off",              # MultiSelect on/off
+             pwd};               # Default directory
 
   idx1 = idx2 = [];
   if (length (varargin) > 0)
@@ -150,7 +145,7 @@
   endif
 
   if (stridx)
-    ## we have string arguments ("position" or "multiselect")
+    ## string arguments ("position" or "multiselect")
 
     ## check for even number of remaining arguments, prop/value pair(s)
     if (rem (nargin - stridx + 1, 2))
@@ -181,6 +176,7 @@
   if (isguirunning ())
     [retfile, retpath, retindex] = __octave_link_file_dialog__ (outargs{:});
   else
+    funcname = __get_funcname__ (mfilename ());
     [retfile, retpath, retindex] = feval (funcname, outargs{:});
   endif
 

--- a/scripts/gui/uimenu.m
+++ b/scripts/gui/uimenu.m
@@ -17,11 +17,12 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn  {Function File} {} uimenu (@var{property}, @var{value}, @dots{})
-## @deftypefnx {Function File} {} uimenu (@var{h}, @var{property}, @var{value}, @dots{})
-## Create a uimenu object and return a handle to it.  If @var{h} is omitted
-## then a top-level menu for the current figure is created.  If @var{h}
-## is given then a submenu relative to @var{h} is created.
+## @deftypefn  {Function File} {@var{hui} =} uimenu (@var{property}, @var{value}, @dots{})
+## @deftypefnx {Function File} {@var{hui} =} uimenu (@var{h}, @var{property}, @var{value}, @dots{})
+## Create a uimenu object and return a handle to it.
+##
+## If @var{h} is omitted then a top-level menu for the current figure is
+## created.  If @var{h} is given then a submenu relative to @var{h} is created.
 ##
 ## uimenu objects have the following specific properties:
 ##
@@ -80,7 +81,8 @@
 
 function hui = uimenu (varargin)
 
-  [h, args] = __uiobject_split_args__ ("uimenu", varargin, {"figure", "uicontextmenu", "uimenu"});
+  [h, args] = __uiobject_split_args__ ("uimenu", varargin,
+                                       {"figure", "uicontextmenu", "uimenu"});
 
   tmp = __go_uimenu__ (h, args{:});
 
@@ -117,7 +119,7 @@
 %!   graphics_toolkit (toolkit);
 %! end_unwind_protect
 
-%% check for top level menus file, edit, and help
+## check for top level menus file, edit, and help
 %!testif HAVE_FLTK
 %! toolkit = graphics_toolkit ("fltk");
 %! hf = figure ("visible", "off");

--- a/scripts/gui/uipanel.m
+++ b/scripts/gui/uipanel.m
@@ -17,16 +17,17 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn  {Function File} {@var{handle} =} uipanel ("Name", value, @dots{})
-## @deftypefnx {Function File} {@var{handle} =} uipanel (@var{parent}, "Name", value, @dots{})
+## @deftypefn  {Function File} {@var{hui} =} uipanel ("Name", value, @dots{})
+## @deftypefnx {Function File} {@var{hui} =} uipanel (@var{parent}, "Name", value, @dots{})
 ## @end deftypefn
 
 ## Author: goffioul
 
-function handle = uipanel (varargin)
+function hui = uipanel (varargin)
 
-  [h, args] = __uiobject_split_args__ ("uipanel", varargin, {"figure", "uipanel", "uibuttongroup"});
-  handle = __go_uipanel__ (h, args{:});
+  [h, args] = __uiobject_split_args__ ("uipanel", varargin,
+                                       {"figure", "uipanel", "uibuttongroup"});
+  hui = __go_uipanel__ (h, args{:});
 
 endfunction
 

--- a/scripts/gui/uipushtool.m
+++ b/scripts/gui/uipushtool.m
@@ -17,15 +17,16 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn  {Function File} {@var{handle} =} uipushtool ("Name", value, @dots{})
-## @deftypefnx {Function File} {@var{handle} =} uipushtool (@var{parent}, "Name", value, @dots{})
+## @deftypefn  {Function File} {@var{hui} =} uipushtool ("Name", value, @dots{})
+## @deftypefnx {Function File} {@var{hui} =} uipushtool (@var{parent}, "Name", value, @dots{})
 ## @end deftypefn
 
 ## Author: goffioul
 
-function handle = uipushtool (varargin)
+function hui = uipushtool (varargin)
 
-  [h, args] = __uiobject_split_args__ ("uipushtool", varargin, {"uitoolbar"}, 0);
+  [h, args] = __uiobject_split_args__ ("uipushtool", varargin,
+                                       {"uitoolbar"}, 0);
   if (isempty (h))
     h = findobj (gcf, "-depth", 1, "type", "uitoolbar");
     if (isempty (h))
@@ -34,7 +35,7 @@
       h = h(1);
     endif
   endif
-  handle = __go_uipushtool__ (h, args{:});
+  hui = __go_uipushtool__ (h, args{:});
 
 endfunction
 

--- a/scripts/gui/uiputfile.m
+++ b/scripts/gui/uiputfile.m
@@ -21,8 +21,10 @@
 ## @deftypefnx {Function File} {[@var{fname}, @var{fpath}, @var{fltidx}] =} uiputfile (@var{flt})
 ## @deftypefnx {Function File} {[@var{fname}, @var{fpath}, @var{fltidx}] =} uiputfile (@var{flt}, @var{dialog_name})
 ## @deftypefnx {Function File} {[@var{fname}, @var{fpath}, @var{fltidx}] =} uiputfile (@var{flt}, @var{dialog_name}, @var{default_file})
-## Open a GUI dialog for selecting a file.  @var{flt} contains a (list of) file
-## filter string(s) in one of the following formats:
+## Open a GUI dialog for selecting a file.
+##
+## @var{flt} contains a (list of) file filter string(s) in one of the following
+## formats:
 ##
 ## @table @asis
 ## @item @qcode{"/path/to/filename.ext"}
@@ -56,23 +58,17 @@
 
 function [retfile, retpath, retindex] = uiputfile (varargin)
 
-  funcname = __get_funcname__ (mfilename ());
-
   if (nargin > 3)
     print_usage ();
   endif
 
-  defaultvals = {cell(0, 2),     # File Filter
-                 "Save File",    # Dialog Title
-                 "",             # Default file name
-                 [240, 120],     # Dialog Position (pixel x/y)
-                 "create",
-                 pwd};           # Default directory
-
-  outargs = cell (6, 1);
-  for i = 1 : 6
-    outargs{i} = defaultvals{i};
-  endfor
+  ## Preset default values
+  outargs = {cell(0, 2),     # File Filter
+             "Save File",    # Dialog Title
+             "",             # Default file name
+             [240, 120],     # Dialog Position (pixel x/y)
+             "create",
+             pwd};           # Default directory
 
   if (nargin > 0)
     file_filter = varargin{1};
@@ -114,17 +110,17 @@
   if (isguirunning ())
     [retfile, retpath, retindex] = __octave_link_file_dialog__ (outargs{:});
   else
+    funcname = __get_funcname__ (mfilename ());
     [retfile, retpath, retindex] = feval (funcname, outargs{:});
   endif
 
-  # add extension to the name it isnt already added
-
-  if ischar (retfile)
+  ## Append extension to the name if it isn't already added.
+  if (ischar (retfile))
     ext = outargs{1}{retindex};
-    ext = strrep (ext, '*', '');
+    ext = strrep (ext, "*", "");
 
-    if length (retfile) >= length (ext)
-      if ! strcmp (retfile(end-length (ext)+1:end), ext)
+    if (length (retfile) >= length (ext))
+      if (! strcmp (retfile(end-length (ext)+1:end), ext))
         retfile = [retfile ext];
       endif
     endif

--- a/scripts/gui/uiresume.m
+++ b/scripts/gui/uiresume.m
@@ -18,10 +18,11 @@
 
 ## -*- texinfo -*-
 ## @deftypefn {Function File} {} uiresume (@var{h})
-## Resume program execution suspended with @code{uiwait}.  The handle @var{h}
-## must be the same as the on specified in @code{uiwait}.  If the handle
-## is invalid or there is no @code{uiwait} call pending for the figure
-## with handle @var{h}, this function does nothing.
+## Resume program execution suspended with @code{uiwait}.
+##
+## The handle @var{h} must be the same as the on specified in @code{uiwait}.
+## If the handle is invalid or there is no @code{uiwait} call pending for the
+## figure with handle @var{h}, this function does nothing.
 ## @seealso{uiwait}
 ## @end deftypefn
 

--- a/scripts/gui/uitoggletool.m
+++ b/scripts/gui/uitoggletool.m
@@ -17,15 +17,16 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn  {Function File} {@var{handle} =} uitoggletool ("Name", value, @dots{})
-## @deftypefnx {Function File} {@var{handle} =} uitoggletool (@var{parent}, "Name", value, @dots{})
+## @deftypefn  {Function File} {@var{hui} =} uitoggletool ("Name", value, @dots{})
+## @deftypefnx {Function File} {@var{hui} =} uitoggletool (@var{parent}, "Name", value, @dots{})
 ## @end deftypefn
 
 ## Author: goffioul
 
-function handle = uitoggletool (varargin)
+function hui = uitoggletool (varargin)
 
-  [h, args] = __uiobject_split_args__ ("uitoggletool", varargin, {"uitoolbar"}, 0);
+  [h, args] = __uiobject_split_args__ ("uitoggletool", varargin,
+                                       {"uitoolbar"}, 0);
   if (isempty (h))
     h = findobj (gcf, "-depth", 1, "type", "uitoolbar");
     if (isempty (h))
@@ -34,7 +35,7 @@
       h = h(1);
     endif
   endif
-  handle = __go_uitoggletool__ (h, args{:});
+  hui = __go_uitoggletool__ (h, args{:});
 
 endfunction
 

--- a/scripts/gui/uitoolbar.m
+++ b/scripts/gui/uitoolbar.m
@@ -17,16 +17,16 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn  {Function File} {@var{handle} =} uitoolbar ("Name", value, @dots{})
-## @deftypefnx {Function File} {@var{handle} =} uitoolbar (@var{parent}, "Name", value, @dots{})
+## @deftypefn  {Function File} {@var{hui} =} uitoolbar ("Name", value, @dots{})
+## @deftypefnx {Function File} {@var{hui} =} uitoolbar (@var{parent}, "Name", value, @dots{})
 ## @end deftypefn
 
 ## Author: goffioul
 
-function handle = uitoolbar (varargin)
+function hui = uitoolbar (varargin)
 
   [h, args] = __uiobject_split_args__ ("uitoolbar", varargin, {"figure"});
-  handle = __go_uitoolbar__ (h, args{:});
+  hui = __go_uitoolbar__ (h, args{:});
 
 endfunction
 

--- a/scripts/gui/uiwait.m
+++ b/scripts/gui/uiwait.m
@@ -21,9 +21,9 @@
 ## @deftypefnx {Function File} {} uiwait (@var{h})
 ## @deftypefnx {Function File} {} uiwait (@var{h}, @var{timeout})
 ## Suspend program execution until the figure with handle @var{h} is
-## deleted or @code{uiresume} is called.  When no figure handle is specified,
-## this function uses the current figure.
+## deleted or @code{uiresume} is called.
 ##
+## When no figure handle is specified this function uses the current figure.
 ## If the figure handle is invalid or there is no current figure, this
 ## functions returns immediately.
 ##

--- a/scripts/gui/waitbar.m
+++ b/scripts/gui/waitbar.m
@@ -190,7 +190,7 @@
 %! close (h1);
 %! close (h2);
 
-%% Test input validation
+## Test input validation
 %!error <FRAC must be between 0 and 1> waitbar (-0.5)
 %!error <FRAC must be between 0 and 1> waitbar (1.5)
 %!error <MSG must be a character string> waitbar (0.5, struct ())

--- a/scripts/gui/waitforbuttonpress.m
+++ b/scripts/gui/waitforbuttonpress.m
@@ -49,7 +49,7 @@
 endfunction
 
 
-%% Test input validation
+## Test input validation
 %!error waitforbuttonpress (1)
 %!error [a,b,c] = waitforbuttonpress ()
 

--- a/scripts/help/doc.m
+++ b/scripts/help/doc.m
@@ -54,7 +54,7 @@
     endif
 
     ## if GUI is running, let it display the function
-    if isguirunning ()
+    if (isguirunning ())
       __octave_link_show_doc__ (fname);
     else
 

--- a/scripts/help/doc_cache_create.m
+++ b/scripts/help/doc_cache_create.m
@@ -124,7 +124,7 @@
   if (! iscell (directory))
     directory = {directory};
   endif
-  dirs_notpath = {directory{!dir_in_path}};
+  dirs_notpath = {directory{! dir_in_path}};
 
   ## add them
   if (! isempty (dirs_notpath))
@@ -155,7 +155,7 @@
 endfunction
 
 
-%% No true tests desirable for this function.
-%% Test input validation
+## No true tests desirable for this function.
+## Test input validation
 %!error doc_cache_create (1)
 

--- a/scripts/help/get_first_help_sentence.m
+++ b/scripts/help/get_first_help_sentence.m
@@ -46,7 +46,7 @@
     print_usage ();
   endif
 
-  if (!ischar (name))
+  if (! ischar (name))
     error ("get_first_help_sentence: NAME must be a string");
   endif
 
@@ -92,7 +92,8 @@
 
 ## This function extracts the first sentence from a Texinfo help text.
 ## The function works by removing @def* from the texinfo text. After this, we
-## render the text to plain text using makeinfo, and then extract the first line.
+## render the text to plain text using makeinfo, and then extract the first
+## line.
 function [text, status] = first_sentence_texinfo (help_text, max_len)
   ## Lines ending with "@\n" are continuation lines, so they should be
   ## concatenated with the following line.
@@ -154,7 +155,7 @@
 %!assert (get_first_help_sentence ('get_first_help_sentence'), ...
 %!        "Return the first sentence of a function's help text.")
 
-%% Test input validation
+## Test input validation
 %!error get_first_help_sentence ()
 %!error get_first_help_sentence (1, 2, 3)
 %!error <NAME must be a string> get_first_help_sentence (1)

--- a/scripts/help/print_usage.m
+++ b/scripts/help/print_usage.m
@@ -113,7 +113,7 @@
     endl_idx = find (help_text == "\n");
     buffer = "";
     for k = 1:length (def_idx)
-      endl = endl_idx (find (endl_idx > def_idx(k), 1));
+      endl = endl_idx(find (endl_idx > def_idx(k), 1));
       if (isempty (endl))
         buffer = strcat (buffer, help_text (def_idx(k):end), "\n");
       else

--- a/scripts/help/private/__strip_html_tags__.m
+++ b/scripts/help/private/__strip_html_tags__.m
@@ -50,9 +50,9 @@
   groups = [els(1), 1]; # list containing [start, length] of each group
   for k = 1:length (dels)
     if (dels (k) == 1)
-      groups (end, 2) ++;
+      groups(end, 2) ++;
     else
-      groups (end+1, 1:2) = [els(k+1), 1];
+      groups(end+1, 1:2) = [els(k+1), 1];
     endif
   endfor
 
@@ -60,20 +60,20 @@
 
   ## Remove end-lines in the beginning
   if (groups (1, 1) == 1)
-    keep (1:groups (1, 2)) = false;
+    keep(1:groups (1, 2)) = false;
   endif
 
   ## Remove end-lines from the end
-  if (sum (groups (end, :)) - 1 == length (text))
-    keep (groups (end, 1):end) = false;
+  if (sum (groups(end, :)) - 1 == length (text))
+    keep(groups(end, 1):end) = false;
   endif
 
   ## Remove groups of end-lines with more than 3 end-lines next to each other
   idx = find (groups (:, 2) >= 3);
   for k = 1:length (idx)
-    start = groups (idx (k), 1);
-    stop = start + groups (idx (k), 2) - 1;
-    keep (start+2:stop) = false;
+    start = groups(idx(k), 1);
+    stop = start + groups(idx(k), 2) - 1;
+    keep(start+2:stop) = false;
   endfor
 
   ## Actually remove the elements

--- a/scripts/image/autumn.m
+++ b/scripts/image/autumn.m
@@ -53,6 +53,7 @@
 
 endfunction
 
+
 %!demo
 %! ## Show the 'autumn' colormap as an image
 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64));