Index: audio/playaudio.m
===================================================================
RCS file: /cvs/octave/scripts/audio/playaudio.m,v
retrieving revision 1.19
diff -u -r1.19 playaudio.m
--- a/audio/playaudio.m	26 Apr 2005 19:24:29 -0000	1.19
+++ b/audio/playaudio.m	8 Sep 2005 00:29:38 -0000
@@ -34,7 +34,7 @@
 
   usage_msg = "playaudio (name, ext)  or  playaudio (X)";
 
-  if (nargin == 1 && isvector (name) && ! isstr (name))
+  if (nargin == 1 && isvector (name) && ! ischar (name))
     ## play a vector
     [nr, nc] = size (name);
     if (nc != 1)
@@ -55,7 +55,7 @@
     unwind_protect_cleanup
       unlink (file);
     end_unwind_protect
-  elseif (nargin >= 1 && isstr (name))
+  elseif (nargin >= 1 && ischar (name))
     ## play a file
     if (nargin == 1)
       name = [name, ".lin"];
Index: control/base/__bodquist__.m
===================================================================
RCS file: /cvs/octave/scripts/control/base/__bodquist__.m,v
retrieving revision 1.10
diff -u -r1.10 __bodquist__.m
--- a/control/base/__bodquist__.m	26 Apr 2005 19:24:29 -0000	1.10
+++ b/control/base/__bodquist__.m	8 Sep 2005 00:29:38 -0000
@@ -74,10 +74,10 @@
     if (isempty(inputs))
       inputs = 1:mm;                    # use all inputs
       warning([rname,": outputs specified but not inputs"]);
-    elseif(is_signal_list(inputs) | isstr(inputs))
+    elseif(is_signal_list(inputs) | ischar(inputs))
       inputs = sysidx(sys,"in",inputs);
     endif
-    if(is_signal_list(outputs) | isstr(outputs))
+    if(is_signal_list(outputs) | ischar(outputs))
       outputs = sysidx(sys,"out",outputs);
     end
     sys = sysprune(sys,outputs,inputs);
Index: control/base/lqg.m
===================================================================
RCS file: /cvs/octave/scripts/control/base/lqg.m,v
retrieving revision 1.10
diff -u -r1.10 lqg.m
--- a/control/base/lqg.m	26 Apr 2005 19:24:29 -0000	1.10
+++ b/control/base/lqg.m	8 Sep 2005 00:29:39 -0000
@@ -99,7 +99,7 @@
   endif
 
   ## check for names of signals
-  if(is_signal_list(input_list) | isstr(input_list))
+  if(is_signal_list(input_list) | ischar(input_list))
     input_list = sysidx(sys,"in",input_list);
   endif
 
Index: control/obsolete/dezero.m
===================================================================
RCS file: /cvs/octave/scripts/control/obsolete/dezero.m,v
retrieving revision 1.4
diff -u -r1.4 dezero.m
--- a/control/obsolete/dezero.m	23 Aug 2005 18:38:27 -0000	1.4
+++ b/control/obsolete/dezero.m	8 Sep 2005 00:29:40 -0000
@@ -36,7 +36,7 @@
 
   if (nargin != 1)
     usage ("dezero (s)");
-  elseif (isstr (s))
+  elseif (ischar (s))
 
     [nr, nc] = size (s);
     len = nr * nc;
@@ -49,7 +49,7 @@
 
       ## need to remove zeros first, then call deblank
       s = toascii (s);
-      t = deblank(setstr(s(find(s != 0) )));
+      t = deblank(char(s(find(s != 0) )));
     endif
 
   else
Index: control/system/__syschnamesl__.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/__syschnamesl__.m,v
retrieving revision 1.4
diff -u -r1.4 __syschnamesl__.m
--- a/control/system/__syschnamesl__.m	26 Apr 2005 19:24:29 -0000	1.4
+++ b/control/system/__syschnamesl__.m	8 Sep 2005 00:29:41 -0000
@@ -106,8 +106,8 @@
   endif
 
   ## just in case it's not a string anymore
-  if( !isstr(old_names) )
-    old_names = setstr(old_names);
+  if( !ischar(old_names) )
+    old_names = char(old_names);
   endif
 
   ## disp("__syschnamesl__: exit, old_names=")
Index: control/system/__sysconcat__.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/__sysconcat__.m,v
retrieving revision 1.1
diff -u -r1.1 __sysconcat__.m
--- a/control/system/__sysconcat__.m	17 Feb 2004 02:34:33 -0000	1.1
+++ b/control/system/__sysconcat__.m	8 Sep 2005 00:29:41 -0000
@@ -2,10 +2,10 @@
   # c = __sysconcat__(a,b)
   # cell array replacement for append, used by control systems toolbox
 
-  if(isstr(a))
+  if(ischar(a))
     a = {a};
   endif
-  if(isstr(b))
+  if(ischar(b))
     b = {b};
   endif
 
Index: control/system/c2d.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/c2d.m,v
retrieving revision 1.10
diff -u -r1.10 c2d.m
--- a/control/system/c2d.m	26 Apr 2005 19:24:29 -0000	1.10
+++ b/control/system/c2d.m	8 Sep 2005 00:29:41 -0000
@@ -107,12 +107,12 @@
     error("sys must be a system data structure");
   elseif (nargin == 1)
     opt = "ex";
-  elseif (nargin == 2 & !isstr(opt) )
+  elseif (nargin == 2 & !ischar(opt) )
     T = opt;
     opt = "ex";
   endif
 
-  if (! isstr (opt))
+  if (! ischar (opt))
     error ("expecting option as a string");
   endif
 
Index: control/system/cellidx.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/cellidx.m,v
retrieving revision 1.3
diff -u -r1.3 cellidx.m
--- a/control/system/cellidx.m	26 Apr 2005 19:24:29 -0000	1.3
+++ b/control/system/cellidx.m	8 Sep 2005 00:29:41 -0000
@@ -40,7 +40,7 @@
   usage("idxvec = cellidx(listvar,strlist)");
 endif
 
-if(isstr(strlist))
+if(ischar(strlist))
   tmp = strlist;
   strlist = {};
   for kk=1:rows(tmp)
@@ -48,7 +48,7 @@
   endfor
 endif
 
-if(isstr(listvar))
+if(ischar(listvar))
   tmp = listvar;
   listvar = {};
   for kk=1:rows(tmp)
Index: control/system/d2c.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/d2c.m,v
retrieving revision 1.7
diff -u -r1.7 d2c.m
--- a/control/system/d2c.m	26 Apr 2005 19:24:29 -0000	1.7
+++ b/control/system/d2c.m	8 Sep 2005 00:29:42 -0000
@@ -73,7 +73,7 @@
   elseif(nargin == 1)
     opt = "log";
     tol = 1e-12;
-  elseif(isstr(opt))   # all remaining cases are for nargin == 2
+  elseif(ischar(opt))   # all remaining cases are for nargin == 2
     tol = 1e-12;
     if( !(strcmp(opt,"log") | strcmp(opt,"bi") ) )
       error(["d2c: invalid opt passed=",opt]);
Index: control/system/dmr2d.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/dmr2d.m,v
retrieving revision 1.8
diff -u -r1.8 dmr2d.m
--- a/control/system/dmr2d.m	26 Apr 2005 19:24:29 -0000	1.8
+++ b/control/system/dmr2d.m	8 Sep 2005 00:29:43 -0000
@@ -87,7 +87,7 @@
   
   endif
 
-  if(is_signal_list(idx) | isstr(idx))
+  if(is_signal_list(idx) | ischar(idx))
     idx = sysidx(sys,"st",idx);
 
   elseif (!(isvector(idx) | isempty(idx)))
Index: control/system/is_signal_list.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/is_signal_list.m,v
retrieving revision 1.6
diff -u -r1.6 is_signal_list.m
--- a/control/system/is_signal_list.m	16 Feb 2004 17:45:50 -0000	1.6
+++ b/control/system/is_signal_list.m	8 Sep 2005 00:29:43 -0000
@@ -29,7 +29,7 @@
   end
   if (flg)
     for ii = 1:length (mylist)
-      if (! (isstr (mylist{ii}) && rows (mylist{ii}) == 1))
+      if (! (ischar (mylist{ii}) && rows (mylist{ii}) == 1))
 	flg = 0;
       endif
     endfor
Index: control/system/listidx.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/listidx.m,v
retrieving revision 1.4
diff -u -r1.4 listidx.m
--- a/control/system/listidx.m	26 Apr 2005 19:24:30 -0000	1.4
+++ b/control/system/listidx.m	8 Sep 2005 00:29:43 -0000
@@ -41,7 +41,7 @@
   usage("idxvec = listidx(listvar,strlist)");
 endif
 
