update email address, tag v1.8

ChangeLog.txt

@@ -6,7 +6,7 @@
 
 JSONlab ChangeLog (key features marked by *):
 
-== JSONlab 1.2 (codename: Optimus - Update 2), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 1.2 (codename: Optimus - Update 2), FangQ <q.fang <at> neu.edu> ==
 
  2015/12/16  replacing string concatenation by str cells to gain 2x speed in savejson (Issue#17)
  2015/12/11  fix FileName option case bug (SVN rev#495)
@@ -15,7 +15,7 @@ JSONlab ChangeLog (key features marked by *):
  2015/10/16  fix bug for cell with transposed data - by Insik Kim (Pull#12)
  2015/09/25  support exporting matlab object to JSON - by Sertan Senturk (Pull#10, #11)
 
-== JSONlab 1.1 (codename: Optimus - Update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 1.1 (codename: Optimus - Update 1), FangQ <q.fang <at> neu.edu> ==
 
  2015/05/05 *massively accelerating loadjson for parsing large collection of unstructured small objects
  2015/05/05  force array bracket in 1x1 struct to maintain depth (Issue#1)
@@ -28,64 +28,64 @@ JSONlab ChangeLog (key features marked by *):
  2015/01/24 *implement the UBJSON Draft12 new name format
  2015/01/13  correct cell array indentation inconsistency
 
-== JSONlab 1.0 (codename: Optimus - Final), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 1.0 (codename: Optimus - Final), FangQ <q.fang <at> neu.edu> ==
 
  2015/01/02  polish help info for all major functions, update examples, finalize 1.0
  2014/12/19  fix a bug to strictly respect NoRowBracket in savejson
 
-== JSONlab 1.0.0-RC2 (codename: Optimus - RC2), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 1.0.0-RC2 (codename: Optimus - RC2), FangQ <q.fang <at> neu.edu> ==
 
  2014/11/22  show progress bar in loadjson ('ShowProgress') 
  2014/11/17 *add Compact option in savejson to output compact JSON format ('Compact')
  2014/11/17  add FastArrayParser in loadjson to specify fast parser applicable levels
  2014/09/18 *start official github mirror: https://github.com/fangq/jsonlab
 
-== JSONlab 1.0.0-RC1 (codename: Optimus - RC1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 1.0.0-RC1 (codename: Optimus - RC1), FangQ <q.fang <at> neu.edu> ==
 
  2014/09/17  fix several compatibility issues when running on octave versions 3.2-3.8
  2014/09/17 *support 2D cell and struct arrays in both savejson and saveubjson
  2014/08/04  escape special characters in a JSON string
  2014/02/16  fix a bug when saving ubjson files
 
-== JSONlab 0.9.9 (codename: Optimus - beta), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 0.9.9 (codename: Optimus - beta), FangQ <q.fang <at> neu.edu> ==
 
  2014/01/22  use binary read and write in saveubjson and loadubjson
 
-== JSONlab 0.9.8-1 (codename: Optimus - alpha update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 0.9.8-1 (codename: Optimus - alpha update 1), FangQ <q.fang <at> neu.edu> ==
 
  2013/10/07  better round-trip conservation for empty arrays and structs (patch submitted by Yul Kang)
 
-== JSONlab 0.9.8 (codename: Optimus - alpha), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 0.9.8 (codename: Optimus - alpha), FangQ <q.fang <at> neu.edu> ==
  2013/08/23 *universal Binary JSON (UBJSON) support, including both saveubjson and loadubjson
 
-== JSONlab 0.9.1 (codename: Rodimus, update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 0.9.1 (codename: Rodimus, update 1), FangQ <q.fang <at> neu.edu> ==
  2012/12/18 *handling of various empty and sparse matrices (fixes submitted by Niclas Borlin)
 
-== JSONlab 0.9.0 (codename: Rodimus), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 0.9.0 (codename: Rodimus), FangQ <q.fang <at> neu.edu> ==
 
  2012/06/17 *new format for an invalid leading char, unpacking hex code in savejson
  2012/06/01  support JSONP in savejson
  2012/05/25  fix the empty cell bug (reported by Cyril Davin)
  2012/04/05  savejson can save to a file (suggested by Patrick Rapin)
 
-== JSONlab 0.8.1 (codename: Sentiel, Update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 0.8.1 (codename: Sentiel, Update 1), FangQ <q.fang <at> neu.edu> ==
 
  2012/02/28  loadjson quotation mark escape bug, see http://bit.ly/yyk1nS
  2012/01/25  patch to handle root-less objects, contributed by Blake Johnson
 
-== JSONlab 0.8.0 (codename: Sentiel), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 0.8.0 (codename: Sentiel), FangQ <q.fang <at> neu.edu> ==
 
  2012/01/13 *speed up loadjson by 20 fold when parsing large data arrays in matlab
  2012/01/11  remove row bracket if an array has 1 element, suggested by Mykel Kochenderfer
  2011/12/22 *accept sequence of 'param',value input in savejson and loadjson
  2011/11/18  fix struct array bug reported by Mykel Kochenderfer
 
-== JSONlab 0.5.1 (codename: Nexus Update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 0.5.1 (codename: Nexus Update 1), FangQ <q.fang <at> neu.edu> ==
 
  2011/10/21  fix a bug in loadjson, previous code does not use any of the acceleration
  2011/10/20  loadjson supports JSON collections - concatenated JSON objects
 
-== JSONlab 0.5.0 (codename: Nexus), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+== JSONlab 0.5.0 (codename: Nexus), FangQ <q.fang <at> neu.edu> ==
 
  2011/10/16  package and release jsonlab 0.5.0
  2011/10/15 *add json demo and regression test, support cpx numbers, fix double quote bug

LICENSE_BSD.txt

@@ -1,4 +1,4 @@
-Copyright 2011-2015 Qianqian Fang <fangq at nmr.mgh.harvard.edu>. All rights reserved.
+Copyright 2011-2017 Qianqian Fang <q.fang <at> neu.edu>. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are
 permitted provided that the following conditions are met:

LICENSE_GPLv3.txt

@@ -3,7 +3,7 @@
 =           An open-source MATLAB/Octave JSON encoder and decoder             =
 ===============================================================================
 
-Copyright (C) 2011-2015  Qianqian Fang <fangq at nmr.mgh.harvard.edu>
+Copyright (C) 2011-2017  Qianqian Fang <q.fang <at> neu.edu>
 
 -------------------------------------------------------------------------------
 

README.txt

@@ -3,9 +3,9 @@
 =           An open-source MATLAB/Octave JSON encoder and decoder             =
 ===============================================================================
 
-*Copyright (C) 2011-2015  Qianqian Fang <fangq at nmr.mgh.harvard.edu>
+*Copyright (C) 2011-2017  Qianqian Fang <q.fang at neu.edu>
 *License: BSD or GNU General Public License version 3 (GPL v3), see License*.txt
-*Version: 1.2 (Optimus - Update 2)
+*Version: 1.8 (Magnus - alpha)
 
 -------------------------------------------------------------------------------
 
@@ -83,7 +83,7 @@ JSON. The detailed help info for the four functions can be found below:
 
   parse a JSON (JavaScript Object Notation) file or string
 
-  authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+  authors:Qianqian Fang (q.fang <at> neu.edu)
   created on 2011/09/09, including previous works from 
 
           Nedialko Krouchev: http://www.mathworks.com/matlabcentral/fileexchange/25713
@@ -94,7 +94,7 @@ JSON. The detailed help info for the four functions can be found below:
           http://www.mathworks.com/matlabcentral/fileexchange/20565
              created on 2008/07/03
 
-  $Id: loadjson.m 487 2015-05-06 18:19:07Z fangq $
+  $Id$
 
   input:
        fname: input file name, if fname contains "{}" or "[]", fname
@@ -131,7 +131,10 @@ JSON. The detailed help info for the four functions can be found below:
        dat=loadjson('{"obj":{"string":"value","array":[1,2,3]}}')
        dat=loadjson(['examples' filesep 'example1.json'])
        dat=loadjson(['examples' filesep 'example1.json'],'SimplifyCell',1)
-</pre>
+
+  license:
+      BSD or GPL version 3, see LICENSE_{BSD,GPLv3}.txt files for details 
+ </pre>
 
 === savejson.m ===
 
@@ -144,16 +147,17 @@ JSON. The detailed help info for the four functions can be found below:
   convert a MATLAB object (cell, struct or array) into a JSON (JavaScript
   Object Notation) string
 
-  author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+  author: Qianqian Fang (q.fang <at> neu.edu)
   created on 2011/09/09
 
-  $Id: savejson.m 486 2015-05-05 20:37:11Z fangq $
+  $Id$
 
   input:
        rootname: the name of the root-object, when set to '', the root name
          is ignored, however, when opt.ForceRootName is set to 1 (see below),
          the MATLAB variable name will be used as the root name.
-       obj: a MATLAB object (array, cell, cell array, struct, struct array).
+       obj: a MATLAB object (array, cell, cell array, struct, struct array,
+       class instance).
        filename: a string for the file name to save the output JSON data.
        opt: a struct for additional options, ignore to use default values.
          opt can have the following fields (first in [.|.] is the default)
@@ -176,10 +180,13 @@ JSON. The detailed help info for the four functions can be found below:
                           parts, and also "_ArrayIsComplex_":1 is added. 
          opt.ParseLogical [0|1]: if this is set to 1, logical array elem
                           will use true/false rather than 1/0.
-         opt.NoRowBracket [1|0]: if this is set to 1, arrays with a single
+         opt.SingletArray [0|1]: if this is set to 1, arrays with a single
                           numerical element will be shown without a square
                           bracket, unless it is the root object; if 0, square
                           brackets are forced for any numerical arrays.
+         opt.SingletCell  [1|0]: if 1, always enclose a cell with "[]" 
+                          even it has only one element; if 0, brackets
+                          are ignored when a cell has only 1 element.
          opt.ForceRootName [0|1]: when set to 1 and rootname is empty, savejson
                           will use the name of the passed obj variable as the 
                           root object name; if obj is an expression and 
@@ -214,6 +221,9 @@ JSON. The detailed help info for the four functions can be found below:
                 'SpecialData',[nan, inf, -inf]);
        savejson('jmesh',jsonmesh)
        savejson('',jsonmesh,'ArrayIndent',0,'FloatFormat','\t%.5g')
+
+  license:
+      BSD or GPL version 3, see LICENSE_{BSD,GPLv3}.txt files for details
  </pre>
 
 === loadubjson.m ===
@@ -225,10 +235,10 @@ JSON. The detailed help info for the four functions can be found below:
 
   parse a JSON (JavaScript Object Notation) file or string
 
-  authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+  authors:Qianqian Fang (q.fang <at> neu.edu)
   created on 2013/08/01
 
-  $Id: loadubjson.m 487 2015-05-06 18:19:07Z fangq $
+  $Id$
 
   input:
        fname: input file name, if fname contains "{}" or "[]", fname
@@ -261,6 +271,9 @@ JSON. The detailed help info for the four functions can be found below:
        dat=loadubjson(ubjdata)
        dat=loadubjson(['examples' filesep 'example1.ubj'])
        dat=loadubjson(['examples' filesep 'example1.ubj'],'SimplifyCell',1)
+
+  license:
+      BSD or GPL version 3, see LICENSE_{BSD,GPLv3}.txt files for details 
 </pre>
 
 === saveubjson.m ===
@@ -274,16 +287,17 @@ JSON. The detailed help info for the four functions can be found below:
   convert a MATLAB object (cell, struct or array) into a Universal 
   Binary JSON (UBJSON) binary string
 
-  author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+  author: Qianqian Fang (q.fang <at> neu.edu)
   created on 2013/08/17
 
-  $Id: saveubjson.m 465 2015-01-25 00:46:07Z fangq $
+  $Id$
 
   input:
        rootname: the name of the root-object, when set to '', the root name
          is ignored, however, when opt.ForceRootName is set to 1 (see below),
          the MATLAB variable name will be used as the root name.
-       obj: a MATLAB object (array, cell, cell array, struct, struct array)
+       obj: a MATLAB object (array, cell, cell array, struct, struct array,
+       class instance)
        filename: a string for the file name to save the output UBJSON data
        opt: a struct for additional options, ignore to use default values.
          opt can have the following fields (first in [.|.] is the default)
@@ -302,10 +316,13 @@ JSON. The detailed help info for the four functions can be found below:
                           parts, and also "_ArrayIsComplex_":1 is added. 
          opt.ParseLogical [1|0]: if this is set to 1, logical array elem
                           will use true/false rather than 1/0.
-         opt.NoRowBracket [1|0]: if this is set to 1, arrays with a single
+         opt.SingletArray [0|1]: if this is set to 1, arrays with a single
                           numerical element will be shown without a square
                           bracket, unless it is the root object; if 0, square
                           brackets are forced for any numerical arrays.
+         opt.SingletCell  [1|0]: if 1, always enclose a cell with "[]" 
+                          even it has only one element; if 0, brackets
+                          are ignored when a cell has only 1 element.
          opt.ForceRootName [0|1]: when set to 1 and rootname is empty, saveubjson
                           will use the name of the passed obj variable as the 
                           root object name; if obj is an expression and 
@@ -332,6 +349,9 @@ JSON. The detailed help info for the four functions can be found below:
                 'SpecialData',[nan, inf, -inf]);
        saveubjson('jsonmesh',jsonmesh)
        saveubjson('jsonmesh',jsonmesh,'meshdata.ubj')
+
+  license:
+      BSD or GPL version 3, see LICENSE_{BSD,GPLv3}.txt files for details
 </pre>
 
 

jsonopt.m

@@ -5,7 +5,7 @@
 % setting options based on a struct. The struct can be produced
 % by varargin2struct from a list of 'param','value' pairs
 %
-% authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+% authors:Qianqian Fang (q.fang <at> neu.edu)
 %
 % $Id: loadjson.m 371 2012-06-20 12:43:06Z fangq $
 %

loadjson.m

@@ -6,7 +6,7 @@
 %
 % parse a JSON (JavaScript Object Notation) file or string
 %
-% authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+% authors:Qianqian Fang (q.fang <at> neu.edu)
 % created on 2011/09/09, including previous works from 
 %
 %         Nedialko Krouchev: http://www.mathworks.com/matlabcentral/fileexchange/25713

loadubjson.m

@@ -6,7 +6,7 @@
 %
 % parse a JSON (JavaScript Object Notation) file or string
 %
-% authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+% authors:Qianqian Fang (q.fang <at> neu.edu)
 % created on 2013/08/01
 %
 % $Id$

mergestruct.m

@@ -4,7 +4,7 @@
 %
 % merge two struct objects into one
 %
-% authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+% authors:Qianqian Fang (q.fang <at> neu.edu)
 % date: 2012/12/22
 %
 % input:

savejson.m

@@ -8,7 +8,7 @@
 % convert a MATLAB object (cell, struct or array) into a JSON (JavaScript
 % Object Notation) string
 %
-% author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+% author: Qianqian Fang (q.fang <at> neu.edu)
 % created on 2011/09/09
 %
 % $Id$

saveubjson.m

@@ -8,7 +8,7 @@
 % convert a MATLAB object (cell, struct or array) into a Universal 
 % Binary JSON (UBJSON) binary string
 %
-% author: Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+% author: Qianqian Fang (q.fang <at> neu.edu)
 % created on 2013/08/17
 %
 % $Id$

struct2jdata.m

@@ -4,7 +4,7 @@
 %
 % convert a JData object (in the form of a struct array) into an array
 %
-% authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+% authors:Qianqian Fang (q.fang <at> neu.edu)
 %
 % input:
 %      data: a struct array. If data contains JData keywords in the first

varargin2struct.m

@@ -6,7 +6,7 @@
 %
 % convert a series of input parameters into a structure
 %
-% authors:Qianqian Fang (fangq<at> nmr.mgh.harvard.edu)
+% authors:Qianqian Fang (q.fang <at> neu.edu)
 % date: 2012/12/22
 %
 % input: