use iso2mesh original function isoctavemesh in place of isoctave

Author: fangq

isoctave.m

@@ -0,0 +1,19 @@
+function [isoctave verinfo]=isoctavemesh
+%
+% [isoctave verinfo]=isoctavemesh
+%
+% determine whether the code is running in octave
+%
+% author: Qianqian Fang, <q.fang at neu.edu>
+%
+% output:
+%   isoctave: 1 if in octave, otherwise 0
+%   verinfo: a string, showing the version of octave (OCTAVE_VERSION)
+%
+% -- this function is part of iso2mesh toolbox (http://iso2mesh.sf.net)
+%
+verinfo='';
+isoctave=(exist('OCTAVE_VERSION','builtin')~=0);
+if(nargout==2 && isoctave)
+    verinfo=OCTAVE_VERSION;
+end

isoctavemesh.m

@@ -438,7 +438,7 @@
 % Invalid characters will be converted to underscores, and the prefix
 % "x0x[Hex code]_" will be added if the first character is not a letter.
     if(~isempty(regexp(str,'^[^A-Za-z]','once')))
-        if(~isoctave && str(1)+0 > 255)
+        if(~isoctavemesh && str(1)+0 > 255)
             str=regexprep(str,'^([^A-Za-z])','x0x${sprintf(''%X'',unicode2native($1))}_','once');
         else
             str=sprintf('x0x%X_%s',char(str(1))+0,str(2:end));
@@ -447,7 +447,7 @@
     if(isvarname(str))
         return;
     end
-    if(~isoctave)
+    if(~isoctavemesh)
         str=regexprep(str,'([^0-9A-Za-z_])','_0x${sprintf(''%X'',unicode2native($1))}_');
     else
         cpos=regexp(str,'[^0-9A-Za-z_]');

loadjson.m

@@ -365,7 +365,7 @@
 % Invalid characters will be converted to underscores, and the prefix
 % "x0x[Hex code]_" will be added if the first character is not a letter.
     if(~isempty(regexp(str,'^[^A-Za-z]','once')))
-        if(~isoctave && str(1)+0 > 255)
+        if(~isoctavemesh && str(1)+0 > 255)
             str=regexprep(str,'^([^A-Za-z])','x0x${sprintf(''%X'',unicode2native($1))}_','once');
         else
             str=sprintf('x0x%X_%s',char(str(1)),str(2:end));
@@ -374,7 +374,7 @@
     if(isvarname(str))
         return;
     end
-    if(~isoctave)
+    if(~isoctavemesh)
         str=regexprep(str,'([^0-9A-Za-z_])','_0x${sprintf(''%X'',unicode2native($1))}_');
     else
         cpos=regexp(str,'[^0-9A-Za-z_]');

loadubjson.m

@@ -125,7 +125,7 @@
 else
    opt=varargin2struct(varargin{:});
 end
-opt.IsOctave=isoctave;
+opt.IsOctave=isoctavemesh;
 
 dozip=jsonopt('Compression','',opt);
 if(~isempty(dozip))
@@ -730,7 +730,7 @@
 %%-------------------------------------------------------------------------
 function newstr=escapejsonstring(str)
 newstr=str;
-isoct=isoctave;
+isoct=isoctavemesh;
 if(isoct)
    vv=sscanf(OCTAVE_VERSION,'%f');
    if(vv(1)>=3.8)

savejson.m

@@ -125,7 +125,7 @@
 else
    opt=varargin2struct(varargin{:});
 end
-opt.IsOctave=isoctave;
+opt.IsOctave=isoctavemesh;
 
 dozip=jsonopt('Compression','',opt);
 if(~isempty(dozip))