# HG changeset patch
# User Rik <rik@octave.org>
# Date 1459376352 25200
# Node ID 6c2fd62db1f70ed5edcf53ed6d59d51ee5f8460f
# Parent  4abcc0969ebd840e6a14cd89d3ad1eb8d086a05a
maint: Eliminate accidental double spaces in code.

* make_int.cc, file-editor-tab.h, file-editor.cc, shortcut-manager.h,
__contourc__.cc, cellfun.cc, debug.cc, errwarn.h, graphics.in.h, jit-ir.h,
oct-stream.cc, quadcc.cc, qz.cc, sparse-xdiv.cc, symtab.cc, __init_fltk__.cc,
ov-class.cc, ov-float.h, ov-scalar.h, op-int.h, CNDArray.cc, CSparse.cc,
MSparse.cc, Sparse.cc, boolNDArray.cc, chNDArray.cc, dNDArray.cc, dSparse.cc,
fCNDArray.cc, fNDArray.cc, int16NDArray.cc, int32NDArray.cc, int64NDArray.cc,
int8NDArray.cc, intNDArray.cc, uint16NDArray.cc, uint32NDArray.cc,
uint64NDArray.cc, uint8NDArray.cc, randgamma.h, randmtzig.h, randpoisson.c,
randpoisson.h, Sparse-op-defs.h, oct-time.cc, kpse.cc, lo-array-errwarn.h,
lo-ieee.h, del2.m, num2str.m, __isequal__.m, lookfor.m, hsv2rgb.m,
colorspace_conversion_revert.m, fminbnd.m, create_pkgadddel.m, shading.m,
struct2hdl.m, gallery.m, discrete_cdf.m, kolmogorov_smirnov_test.m, assert.m,
datestr.m, classes.tst, jit.tst:
Eliminate accidental double spaces in code.

diff -r 4abcc0969ebd -r 6c2fd62db1f7 examples/code/make_int.cc
--- a/examples/code/make_int.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/examples/code/make_int.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -88,7 +88,7 @@
   Complex complex_value (bool = false) const { return scalar; }
 
   ComplexMatrix complex_matrix_value (bool = false) const
-  { return  ComplexMatrix (1, 1, Complex (scalar)); }
+  { return ComplexMatrix (1, 1, Complex (scalar)); }
 
   octave_value gnot (void) const { return octave_value ((double) ! scalar); }
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libgui/src/m-editor/file-editor-tab.h
--- a/libgui/src/m-editor/file-editor-tab.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/libgui/src/m-editor/file-editor-tab.h	Wed Mar 30 15:19:12 2016 -0700
@@ -147,7 +147,8 @@
   void handle_request_add_breakpoint (int line, const QString& cond);
   void handle_request_remove_breakpoint (int line);
 
-  void handle_octave_result (QObject *requester, QString& command, octave_value_list &result);
+  void handle_octave_result (QObject *requester, QString& command,
+                             octave_value_list &result);
 
 signals:
 
@@ -160,14 +161,16 @@
                                    bool remove_on_success);
   void run_file_signal (const QFileInfo& info);
   void request_open_file (const QString&);
-  void  edit_mfile_request (const QString&, const QString&,
-                            const QString&, int);
+  void edit_mfile_request (const QString&, const QString&,
+                           const QString&, int);
 
   void remove_breakpoint_via_debugger_linenr (int debugger_linenr);
   void request_remove_breakpoint_via_editor_linenr (int editor_linenr);
   void remove_all_breakpoints (void);
-  void find_translated_line_number (int original_linenr, int& translated_linenr, marker*&);
-  void find_linenr_just_before (int linenr, int& original_linenr, int& editor_linenr);
+  void find_translated_line_number (int original_linenr,
+                                    int& translated_linenr, marker*&);
+  void find_linenr_just_before (int linenr, int& original_linenr,
+                                int& editor_linenr);
   void report_marker_linenr (QIntList& lines, QStringList& conditions);
   void remove_position_via_debugger_linenr (int debugger_linenr);
   void remove_all_positions (void);
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libgui/src/m-editor/file-editor.cc
--- a/libgui/src/m-editor/file-editor.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libgui/src/m-editor/file-editor.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -2192,7 +2192,7 @@
 void
 file_editor::check_actions ()
 {
-  bool  have_tabs = _tab_widget->count () > 0;
+  bool have_tabs = _tab_widget->count () > 0;
 
   _edit_cmd_menu->setEnabled (have_tabs);
   _edit_fmt_menu->setEnabled (have_tabs);
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libgui/src/shortcut-manager.h
--- a/libgui/src/shortcut-manager.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/libgui/src/shortcut-manager.h	Wed Mar 30 15:19:12 2016 -0700
@@ -38,7 +38,7 @@
   enter_shortcut (QWidget *p = 0);
   ~enter_shortcut ();
 
-  virtual void  keyPressEvent (QKeyEvent *e);
+  virtual void keyPressEvent (QKeyEvent *e);
 
 public slots:
   void handle_direct_shortcut (int);
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/__contourc__.cc
--- a/libinterp/corefcn/__contourc__.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/__contourc__.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -11,8 +11,8 @@
 
 Copyright (C) 1995, 2000, 2001 Maurice LeBrun
 Copyright (C) 2000, 2002 Joao Cardoso
-Copyright (C) 2000, 2001, 2002, 2004  Alan W. Irwin
-Copyright (C) 2004  Andrew Ross
+Copyright (C) 2000, 2001, 2002, 2004 Alan W. Irwin
+Copyright (C) 2004 Andrew Ross
 
 This file is part of Octave.
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/cellfun.cc
--- a/libinterp/corefcn/cellfun.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/cellfun.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -140,28 +140,28 @@
   else if (name == "islogical")
     {
       BNDA result (f_args.dims ());
-      for (octave_idx_type  count= 0; count < k; count++)
+      for (octave_idx_type count= 0; count < k; count++)
         result(count) = f_args.elem (count).is_bool_type ();
       retval(0) = result;
     }
   else if (name == "isnumeric")
     {
       BNDA result (f_args.dims ());
-      for (octave_idx_type  count= 0; count < k; count++)
+      for (octave_idx_type count= 0; count < k; count++)
         result(count) = f_args.elem (count).is_numeric_type ();
       retval(0) = result;
     }
   else if (name == "isreal")
     {
       BNDA result (f_args.dims ());
-      for (octave_idx_type  count= 0; count < k; count++)
+      for (octave_idx_type count= 0; count < k; count++)
         result(count) = f_args.elem (count).is_real_type ();
       retval(0) = result;
     }
   else if (name == "length")
     {
       NDA result (f_args.dims ());
-      for (octave_idx_type  count= 0; count < k; count++)
+      for (octave_idx_type count= 0; count < k; count++)
         result(count) = static_cast<double> (f_args.elem (count).length ());
       retval(0) = result;
     }
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/debug.cc
--- a/libinterp/corefcn/debug.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/debug.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -71,7 +71,7 @@
 std::set<std::string> bp_table::caught_that_stop;
 std::set<std::string> bp_table::warnings_that_stop;
 
-// Read entire file called  fname  and return the contents as a string
+// Read entire file called fname and return the contents as a string
 static std::string
 snarf_file (const std::string& fname)
 {
@@ -208,10 +208,10 @@
 
 // Parse parameters (args) of dbstop and dbclear commands.
 // For dbstop, who=="dbstop"; for dbclear, who=="dbclear".
-// The syntax is  dbstop [[in] symbol] [[at] line [line [...]]] [if condition]
+// The syntax is: dbstop [[in] symbol] [[at] line [line [...]]] [if condition]
 // where the form of condition depends on whether or not a file or line has
 // been seen.
-// Also execute "if [error|warning|interrupt|naninf]" clauses
+// Also execute "if [error|warning|interrupt|naninf]" clauses.
 void
 parse_dbfunction_params (const char *who, const octave_value_list& args,
                          std::string& symbol_name, bp_table::intmap& lines,
@@ -437,8 +437,8 @@
 %! assert (s.errs, {"Octave:undefined-function"});
 */
 
-// Return  true  if there is a valid breakpoint table, false otherwise.
-// If not table exists, one is created; false is only returned if this fails
+// Return true if there is a valid breakpoint table, false otherwise.
+// If no table exists, one is created; false is only returned if this fails.
 bool
 bp_table::instance_ok (void)
 {
@@ -556,7 +556,7 @@
 
 
 // Insert a breakpoint in function fcn at line within file fname,
-// to stop only when  condition is true.
+// to stop only when condition is true.
 // Record in bp_set that fname contains a breakpoint.
 bool
 bp_table::do_add_breakpoint_1 (octave_user_code *fcn,
@@ -596,7 +596,7 @@
   return found;
 }
 
-// Cursory check that  cond  is a valid condition to use for a breakpoint
+// Cursory check that cond is a valid condition to use for a breakpoint.
 // Currently allows conditions with side-effects, like 'y+=10' and 'y++';
 // it is odd that the former is not flagged by "is_assignment_expression".
 // Throws an exception if not valid.
@@ -635,9 +635,9 @@
   return true;
 }
 
-// Given file name  fname,  find the subfunction at line  line  and create
+// Given file name fname, find the subfunction at line and create
 // a breakpoint there.  Put the system into debug_mode.
-// (FIXME: If  line  is multiple lines, what happens if they are in different
+// (FIXME: If line is multiple lines, what happens if they are in different
 //         functions?)
 bp_table::intmap
 bp_table::do_add_breakpoint (const std::string& fname,
@@ -1170,7 +1170,7 @@
 }
 
 // Report the status of "dbstop if error ..." and "dbstop if warning ..."
-// If to_screen is true, the output goes to  octave_stdout; otherwise it is
+// If to_screen is true, the output goes to octave_stdout; otherwise it is
 // returned.
 // If dbstop if error is true but no explicit IDs are specified, the return
 // value will have an empty field called "errs".  If IDs are specified, the
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/errwarn.h
--- a/libinterp/corefcn/errwarn.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/errwarn.h	Wed Mar 30 15:19:12 2016 -0700
@@ -135,7 +135,7 @@
 OCTAVE_NORETURN OCTINTERP_API extern void
 err_wrong_type_arg (const octave_value& tc);
 
-OCTAVE_NORETURN OCTINTERP_API extern  void
+OCTAVE_NORETURN OCTINTERP_API extern void
 err_wrong_type_arg (octave_execution_exception& e, const octave_value& tc);
 
 OCTAVE_NORETURN OCTINTERP_API extern void
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/graphics.in.h
--- a/libinterp/corefcn/graphics.in.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/graphics.in.h	Wed Mar 30 15:19:12 2016 -0700
@@ -4771,7 +4771,7 @@
     }
 
   public:
-    float  pixel_xsize (void)
+    float pixel_xsize (void)
     {
       return pixel_size ((get_cdata ().dims ())(1), xdata.get_limits ());
     }
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/jit-ir.h
--- a/libinterp/corefcn/jit-ir.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/jit-ir.h	Wed Mar 30 15:19:12 2016 -0700
@@ -74,7 +74,7 @@
 
 #undef JIT_METH
 
-// ABCs which aren't included in  JIT_VISIT_IR_ALL
+// ABCs which aren't included in JIT_VISIT_IR_ALL
 class jit_instruction;
 class jit_terminator;
 
@@ -809,8 +809,8 @@
 
   const std::string &name (void) const { return mname; }
 
-  // manipulate the value_stack, for use during SSA construction. The top of
-  // the  value stack represents the current value for this variable
+  // manipulate the value_stack, for use during SSA construction.  The top of
+  // the value stack represents the current value for this variable
   bool has_top (void) const
   {
     return ! value_stack.empty ();
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/oct-stream.cc
--- a/libinterp/corefcn/oct-stream.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/oct-stream.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -3864,7 +3864,7 @@
 
   is.clear ();
   is.seekg (pos);              // reset to position before look-ahead
-                               // FIXME  pos may be corrupted by is.read
+                               // FIXME: pos may be corrupted by is.read
 
   int i;
   int (*compare)(const char *, const char *, size_t);
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/quadcc.cc
--- a/libinterp/corefcn/quadcc.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/quadcc.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -38,7 +38,7 @@
 #define DEBUG_QUADCC 0
 
 // Define the minimum size of the interval heap.
-#define MIN_CQUAD_HEAPSIZE  200
+#define MIN_CQUAD_HEAPSIZE 200
 
 // Data of a single interval.
 typedef struct
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/qz.cc
--- a/libinterp/corefcn/qz.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/qz.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -231,12 +231,12 @@
 }
 
 // fcrhp, fin, fout, folhp:
-// routines for ordering of generalized eigenvalues
-// return 1 if  test is passed, 0 otherwise
-//    fin: |lambda| < 1
-//    fout: |lambda| >= 1
-//    fcrhp: real(lambda) >= 0
-//    folhp: real(lambda) < 0
+// Routines for ordering of generalized eigenvalues.
+// Return 1 if test is passed, 0 otherwise.
+//   fin:  |lambda| < 1
+//   fout: |lambda| >= 1
+//   fcrhp: real(lambda) >= 0
+//   folhp: real(lambda) < 0
 
 static octave_idx_type
 fcrhp (const octave_idx_type& lsize, const double& alpha,
@@ -714,7 +714,7 @@
                 << std::endl;
 #endif
 
-      // Reduce  to generalized hessenberg form.
+      // Reduce to generalized Hessenberg form.
       F77_XFCN (dgghrd, DGGHRD,
                 (F77_CONST_CHAR_ARG2 (&compq, 1),
                  F77_CONST_CHAR_ARG2 (&compz, 1),
@@ -1062,7 +1062,7 @@
       else
         {
 #ifdef DEBUG
-          std::cout << "qz: computing  generalized eigenvectors" << std::endl;
+          std::cout << "qz: computing generalized eigenvectors" << std::endl;
 #endif
 
           VL = QQ;
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/sparse-xdiv.cc
--- a/libinterp/corefcn/sparse-xdiv.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/sparse-xdiv.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -398,7 +398,7 @@
   octave_idx_type nr = b.rows ();
   octave_idx_type nc = b.cols ();
 
-  ComplexMatrix  result (nr, nc, Complex (octave_NaN, octave_NaN));
+  ComplexMatrix result (nr, nc, Complex (octave_NaN, octave_NaN));
 
   for (octave_idx_type j = 0; j < nc; j++)
     for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++)
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/corefcn/symtab.cc
--- a/libinterp/corefcn/symtab.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/corefcn/symtab.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1117,7 +1117,7 @@
 
 // Insert INF_CLASS in the set of class names that are considered
 // inferior to SUP_CLASS.  Return FALSE if INF_CLASS is currently
-// marked as superior to  SUP_CLASS.
+// marked as superior to SUP_CLASS.
 
 bool
 symbol_table::set_class_relationship (const std::string& sup_class,
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/dldfcn/__init_fltk__.cc
--- a/libinterp/dldfcn/__init_fltk__.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/dldfcn/__init_fltk__.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -2349,7 +2349,7 @@
     // FLTK doesn't give this info.
     return 72.0;
 
-    // FIXME: FLTK >= 1.3.0 could do this with  Fl::screen_dpi (h, v, n)
+    // FIXME: FLTK >= 1.3.0 could do this with Fl::screen_dpi (h, v, n)
     // but do we need it?
   }
 */
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/octave-value/ov-class.cc
--- a/libinterp/octave-value/ov-class.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/octave-value/ov-class.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1114,8 +1114,8 @@
   // First, check to see if there might be an issue with inheritance.
   for (octave_map::const_iterator p = map.begin (); p != map.end (); p++)
     {
-      std::string  key = map.key (p);
-      Cell         val = map.contents (p);
+      std::string key = map.key (p);
+      Cell        val = map.contents (p);
       if (val(0).is_object ())
         {
           dbgstr = "blork";
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/octave-value/ov-float.h
--- a/libinterp/octave-value/ov-float.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/octave-value/ov-float.h	Wed Mar 30 15:19:12 2016 -0700
@@ -177,10 +177,10 @@
   FloatComplex float_complex_value (bool = false) const { return scalar; }
 
   ComplexMatrix complex_matrix_value (bool = false) const
-  { return  ComplexMatrix (1, 1, Complex (scalar)); }
+  { return ComplexMatrix (1, 1, Complex (scalar)); }
 
   FloatComplexMatrix float_complex_matrix_value (bool = false) const
-  { return  FloatComplexMatrix (1, 1, FloatComplex (scalar)); }
+  { return FloatComplexMatrix (1, 1, FloatComplex (scalar)); }
 
   ComplexNDArray complex_array_value (bool = false) const
   { return ComplexNDArray (dim_vector (1, 1), Complex (scalar)); }
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/octave-value/ov-scalar.h
--- a/libinterp/octave-value/ov-scalar.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/octave-value/ov-scalar.h	Wed Mar 30 15:19:12 2016 -0700
@@ -176,10 +176,10 @@
   FloatComplex float_complex_value (bool = false) const { return scalar; }
 
   ComplexMatrix complex_matrix_value (bool = false) const
-  { return  ComplexMatrix (1, 1, Complex (scalar)); }
+  { return ComplexMatrix (1, 1, Complex (scalar)); }
 
   FloatComplexMatrix float_complex_matrix_value (bool = false) const
-  { return  FloatComplexMatrix (1, 1, FloatComplex (scalar)); }
+  { return FloatComplexMatrix (1, 1, FloatComplex (scalar)); }
 
   ComplexNDArray complex_array_value (bool = false) const
   { return ComplexNDArray (dim_vector (1, 1), Complex (scalar)); }
diff -r 4abcc0969ebd -r 6c2fd62db1f7 libinterp/operators/op-int.h
--- a/libinterp/operators/op-int.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/libinterp/operators/op-int.h	Wed Mar 30 15:19:12 2016 -0700
@@ -538,7 +538,7 @@
   DEFNDASSIGNOP_OP (PFX ## _assign_div, TM ## matrix, TM ## scalar, TM ## scalar, /=)
 
 #define OCTAVE_MS_POW_OPS(T1, T2) \
-octave_value elem_xpow (T1 ## NDArray a, octave_ ## T2  b) \
+octave_value elem_xpow (T1 ## NDArray a, octave_ ## T2 b) \
 { \
   T1 ## NDArray result (a.dims ()); \
   for (int i = 0; i < a.numel (); i++) \
@@ -549,7 +549,7 @@
   return octave_value (result); \
 } \
 \
-octave_value elem_xpow (T1 ## NDArray a, double  b) \
+octave_value elem_xpow (T1 ## NDArray a, double b) \
 { \
   T1 ## NDArray result (a.dims ()); \
   for (int i = 0; i < a.numel (); i++) \
@@ -560,7 +560,7 @@
   return octave_value (result); \
 } \
 \
-octave_value elem_xpow (NDArray a, octave_ ## T2  b) \
+octave_value elem_xpow (NDArray a, octave_ ## T2 b) \
 { \
   T2 ## NDArray result (a.dims ()); \
   for (int i = 0; i < a.numel (); i++) \
@@ -571,7 +571,7 @@
   return octave_value (result); \
 } \
 \
-octave_value elem_xpow (T1 ## NDArray a, float  b) \
+octave_value elem_xpow (T1 ## NDArray a, float b) \
 { \
   T1 ## NDArray result (a.dims ()); \
   for (int i = 0; i < a.numel (); i++) \
@@ -582,7 +582,7 @@
   return octave_value (result); \
 } \
 \
-octave_value elem_xpow (FloatNDArray a, octave_ ## T2  b) \
+octave_value elem_xpow (FloatNDArray a, octave_ ## T2 b) \
 { \
   T2 ## NDArray result (a.dims ()); \
   for (int i = 0; i < a.numel (); i++) \
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/CNDArray.cc
--- a/liboctave/array/CNDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/CNDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 1996-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/CSparse.cc
--- a/liboctave/array/CSparse.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/CSparse.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -7602,12 +7602,12 @@
       r.cidx (0) = 0;
       for (octave_idx_type i = 0 ; i < a_nc ; i++)
         {
-          octave_idx_type  ja = a.cidx (i);
-          octave_idx_type  ja_max = a.cidx (i+1);
-          bool ja_lt_max= ja < ja_max;
-
-          octave_idx_type  jb = b.cidx (i);
-          octave_idx_type  jb_max = b.cidx (i+1);
+          octave_idx_type ja = a.cidx (i);
+          octave_idx_type ja_max = a.cidx (i+1);
+          bool ja_lt_max = ja < ja_max;
+
+          octave_idx_type jb = b.cidx (i);
+          octave_idx_type jb_max = b.cidx (i+1);
           bool jb_lt_max = jb < jb_max;
 
           while (ja_lt_max || jb_lt_max)
@@ -7719,12 +7719,12 @@
       r.cidx (0) = 0;
       for (octave_idx_type i = 0 ; i < a_nc ; i++)
         {
-          octave_idx_type  ja = a.cidx (i);
-          octave_idx_type  ja_max = a.cidx (i+1);
-          bool ja_lt_max= ja < ja_max;
-
-          octave_idx_type  jb = b.cidx (i);
-          octave_idx_type  jb_max = b.cidx (i+1);
+          octave_idx_type ja = a.cidx (i);
+          octave_idx_type ja_max = a.cidx (i+1);
+          bool ja_lt_max = ja < ja_max;
+
+          octave_idx_type jb = b.cidx (i);
+          octave_idx_type jb_max = b.cidx (i+1);
           bool jb_lt_max = jb < jb_max;
 
           while (ja_lt_max || jb_lt_max)
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/MSparse.cc
--- a/liboctave/array/MSparse.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/MSparse.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -45,12 +45,12 @@
   octave_idx_type jx = 0;
   for (octave_idx_type i = 0 ; i < a_nc ; i++)
     {
-      octave_idx_type  ja = a.cidx (i);
-      octave_idx_type  ja_max = a.cidx (i+1);
-      bool ja_lt_max= ja < ja_max;
+      octave_idx_type ja = a.cidx (i);
+      octave_idx_type ja_max = a.cidx (i+1);
+      bool ja_lt_max = ja < ja_max;
 
-      octave_idx_type  jb = b.cidx (i);
-      octave_idx_type  jb_max = b.cidx (i+1);
+      octave_idx_type jb = b.cidx (i);
+      octave_idx_type jb_max = b.cidx (i+1);
       bool jb_lt_max = jb < jb_max;
 
       while (ja_lt_max || jb_lt_max)
@@ -315,12 +315,12 @@
       r.cidx (0) = 0;
       for (octave_idx_type i = 0 ; i < a_nc ; i++)
         {
-          octave_idx_type  ja = a.cidx (i);
-          octave_idx_type  ja_max = a.cidx (i+1);
-          bool ja_lt_max= ja < ja_max;
+          octave_idx_type ja = a.cidx (i);
+          octave_idx_type ja_max = a.cidx (i+1);
+          bool ja_lt_max = ja < ja_max;
 
-          octave_idx_type  jb = b.cidx (i);
-          octave_idx_type  jb_max = b.cidx (i+1);
+          octave_idx_type jb = b.cidx (i);
+          octave_idx_type jb_max = b.cidx (i+1);
           bool jb_lt_max = jb < jb_max;
 
           while (ja_lt_max || jb_lt_max)
@@ -436,12 +436,12 @@
       r.cidx (0) = 0;
       for (octave_idx_type i = 0 ; i < a_nc ; i++)
         {
-          octave_idx_type  ja = a.cidx (i);
-          octave_idx_type  ja_max = a.cidx (i+1);
-          bool ja_lt_max= ja < ja_max;
+          octave_idx_type ja = a.cidx (i);
+          octave_idx_type ja_max = a.cidx (i+1);
+          bool ja_lt_max = ja < ja_max;
 
-          octave_idx_type  jb = b.cidx (i);
-          octave_idx_type  jb_max = b.cidx (i+1);
+          octave_idx_type jb = b.cidx (i);
+          octave_idx_type jb_max = b.cidx (i+1);
           bool jb_lt_max = jb < jb_max;
 
           while (ja_lt_max || jb_lt_max)
@@ -554,12 +554,12 @@
 
       for (octave_idx_type i = 0 ; i < a_nc ; i++)
         {
-          octave_idx_type  ja = a.cidx (i);
-          octave_idx_type  ja_max = a.cidx (i+1);
-          bool ja_lt_max= ja < ja_max;
+          octave_idx_type ja = a.cidx (i);
+          octave_idx_type ja_max = a.cidx (i+1);
+          bool ja_lt_max = ja < ja_max;
 
-          octave_idx_type  jb = b.cidx (i);
-          octave_idx_type  jb_max = b.cidx (i+1);
+          octave_idx_type jb = b.cidx (i);
+          octave_idx_type jb_max = b.cidx (i+1);
           bool jb_lt_max = jb < jb_max;
 
           while (ja_lt_max || jb_lt_max)
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/Sparse.cc
--- a/liboctave/array/Sparse.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/Sparse.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -815,7 +815,7 @@
 
           octave_idx_type kk = 0;
           retval.xcidx (0) = 0;
-          // quotient and remainder of  i * old_nr divided by new_nr
+          // Quotient and remainder of i * old_nr divided by new_nr.
           // Track them individually to avoid overflow (bug #42850).
           octave_idx_type i_old_qu = 0;
           octave_idx_type i_old_rm = static_cast<octave_idx_type> (-old_nr);
@@ -1780,7 +1780,7 @@
     }
   else if (idx_j.is_colon ())
     {
-      // This requires  uncompressing columns, which is generally costly,
+      // This requires uncompressing columns, which is generally costly,
       // so we rely on the efficient transpose to handle this.
       // It may still make sense to optimize some cases here.
       retval = transpose ();
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/boolNDArray.cc
--- a/liboctave/array/boolNDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/boolNDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 1996-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/chNDArray.cc
--- a/liboctave/array/chNDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/chNDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 2003-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/dNDArray.cc
--- a/liboctave/array/dNDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/dNDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 1996-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/dSparse.cc
--- a/liboctave/array/dSparse.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/dSparse.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -771,12 +771,12 @@
   r.cidx (0) = 0;
   for (octave_idx_type i = 0 ; i < x_nc ; i++)
     {
-      octave_idx_type  ja = x.cidx (i);
-      octave_idx_type  ja_max = x.cidx (i+1);
-      bool ja_lt_max= ja < ja_max;
-
-      octave_idx_type  jb = y.cidx (i);
-      octave_idx_type  jb_max = y.cidx (i+1);
+      octave_idx_type ja = x.cidx (i);
+      octave_idx_type ja_max = x.cidx (i+1);
+      bool ja_lt_max = ja < ja_max;
+
+      octave_idx_type jb = y.cidx (i);
+      octave_idx_type jb_max = y.cidx (i+1);
       bool jb_lt_max = jb < jb_max;
 
       while (ja_lt_max || jb_lt_max)
@@ -7710,12 +7710,12 @@
       r.cidx (0) = 0;
       for (octave_idx_type i = 0 ; i < a_nc ; i++)
         {
-          octave_idx_type  ja = a.cidx (i);
-          octave_idx_type  ja_max = a.cidx (i+1);
-          bool ja_lt_max= ja < ja_max;
-
-          octave_idx_type  jb = b.cidx (i);
-          octave_idx_type  jb_max = b.cidx (i+1);
+          octave_idx_type ja = a.cidx (i);
+          octave_idx_type ja_max = a.cidx (i+1);
+          bool ja_lt_max = ja < ja_max;
+
+          octave_idx_type jb = b.cidx (i);
+          octave_idx_type jb_max = b.cidx (i+1);
           bool jb_lt_max = jb < jb_max;
 
           while (ja_lt_max || jb_lt_max)
@@ -7860,12 +7860,12 @@
       r.cidx (0) = 0;
       for (octave_idx_type i = 0 ; i < a_nc ; i++)
         {
-          octave_idx_type  ja = a.cidx (i);
-          octave_idx_type  ja_max = a.cidx (i+1);
-          bool ja_lt_max= ja < ja_max;
-
-          octave_idx_type  jb = b.cidx (i);
-          octave_idx_type  jb_max = b.cidx (i+1);
+          octave_idx_type ja = a.cidx (i);
+          octave_idx_type ja_max = a.cidx (i+1);
+          bool ja_lt_max = ja < ja_max;
+
+          octave_idx_type jb = b.cidx (i);
+          octave_idx_type jb_max = b.cidx (i+1);
           bool jb_lt_max = jb < jb_max;
 
           while (ja_lt_max || jb_lt_max)
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/fCNDArray.cc
--- a/liboctave/array/fCNDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/fCNDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 1996-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/fNDArray.cc
--- a/liboctave/array/fNDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/fNDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 1996-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/int16NDArray.cc
--- a/liboctave/array/int16NDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/int16NDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 2004-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/int32NDArray.cc
--- a/liboctave/array/int32NDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/int32NDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 2004-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/int64NDArray.cc
--- a/liboctave/array/int64NDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/int64NDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 2004-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/int8NDArray.cc
--- a/liboctave/array/int8NDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/int8NDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 2004-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/intNDArray.cc
--- a/liboctave/array/intNDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/intNDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 2004-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/uint16NDArray.cc
--- a/liboctave/array/uint16NDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/uint16NDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 2004-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/uint32NDArray.cc
--- a/liboctave/array/uint32NDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/uint32NDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 2004-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/uint64NDArray.cc
--- a/liboctave/array/uint64NDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/uint64NDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 2004-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/array/uint8NDArray.cc
--- a/liboctave/array/uint8NDArray.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/array/uint8NDArray.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1,4 +1,4 @@
-// N-D Array  manipulations.
+// N-D Array manipulations.
 /*
 
 Copyright (C) 2004-2015 John W. Eaton
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/numeric/randgamma.h
--- a/liboctave/numeric/randgamma.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/numeric/randgamma.h	Wed Mar 30 15:19:12 2016 -0700
@@ -28,7 +28,7 @@
 
 #include "octave-config.h"
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -39,7 +39,7 @@
 extern OCTAVE_API void oct_fill_float_randg (float a, octave_idx_type n,
                                              float *p);
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/numeric/randmtzig.h
--- a/liboctave/numeric/randmtzig.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/numeric/randmtzig.h	Wed Mar 30 15:19:12 2016 -0700
@@ -97,7 +97,7 @@
 extern OCTAVE_API void oct_fill_float_randn (octave_idx_type n, float *p);
 extern OCTAVE_API void oct_fill_float_rande (octave_idx_type n, float *p);
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/numeric/randpoisson.c
--- a/liboctave/numeric/randpoisson.c	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/numeric/randpoisson.c	Wed Mar 30 15:19:12 2016 -0700
@@ -100,7 +100,7 @@
     64.55753862700633106,  67.88974313718153498,  71.25703896716800901
   };
 
-  double  r, rr;
+  double r, rr;
 
   if (k >= 30.0)
     {
@@ -115,12 +115,12 @@
 
 /******************************************************************
  *                                                                *
- * Poisson Distribution - Patchwork Rejection/Inversion  *
+ * Poisson Distribution - Patchwork Rejection/Inversion           *
  *                                                                *
  ******************************************************************
  *                                                                *
- * For parameter  my < 10  Tabulated Inversion is applied.        *
- * For my >= 10  Patchwork Rejection is employed:                 *
+ * For parameter my < 10, Tabulated Inversion is applied.         *
+ * For my >= 10, Patchwork Rejection is employed:                 *
  * The area below the histogram function f(x) is rearranged in    *
  * its body by certain point reflections. Within a large center   *
  * interval variates are sampled efficiently by rejection from    *
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/numeric/randpoisson.h
--- a/liboctave/numeric/randpoisson.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/numeric/randpoisson.h	Wed Mar 30 15:19:12 2016 -0700
@@ -28,7 +28,7 @@
 
 #include "octave-config.h"
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -44,7 +44,7 @@
 extern OCTAVE_API void
 oct_fill_float_randp (float L, octave_idx_type n, float *p);
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/operators/Sparse-op-defs.h
--- a/liboctave/operators/Sparse-op-defs.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/operators/Sparse-op-defs.h	Wed Mar 30 15:19:12 2016 -0700
@@ -380,12 +380,12 @@
         r.cidx (0) = 0; \
         for (octave_idx_type i = 0 ; i < m1_nc ; i++) \
           { \
-            octave_idx_type  ja = m1.cidx (i); \
-            octave_idx_type  ja_max = m1.cidx (i+1); \
-            bool ja_lt_max= ja < ja_max; \
+            octave_idx_type ja = m1.cidx (i); \
+            octave_idx_type ja_max = m1.cidx (i+1); \
+            bool ja_lt_max = ja < ja_max; \
             \
-            octave_idx_type  jb = m2.cidx (i); \
-            octave_idx_type  jb_max = m2.cidx (i+1); \
+            octave_idx_type jb = m2.cidx (i); \
+            octave_idx_type jb_max = m2.cidx (i+1); \
             bool jb_lt_max = jb < jb_max; \
             \
             while (ja_lt_max || jb_lt_max) \
@@ -488,12 +488,12 @@
         r.cidx (0) = 0; \
         for (octave_idx_type i = 0 ; i < m1_nc ; i++) \
           { \
-            octave_idx_type  ja = m1.cidx (i); \
-            octave_idx_type  ja_max = m1.cidx (i+1); \
-            bool ja_lt_max= ja < ja_max; \
+            octave_idx_type ja = m1.cidx (i); \
+            octave_idx_type ja_max = m1.cidx (i+1); \
+            bool ja_lt_max = ja < ja_max; \
             \
-            octave_idx_type  jb = m2.cidx (i); \
-            octave_idx_type  jb_max = m2.cidx (i+1); \
+            octave_idx_type jb = m2.cidx (i); \
+            octave_idx_type jb_max = m2.cidx (i+1); \
             bool jb_lt_max = jb < jb_max; \
             \
             while (ja_lt_max || jb_lt_max) \
@@ -604,12 +604,12 @@
         \
         for (octave_idx_type i = 0 ; i < m1_nc ; i++) \
           { \
-            octave_idx_type  ja = m1.cidx (i); \
-            octave_idx_type  ja_max = m1.cidx (i+1); \
-            bool ja_lt_max= ja < ja_max; \
+            octave_idx_type ja = m1.cidx (i); \
+            octave_idx_type ja_max = m1.cidx (i+1); \
+            bool ja_lt_max = ja < ja_max; \
             \
-            octave_idx_type  jb = m2.cidx (i); \
-            octave_idx_type  jb_max = m2.cidx (i+1); \
+            octave_idx_type jb = m2.cidx (i); \
+            octave_idx_type jb_max = m2.cidx (i+1); \
             bool jb_lt_max = jb < jb_max; \
             \
             while (ja_lt_max || jb_lt_max) \
@@ -1758,7 +1758,7 @@
         { \
           for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \
             { \
-              octave_idx_type  col = a.ridx (j); \
+              octave_idx_type col = a.ridx (j); \
               for (octave_idx_type k = m.cidx (col) ; k < m.cidx (col+1); k++) \
                 { \
                   if (w[m.ridx (k)] < i + 1) \
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/system/oct-time.cc
--- a/liboctave/system/oct-time.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/system/oct-time.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -100,12 +100,12 @@
 
 // From the mktime() manual page:
 //
-//     The  mktime()  function converts a broken-down time structure,
+//     The mktime() function converts a broken-down time structure,
 //     expressed as local time, to calendar time representation.
 //
 //     <snip>
 //
-//     If structure members are outside  their  legal interval, they
+//     If structure members are outside their legal interval, they
 //     will be normalized (so that, e.g., 40 October is changed into
 //     9 November).
 //
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/util/kpse.cc
--- a/liboctave/util/kpse.cc	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/util/kpse.cc	Wed Mar 30 15:19:12 2016 -0700
@@ -1301,7 +1301,7 @@
       std::string elt = *pi;
 
       /* We assume that the !! magic is only used on absolute components.
-         Single "." get special treatment, as does "./" or its  equivalent.  */
+         Single "." get special treatment, as does "./" or its equivalent.  */
 
       size_t elt_len = elt.length ();
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/util/lo-array-errwarn.h
--- a/liboctave/util/lo-array-errwarn.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/util/lo-array-errwarn.h	Wed Mar 30 15:19:12 2016 -0700
@@ -31,7 +31,7 @@
 // Exception thrown by err_invalid_index
 // This is thrown when the invalid index is detected, at which point nd and dim
 // are usually not known.  It is caught at the place they are known, where a
-// new  err_invalid_index  is called.
+// new err_invalid_index  is called.
 //
 // Typically, this should be caught after any call to
 // octave_value_list::index_vector()
diff -r 4abcc0969ebd -r 6c2fd62db1f7 liboctave/util/lo-ieee.h
--- a/liboctave/util/lo-ieee.h	Tue Mar 29 21:13:22 2016 -0700
+++ b/liboctave/util/lo-ieee.h	Wed Mar 30 15:19:12 2016 -0700
@@ -25,7 +25,7 @@
 
 #include "octave-config.h"
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -96,7 +96,7 @@
 
 extern OCTAVE_API int __lo_ieee_float_signbit (float);
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/general/del2.m
--- a/scripts/general/del2.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/general/del2.m	Wed Mar 30 15:19:12 2016 -0700
@@ -1,5 +1,5 @@
 ## Copyright (C) 2000-2015 Kai Habel
-## Copyright (C) 2007  David Bateman
+## Copyright (C) 2007 David Bateman
 ##
 ## This file is part of Octave.
 ##
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/general/num2str.m
--- a/scripts/general/num2str.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/general/num2str.m	Wed Mar 30 15:19:12 2016 -0700
@@ -193,7 +193,7 @@
 %!assert (num2str (123), "123")
 %!assert (num2str (1.23), "1.23")
 %!assert (num2str (123.456, 4), "123.5")
-%!assert (num2str ([1, 1.34; 3, 3.56], "%5.1f"),  ["1.0  1.3"; "3.0  3.6"])
+%!assert (num2str ([1, 1.34; 3, 3.56], "%5.1f"), ["1.0  1.3"; "3.0  3.6"])
 %!assert (num2str (1.234 + 27.3i), "1.234+27.3i")
 %!assert (num2str ([true false true]), "1  0  1")
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/general/private/__isequal__.m
--- a/scripts/general/private/__isequal__.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/general/private/__isequal__.m	Wed Mar 30 15:19:12 2016 -0700
@@ -44,7 +44,7 @@
 ##    b. object     convert to struct, and then compare as stated above
 ##    c. cell       compare each member by order (recursive)
 ##    d. char       compare each member with strcmp
-##    e  fcn_handle compare using overloade 'eq' operator
+##    e  fcn_handle compare using overloaded 'eq' operator
 ##    f. <other>    compare each nonzero member, and assume NaN == NaN
 ##                  if nans_compare_equal is nonzero.
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/help/lookfor.m
--- a/scripts/help/lookfor.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/help/lookfor.m	Wed Mar 30 15:19:12 2016 -0700
@@ -77,7 +77,7 @@
   ## ditto for path.
   new_path = ostrsplit (path (), pathsep ());
 
-  ## remove  directories already covered by orig_path.
+  ## remove directories already covered by orig_path.
   if (had_core_cache)
     new_path = setdiff (new_path, orig_path);
   endif
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/image/hsv2rgb.m
--- a/scripts/image/hsv2rgb.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/image/hsv2rgb.m	Wed Mar 30 15:19:12 2016 -0700
@@ -109,7 +109,7 @@
 %!assert (hsv2rgb ([0 0.5 0.5]), hsv2rgb ([1 0.5 0.5]))
 
 ## Not Matlab compatible (Matlab would return [1/2  1/12  1/12]) but
-## it's also invalid input.  This is, however, the same output as python
+## it's also invalid input.  This is, however, the same output as Python
 ## colorsys module.
 %!assert (hsv2rgb ([0.5 -0.5 0.5]), [0.75 0.5 0.5])
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/image/private/colorspace_conversion_revert.m
--- a/scripts/image/private/colorspace_conversion_revert.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/image/private/colorspace_conversion_revert.m	Wed Mar 30 15:19:12 2016 -0700
@@ -19,7 +19,7 @@
 ## Private function the functions that convert between color spaces, i.e.,
 ## rgb2ntsc, rgb2hsv, hsv2rgb, and ntsc2rgb.  This reverts a colormap type
 ## into the same shape and class as it was in the input.  The flags are meant
-## to come from  complementary private function
+## to come from complementary private function
 ## colorspace_conversion_input_check()
 
 function rv = colorspace_conversion_revert (rv, sz, is_im, is_nd)
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/optimization/fminbnd.m
--- a/scripts/optimization/fminbnd.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/optimization/fminbnd.m	Wed Mar 30 15:19:12 2016 -0700
@@ -180,7 +180,7 @@
     iter(niter).x = u;
     iter(niter).fx = fu;
 
-    ## update  a, b, v, w, and x
+    ## update a, b, v, w, and x
 
     if (fu < fval)
       if (u < x)
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/pkg/private/create_pkgadddel.m
--- a/scripts/pkg/private/create_pkgadddel.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/pkg/private/create_pkgadddel.m	Wed Mar 30 15:19:12 2016 -0700
@@ -25,7 +25,7 @@
 function create_pkgadddel (desc, packdir, nm, global_install)
   instpkg = fullfile (desc.dir, nm);
   instfid = fopen (instpkg, "at"); # append to support PKG_ADD at inst/
-  ## If it is exists, most of the  PKG_* file should go into the
+  ## If it is exists, most of the PKG_* file should go into the
   ## architecture dependent directory so that the autoload/mfilename
   ## commands work as expected. The only part that doesn't is the
   ## part in the main directory.
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/plot/appearance/shading.m
--- a/scripts/plot/appearance/shading.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/plot/appearance/shading.m	Wed Mar 30 15:19:12 2016 -0700
@@ -57,7 +57,7 @@
   endif
 
   ## Find all patch and surface objects that are descendants of hax
-  ## and  which are not part of a contour plot hggroup.
+  ## and which are not part of a contour plot hggroup.
   hlist = [];
   kids = get (hax, "children");
   while (! isempty (kids))
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/plot/util/struct2hdl.m
--- a/scripts/plot/util/struct2hdl.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/plot/util/struct2hdl.m	Wed Mar 30 15:19:12 2016 -0700
@@ -575,7 +575,7 @@
       ## set all properties but special handles
       set (h, s.properties);
 
-      ## find  props with val == (one of special handles)
+      ## find props with val == (one of special handles)
       nf = length (idx);
       fields = fields(idx);
       vals = vals(idx);
@@ -590,8 +590,8 @@
         nf -= 1;
       endwhile
 
-      ## If hggroup children  were created by high level functions,
-      ## copy only usefull properties.
+      ## If hggroup children were created by high level functions,
+      ## copy only useful properties.
       if (hilev)
         if (strcmp (s.type, "hggroup"))
           nold = numel (s.children);
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/special-matrix/gallery.m
--- a/scripts/special-matrix/gallery.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/special-matrix/gallery.m	Wed Mar 30 15:19:12 2016 -0700
@@ -504,27 +504,27 @@
 endfunction
 
 function C = cauchy (x, y)
-  ##CAUCHY  Cauchy matrix.
-  ##  C = CAUCHY(X, Y), where X, Y are N-vectors, is the N-by-N matrix
-  ##  with C(i,j) = 1/(X(i)+Y(j)).   By default, Y = X.
-  ##  Special case: if X is a scalar CAUCHY(X) is the same as CAUCHY(1:X).
-  ##  Explicit formulas are known for DET(C) (which is nonzero if X and Y
-  ##  both have distinct elements) and the elements of INV(C).
-  ##  C is totally positive if 0 < X(1) < ... < X(N) and
-  ##  0 < Y(1) < ... < Y(N).
+  ## CAUCHY  Cauchy matrix.
+  ##   C = CAUCHY(X, Y), where X, Y are N-vectors, is the N-by-N matrix
+  ##   with C(i,j) = 1/(X(i)+Y(j)).   By default, Y = X.
+  ##   Special case: if X is a scalar CAUCHY(X) is the same as CAUCHY(1:X).
+  ##   Explicit formulas are known for DET(C) (which is nonzero if X and Y
+  ##   both have distinct elements) and the elements of INV(C).
+  ##   C is totally positive if 0 < X(1) < ... < X(N) and
+  ##   0 < Y(1) < ... < Y(N).
   ##
-  ##  References:
-  ##  N.J. Higham, Accuracy and Stability of Numerical Algorithms,
-  ##    Society for Industrial and Applied Mathematics, Philadelphia, PA,
-  ##    USA, 1996; sec. 26.1.
-  ##  D.E. Knuth, The Art of Computer Programming, Volume 1,
-  ##    Fundamental Algorithms, second edition, Addison-Wesley, Reading,
-  ##    Massachusetts, 1973, p. 36.
-  ##  E.E. Tyrtyshnikov, Cauchy-Toeplitz matrices and some applications,
-  ##    Linear Algebra and Appl., 149 (1991), pp. 1-18.
-  ##    O. Taussky and M. Marcus, Eigenvalues of finite matrices, in
-  ##    Survey of Numerical Analysis, J. Todd, ed., McGraw-Hill, New York,
-  ##    pp. 279-313, 1962. (States the totally positive property on p. 295.)
+  ##   References:
+  ##   N.J. Higham, Accuracy and Stability of Numerical Algorithms,
+  ##     Society for Industrial and Applied Mathematics, Philadelphia, PA,
+  ##     USA, 1996; sec. 26.1.
+  ##   D.E. Knuth, The Art of Computer Programming, Volume 1,
+  ##     Fundamental Algorithms, second edition, Addison-Wesley, Reading,
+  ##     Massachusetts, 1973, p. 36.
+  ##   E.E. Tyrtyshnikov, Cauchy-Toeplitz matrices and some applications,
+  ##     Linear Algebra and Appl., 149 (1991), pp. 1-18.
+  ##     O. Taussky and M. Marcus, Eigenvalues of finite matrices, in
+  ##     Survey of Numerical Analysis, J. Todd, ed., McGraw-Hill, New York,
+  ##     pp. 279-313, 1962. (States the totally positive property on p. 295.)
 
   if (nargin < 1 || nargin > 2)
     error ("gallery: 1 or 2 arguments are required for cauchy matrix.");
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/statistics/distributions/discrete_cdf.m
--- a/scripts/statistics/distributions/discrete_cdf.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/statistics/distributions/discrete_cdf.m	Wed Mar 30 15:19:12 2016 -0700
@@ -77,5 +77,5 @@
 %!error discrete_cdf (1, ones (2,1), ones (1,1))
 %!error discrete_cdf (1, ones (2,1), [1 -1])
 %!error discrete_cdf (1, ones (2,1), [1 NaN])
-%!error discrete_cdf (1, ones (2,1), [0  0])
+%!error discrete_cdf (1, ones (2,1), [0 0])
 
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/statistics/tests/kolmogorov_smirnov_test.m
--- a/scripts/statistics/tests/kolmogorov_smirnov_test.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/statistics/tests/kolmogorov_smirnov_test.m	Wed Mar 30 15:19:12 2016 -0700
@@ -116,7 +116,7 @@
 %!assert (kolmogorov_smirnov_test (0:100, "unif", 0, 100), 1.0, eps)
 ## test for recognition of logistic_cdf function
 %!assert (kolmogorov_smirnov_test (0:100, "logistic"), 0)
-## test for  F < G
+## test for F < G
 %!assert (kolmogorov_smirnov_test (50:100, "unif", 0, 50, "<"))
 
 %!error kolmogorov_smirnov_test (1)
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/testfun/assert.m
--- a/scripts/testfun/assert.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/testfun/assert.m	Wed Mar 30 15:19:12 2016 -0700
@@ -480,10 +480,10 @@
 %!error <Rel err .* exceeds tol> assert (100, 100+300*eps, -2*eps)
 
 ## test relative vs. absolute tolerances
-%!test  assert (0.1+eps, 0.1,  2*eps);
+%!test  assert (0.1+eps, 0.1, 2*eps);
 %!error <Rel err 2.2204e-0?15 exceeds tol> assert (0.1+eps, 0.1, -2*eps);
 %!test  assert (100+100*eps, 100, -2*eps);
-%!error <Abs err 2.8422e-0?14 exceeds tol> assert (100+100*eps, 100,  2*eps);
+%!error <Abs err 2.8422e-0?14 exceeds tol> assert (100+100*eps, 100, 2*eps);
 
 ## Corner case of relative tolerance with 0 divider
 %!error <Abs err 2 exceeds tol 0.1> assert (2, 0, -0.1)
diff -r 4abcc0969ebd -r 6c2fd62db1f7 scripts/time/datestr.m
--- a/scripts/time/datestr.m	Tue Mar 29 21:13:22 2016 -0700
+++ b/scripts/time/datestr.m	Wed Mar 30 15:19:12 2016 -0700
@@ -108,7 +108,7 @@
 ## @end deftypefn
 
 ## FIXME: parse arbitrary code strings.
-## e.g., for  Wednesday 2001-03-05 09:04:06 AM, use
+## e.g., for Wednesday 2001-03-05 09:04:06 AM, use
 ##     yy    01
 ##     yyyy  2001
 ##     m     M
diff -r 4abcc0969ebd -r 6c2fd62db1f7 test/classes/classes.tst
--- a/test/classes/classes.tst	Tue Mar 29 21:13:22 2016 -0700
+++ b/test/classes/classes.tst	Wed Mar 30 15:19:12 2016 -0700
@@ -331,7 +331,7 @@
 %!assert (isa (x3, 'Blork') && isequal (size (x3), [2 2]))
 %!test x3 = [x2; [51 x1]];
 %!assert (isa (x3, 'Blork') && isequal (size (x3), [2 2]))
-%!error <dimension mismatch> x4 = [x1  x3];
+%!error <dimension mismatch> x4 = [x1, x3];
 %!error <dimension mismatch> x4 = [x1; x3];
 
 %%%%%%%%%%%%%%%%%%%%%%%%
diff -r 4abcc0969ebd -r 6c2fd62db1f7 test/jit.tst
--- a/test/jit.tst	Tue Mar 29 21:13:22 2016 -0700
+++ b/test/jit.tst	Wed Mar 30 15:19:12 2016 -0700
@@ -424,7 +424,7 @@
 %!   m = sin (m);
 %!   break;
 %! endfor
-%! assert (m == sin ([1  2 3]));
+%! assert (m == sin ([1 2 3]));
 %! assert (jit_failcnt, 0);
 
 %!testif HAVE_LLVM