Various improvements

* Correction in `gcd` and `lcm`: they weren't working correctly with a
single input

* `conv` automatically converts its first two inputs to `double`

* `Z}` with two inputs splits along the dimension indicated by second
input

* `isempty` function has been removed (can be done easily with `numel`)

* added Octave compatibility with `spiral` function

* extended `image` to include `imagesc`. This is controlled by last
input.

* Functions `bitand`, `bitor`, `bitxor`, `bitget`, `bitset` now
automatically convert `char` first input
to `double`

* Function `bitset` now has 3 inputs by default

Author: lmendo

MATL_spec.pdf

@@ -52,7 +52,8 @@ Z%	2	2	2	1	1	1	true	true	out{1} = typecast(in{:});	convert datatypes without cha
 &	1	inf	2	1	1	1	true	true	y = in{1}; for n=2:numel(in), y = bsxfun(@and, y, in{n}); end; if numel(in)==1, y = logical(y); end; out{1} = y; clear y n;	logical 'and' (element-wise, singleton expansion)	\matlab+&+ (\matlab+and+), element-wise with singleton expansion
 X&	2	4	2	1	3	1	true	true	[out{:}] = intersect(in{:});	set intersection	\matlab+intersect+
 Y&					
-Z&	2	3	2	1	1	1	true	true	if max(size(in{1}))==1 || max(size(in{2}))==1 || isequal(size(in{1}), size(in{2}))	bit-wise logical 'and' (element-wise, singleton expansion)	\matlab+bitand+, element-wise with singleton expansion
+Z&	2	3	2	1	1	1	true	true	if ischar(in{1}), in{1} = double(in{1}); end	bit-wise logical 'and' (element-wise, singleton expansion)	\matlab+bitand+, element-wise with singleton expansion. If first input is \matlab+char+ it is automatically converted to \matlab+double+
+									if max(size(in{1}))==1 || max(size(in{2}))==1 || isequal(size(in{1}), size(in{2}))
 									out{1} = bitand(in{:});
 									else
 									nd = max(ndims(in{1}), ndims(in{2})); sz1 = arrayfun(@(n)size(in{1},n), 1:nd); sz2 = arrayfun(@(n)size(in{2},n), 1:nd);
@@ -147,7 +148,7 @@ Z*	1	inf	2	1	1	1	true	true	n = numel(in); combs = cell(1,n);	Cartesian product	C
 									combs = cat(n+1, combs{:}); combs = reshape(combs,[],n);
 									out{1} = combs; clear combs n
 +	1	inf	2	1	1	1	true	true	y = in{1}; for n=2:numel(in), y = bsxfun(@plus, y, in{n}); end; out{1} = y; clear y n;	addition (element-wise, singleton expansion)	\matlab|+| (\matlab+plus+), element-wise with singleton expansion
-X+	2	3	2	1	1	1	true	true	out{1} = conv(in{:});	convolution	\matlab+conv+
+X+	2	3	2	1	1	1	true	true	out{1} = conv(double(in{1}), double(in{2}), in{3:end});	convolution	\matlab+conv+. Converts first two inputs to \matlab+double+.
 Y+	2	4	2	1	1	1	true	true	out{1} = conv2(in{:});	two-dimensional convolution	\matlab+conv2+
 Z+	2	2	2	1	1	1	true	true	out{1} = convmtx(in{:});	convolution matrix	\matlab+convmtx+
 ,					
@@ -161,7 +162,8 @@ Z-
 .					
 X.
 Y.	0	1	1	0	0	0	true	true	pause(in{:})	pause	\matlab+pause+ (without outputs)
-Z.	2	3	2	1	1	1	true	true	out{1} = bitget(in{:});	get bit	\matlab+bitget+
+Z.	2	3	2	1	1	1	true	true	if ischar(in{1}), in{1} = double(in{1}); end	get bit	\matlab+bitget+. If first input is \matlab+char+ it is automatically converted to \matlab+double+
+									out{1} = bitget(in{:});
 /	2	2	2	1	1	1	true	true	out{1} = bsxfun(@rdivide, in{1}, in{2});	array right division (element-wise, singleton expansion)	\matlab+./+ (\matlab+rdivide+), element-wise with singleton expansion
 X/	1	1	1	1	1	1	true	true	out{1} = angle(in{1});	phase angle (radians)	\matlab+angle+
 Y/	2	2	2	1	1	1	true	true	out{1} = in{1}/in{2};	right matrix division	right matrix division, \matlab+/+ (\matlab+mrdivide+)