-if(isstr(strlist))
+if(ischar(strlist))
   tmp = strlist;
   strlist = list();
   for kk=1:rows(tmp)
@@ -49,7 +49,7 @@
   endfor
 endif
 
-if(isstr(listvar))
+if(ischar(listvar))
   tmp = listvar;
   listvar = list();
   for kk=1:rows(tmp)
Index: control/system/ss.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/ss.m,v
retrieving revision 1.6
diff -u -r1.6 ss.m
--- a/control/system/ss.m	26 Apr 2005 19:24:30 -0000	1.6
+++ b/control/system/ss.m	8 Sep 2005 00:29:44 -0000
@@ -218,7 +218,7 @@
   ## check for continuous states
   if( (nargin < 6) & (tsam == 0) )               n = na;
   elseif(nargin < 6)                             n = 0;
-  elseif((!ismatrix(n)) | isstr(n))
+  elseif((!ismatrix(n)) | ischar(n))
     error("Parameter n is not a numerical value.");
   elseif( (!isscalar(n)) | (n < 0 ) | (n != round(n)) )
     if(isscalar(n))     error("invalid value of n=%d,%e",n,n);
@@ -229,7 +229,7 @@
   ## check for num discrete states
   if( (nargin < 7) & (tsam == 0))               nz = 0;
   elseif(nargin < 7)                            nz = na - n;
-  elseif((!ismatrix(nz)) | isstr(nz))
+  elseif((!ismatrix(nz)) | ischar(nz))
     error("Parameter nz is not a numerical value.");
   elseif( (!isscalar(nz)) | (nz < 0 ) | (nz != round(nz)) )
     if(isscalar(nz))
Index: control/system/sysappend.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/sysappend.m,v
retrieving revision 1.9
diff -u -r1.9 sysappend.m
--- a/control/system/sysappend.m	26 Apr 2005 19:24:30 -0000	1.9
+++ b/control/system/sysappend.m	8 Sep 2005 00:29:44 -0000
@@ -111,7 +111,7 @@
     if(Bm != Am)
       ## construct new signal names
       if(nargin >= 6)   # new names were passed
