merge char escape handeling to escapejsonstring in savejson

git-svn-id: http://svn.code.sf.net/p/iso2mesh/code/trunk/jsonlab@467 786e58fb-9377-0410-9ff7-e4ac0ac0635c

Author: fangq

examples/example3.json

@@ -3,7 +3,7 @@
   "value": "_&File",
   "popup": {
     "menuitem": [
-      {"value": "_&New", "onclick": "CreateNewDoc(\"\"\")"},
+      {"value": "_&New", "onclick": "CreateNewDoc(\"'\\\"Untitled\\\"'\")"},
       {"value": "_&Open", "onclick": "OpenDoc()"},
       {"value": "_&Close", "onclick": "CloseDoc()"}
     ]

examples/jsonlab_selftest.matlab

@@ -79,7 +79,7 @@
 				"menuitem": [
 					{
 						"value": "_&New",
-						"onclick": "CreateNewDoc(\"\"\")"
+						"onclick": "CreateNewDoc(\"'\\\"Untitled\\\"'\")"
 					},
 					{
 						"value": "_&Open",
@@ -95,7 +95,7 @@
 	}
 }
 
-{"data": {"menu": {"id": "file","value": "_&File","popup": {"menuitem": [{"value": "_&New","onclick": "CreateNewDoc(\"\"\")"},{"value": "_&Open","onclick": "OpenDoc()"},{"value": "_&Close","onclick": "CloseDoc()"}]}}}}
+{"data": {"menu": {"id": "file","value": "_&File","popup": {"menuitem": [{"value": "_&New","onclick": "CreateNewDoc(\"'\\\"Untitled\\\"'\")"},{"value": "_&Open","onclick": "OpenDoc()"},{"value": "_&Close","onclick": "CloseDoc()"}]}}}}
 
 ===============================================
 >> example4.json
@@ -128,17 +128,17 @@
 
 >> >> ===============================================
 >> example1.json
-{SUdata{SU	firstNameSUJohnSUlastNameSUSmithSUageiSUaddress{SUstreetAddressSU21 2nd StreetSUcitySUNew YorkSUstateSUNYSU
-postalCodeSU10021}SUphoneNumber[{SUtypeSUhomeSUnumberSU212 555-1234}{SUtypeSUfaxSUnumberSU646 555-4567}]}}
+{Udata{U	firstNameSUJohnUlastNameSUSmithUageiUaddress{UstreetAddressSU21 2nd StreetUcitySUNew YorkUstateSUNYU
+postalCodeSU10021}UphoneNumber[{UtypeSUhomeUnumberSU212 555-1234}{UtypeSUfaxUnumberSU646 555-4567}]}}
 ===============================================
 >> example2.json
-{SUdata{SUglossary{SUtitleSUexample glossarySUGlossDiv{SUtitleCSSU	GlossList{SU
-GlossEntry{SUIDSUSGMLSUSortAsSUSGMLSU	GlossTermSU$Standard Generalized Markup LanguageSUAcronymSUSGMLSUAbbrevSUISO 8879:1986SUGlossDef{SUparaSUHA meta-markup language, used to create markup languages such as DocBook.SUGlossSeeAlso[SUGMLSUXML]}SUGlossSeeSUmarkup}}}}}}
+{Udata{Uglossary{UtitleSUexample glossaryUGlossDiv{UtitleCSU	GlossList{U
+GlossEntry{UIDSUSGMLUSortAsSUSGMLU	GlossTermSU$Standard Generalized Markup LanguageUAcronymSUSGMLUAbbrevSUISO 8879:1986UGlossDef{UparaSUHA meta-markup language, used to create markup languages such as DocBook.UGlossSeeAlso[SUGMLSUXML]}UGlossSeeSUmarkup}}}}}}
 ===============================================
 >> example3.json
-{SUdata{SUmenu{SUidSUfileSUvalueSU_&FileSUpopup{SUmenuitem[{SUvalueSU_&NewSUonclickSUCreateNewDoc(""")}{SUvalueSU_&OpenSUonclickSU	OpenDoc()}{SUvalueSU_&CloseSUonclickSU
+{Udata{Umenu{UidSUfileUvalueSU_&FileUpopup{Umenuitem[{UvalueSU_&NewUonclickSUCreateNewDoc("'\"Untitled\"'")}{UvalueSU_&OpenUonclickSU	OpenDoc()}{UvalueSU_&CloseUonclickSU
 CloseDoc()}]}}}}
 ===============================================
 >> example4.json
-{SUdata[{SUsample{SUrhoi}}{SUsample{SUrhoi}}[[$i#U
+{Udata[{Usample{Urhoi}}{Usample{Urhoi}}[[$i#U
 >> 

savejson.m

@@ -276,16 +276,7 @@
 end
 isoct=jsonopt('IsOctave',0,varargin{:});
 for e=1:len
-    if(isoct)
-        val=regexprep(item(e,:),'\\','\\');
-        val=regexprep(val,'"','\"');
-        val=regexprep(val,'^"','\"');
-    else
-        val=regexprep(item(e,:),'\\','\\\\');
-        val=regexprep(val,'"','\\"');
-        val=regexprep(val,'^"','\\"');
-    end
-    val=escapejsonstring(val);
+    val=escapejsonstring(item(e,:));
     if(len==1)
         obj=['"' checkname(name,varargin{:}) '": ' '"',val,'"'];
 	if(isempty(name)) obj=['"',val,'"']; end
@@ -463,12 +454,12 @@
    if(vv(1)>=3.8) isoct=0; end
 end
 if(isoct)
-  escapechars={'\a','\f','\n','\r','\t','\v'};
+  escapechars={'\\','\"','\/','\a','\f','\n','\r','\t','\v'};
   for i=1:length(escapechars);
     newstr=regexprep(newstr,escapechars{i},escapechars{i});
   end
 else
-  escapechars={'\a','\b','\f','\n','\r','\t','\v'};
+  escapechars={'\\','\"','\/','\a','\b','\f','\n','\r','\t','\v'};
   for i=1:length(escapechars);
     newstr=regexprep(newstr,escapechars{i},regexprep(escapechars{i},'\\','\\\\'));
   end