@@ -245,7 +247,8 @@ Y:	1	inf	2	1	inf	1	true	true	switch in{1}	Higham test matrices and other matrice
 									otherwise
 									[out{:}] = gallery(in{:});
 									end
-Z:	2	3	2	1	1	1	true	true	out{1} = bitset(in{:});	set bit	\matlab+bitset+
+Z:	2	4	3	1	1	1	true	true	if ischar(in{1}), in{1} = double(in{1}); end	set bit	\matlab+bitset+. If first input is \matlab+char+ it is automatically converted to \matlab+double+
+									out{1} = bitset(in{:});
 ;
 X;	1	1	1	1	1	1	true	true	out{1} = acos(in{1});	inverse cosine (radians)	\matlab+acos+
 Y;	1	1	1	1	1	1	true	true	out{1} = asin(in{1});	inverse sine (radians)	\matlab+asin+
@@ -343,7 +346,10 @@ YF	0	1	1	0	0	0	true	true	format(in{:})	set output format	\matlab+format+
 ZF					
 G					
 XG	1	inf	1	0	0	0	true	true	plot(in{:}); drawnow	plot	\matlab+plot+. Calls \matlab+drawnow+ to update figure immediately
-YG	0	3	1	0	0	0	true	true	image(in{:}); axis ij, axis image, drawnow	display image	\matlab+image(...), axis ij, axis image+. Calls \matlab+drawnow+ to update figure immediately
+YG	2	inf	2	0	0	0	true	true	if isnumeric(in{end})&&numel(in{end})~=1, imagesc(in{:});	display image	\matlab+imagesc+ or \matlab+image+. If last input is a scalar that evaluates to \matlab+true+ / \matlab+false+: \matlab+imagesc+ / \matlab+image+ is respectively called with remaining inputs. If last input is not a scalar: \matlab+imagesc+ is called with all inputs. Afterwards, in all cases, this sets \matlab+axis ij, axis image+ and calls \matlab+drawnow+ to update figure immediately
+									elseif in{end}, imagesc(in{1:end-1});
+									else image(in{1:end-1}); end
+									axis ij, axis image, drawnow
 ZG	1	1	1	0	1	0	true	true	[out{:}] = colormap(in{:}); if isempty(out), drawnow, end	color look-up table	\matlab+colormap+. With $0$ outputs, calls \matlab+drawnow+ to update figure immediately
 H	0	0	0	0	inf	numel(CB_H)	true	true	out = CB_H(1:nout);	paste from clipboard H	paste from clipboard H
 XH	0	inf	1	0	0	0	false	true	CB_H = in;	copy to clipboard H	copy to clipboard H
@@ -466,7 +472,7 @@ Zc	1	2	1	1	1	1	true	true	out{1} = strjoin(in{:});	join cell array of strings int
 d	1	3	1	1	1	1	true	true	out{1} = diff(in{:});	difference	\matlab+diff+
 Xd	1	2	1	1	1	1	true	true	out{1} = diag(in{:});	diagonal matrices and diagonals of a matrix	\matlab+diag+				
 Yd	1	inf	2	1	1	1	true	true	out{1} = blkdiag(in{:});	block diagonal concatenation	\matlab+blkdiag+
-Zd	1	2	2	1	3	1	true	true	if numel(in)==1 && numel(out)==1, x=in{1}(1); for t=in{1}, x=gcd(x,t); end; out{1}=x;	greatest common divisor (element-wise, singleton expansion)	\matlab+gcd+, element-wise with singleton expansion. With $1$ input and $1$ output, computes the greatest common divisor of all elements of the input
+Zd	1	2	2	1	3	1	true	true	if numel(in)==1 && numel(out)==1, x=in{1}(1); for t=in{1}(:).', x=gcd(x,t); end; out{1}=x;	greatest common divisor (element-wise, singleton expansion)	\matlab+gcd+, element-wise with singleton expansion. With $1$ input and $1$ output, computes the greatest common divisor of all elements of the input
 									else
 									if max(size(in{1}))==1 || max(size(in{2}))==1 || isequal(size(in{1}), size(in{2}))	
 									[out{:}] = gcd(in{:});