-	if(!isstr(inname))
+	if(!ischar(inname))
 	  error("inname must be a string");
 	elseif(rows(inname) != (Bm - Am))
 	  error(sprintf("%d new inputs requested; inname(%dx%d)", ...
@@ -144,7 +144,7 @@
 
       ## construct new signal names, output classification
       if(nargin >= 5)  # new names were passed
-	if(!isstr(outname))
+	if(!ischar(outname))
 	  error("outname must be a string");
 	elseif(rows(outname) != (Bp - Ap))
 	  error(sprintf("%d new outputs requested; outname(%dx%d)", ...
Index: control/system/sysconnect.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/sysconnect.m,v
retrieving revision 1.7
diff -u -r1.7 sysconnect.m
--- a/control/system/sysconnect.m	26 Apr 2005 19:24:30 -0000	1.7
+++ b/control/system/sysconnect.m	8 Sep 2005 00:29:44 -0000
@@ -96,10 +96,10 @@
   endif
 
   ## convert signal names to indices
-  if(is_signal_list(input_list) | isstr(input_list))
+  if(is_signal_list(input_list) | ischar(input_list))
     input_list = sysidx(sys,"in",input_list);
   endif
-  if(is_signal_list(output_list) | isstr(output_list))
+  if(is_signal_list(output_list) | ischar(output_list))
     output_list = sysidx(sys,"out",output_list);
   endif
 
Index: control/system/sysdup.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/sysdup.m,v
retrieving revision 1.9
diff -u -r1.9 sysdup.m
--- a/control/system/sysdup.m	26 Apr 2005 19:24:30 -0000	1.9
+++ b/control/system/sysdup.m	8 Sep 2005 00:29:45 -0000
@@ -74,10 +74,10 @@
   [aa,bb,cc,dd] = sys2ss(Asys);
 
   ## check for signal names
-  if(is_signal_list(input_list) | isstr(input_list))
+  if(is_signal_list(input_list) | ischar(input_list))
     input_list = sysidx(Asys,"in",input_list);
   endif
-  if(is_signal_list(output_list) | isstr(output_list))
+  if(is_signal_list(output_list) | ischar(output_list))
     output_list = sysidx(Asys,"out",output_list);
   endif
 
Index: control/system/sysgetsignals.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/sysgetsignals.m,v
retrieving revision 1.9
diff -u -r1.9 sysgetsignals.m
--- a/control/system/sysgetsignals.m	28 Apr 2005 02:33:03 -0000	1.9
+++ b/control/system/sysgetsignals.m	8 Sep 2005 00:29:45 -0000
@@ -160,7 +160,7 @@
     inname = sysgetsignals(sys,"in");
     outname = sysgetsignals(sys,"out");
     yd = sysgetsignals(sys,"yd");
-  elseif(!(isstr(sigid) & min(size(sigid)) == 1))
+  elseif(!(ischar(sigid) & min(size(sigid)) == 1))
     error(sprintf("sigid(%dx%d) must be a string)",rows(sigid),columns(sigid)));
   else
     if(strcmp("st",sigid))         stname = sys.stname;
@@ -172,7 +172,7 @@
         sigid));
     endif
     if(nargin >= 3)
-      if( is_signal_list(signum) | isstr(signum) )
+      if( is_signal_list(signum) | ischar(signum) )
         signum = cellidx(stname,signum);
       end
       if(max(signum) > length(stname))
Index: control/system/sysidx.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/sysidx.m,v
retrieving revision 1.5
diff -u -r1.5 sysidx.m
--- a/control/system/sysidx.m	26 Apr 2005 19:24:30 -0000	1.5
+++ b/control/system/sysidx.m	8 Sep 2005 00:29:45 -0000
@@ -31,7 +31,7 @@
     usage ("idxvec = sysidx (sys, sigtype, signamelist)");
   elseif (! isstruct (sys))
     error ("sys must be a system data structure");
-  elseif (! isstr (sigtype))
+  elseif (! ischar (sigtype))
     error ("sigtype must be a string");
   elseif (rows (sigtype) != 1)
     [nr, nc] = size (sigtype);
Index: control/system/sysprune.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/sysprune.m,v
retrieving revision 1.10
diff -u -r1.10 sysprune.m
--- a/control/system/sysprune.m	26 Apr 2005 19:24:30 -0000	1.10
+++ b/control/system/sysprune.m	8 Sep 2005 00:29:46 -0000
@@ -73,10 +73,10 @@
   if(isempty(state_idx)) state_idx = 1:(nn+nz); endif
 
   ## check for signal names
-  if(is_signal_list(output_idx) | isstr(output_idx))
+  if(is_signal_list(output_idx) | ischar(output_idx))
     output_idx = sysidx(sys,"out",output_idx);
   endif
-  if(is_signal_list(input_idx) | isstr(input_idx))
+  if(is_signal_list(input_idx) | ischar(input_idx))
     input_idx = sysidx(sys,"in",input_idx);
   endif
 
Index: control/system/syssetsignals.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/syssetsignals.m,v
retrieving revision 1.7
diff -u -r1.7 syssetsignals.m
--- a/control/system/syssetsignals.m	26 Apr 2005 19:24:30 -0000	1.7
+++ b/control/system/syssetsignals.m	8 Sep 2005 00:29:46 -0000
@@ -101,13 +101,13 @@
     error("sys must be a system data structure");
   elseif (isempty(opt))
     opt = "out";
-  elseif( ! isstr(opt)  )
+  elseif( ! ischar(opt)  )
     error("opt must be a string");
   elseif( ! (strcmp(opt,"out") + strcmp(opt,"yd") + ...
     strcmp(opt,"in") + strcmp(opt,"st") ) )
     error("opt must be one of [], ""out"", ""yd"", ""in"", or ""st""");
   elseif(nargin == 4)
-    if(is_signal_list(sig_idx) | isstr(sig_idx))
+    if(is_signal_list(sig_idx) | ischar(sig_idx))
       ## convert to vector of indices
       if(opt == "yd")
         sig_idx = sysidx(sys,"out",sig_idx);
@@ -137,7 +137,7 @@
       names = {names};
     endif
     if( (!is_signal_list(names)) & (!isempty(names)) )
-      if(isstr(names{1}))
+      if(ischar(names{1}))
         warning("syssetsignals(opt=%s): converting string matrix \"names\" to a cell array of strings",opt);
         tmpstr = names{1};
         for ii=1:rows(tmpstr)
Index: control/system/tfout.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/tfout.m,v
retrieving revision 1.6
diff -u -r1.6 tfout.m
--- a/control/system/tfout.m	26 Apr 2005 19:24:30 -0000	1.6
+++ b/control/system/tfout.m	8 Sep 2005 00:29:46 -0000
@@ -45,7 +45,7 @@
 
     if (nargin == 2)
       x = "s";
-    elseif( ! isstr(x) )
+    elseif( ! ischar(x) )
       error("tfout: third argument must be a string");
     endif
 
Index: control/system/zpout.m
===================================================================
RCS file: /cvs/octave/scripts/control/system/zpout.m,v
retrieving revision 1.6
diff -u -r1.6 zpout.m
--- a/control/system/zpout.m	26 Apr 2005 19:24:30 -0000	1.6
+++ b/control/system/zpout.m	8 Sep 2005 00:29:46 -0000
@@ -49,7 +49,7 @@
 
     if (nargin == 3)
       x = "s";
-    elseif( ! isstr(x) )
+    elseif( ! ischar(x) )
       error("zpout: third argument must be a string");
     endif
 
Index: control/util/prompt.m
===================================================================
RCS file: /cvs/octave/scripts/control/util/prompt.m,v
retrieving revision 1.5
diff -u -r1.5 prompt.m
--- a/control/util/prompt.m	26 Apr 2005 19:24:30 -0000	1.5
+++ b/control/util/prompt.m	8 Sep 2005 00:29:47 -0000
@@ -41,7 +41,7 @@
     usage ("prompt ([str])");
   elseif (nargin == 0)
     str = "\n ---- Press a key to continue ---";
-  elseif (! isstr (str) )
+  elseif (! ischar (str) )
     error ("prompt: input must be a string");
   endif
 
Index: control/util/sortcom.m
===================================================================
RCS file: /cvs/octave/scripts/control/util/sortcom.m,v
retrieving revision 1.5
diff -u -r1.5 sortcom.m
--- a/control/util/sortcom.m	26 Apr 2005 19:24:30 -0000	1.5
+++ b/control/util/sortcom.m	8 Sep 2005 00:29:47 -0000
@@ -61,7 +61,7 @@
 
   if(nargin == 1)         opt = "re";
   else
-    if (!isstr(opt))
+    if (!ischar(opt))
       error("sortcom: second argument must be a string");
     endif
   endif
Index: control/util/strappend.m
===================================================================
RCS file: /cvs/octave/scripts/control/util/strappend.m,v
retrieving revision 1.4
diff -u -r1.4 strappend.m
--- a/control/util/strappend.m	26 Apr 2005 19:24:30 -0000	1.4
+++ b/control/util/strappend.m	8 Sep 2005 00:29:47 -0000
@@ -28,7 +28,7 @@
     usage ("retval = strappend (strlist, suffix)");
   elseif (! is_signal_list (strlist))
     error ("strlist must be a list of strings (see is_signal_list)");
-  elseif (! (isstr (suffix) && rows (suffix) == 1))
+  elseif (! (ischar (suffix) && rows (suffix) == 1))
     error ("suffix must be a single string");
   endif
 
Index: finance/fv.m
===================================================================
RCS file: /cvs/octave/scripts/finance/fv.m,v
retrieving revision 1.9
diff -u -r1.9 fv.m
--- a/finance/fv.m	23 Aug 2005 18:38:28 -0000	1.9
+++ b/finance/fv.m	8 Sep 2005 00:29:48 -0000
@@ -59,10 +59,10 @@
 
   if (nargin > 3)
     if (nargin == 5)
-      if (! isstr (m))
+      if (! ischar (m))
         error ("fv: `method' must be a string");
       endif
-    elseif isstr (l)
+    elseif ischar (l)
       m = l;
       l = 0;
     else
Index: finance/nper.m
===================================================================
RCS file: /cvs/octave/scripts/finance/nper.m,v
retrieving revision 1.12
diff -u -r1.12 nper.m
--- a/finance/nper.m	23 Aug 2005 18:38:28 -0000	1.12
+++ b/finance/nper.m	8 Sep 2005 00:29:48 -0000
@@ -53,11 +53,11 @@
   endif
 
   if (nargin == 5)
-    if (! isstr (m))
+    if (! ischar (m))
       error ("nper: `method' must be a string");
     endif
   elseif (nargin == 4)
-    if (isstr (l))
+    if (ischar (l))
       m = l;
       l = 0;
     else
Index: finance/pmt.m
===================================================================
RCS file: /cvs/octave/scripts/finance/pmt.m,v
retrieving revision 1.14
diff -u -r1.14 pmt.m
--- a/finance/pmt.m	23 Aug 2005 18:38:28 -0000	1.14
+++ b/finance/pmt.m	8 Sep 2005 00:29:48 -0000
@@ -50,11 +50,11 @@
   endif
 
   if (nargin == 5)
-    if (! isstr (m))
+    if (! ischar (m))
       error ("pmt: `method' must be a string");
     endif
   elseif (nargin == 4)
-    if (isstr (l))
+    if (ischar (l))
       m = l;
       l = 0;
     else
Index: finance/pv.m
===================================================================
RCS file: /cvs/octave/scripts/finance/pv.m,v
retrieving revision 1.12
diff -u -r1.12 pv.m
--- a/finance/pv.m	23 Aug 2005 18:38:28 -0000	1.12
+++ b/finance/pv.m	8 Sep 2005 00:29:48 -0000
@@ -60,10 +60,10 @@
 
   if (nargin > 3)
     if (nargin == 5)
-      if (! isstr (m))
+      if (! ischar (m))
         error ("pv: `method' must be a string");
       endif
-    elseif (isstr (l))
+    elseif (ischar (l))
       m = l;
       l = 0;
     else
Index: finance/rate.m
===================================================================
RCS file: /cvs/octave/scripts/finance/rate.m,v
retrieving revision 1.12
diff -u -r1.12 rate.m
--- a/finance/rate.m	23 Aug 2005 18:38:28 -0000	1.12
+++ b/finance/rate.m	8 Sep 2005 00:29:48 -0000
@@ -50,11 +50,11 @@
   endif
 
   if (nargin == 5)
-    if (! isstr (m))
+    if (! ischar (m))
       error ("rate: `method' must be a string");
     endif
   elseif (nargin == 4)
-    if (isstr (l))
+    if (ischar (l))
       m = l;
       l = 0;
     else
Index: general/diff.m
===================================================================
RCS file: /cvs/octave/scripts/general/diff.m,v
retrieving revision 1.9
diff -u -r1.9 diff.m
--- a/general/diff.m	23 Aug 2005 18:38:28 -0000	1.9
+++ b/general/diff.m	8 Sep 2005 00:29:48 -0000
@@ -85,7 +85,7 @@
     endif
   endif
 
-  if (isstr (x))
+  if (ischar (x))
     error ("diff: symbolic differentiation not (yet) supported");
   endif
 
Index: general/num2str.m
===================================================================
RCS file: /cvs/octave/scripts/general/num2str.m,v
retrieving revision 1.25
diff -u -r1.25 num2str.m
--- a/general/num2str.m	18 May 2005 11:43:38 -0000	1.25
+++ b/general/num2str.m	8 Sep 2005 00:29:48 -0000
@@ -36,14 +36,14 @@
     usage ("num2str (x) or num2str (x, precision) or num2str (x, fmt)");
   endif
 
-  if (isstr (x))
+  if (ischar (x))
     retval = x;
     return;
   endif
 
   if (iscomplex (x))
     if (nargin == 2)
-      if (isstr (arg))
+      if (ischar (arg))
 	fmt = strcat (arg, "%-+", arg(2:end), "i");
       else
 	if (isnumeric (x) && round (x) == x && abs (x) < (10 .^ arg))
@@ -106,7 +106,7 @@
     retval = split (tmp, "\n");
   else
     if (nargin == 2)
-      if (isstr (arg))
+      if (ischar (arg))
 	fmt = arg;
       else
 	if (isnumeric (x) && round (x) == x && abs (x) < (10 .^ arg))
Index: general/repmat.m
===================================================================
RCS file: /cvs/octave/scripts/general/repmat.m,v
retrieving revision 1.8
diff -u -r1.8 repmat.m
--- a/general/repmat.m	26 Apr 2005 19:24:30 -0000	1.8
+++ b/general/repmat.m	8 Sep 2005 00:29:48 -0000
@@ -52,8 +52,8 @@
   endif
 
   if (numel (a) == 1)
-    if (isstr (a))
-      x = setstr (toascii (a) * ones (idx));
+    if (ischar (a))
+      x = char (toascii (a) * ones (idx));
     else
       if (strcmp (class (a), "double"))
 	## This is faster with octave for double/Complex
@@ -67,8 +67,8 @@
       endif
     endif
   elseif (ndims (a) == 2 && length (idx) < 3)
-    if (isstr (a))
-      x = setstr (kron (ones (idx), toascii (a)));
+    if (ischar (a))
+      x = char (kron (ones (idx), toascii (a)));
     elseif (strcmp (class(a), "double")) 
       x = kron (ones (idx), a);
     else
Index: general/sortrows.m
===================================================================
RCS file: /cvs/octave/scripts/general/sortrows.m,v
retrieving revision 1.4
diff -u -r1.4 sortrows.m
--- a/general/sortrows.m	26 Apr 2005 19:24:30 -0000	1.4
+++ b/general/sortrows.m	8 Sep 2005 00:29:49 -0000
@@ -35,7 +35,7 @@
     indices = c(:);
   endif
 
-  if (isstr (m))
+  if (ischar (m))
     s = toascii (m);
   else
     s = m;
@@ -53,8 +53,8 @@
     i = i(idx);
   endfor
 
-  if (isstr (m))
-    s = setstr (s);
+  if (ischar (m))
+    s = char (s);
   endif
 
 endfunction
Index: general/strerror.m
===================================================================
RCS file: /cvs/octave/scripts/general/strerror.m,v
retrieving revision 1.12
diff -u -r1.12 strerror.m
--- a/general/strerror.m	26 Apr 2005 19:24:30 -0000	1.12
+++ b/general/strerror.m	8 Sep 2005 00:29:49 -0000
@@ -33,7 +33,7 @@
     usage ("strerror (name, err)");
   endif
 
-  if (! isstr (name))
+  if (! ischar (name))
     error ("strerror: first argument must be a string");
   endif
 
Index: image/colormap.m
===================================================================
RCS file: /cvs/octave/scripts/image/colormap.m,v
retrieving revision 1.23
diff -u -r1.23 colormap.m
--- a/image/colormap.m	26 Apr 2005 19:24:30 -0000	1.23
+++ b/image/colormap.m	8 Sep 2005 00:29:49 -0000
@@ -47,7 +47,7 @@
 
   if (nargin == 1)
 
-    if (isstr (map))
+    if (ischar (map))
       if (strcmp (map, "default"))
         map = gray ();
       else
Index: image/imshow.m
===================================================================
RCS file: /cvs/octave/scripts/image/imshow.m,v
retrieving revision 1.21
diff -u -r1.21 imshow.m
--- a/image/imshow.m	28 Apr 2005 18:44:27 -0000	1.21
+++ b/image/imshow.m	8 Sep 2005 00:29:49 -0000
@@ -153,7 +153,7 @@
   ## Check for "truesize".
   zoom = [];
   for i = mvars+1:nargin
-    if (isstr (varargin{i}) && strcmp (varargin{i}, "truesize"))
+    if (ischar (varargin{i}) && strcmp (varargin{i}, "truesize"))
       zoom = 1;
     endif
   endfor
Index: image/loadimage.m
===================================================================
RCS file: /cvs/octave/scripts/image/loadimage.m,v
retrieving revision 1.20
diff -u -r1.20 loadimage.m
--- a/image/loadimage.m	26 Apr 2005 19:24:30 -0000	1.20
+++ b/image/loadimage.m	8 Sep 2005 00:29:49 -0000
@@ -33,7 +33,7 @@
 
   if (nargin != 1)
     usage ("[img, map] = loadimage (filename)");
-  elseif (! isstr (filename))
+  elseif (! ischar (filename))
     error ("loadimage: expecting filename as a string");
   endif
 
Index: image/saveimage.m
===================================================================
RCS file: /cvs/octave/scripts/image/saveimage.m,v
retrieving revision 1.45
diff -u -r1.45 saveimage.m
--- a/image/saveimage.m	29 Aug 2005 20:48:29 -0000	1.45
+++ b/image/saveimage.m	8 Sep 2005 00:29:49 -0000
@@ -93,7 +93,7 @@
 
   if (nargin < 3)
     img_form = "img";
-  elseif (! isstr (img_form))
+  elseif (! ischar (img_form))
     error ("image format specification must be a string");
   elseif (! (strcmp (img_form, "img")
              || strcmp (img_form, "ppm")
@@ -105,7 +105,7 @@
     warning ("image variable is not a matrix");
   endif
 
-  if (! isstr (filename))
+  if (! ischar (filename))
     error ("file name must be a string");
   endif
 
Index: linear-algebra/norm.m
===================================================================
RCS file: /cvs/octave/scripts/linear-algebra/norm.m,v
retrieving revision 1.26
diff -u -r1.26 norm.m
--- a/linear-algebra/norm.m	26 Apr 2005 19:24:30 -0000	1.26
+++ b/linear-algebra/norm.m	8 Sep 2005 00:29:49 -0000
@@ -78,7 +78,7 @@
   if (rows (x) == 1 || columns (x) == 1)
 
     if (nargin == 2)
-      if (isstr (p))
+      if (ischar (p))
         if (strcmp (p, "fro"))
 	  retval = sqrt (sum (abs (x) .^ 2));
         elseif (strcmp (p, "inf"))
@@ -102,7 +102,7 @@
   else
 
     if (nargin == 2)
-      if (isstr (p))
+      if (ischar (p))
         if (strcmp (p, "fro"))
 	  retval = sqrt (sum (sum (abs (x) .^ 2)));
         elseif (strcmp (p, "inf"))
Index: miscellaneous/fileparts.m
===================================================================
RCS file: /cvs/octave/scripts/miscellaneous/fileparts.m,v
retrieving revision 1.8
diff -u -r1.8 fileparts.m
--- a/miscellaneous/fileparts.m	26 Apr 2005 19:24:30 -0000	1.8
+++ b/miscellaneous/fileparts.m	8 Sep 2005 00:29:49 -0000
@@ -26,7 +26,7 @@
 function [directory, name, extension, version] = fileparts (filename)
 
   if (nargin == 1)
-    if (isstr (filename))
+    if (ischar (filename))
       ds = rindex (filename, filesep);
       es = rindex (filename, ".");
       ## These can be the same if they are both 0 (no dir or ext).
Index: miscellaneous/popen2.m
===================================================================
RCS file: /cvs/octave/scripts/miscellaneous/popen2.m,v
retrieving revision 1.16
diff -u -r1.16 popen2.m
--- a/miscellaneous/popen2.m	26 Apr 2005 19:24:31 -0000	1.16
+++ b/miscellaneous/popen2.m	8 Sep 2005 00:29:49 -0000
@@ -34,7 +34,7 @@
 ## [in, out, pid] = popen2 ("sort", "-nr");
 ## fputs (in, "these\nare\nsome\nstrings\n");
 ## fclose (in);
-## while (isstr (s = fgets (out)))
+## while (ischar (s = fgets (out)))
 ##   fputs (stdout, s);
 ## endwhile
 ## fclose (out);
@@ -60,7 +60,7 @@
       args = "";
     endif
 
-    if (isstr (command))
+    if (ischar (command))
 
       [stdin_pipe, stdin_status] = pipe ();
       [stdout_pipe, stdout_status] = pipe ();
Index: plot/__axis_label__.m
===================================================================
RCS file: /cvs/octave/scripts/plot/__axis_label__.m,v
retrieving revision 1.9
diff -u -r1.9 __axis_label__.m
--- a/plot/__axis_label__.m	26 Apr 2005 19:24:31 -0000	1.9
+++ b/plot/__axis_label__.m	8 Sep 2005 00:29:50 -0000
@@ -29,7 +29,7 @@
   if (nargin == 0)
     usage ("__axis_label__ (caller, text)");
   elseif (nargin == 2)
-    if (isstr (text))
+    if (ischar (text))
       __gnuplot_raw__ (sprintf ("set %s \"%s\";\n", caller,
 				undo_string_escapes (text)));
       if (automatic_replot)
Index: plot/__errcomm__.m
===================================================================
RCS file: /cvs/octave/scripts/plot/__errcomm__.m,v
retrieving revision 1.12
diff -u -r1.12 __errcomm__.m
--- a/plot/__errcomm__.m	16 Jun 2005 20:19:18 -0000	1.12
+++ b/plot/__errcomm__.m	8 Sep 2005 00:29:50 -0000
@@ -59,7 +59,7 @@
       data{ndata} = a;
       while (k <= nargs)
 	a = varargin{k++};
-	if (isstr (a))
+	if (ischar (a))
 	  __errplot__ (a, data{1:ndata});
 	  break;
 	elseif (isvector (a))
@@ -79,7 +79,7 @@
       endwhile
     endwhile
 
-    if (! isstr (a))
+    if (! ischar (a))
       __errplot__ ("~", data{1:ndata});
     endif
   unwind_protect_cleanup
Index: plot/__plt1__.m
===================================================================
RCS file: /cvs/octave/scripts/plot/__plt1__.m,v
retrieving revision 1.14
diff -u -r1.14 __plt1__.m
--- a/plot/__plt1__.m	26 Apr 2005 19:24:31 -0000	1.14
+++ b/plot/__plt1__.m	8 Sep 2005 00:29:50 -0000
@@ -33,7 +33,7 @@
     fmt = "";
   endif
 
-  if (! isstr (fmt))
+  if (! ischar (fmt))
     error ("__plt1__: fmt must be a string");
   endif
 
Index: plot/__plt2__.m
===================================================================
RCS file: /cvs/octave/scripts/plot/__plt2__.m,v
retrieving revision 1.14
diff -u -r1.14 __plt2__.m
--- a/plot/__plt2__.m	26 Apr 2005 19:24:31 -0000	1.14
+++ b/plot/__plt2__.m	8 Sep 2005 00:29:50 -0000
@@ -33,7 +33,7 @@
     fmt = "";
   endif
 
-  if (! isstr (fmt))
+  if (! ischar (fmt))
     error ("__plt2__: fmt must be a string");
   endif
 
Index: plot/__plt__.m
===================================================================
RCS file: /cvs/octave/scripts/plot/__plt__.m,v
retrieving revision 1.34
diff -u -r1.34 __plt__.m
--- a/plot/__plt__.m	8 Jul 2005 15:25:43 -0000	1.34
+++ b/plot/__plt__.m	8 Sep 2005 00:29:50 -0000
@@ -50,7 +50,7 @@
 
       have_data = false;
 
-      if (isstr (next_arg))
+      if (ischar (next_arg))
 	if (x_set)
 	  fmt = __pltopt__ (caller, next_arg);
 	  if (y_set)
Index: plot/__pltopt1__.m
===================================================================
RCS file: /cvs/octave/scripts/plot/__pltopt1__.m,v
retrieving revision 1.17
diff -u -r1.17 __pltopt1__.m
--- a/plot/__pltopt1__.m	8 Jul 2005 01:00:10 -0000	1.17
+++ b/plot/__pltopt1__.m	8 Sep 2005 00:29:51 -0000
@@ -65,7 +65,7 @@
     usage ("__pltopt1__ (caller, opt)");
   endif
 
-  if (! isstr (opt))
+  if (! ischar (opt))
     error ("__pltopt1__: argument must be a string");
   endif
 
Index: plot/__pltopt__.m
===================================================================
RCS file: /cvs/octave/scripts/plot/__pltopt__.m,v
retrieving revision 1.27
diff -u -r1.27 __pltopt__.m
--- a/plot/__pltopt__.m	26 Apr 2005 19:24:31 -0000	1.27
+++ b/plot/__pltopt__.m	8 Sep 2005 00:29:51 -0000
@@ -111,7 +111,7 @@
 
 function fmt = __pltopt__ (caller, opt)
 
-  if (! isstr (opt))
+  if (! ischar (opt))
     usage ("__pltopt__ (caller, opt)");
   endif
 
Index: plot/axis.m
===================================================================
RCS file: /cvs/octave/scripts/plot/axis.m,v
retrieving revision 1.31
diff -u -r1.31 axis.m
--- a/plot/axis.m	26 Apr 2005 19:24:31 -0000	1.31
+++ b/plot/axis.m	8 Sep 2005 00:29:53 -0000
@@ -134,7 +134,7 @@
       curr_axis = __current_axis__;
     endif
 
-  elseif (isstr (ax))
+  elseif (ischar (ax))
     ax = tolower (ax);
     len = length (ax);
 
Index: plot/bottom_title.m
===================================================================
RCS file: /cvs/octave/scripts/plot/bottom_title.m,v
retrieving revision 1.20
diff -u -r1.20 bottom_title.m
--- a/plot/bottom_title.m	26 Apr 2005 19:24:31 -0000	1.20
+++ b/plot/bottom_title.m	8 Sep 2005 00:29:53 -0000
@@ -31,7 +31,7 @@
     usage ("bottom_title (text)");
   endif
 
-  if (isstr (text))
+  if (ischar (text))
     __gnuplot_raw__ ("set top_title;\n");
     __gnuplot_raw__ ("set title;\n");
     __gnuplot_raw__ (sprintf ("set bottom_title \"%s\";\n",
Index: plot/close.m
===================================================================
RCS file: /cvs/octave/scripts/plot/close.m,v
retrieving revision 1.3
diff -u -r1.3 close.m
--- a/plot/close.m	26 Apr 2005 19:24:31 -0000	1.3
+++ b/plot/close.m	8 Sep 2005 00:29:53 -0000
@@ -40,7 +40,7 @@
     endif
     closeplot;
   elseif (nargin == 1)
-    if (isstr (arg1))
+    if (ischar (arg1))
       if (strcmp (arg1, "all"))
 	closeplot;
       else
@@ -56,8 +56,8 @@
       endif
     endif
   elseif (nargin == 2
-	  && isstr (arg1) && strcmp (arg1, "all")
-	  && isstr (arg2) && strcmp (arg2, "hidden"))
+	  && ischar (arg1) && strcmp (arg1, "all")
+	  && ischar (arg2) && strcmp (arg2, "hidden"))
     closeplot;
   else
     usage ("close [all]");
Index: plot/grid.m
===================================================================
RCS file: /cvs/octave/scripts/plot/grid.m,v
retrieving revision 1.25
diff -u -r1.25 grid.m
--- a/plot/grid.m	26 Apr 2005 19:24:31 -0000	1.25
+++ b/plot/grid.m	8 Sep 2005 00:29:53 -0000
@@ -41,7 +41,7 @@
     __gnuplot_raw__ ("set grid;\n");
     do_replot = true;
   elseif (nargin == 1)
-    if (isstr (x))
+    if (ischar (x))
       if (strcmp ("off", x))
         __gnuplot_raw__ ("set nogrid;\n");
 	do_replot = true;
Index: plot/hist.m
===================================================================
RCS file: /cvs/octave/scripts/plot/hist.m,v
retrieving revision 1.27
diff -u -r1.27 hist.m
--- a/plot/hist.m	26 Apr 2005 19:24:31 -0000	1.27
+++ b/plot/hist.m	8 Sep 2005 00:29:53 -0000
@@ -50,7 +50,7 @@
     usage ("[nn, xx] = hist (y, x, norm)");
   endif
 
-  arg_is_vector = is_vector (y);
+  arg_isvector = isvector (y);
 
   if (rows (y) == 1)
     y = y(:);
@@ -120,7 +120,7 @@
   endif
 
   if (nargout > 0)
-    if (arg_is_vector)
+    if (arg_isvector)
       nn = freq';
       xx = x';
     else
Index: plot/plot_border.m
===================================================================
RCS file: /cvs/octave/scripts/plot/plot_border.m,v
retrieving revision 1.22
diff -u -r1.22 plot_border.m
--- a/plot/plot_border.m	26 Apr 2005 19:24:31 -0000	1.22
+++ b/plot/plot_border.m	8 Sep 2005 00:29:53 -0000
@@ -68,7 +68,7 @@
 
     arg = varargin{k++};
 
-    if (! isstr (arg))
+    if (! ischar (arg))
       error ("plot_border: input not a string");
     endif
 
Index: plot/polar.m
===================================================================
RCS file: /cvs/octave/scripts/plot/polar.m,v
retrieving revision 1.25
diff -u -r1.25 polar.m
--- a/plot/polar.m	11 May 2005 16:34:11 -0000	1.25
+++ b/plot/polar.m	8 Sep 2005 00:29:53 -0000
@@ -40,12 +40,12 @@
   __gnuplot_raw__ ("set nopolar;\n");
 
   if (nargin == 3)
-    if (! isstr (fmt))
+    if (! ischar (fmt))
       error ("polar: third argument must be a string");
     endif
     __plr2__ (x1, x2, fmt);
   elseif (nargin == 2)
-    if (isstr (x2))
+    if (ischar (x2))
       __plr1__ (x1, x2);
     else
       fmt = "";
Index: plot/print.m
===================================================================
RCS file: /cvs/octave/scripts/plot/print.m,v
retrieving revision 1.6
diff -u -r1.6 print.m
--- a/plot/print.m	23 May 2005 20:41:22 -0000	1.6
+++ b/plot/print.m	8 Sep 2005 00:29:53 -0000
@@ -110,7 +110,7 @@
 
   for i = 1:nargin
     arg = varargin{i};
-    if (isstr (arg))
+    if (ischar (arg))
       if (strcmp (arg, "-color"))
 	use_color = 1;
       elseif (strcmp (arg, "-mono"))
Index: plot/title.m
===================================================================
RCS file: /cvs/octave/scripts/plot/title.m,v
retrieving revision 1.25
diff -u -r1.25 title.m
--- a/plot/title.m	26 Apr 2005 19:24:31 -0000	1.25
+++ b/plot/title.m	8 Sep 2005 00:29:53 -0000
@@ -33,7 +33,7 @@
     usage ("title (text)");
   endif
 
-  if (isstr (text))
+  if (ischar (text))
     __gnuplot_raw__ (sprintf ("set title \"%s\";\n",
 			      undo_string_escapes (text)));
     if (automatic_replot)
Index: plot/top_title.m
===================================================================
RCS file: /cvs/octave/scripts/plot/top_title.m,v
retrieving revision 1.20
diff -u -r1.20 top_title.m
--- a/plot/top_title.m	26 Apr 2005 19:24:31 -0000	1.20
+++ b/plot/top_title.m	8 Sep 2005 00:29:53 -0000
@@ -33,7 +33,7 @@
     usage ("top_title (text)");
   endif
 
-  if (isstr (text))
+  if (ischar (text))
     __gnuplot_raw__ ("set bottom_title;\n")
     __gnuplot_raw__ ("set title;\n")
     __gnuplot_raw__ (sprintf ("set top_title \"%s\";\n",
Index: polynomial/polyout.m
===================================================================
RCS file: /cvs/octave/scripts/polynomial/polyout.m,v
retrieving revision 1.8
diff -u -r1.8 polyout.m
--- a/polynomial/polyout.m	26 Apr 2005 19:24:31 -0000	1.8
+++ b/polynomial/polyout.m	8 Sep 2005 00:29:53 -0000
@@ -54,7 +54,7 @@
 
   if (nargin == 1)
     x = "s";
-  elseif (! isstr(x))
+  elseif (! ischar(x))
     error("polyout: second argument must be a string");
   endif
 
Index: set/unique.m
===================================================================
RCS file: /cvs/octave/scripts/set/unique.m,v
retrieving revision 1.5
diff -u -r1.5 unique.m
--- a/set/unique.m	26 Apr 2005 19:24:31 -0000	1.5
+++ b/set/unique.m	8 Sep 2005 00:29:53 -0000
@@ -55,7 +55,7 @@
     return;
   endif
 
-  if (isstr (x))
+  if (ischar (x))
     y = toascii (y);
   endif
 
@@ -95,8 +95,8 @@
   endif
   i(idx) = [];
 
-  if (isstr (x))
-    y = setstr (y);
+  if (ischar (x))
+    y = char (y);
   endif
 
 endfunction
Index: signal/freqz.m
===================================================================
RCS file: /cvs/octave/scripts/signal/freqz.m,v
retrieving revision 1.20
diff -u -r1.20 freqz.m
--- a/signal/freqz.m	2 Jun 2005 16:01:25 -0000	1.20
+++ b/signal/freqz.m	8 Sep 2005 00:29:53 -0000
@@ -84,7 +84,7 @@
     region = Fs = [];
   elseif (nargin == 4)
     Fs = [];
-    if (! isstr (region) && ! isempty (region))
+    if (! ischar (region) && ! isempty (region))
       Fs = region; 
       region = [];
     endif
Index: signal/stft.m
===================================================================
RCS file: /cvs/octave/scripts/signal/stft.m,v
retrieving revision 1.6
diff -u -r1.6 stft.m
--- a/signal/stft.m	26 Apr 2005 19:24:31 -0000	1.6
+++ b/signal/stft.m	8 Sep 2005 00:29:53 -0000
@@ -69,7 +69,7 @@
       endif
     endif
   elseif (nargin == 5)
-    if (isstr (w_type))
+    if (ischar (w_type))
       if (strcmp (w_type, "hanning"))
         w_type = 1;
       elseif (strcmp (w_type, "hamming"))
Index: statistics/base/mean.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/base/mean.m,v
retrieving revision 1.12
diff -u -r1.12 mean.m
--- a/statistics/base/mean.m	23 Aug 2005 18:38:28 -0000	1.12
+++ b/statistics/base/mean.m	8 Sep 2005 00:29:53 -0000
@@ -66,7 +66,7 @@
     opt = "a";
     need_dim = 1;
   elseif (nargin == 2)
-    if (isstr (opt1))
+    if (ischar (opt1))
       opt = opt1;
       need_dim = 1;
     else
@@ -74,10 +74,10 @@
       opt = "a";
     endif
   elseif (nargin == 3)
-    if (isstr (opt1))
+    if (ischar (opt1))
       opt = opt1;
       dim = opt2;
-    elseif (isstr (opt2))
+    elseif (ischar (opt2))
       opt = opt2;
       dim = opt1;
     else
Index: statistics/base/moment.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/base/moment.m,v
retrieving revision 1.11
diff -u -r1.11 moment.m
--- a/statistics/base/moment.m	23 Aug 2005 18:38:28 -0000	1.11
+++ b/statistics/base/moment.m	8 Sep 2005 00:29:53 -0000
@@ -57,7 +57,7 @@
     opt = "";
     need_dim = 1;
   elseif (nargin == 3)
-    if (isstr (opt1))
+    if (ischar (opt1))
       opt = opt1;
       need_dim = 1;
     else
@@ -65,10 +65,10 @@
       opt = "";
     endif
   elseif (nargin == 4)
-    if (isstr (opt1))
+    if (ischar (opt1))
       opt = opt1;
       dim = opt2;
-    elseif (isstr (opt2))
+    elseif (ischar (opt2))
       opt = opt2;
       dim = opt1;
     else
Index: statistics/tests/cor_test.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/cor_test.m,v
retrieving revision 1.9
diff -u -r1.9 cor_test.m
--- a/statistics/tests/cor_test.m	23 Aug 2005 18:38:28 -0000	1.9
+++ b/statistics/tests/cor_test.m	8 Sep 2005 00:29:53 -0000
@@ -73,13 +73,13 @@
 
   if (nargin < 3)
     ALTERNATIVE = "!=";
-  elseif (! isstr (ALTERNATIVE))
+  elseif (! ischar (ALTERNATIVE))
     error ("cor_test: ALTERNATIVE must be a string");
   endif
 
   if (nargin < 4)
     METHOD = "pearson";
-  elseif (! isstr (METHOD))
+  elseif (! ischar (METHOD))
     error ("cor_test: METHOD must be a string");
   endif
 
Index: statistics/tests/kolmogorov_smirnov_test.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/kolmogorov_smirnov_test.m,v
retrieving revision 1.13
diff -u -r1.13 kolmogorov_smirnov_test.m
--- a/statistics/tests/kolmogorov_smirnov_test.m	23 Aug 2005 18:38:28 -0000	1.13
+++ b/statistics/tests/kolmogorov_smirnov_test.m	8 Sep 2005 00:29:53 -0000
@@ -72,7 +72,7 @@
     args = "";
     for k = 1 : (nargin-2);
       tmp  = varargin{k};
-      if isstr (tmp)
+      if ischar (tmp)
         alt = tmp;
       else
         args = sprintf ("%s, %g", args, tmp);
Index: statistics/tests/kolmogorov_smirnov_test_2.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/kolmogorov_smirnov_test_2.m,v
retrieving revision 1.12
diff -u -r1.12 kolmogorov_smirnov_test_2.m
--- a/statistics/tests/kolmogorov_smirnov_test_2.m	23 Aug 2005 18:38:28 -0000	1.12
+++ b/statistics/tests/kolmogorov_smirnov_test_2.m	8 Sep 2005 00:29:53 -0000
@@ -59,7 +59,7 @@
   if (nargin == 2)
     alt = "!=";
   else
-    if (! isstr (alt))
+    if (! ischar (alt))
       error ("kolmogorov_smirnov_test_2: alt must be a string");
     endif
   endif
Index: statistics/tests/prop_test_2.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/prop_test_2.m,v
retrieving revision 1.8
diff -u -r1.8 prop_test_2.m
--- a/statistics/tests/prop_test_2.m	23 Aug 2005 18:38:28 -0000	1.8
+++ b/statistics/tests/prop_test_2.m	8 Sep 2005 00:29:53 -0000
@@ -61,7 +61,7 @@
     alt  = "!=";
   endif
 
-  if (! isstr (alt))
+  if (! ischar (alt))
     error ("prop_test_2: alt must be a string");
   endif
   if (strcmp (alt, "!=") || strcmp (alt, "<>"))
Index: statistics/tests/sign_test.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/sign_test.m,v
retrieving revision 1.9
diff -u -r1.9 sign_test.m
--- a/statistics/tests/sign_test.m	23 Aug 2005 18:38:28 -0000	1.9
+++ b/statistics/tests/sign_test.m	8 Sep 2005 00:29:53 -0000
@@ -64,7 +64,7 @@
     alt  = "!=";
   endif
 
-  if (! isstr (alt))
+  if (! ischar (alt))
     error ("sign_test: alt must be a string");
   endif
   if (strcmp (alt, "!=") || strcmp (alt, "<>"))
Index: statistics/tests/t_test.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/t_test.m,v
retrieving revision 1.10
diff -u -r1.10 t_test.m
--- a/statistics/tests/t_test.m	23 Aug 2005 18:38:28 -0000	1.10
+++ b/statistics/tests/t_test.m	8 Sep 2005 00:29:54 -0000
@@ -64,7 +64,7 @@
     alt  = "!=";
   endif
 
-  if (! isstr (alt))
+  if (! ischar (alt))
     error ("t_test: alt must be a string");
   endif
   if (strcmp (alt, "!=") || strcmp (alt, "<>"))
Index: statistics/tests/t_test_2.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/t_test_2.m,v
retrieving revision 1.9
diff -u -r1.9 t_test_2.m
--- a/statistics/tests/t_test_2.m	23 Aug 2005 18:38:28 -0000	1.9
+++ b/statistics/tests/t_test_2.m	8 Sep 2005 00:29:54 -0000
@@ -65,7 +65,7 @@
     alt = "!=";
   endif
 
-  if (! isstr (alt))
+  if (! ischar (alt))
     error ("t_test_2: alt must be a string");
   endif
   if (strcmp (alt, "!=") || strcmp (alt, "<>"))
Index: statistics/tests/t_test_regression.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/t_test_regression.m,v
retrieving revision 1.11
diff -u -r1.11 t_test_regression.m
--- a/statistics/tests/t_test_regression.m	23 Aug 2005 18:38:28 -0000	1.11
+++ b/statistics/tests/t_test_regression.m	8 Sep 2005 00:29:54 -0000
@@ -48,7 +48,7 @@
     r   = 0;
     alt = "!=";
   elseif (nargin == 4)
-    if (isstr (r))
+    if (ischar (r))
       alt = r;
       r   = 0;
     else
@@ -60,7 +60,7 @@
 
   if (! isscalar (r))
     error ("t_test_regression: r must be a scalar");
-  elseif (! isstr (alt))
+  elseif (! ischar (alt))
     error ("t_test_regression: alt must be a string");
   endif
 
Index: statistics/tests/u_test.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/u_test.m,v
retrieving revision 1.10
diff -u -r1.10 u_test.m
--- a/statistics/tests/u_test.m	23 Aug 2005 18:38:28 -0000	1.10
+++ b/statistics/tests/u_test.m	8 Sep 2005 00:29:54 -0000
@@ -66,7 +66,7 @@
     alt  = "!=";
   endif
 
-  if (! isstr (alt))
+  if (! ischar (alt))
     error("u_test: alt must be a string");
   endif
   if (strcmp (alt, "!=") || strcmp (alt, "<>"))
Index: statistics/tests/var_test.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/var_test.m,v
retrieving revision 1.9
diff -u -r1.9 var_test.m
--- a/statistics/tests/var_test.m	23 Aug 2005 18:38:28 -0000	1.9
+++ b/statistics/tests/var_test.m	8 Sep 2005 00:29:54 -0000
@@ -60,7 +60,7 @@
     alt  = "!=";
   endif
 
-  if (! isstr (alt))
+  if (! ischar (alt))
     error ("var_test: alt must be a string");
   endif
   if (strcmp (alt, "!=") || strcmp (alt, "<>"))
Index: statistics/tests/welch_test.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/welch_test.m,v
retrieving revision 1.10
diff -u -r1.10 welch_test.m
--- a/statistics/tests/welch_test.m	23 Aug 2005 18:38:28 -0000	1.10
+++ b/statistics/tests/welch_test.m	8 Sep 2005 00:29:54 -0000
@@ -66,7 +66,7 @@
     alt  = "!=";
   endif
 
-  if (! isstr (alt))
+  if (! ischar (alt))
     error ("welch_test: alt must be a string");
   endif
   if (strcmp (alt, "!=") || strcmp (alt, "<>"))
Index: statistics/tests/wilcoxon_test.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/wilcoxon_test.m,v
retrieving revision 1.9
diff -u -r1.9 wilcoxon_test.m
--- a/statistics/tests/wilcoxon_test.m	23 Aug 2005 18:38:28 -0000	1.9
+++ b/statistics/tests/wilcoxon_test.m	8 Sep 2005 00:29:54 -0000
@@ -70,7 +70,7 @@
     alt = "!=";
   endif
 
-  if (! isstr (alt))
+  if (! ischar (alt))
     error("wilcoxon_test: alt must be a string");
   elseif (strcmp (alt, "!=") || strcmp (alt, "<>"))
     pval = 2 * min (cdf, 1 - cdf);
Index: statistics/tests/z_test.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/z_test.m,v
retrieving revision 1.10
diff -u -r1.10 z_test.m
--- a/statistics/tests/z_test.m	23 Aug 2005 18:38:28 -0000	1.10
+++ b/statistics/tests/z_test.m	8 Sep 2005 00:29:54 -0000
@@ -66,7 +66,7 @@
     alt = "!=";
   endif
 
-  if (! isstr (alt))
+  if (! ischar (alt))
     error ("z_test: alt must be a string");
   elseif (strcmp (alt, "!=") || strcmp (alt, "<>"))
     pval = 2 * min (cdf, 1 - cdf);
Index: statistics/tests/z_test_2.m
===================================================================
RCS file: /cvs/octave/scripts/statistics/tests/z_test_2.m,v
retrieving revision 1.10
diff -u -r1.10 z_test_2.m
--- a/statistics/tests/z_test_2.m	23 Aug 2005 18:38:28 -0000	1.10
+++ b/statistics/tests/z_test_2.m	8 Sep 2005 00:29:54 -0000
@@ -66,7 +66,7 @@
     alt = "!=";
   endif
 
-  if (! isstr (alt))
+  if (! ischar (alt))
     error ("z_test_2: alt must be a string");
   elseif (strcmp (alt, "!=") || strcmp (alt, "<>"))
     pval = 2 * min (cdf, 1 - cdf);
Index: strings/base2dec.m
===================================================================
RCS file: /cvs/octave/scripts/strings/base2dec.m,v
retrieving revision 1.5
diff -u -r1.5 base2dec.m
--- a/strings/base2dec.m	26 Apr 2005 19:24:32 -0000	1.5
+++ b/strings/base2dec.m	8 Sep 2005 00:29:54 -0000
@@ -55,7 +55,7 @@
   endif
 
   symbols = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  if (isstr (base))
+  if (ischar (base))
     symbols = base;
     base = length (symbols);
     if (any (diff (sort (toascii (symbols))) == 0))
Index: strings/blanks.m
===================================================================
RCS file: /cvs/octave/scripts/strings/blanks.m,v
retrieving revision 1.15
diff -u -r1.15 blanks.m
--- a/strings/blanks.m	23 Aug 2005 18:38:28 -0000	1.15
+++ b/strings/blanks.m	8 Sep 2005 00:29:54 -0000
@@ -32,7 +32,7 @@
   endif
 
   if (isscalar (n) && n == round (n))
-    s = setstr (ones (1, n) * toascii (" "));
+    s = char (ones (1, n) * toascii (" "));
   else
     error ("blanks: n must be a non-negative integer");
   endif
Index: strings/deblank.m
===================================================================
RCS file: /cvs/octave/scripts/strings/deblank.m,v
retrieving revision 1.18
diff -u -r1.18 deblank.m
--- a/strings/deblank.m	23 Aug 2005 18:38:28 -0000	1.18
+++ b/strings/deblank.m	8 Sep 2005 00:29:54 -0000
@@ -33,7 +33,7 @@
     usage ("deblank (s)");
   endif
 
-  if (isstr (s))
+  if (ischar (s))
 
     k = find (! isspace (s) & s != "\0");
     if (isempty (s) || isempty (k))
Index: strings/dec2base.m
===================================================================
RCS file: /cvs/octave/scripts/strings/dec2base.m,v
retrieving revision 1.9
diff -u -r1.9 dec2base.m
--- a/strings/dec2base.m	8 Jul 2005 15:37:30 -0000	1.9
+++ b/strings/dec2base.m	8 Sep 2005 00:29:55 -0000
@@ -61,7 +61,7 @@
   endif
 
   symbols = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  if (isstr (base))
+  if (ischar (base))
     symbols = base;
     base = length (symbols);
     if any (diff (sort (toascii (symbols))) == 0)
Index: strings/index.m
===================================================================
RCS file: /cvs/octave/scripts/strings/index.m,v
retrieving revision 1.16
diff -u -r1.16 index.m
--- a/strings/index.m	23 Aug 2005 18:38:28 -0000	1.16
+++ b/strings/index.m	8 Sep 2005 00:29:55 -0000
@@ -41,7 +41,7 @@
     usage ("index (s, t)");
   endif
   
-  if (!isstr (s) || !isstr (t) || all (size (s) > 1) || all (size (t) > 1) )
+  if (!ischar (s) || !ischar (t) || all (size (s) > 1) || all (size (t) > 1) )
     error ("index: expecting string arguments");
   endif
 
Index: strings/rindex.m
===================================================================
RCS file: /cvs/octave/scripts/strings/rindex.m,v
retrieving revision 1.14
diff -u -r1.14 rindex.m
--- a/strings/rindex.m	23 Aug 2005 18:38:28 -0000	1.14
+++ b/strings/rindex.m	8 Sep 2005 00:29:55 -0000
@@ -41,7 +41,7 @@
     usage ("rindex (s, t)");
   endif
 
-  if (!isstr (s) || !isstr (t) || all (size (s) > 1) || all (size (t) > 1) )
+  if (!ischar (s) || !ischar (t) || all (size (s) > 1) || all (size (t) > 1) )
     error ("rindex: expecting string arguments");
   endif
 
Index: strings/split.m
===================================================================
RCS file: /cvs/octave/scripts/strings/split.m,v
retrieving revision 1.17
diff -u -r1.17 split.m
--- a/strings/split.m	23 Aug 2005 18:38:28 -0000	1.17
+++ b/strings/split.m	8 Sep 2005 00:29:55 -0000
@@ -37,7 +37,7 @@
 function m = split (s, t)
 
   if (nargin == 2)
-    if (isstr (s) && isstr (t))
+    if (ischar (s) && ischar (t))
 
       l_s = length (s);
       l_t = length (t);
Index: strings/str2mat.m
===================================================================
RCS file: /cvs/octave/scripts/strings/str2mat.m,v
retrieving revision 1.17
diff -u -r1.17 str2mat.m
--- a/strings/str2mat.m	23 Aug 2005 18:38:28 -0000	1.17
+++ b/strings/str2mat.m	8 Sep 2005 00:29:55 -0000
@@ -44,8 +44,8 @@
   nc = zeros (nargin, 1);
   for k = 1 : nargin
     s = varargin{k};
-    if (! isstr (s))
-      s = setstr (s);
+    if (! ischar (s))
+      s = char (s);
     endif
     [nr(k), nc(k)] = size (s);
   endfor
@@ -59,13 +59,13 @@
   retval_nr = sum (nr);
   retval_nc = max (nc);
 
-  retval = setstr (ones (retval_nr, retval_nc) * toascii (" "));
+  retval = char (ones (retval_nr, retval_nc) * toascii (" "));
 
   row_offset = 0;
   for k = 1 : nargin
     s = varargin{k};
-    if (! isstr (s))
-      s = setstr (s);
+    if (! ischar (s))
+      s = char (s);
     endif
     if (nc(k) > 0)
       retval ((row_offset + 1) : (row_offset + nr(k)), 1:nc(k)) = s;
Index: strings/str2num.m
===================================================================
RCS file: /cvs/octave/scripts/strings/str2num.m,v
retrieving revision 1.4
diff -u -r1.4 str2num.m
--- a/strings/str2num.m	26 Apr 2005 19:24:32 -0000	1.4
+++ b/strings/str2num.m	8 Sep 2005 00:29:55 -0000
@@ -26,13 +26,13 @@
 
 function m = str2num (s)
 
-  if (nargin == 1 && isstr (s))
+  if (nargin == 1 && ischar (s))
     [nr, nc] = size (s);
     sep = ";";
     sep = sep (ones (nr, 1), 1);
     s = sprintf ("m = [%s];", reshape ([s, sep]', 1, nr * (nc + 1)));
     eval (s, "m = [];");
-    if (isstr (m))
+    if (ischar (m))
       m = [];
     endif
   else
Index: strings/strcat.m
===================================================================
RCS file: /cvs/octave/scripts/strings/strcat.m,v
retrieving revision 1.17
diff -u -r1.17 strcat.m
--- a/strings/strcat.m	31 Aug 2005 20:41:47 -0000	1.17
+++ b/strings/strcat.m	8 Sep 2005 00:29:55 -0000
@@ -39,7 +39,7 @@
     save_warn_empty_list_elements = warn_empty_list_elements;
     unwind_protect
       warn_empty_list_elements = 0;
-      if (isstr (s))
+      if (ischar (s))
         tmpst = s;
       else
         error ("strcat: all arguments must be strings");
@@ -48,7 +48,7 @@
       k = 1;
       while (n--)
         tmp = varargin{k++};
-        if (isstr (tmp))
+        if (ischar (tmp))
           tmpst = [tmpst, tmp];
         else
           error ("strcat: all arguments must be strings");
Index: strings/strcmpi.m
===================================================================
RCS file: /cvs/octave/scripts/strings/strcmpi.m,v
retrieving revision 1.3
diff -u -r1.3 strcmpi.m
--- a/strings/strcmpi.m	26 Apr 2005 19:24:32 -0000	1.3
+++ b/strings/strcmpi.m	8 Sep 2005 00:29:55 -0000
@@ -33,7 +33,7 @@
 function status = strcmpi(s1, s2)
 
   if (nargin == 2)
-    status = (isstr (s1) && isstr(s2) && strcmp (upper (s1), upper (s2)));
+    status = (ischar (s1) && ischar(s2) && strcmp (upper (s1), upper (s2)));
   else
     usage ("strcmpi (s, t)");
   endif
Index: strings/strncmp.m
===================================================================
RCS file: /cvs/octave/scripts/strings/strncmp.m,v
retrieving revision 1.1
diff -u -r1.1 strncmp.m
--- a/strings/strncmp.m	24 May 2005 15:36:45 -0000	1.1
+++ b/strings/strncmp.m	8 Sep 2005 00:29:55 -0000
@@ -39,9 +39,9 @@
 
   retval = false;
 
-  if (isstr (s1))
+  if (ischar (s1))
     [r1, c1] = size (s1);
-    if (isstr (s2))
+    if (ischar (s2))
       [r2, c2] = size (s2);
       if (r1 == r2 && c1 == c2)
 	if (c1 == 0)
@@ -102,7 +102,7 @@
     endif
   elseif (iscellstr (s1))
     [r1, c1] = size (s1);
-    if (isstr (s2))
+    if (ischar (s2))
       retval = strncmp (s2, s1, n, "logical");
     elseif (iscellstr (s2))
       [r2, c2] = size (s2);
Index: strings/strrep.m
===================================================================
RCS file: /cvs/octave/scripts/strings/strrep.m,v
retrieving revision 1.16
diff -u -r1.16 strrep.m
--- a/strings/strrep.m	23 Aug 2005 18:38:28 -0000	1.16
+++ b/strings/strrep.m	8 Sep 2005 00:29:55 -0000
@@ -38,7 +38,7 @@
     usage ("strrep (s, x, y)");
   endif
 
-  if (! (isstr (s) && isstr (x) && isstr (y)))
+  if (! (ischar (s) && ischar (x) && ischar (y)))
     error ("strrep: all arguments must be strings");
   endif
 
@@ -84,7 +84,7 @@
     repeat = [1:length(x)]' * ones (1, length (ind));
     delete = ones (length (x), 1) * ind + repeat - 1;
     t(delete) = [];
-    t = setstr (t);
+    t = char (t);
   endif
 
 endfunction
Index: strings/substr.m
===================================================================
RCS file: /cvs/octave/scripts/strings/substr.m,v
retrieving revision 1.14
diff -u -r1.14 substr.m
--- a/strings/substr.m	23 Aug 2005 18:38:28 -0000	1.14
+++ b/strings/substr.m	8 Sep 2005 00:29:58 -0000
@@ -48,7 +48,7 @@
     usage ("substr (s, offset, len)");
   endif
 
-  if (isstr (s))
+  if (ischar (s))
     nc = columns (s);
     if (abs (offset) > 0 && abs (offset) <= nc)
       if (offset > 0)