@@ -520,7 +526,7 @@ Zl	1	1	1	1	2	1	true	true	[out{:}] = log2(in{:});	base 2 logarithm	\matlab+log2+
 m	2	4	2	1	2	1	true	true	[out{:}] = ismember(in{:});	true for set member	\matlab+ismember+. \sa \matl+Xm+
 Xm	2	3	2	1	2	1	true	true	[out{:}] = ismember(in{1},in{2},'rows',in{3:end});	true for set member, row-wise	\matlab+ismember(..., 'rows', ...)+. \sa \matl+m+
 Ym	1	4	1	1	1	1	true	true	out{1} = mean(in{:});	mean value	\matlab+mean+
-Zm	1	2	2	1	1	1	true	true	if numel(in)==1, x=1; for t=in{1}, x=lcm(x,t); end; out{1}=x;	least common multiple (element-wise, singleton expansion)	\matlab+lcm+, element-wise with singleton expansion. With $1$ input, computes the least common multiple of all elements of the input
+Zm	1	2	2	1	1	1	true	true	if numel(in)==1, x=1; for t=in{1}(:).', x=lcm(x,t); end; out{1}=x;	least common multiple (element-wise, singleton expansion)	\matlab+lcm+, element-wise with singleton expansion. With $1$ input, computes the least common multiple of all elements of the input
 									else
 									if max(size(in{1}))==1 || max(size(in{2}))==1 || isequal(size(in{1}), size(in{2}))	
 									out{1} = lcm(in{:});
@@ -584,7 +590,7 @@ Yy	2	2	2	1	1	1	true	true	out{1} = bsxfun(@hypot, in{1}, in{2});	hypotenuse (elem
 Zy					
 z	1	1	1	1	1	1	true	true	out{1} = nnz(in{:});	number of nonzero elements	\matlab+nnz+
 Xz	1	1	1	1	1	1	true	true	out{1} = nonzeros(in{:});	nonzero elements	\matlab+nonzeros+
-Yz	1	1	1	1	1	1	true	true	out{1} = isempty(in{:});	true for empty array	\matlab+isempty+
+Yz	
 Zz					
 {					
 X{	1	2	1	1	1	1	true	true	out{1} = num2cell(in{:});	convert numeric array into cell array	\matlab+num2cell+
@@ -593,7 +599,8 @@ Z{	1	1	1	1	1	1	true	true	sz = num2cell(size(in{1})); out{1} = mat2cell(in{1}, on
 |	1	inf	2	1	1	1	true	true	y = in{1}; for n=2:numel(in), y = bsxfun(@or, y, in{n}); end; if numel(in)==1, y = logical(y); end; out{1} = y; clear y n;	logical 'or' (element-wise, singleton expansion)	\matlab+|+ (\matlab+or+), element-wise with singleton expansion
 X|	2	4	2	1	3	1	true	true	[out{:}] = union(in{:});	set union	\matlab+union+
 Y|	1	2	1	1	1	1	true	true	out{1} = norm(in{:});	matrix or vector norm	\matlab+norm+
-Z|	2	3	2	1	1	1	true	true	if max(size(in{1}))==1 || max(size(in{2}))==1 || isequal(size(in{1}), size(in{2}))	bit-wise logical 'or' (element-wise, singleton expansion)	\matlab+bitor+, element-wise with singleton expansion
+Z|	2	3	2	1	1	1	true	true	if ischar(in{1}), in{1} = double(in{1}); end	bit-wise logical 'or' (element-wise, singleton expansion)	\matlab+bitor+, element-wise with singleton expansion. If first input is \matlab+char+ it is automatically converted to \matlab+double+
+									if max(size(in{1}))==1 || max(size(in{2}))==1 || isequal(size(in{1}), size(in{2}))
 									out{1} = bitor(in{:});
 									else
 									nd = max(ndims(in{1}), ndims(in{2})); sz1 = arrayfun(@(n)size(in{1},n), 1:nd); sz2 = arrayfun(@(n)size(in{2},n), 1:nd);
@@ -605,12 +612,17 @@ Z|	2	3	2	1	1	1	true	true	if max(size(in{1}))==1 || max(size(in{2}))==1 || isequa
 }					
 X}					
 Y}	1	1	1	1	1	1	true	true	out{1} = cell2mat(in{:});	convert contents of cell array into single array	\matlab+cell2mat+
-Z}	1	1	1	0	inf	numel(in{1})	true	true	outall = mat2cell(in{1}(:), ones(1,numel(in{1}))).';	split array into elements	split array into its elements in linear order
+Z}	1	2	1	0	inf	prod(size(in{:}))	true	true	if numel(in)==1, outall = mat2cell(in{1}(:), ones(1,numel(in{1}))).';	split array along a dimension	split array into elements in linear order. With $2$ inputs: split into subarrays along the dimension indicated by the second input
+									elseif numel(in)==2, d = num2cell(size(in{1})); d{in{2}} = ones(1,size(in{1},in{2})); outall = mat2cell(in{1}, d{:}); outall = outall(:).'; clear d
+									else error('MATL:runtime', 'MATL run-time error: too many inputs'); end
 									out = outall(1:nout);
+% The default nout, prod(size(in{:})), is either numel(in{1}) o size(in{1}, in{2})
+% I considered defining Z} such that with 1 input it split along the first non-singleton dimension. But that gave me trouble. : The default nout should have been the size along the first non-singleton dimension or along the dimension indicated by the first output. : I didn't see how to define the default nout in a single statement. I tried size(in{1}, (numel(in)>1)*in{end} + (numel(in)==1)*[find(size(in{1})-1,1) repmat(1,1,numel(in{1})==1)]); but it didn't work when the first input was a cell array and there was not second input: in that case in{end} was not a number
 ~	1	1	1	1	1	1	true	true	out{1} = ~in{1};	logical 'not' (element-wise)	\matlab+~+ (\matlab+not+)
 X~	2	4	2	1	3	1	true	true	[out{:}] = setxor(in{:});	set exclusive-or	\matlab+setxor+
 Y~	2	2	2	1	1	1	true	true	out{1} = bsxfun(@xor, in{1}, in{2});	logical 'xor' (element-wise, singleton expansion)	\matlab+xor+, element-wise with singleton expansion
-Z~	1	3	2	1	1	1	true	true	if numel(in)>=2 && isnumeric(in{2})	bit-wise logical 'xor' (element-wise, singleton expanstion) or complement bits	\matlab+bitxor+, element-wise with singleton expansion. With $1$ numeric input (and optionally a second string input): \matlab+bitcmp+
+Z~	1	3	2	1	1	1	true	true	if ischar(in{1}), in{1} = double(in{1}); end	bit-wise logical 'xor' (element-wise, singleton expanstion) or complement bits	\matlab+bitxor+, element-wise with singleton expansion. With $1$ numeric input (and optionally a second string input): \matlab+bitcmp+. In both cases, if first input is \matlab+char+ it is automatically converted to \matlab+double+
+									if numel(in)>=2 && isnumeric(in{2})
 									if max(size(in{1}))==1 || max(size(in{2}))==1 || isequal(size(in{1}), size(in{2}))
 									out{1} = bitxor(in{:});
 									else

funDef.mat

@@ -132,6 +132,7 @@
     maxOut = str2double(F(n).maxOut);
     defOut = str2double(F(n).defOut);
 
+    % Changes done here should be done in MATL_spec.tex too;
     if isnan(defIn) && ~isempty(F(n).defIn) % F(n).defIn contains a string that couldn't be converted to a number
         switch F(n).defIn
         case 'numel(STACK)'
@@ -158,7 +159,7 @@
         inFormatted{n} = sprintf('%i', defIn);
     end
 
-    % Format output spec:
+    % Format output spec. Changes done here should be done in MATL_spec.tex too
     if isnan(defOut) && ~isempty(F(n).defOut) % F(n).defOut contains a string that couldn't be converted to a number
         switch F(n).defOut
         case {'numel(CB_H)' 'numel(CB_I)' 'numel(CB_J)' 'numel(CB_K)'}
@@ -167,6 +168,8 @@
             defOutStr = 'number of elements in clipboard level';
         case 'numel(in{1})'
             defOutStr = 'number of elements of first input';
+        case 'prod(size(in{:}))' % Z}
+            defOutStr = 'number of elements or subarrays that will be produced';
         otherwise
             error('Unrecognized default number of outputs')
         end

funDef.txt

@@ -68,10 +68,12 @@
 appendLines('% Set initial conditions', 0)
 appendLines('warningState = warning;', 0);
 appendLines('format compact; format long; warning(''off'',''all'');', 0) % clc
+appendLines('defaultColorMap = get(0, ''DefaultFigureColormap'');', 0)
+appendLines('set(0, ''DefaultFigureColormap'', gray(256));', 0)
 if isMatlab && exist('rng', 'file') % recent Matlab version
     appendLines('rng(''shuffle'')', 0)
 elseif isMatlab % old Matlab version
-    appendLines('rand(''seed'',sum(clock)); randn(''seed'',sum(clock))');
+    appendLines('rand(''seed'',sum(clock)); randn(''seed'',sum(clock))', 0);
 % else % Octave: seeds are set randomly automatically by Octave
 end
 appendLines('diary off; delete defout; diary defout', 0)
@@ -230,14 +232,15 @@
 appendLines('', 0)
 appendLines('% Set final conditions', 0)
 appendLines('diary off; warning(warningState);', 0);
+appendLines('set(0, ''DefaultFigureColormap'', defaultColorMap);', 0)
 appendLines('', 0)
 appendLines('end', 0) % close function, in case there are subfunctions
 
 % Define subfunctions for compatibility with Octave
 if ~isMatlab
-    % num2str
-    appendLines('% Define subfunctions', 0)
     appendLines('', 0)
+    appendLines('% Define subfunctions', 0)
+    % num2str. Fixes alignment in certain cases
     appendLines({...
         'function y = num2str(varargin)' ...
         'x = varargin{1}; x = reshape(x, size(x,1),[]);'  ...
@@ -249,13 +252,31 @@
         'y = reshape(y.'',[],size(x,1)).''; y = strtrim(y);' ...
         'end' ...
         'end'}, 0)
-    % im2col
-    appendLines('', 0)
-    appendLines({...
-        'function y = im2col(varargin)' ...
-        'argin1 = varargin{1}; argin1 = reshape(argin1, size(argin1,1), []);' ...
-        'y = builtin(''im2col'', argin1, varargin{2:end});' ...
-        'end'}, 0)    
+    % im2col. Fixes behaviour
+    fname = 'im2col';
+    if any(~cellfun(@isempty,strfind(C,fname)))
+        appendLines('', 0)
+        appendLines({...
+            'function y = im2col(varargin)' ...
+            'argin1 = varargin{1}; argin1 = reshape(argin1, size(argin1,1), []);' ...
+            'y = builtin(''im2col'', argin1, varargin{2:end});' ...
+            'end'}, 0)
+    end
+    % spiral. Non-existent in Octave
+    fname = 'spiral';
+    if any(~cellfun(@isempty,strfind(C,fname)))
+        appendLines('', 0)
+        appendLines({...
+            'function s = spiral(n)' ...
+            's = zeros(n,n); i = ceil(n/2); j = ceil(n/2);' ...
+            's(i,j) = 1; if n == 1, return, end' ...
+            'k = 1; d = 1;' ...
+            'for p = 1:n' ...
+            'q = 1:min(p,n-1); j = j+d*q; k = k+q; s(i,j) = k; if (p == n), return, end' ...
+            'j = j(p); k = k(p); i = i+d*q''; k = k+q''; s(i,j) = k; i = i(p); k = k(p); d = -d;' ...
+            'end' ...
+            'end'}, 0)
+    end
 end
 
 if verbose