Mercurial > octave-nkf
changeset 6547:4fb053f24fd6
[project @ 2007-04-19 21:47:40 by jwe]
line wrap: on
line diff
--- a/doc/interpreter/bugs.txi Thu Apr 19 17:06:22 2007 +0000 +++ b/doc/interpreter/bugs.txi Thu Apr 19 21:47:41 2007 +0000 @@ -70,62 +70,6 @@ @noindent to turn the pager off. - -@item -If you get messages like - -@example -Input line too long -@end example - -when trying to plot many lines on one graph, you have probably generated -a plot command that is too large for @code{gnuplot}'s fixed-length -buffer for commands. Splitting up the plot command doesn't help because -replot is implemented in gnuplot by simply appending the new plotting -commands to the old command line and then evaluating it again. - -You can demonstrate this `feature' by running gnuplot and doing -something like - -@example - plot sin (x), sin (x), sin (x), ... lots more ..., sin (x) -@end example - -@noindent -and then - -@example - replot sin (x), sin (x), sin (x), ... lots more ..., sin (x) -@end example - -@noindent -after repeating the replot command a few times, gnuplot will give you -an error. - -Also, it doesn't help to use backslashes to enter a plot command over -several lines, because the limit is on the overall command line -length, once the backslashed lines are all pasted together. - -Because of this, Octave tries to use as little of the command-line -length as possible by using the shortest possible abbreviations for -all the plot commands and options. Unfortunately, the length of the -temporary file names is probably what is taking up the most space on -the command line. - -You can buy a little bit of command line space by setting the -environment variable @code{TMPDIR} to be "." before starting Octave, or -you can increase the maximum command line length in gnuplot by changing -the following limits in the file plot.h in the gnuplot distribution and -recompiling gnuplot. - -@example -#define MAX_LINE_LEN 32768 /* originally 1024 */ -#define MAX_TOKENS 8192 /* originally 400 */ -@end example - -Of course, this doesn't really fix the problem, but it does make it -much less likely that you will run into trouble unless you are putting -a very large number of lines on a given plot. @end itemize A list of ideas for future enhancements is distributed with Octave. See
--- a/doc/interpreter/grammar.txi Thu Apr 19 17:06:22 2007 +0000 +++ b/doc/interpreter/grammar.txi Thu Apr 19 21:47:41 2007 +0000 @@ -7,7 +7,7 @@ @cindex grammar rules @cindex language definition -Someday I hope to expand this to include a semi-formal description of +This appendix should eventually contain a semi-formal description of Octave's language. @menu @@ -21,38 +21,16 @@ The following identifiers are keywords, and may not be used as variable or function names: -@example -@group -break for -case function -catch global -continue gplot -else gsplot -elseif if -end otherwise -end_try_catch return -end_unwind_protect switch -endfor try -endfunction unwind_protect -endif unwind_protect_cleanup -endswitch while -endwhile -@end group -@end example - -The following command-like functions are also speical. They may be used -as simple variable names, but not as formal parameters for functions, or -as the names of structure variables. Failed assignments leave them -undefined (you can recover the orginal definition as a function using -clear). - -@example -@group -casesen echo load show -cd edit_history ls type -chdir format more which -clear help run_history who -diary history save whos -dir hold set -@end group -@end example +@multitable @columnfractions .33 .33 .33 +@item @code{break} @tab @code{case} @tab @code{catch} +@item @code{continue} @tab @code{do} @tab @code{else} +@item @code{elseif} @tab @code{end} @tab @code{end_try_catch} +@item @code{end_unwind_protect} @tab @code{endfor} @tab @code{endfunction} +@item @code{endif} @tab @code{endswitch} @tab @code{endwhile} +@item @code{for} @tab @code{function} @tab @code{global} +@item @code{if} @tab @code{otherwise} @tab @code{persistent} +@item @code{return} @tab @code{static} @tab @code{switch} +@item @code{try} @tab @code{until} @tab @code{unwind_protect} +@item @code{unwind_protect_cleanup} @tab @code{varargin} @tab @code{varargout} +@item @code{while} @tab @code{__FILE__} @tab @code{__LINE__} +@end multitable
--- a/scripts/audio/wavread.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/audio/wavread.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,22 +18,22 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {@var{y}} = wavread (@var{filename}) +## @deftypefn {Function File} {@var{y} =} wavread (@var{filename}) ## Load the RIFF/WAVE sound file @var{filename}, and return the samples ## in vector @var{y}. If the file contains multichannel data, then ## @var{y} is a matrix with the channels represented as columns. ## -## @deftypefnx {Function File} {[@var{y}, @var{Fs}, @var{bits}]} = wavread (@var{filename}) +## @deftypefnx {Function File} {[@var{y}, @var{Fs}, @var{bits}] =} wavread (@var{filename}) ## Additionally return the sample rate (@var{fs}) in Hz and the number of bits ## per sample (@var{bits}). ## -## @deftypefnx {Function File} {[@dots{}]} = wavread (@var{filename}, @var{n}) +## @deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n}) ## Read only the first @var{n} samples from each channel. ## -## @deftypefnx {Function File} {[@dots{}]} = wavread(@var{filename},[@var{n1} @var{n2}]) +## @deftypefnx {Function File} {[@dots{}] =} wavread(@var{filename},[@var{n1} @var{n2}]) ## Read only samples @var{n1} through @var{n2} from each channel. ## -## @deftypefnx {Function File} {[@var{samples}, @var{channels}]} = wavread (@var{filename}, "size") +## @deftypefnx {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size") ## Return the number of samples (@var{n}) and channels (@var{ch}) ## instead of the audio data. ## @seealso{wavwrite}
--- a/scripts/control/system/dmr2d.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/control/system/dmr2d.m Thu Apr 19 21:47:41 2007 +0000 @@ -55,9 +55,9 @@ ## The sampling time of sys is updated to @var{ts2}. ## ## if @var{cuflg}=0 then a set of additional inputs is added to -## the system with suffixes _d1, ..., _dn to indicate their +## the system with suffixes _d1, @dots{}, _dn to indicate their ## delay from the starting time k @var{ts2}, i.e. -## u = [u_1; u_1_d1; ..., u_1_dn] where u_1_dk is the input +## u = [u_1; u_1_d1; @dots{}, u_1_dn] where u_1_dk is the input ## k*ts1 units of time after u_1 is sampled. (@var{ts1} is ## the original sampling time of the discrete time system and ## @var{ts2} = (n+1)*ts1)
--- a/scripts/control/system/fir2sys.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/control/system/fir2sys.m Thu Apr 19 21:47:41 2007 +0000 @@ -26,7 +26,7 @@ ## @item num ## vector of coefficients ## @ifinfo -## [c0, c1, ..., cn] +## [c0, c1, @dots{}, cn] ## @end ifinfo ## @iftex ## @tex @@ -35,7 +35,7 @@ ## @end iftex ## of the @acronym{SISO} @acronym{FIR} transfer function ## @ifinfo -## C(z) = c0 + c1*z^(-1) + c2*z^(-2) + ... + cn*z^(-n) +## C(z) = c0 + c1*z^(-1) + c2*z^(-2) + @dots{} + cn*z^(-n) ## @end ifinfo ## @iftex ## @tex
--- a/scripts/elfun/lcm.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/elfun/lcm.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Mapping Function} {} lcm (@var{x}, @code{...}) +## @deftypefn {Mapping Function} {} lcm (@var{x}, @dots{}) ## Compute the least common multiple of the elements elements of @var{x}, or ## the list of all the arguments. For example, ##
--- a/scripts/general/circshift.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/general/circshift.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {@var{y}} = circshift (@var{x}, @var{n}) +## @deftypefn {Function File} {@var{y} =} circshift (@var{x}, @var{n}) ## Circularly shifts the values of the array @var{x}. @var{n} must be ## a vector of integers no longer than the number of dimensions in ## @var{x}. The values of @var{n} can be either positive or negative,
--- a/scripts/general/common_size.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/general/common_size.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{err}, @var{y1}, ...] =} common_size (@var{x1}, ...) +## @deftypefn {Function File} {[@var{err}, @var{y1}, @dots{}] =} common_size (@var{x1}, @dots{}) ## Determine if all input arguments are either scalar or of common ## size. If so, @var{err} is zero, and @var{yi} is a matrix of the ## common size with all entries equal to @var{xi} if this is a scalar or
--- a/scripts/general/shiftdim.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/general/shiftdim.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,8 +18,8 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {@var{y}} = shiftdim (@var{x}, @var{n}) -## @deftypefnx {Function File} {[@var{y}, @var{ns}]} = shiftdim (@var{x}) +## @deftypefn {Function File} {@var{y} =} shiftdim (@var{x}, @var{n}) +## @deftypefnx {Function File} {[@var{y}, @var{ns}] =} shiftdim (@var{x}) ## Shifts the dimension of @var{x} by @var{n}, where @var{n} must be ## an integer scalar. When @var{n} is positive, the dimensions of ## @var{x} are shifted to the left, with the leading dimensions
--- a/scripts/image/hsv2rgb.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/image/hsv2rgb.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {} @var{rgb_map} = hsv2rgb (@var{hsv_map}) +## @deftypefn {Function File} {@var{rgb_map} =} hsv2rgb (@var{hsv_map}) ## Transform a colormap from the hsv space to the rgb space. ## @seealso{rgb2hsv} ## @end deftypefn
--- a/scripts/image/rgb2hsv.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/image/rgb2hsv.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {} @var{hsv_map} = rgb2hsv (@var{rgb_map}) +## @deftypefn {Function File} {@var{hsv_map} =} rgb2hsv (@var{rgb_map}) ## Transform a colormap from the rgb space to the hsv space. ## ## A color n the RGB space consists of the red, green and blue intensities.
--- a/scripts/miscellaneous/getfield.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/miscellaneous/getfield.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,23 +18,23 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Built-in Function} {} [@var{v1},...] = -## @code{getfield (@var{s}, 'k1',...)} extract fields from a structure. +## @deftypefn {Built-in Function} {[@var{v1}, @dots{}] =} getfield (@var{s}, @var{key}, @dots{}) extract fields from a structure. ## For example ## ## @example ## @group ## ss(1,2).fd(3).b=5; -## getfield(ss,@{1,2@},'fd',@{3@},'b') +## getfield (ss, @{1,2@}, "fd", @{3@}, "b") ## @result{} ans = 5 ## @end group ## @end example ## -## Note that this function could be written as +## Note that the function call in the previous example is equivalent to +## the expression ## ## @example -## i1= @{1,2@}; i2= 'fd'; i3= @{3@}; i4= 'b'; -## ss( i1@{:@} ).( i2 )( i3@{:@} ).( i4 ) +## i1= @{1,2@}; i2= "fd"; i3= @{3@}; i4= "b"; +## ss(i1@{:@}).(i2)(i3@{:@}).(i4) ## @end example ## @seealso{setfield, rmfield, isfield, isstruct, fieldnames, struct} ## @end deftypefn
--- a/scripts/miscellaneous/license.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/miscellaneous/license.m Thu Apr 19 21:47:41 2007 +0000 @@ -24,10 +24,10 @@ ## @deftypefnx {Function File} {} license ("inuse") ## Display a list of packages currently being used. ## -## @deftypefnx {Function File} {@var{retval}} = license ("inuse") +## @deftypefnx {Function File} {@var{retval} =} license ("inuse") ## Return a structure containing the fields @code{feature} and @code{user}. ## -## @deftypefnx {Function File} {@var{retval}} = license ("test", @var{feature}) +## @deftypefnx {Function File} {@var{retval} =} license ("test", @var{feature}) ## Return 1 if a license exists for the product identified by the string ## @var{feature} and 0 otherwise. The argument @var{feature} is case ## insensitive and only the first 27 characters are checked. @@ -44,7 +44,7 @@ ## Future tests for the specified license of @var{feature} return 0. ## @end table ## -## @deftypefnx {Function File} {@var{retval}} = license ("checkout", @var{feature}) +## @deftypefnx {Function File} {@var{retval} =} license ("checkout", @var{feature}) ## Check out a license for @var{feature}, returning 1 on success and 0 ## on failure. ##
--- a/scripts/miscellaneous/mex.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/miscellaneous/mex.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {} mex [options] file ... +## @deftypefn {Function File} {} mex [options] file @dots{} ## Compile source code written in C, C++, or Fortran, to a MEX file. ## This is equivalent to @code{mkoctfile --mex [options] file}. ## @seealso{mkoctfile}
--- a/scripts/miscellaneous/mkoctfile.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/miscellaneous/mkoctfile.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {} mkoctfile [-options] file ... +## @deftypefn {Function File} {} mkoctfile [-options] file @dots{} ## ## The @code{mkoctfile} function compiles source code written in C, ## C++, or Fortran. Depending on the options used with @code{mkoctfile}, the
--- a/scripts/miscellaneous/setfield.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/miscellaneous/setfield.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{k1},..., @var{v1}] =} setfield (@var{s}, @var{k1}, @var{v1}, @dots{}) +## @deftypefn {Function File} {[@var{k1}, @dots{}, @var{v1}] =} setfield (@var{s}, @var{k1}, @var{v1}, @dots{}) ## Set field members in a structure. ## ## @example
--- a/scripts/plot/contour.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/plot/contour.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {} {@var{c}} = contour (@var{x},@var{y},@var{z},@var{vv}) +## @deftypefn {Function File} {} {@var{c} =} contour (@var{x}, @var{y}, @var{z}, @var{vv}) ## Compute isolines (countour lines) of the matrix @var{z}. ## parameters @var{x}, @var{y} and @var{vn} are optional. ## @@ -26,8 +26,8 @@ ## contour lines in the following format ## ## @example -## @var{c} = [lev1 , x1 , x2 , ... , levn , x1 , x2 , ... -## len1 , y1 , y2 , ... , lenn , y1 , y2 , ... ] +## @var{c} = [lev1, x1, x2, ..., levn, x1, x2, ... +## len1, y1, y2, ..., lenn, y1, y2, ...] ## @end example ## ## @noindent @@ -41,9 +41,10 @@ ## @var{vn} is omitted it defaults to 10. ## ## @example -## @var{c}=contourc (@var{x}, @var{y}, @var{z}, linspace(0,2*pi,10)) +## levels = linspace (0, 2*pi, 10); +## @var{c} = contourc (@var{x}, @var{y}, @var{z}, levels); ## @end example -## @seealso{contourc,line,plot} +## @seealso{contourc, line, plot} ## @end deftypefn ## Author: shaia
--- a/scripts/plot/contourc.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/plot/contourc.m Thu Apr 19 21:47:41 2007 +0000 @@ -27,8 +27,8 @@ ## contour lines in the following format ## ## @example -## @var{c} = [lev1 , x1 , x2 , ... , levn , x1 , x2 , ... -## len1 , y1 , y2 , ... , lenn , y1 , y2 , ... ] +## @var{c} = [lev1, x1, x2, ..., levn, x1, x2, ... +## len1, y1, y2, ..., lenn, y1, y2, ...] ## @end example ## ## @noindent
--- a/scripts/plot/errorbar.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/plot/errorbar.m Thu Apr 19 21:47:41 2007 +0000 @@ -35,7 +35,7 @@ ## If more than two arguments are given, they are interpreted as ## ## @example -## errorbar (@var{x}, @var{y}, ..., @var{fmt} ...) +## errorbar (@var{x}, @var{y}, ..., @var{fmt}, ...) ## @end example ## ## @noindent
--- a/scripts/plot/ndgrid.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/plot/ndgrid.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,15 +18,15 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{y1}, @var{y2}, ..., @var{y}n]} = ndgrid (@var{x1}, @var{x2}, ..., @var{x}n) -## @deftypefnx {Function File} {[@var{y1}, @var{y2}, ..., @var{y}n]} = ndgrid (@var{x}) -## Given n vectors @var{x1}, ... @var{x}n, ndgrid returns n arrays of dimension n. +## @deftypefn {Function File} {[@var{y1}, @var{y2}, @dots{}, @var{y}n] =} ndgrid (@var{x1}, @var{x2}, @dots{}, @var{x}n) +## @deftypefnx {Function File} {[@var{y1}, @var{y2}, @dots{}, @var{y}n] =} ndgrid (@var{x}) +## Given n vectors @var{x1}, @dots{} @var{x}n, ndgrid returns n arrays of dimension n. ## The elements of the ith output argument contains the elements of the vector ## @var{x}i repeated over all dimensions different from the ith dimension. ## Calling ndgrid with only one input argument @var{x} is equivalent of calling ndgrid with ## all n input arguments equal to @var{x}: ## -## [@var{y1}, @var{y2}, ..., @var{y}n] = ndgrid (@var{x}, ..., @var{x}) +## [@var{y1}, @var{y2}, @dots{}, @var{y}n] = ndgrid (@var{x}, @dots{}, @var{x}) ## @seealso{meshgrid} ## @end deftypefn
--- a/scripts/signal/autoreg_matrix.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/signal/autoreg_matrix.m Thu Apr 19 21:47:41 2007 +0000 @@ -22,7 +22,7 @@ ## Given a time series (vector) @var{y}, return a matrix with ones in the ## first column and the first @var{k} lagged values of @var{y} in the ## other columns. I.e., for @var{t} > @var{k}, @code{[1, -## @var{y}(@var{t}-1), ..., @var{y}(@var{t}-@var{k})]} is the t-th row +## @var{y}(@var{t}-1), @dots{}, @var{y}(@var{t}-@var{k})]} is the t-th row ## of the result. The resulting matrix may be used as a regressor matrix ## in autoregressions. ## @end deftypefn
--- a/scripts/signal/diffpara.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/signal/diffpara.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{d}, @var{dd}]} = diffpara (@var{x}, @var{a}, @var{b}) +## @deftypefn {Function File} {[@var{d}, @var{dd}] =} diffpara (@var{x}, @var{a}, @var{b}) ## Return the estimator @var{d} for the differencing parameter of an ## integrated time series. ##
--- a/scripts/signal/durbinlevinson.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/signal/durbinlevinson.m Thu Apr 19 21:47:41 2007 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} durbinlevinson (@var{c}, @var{oldphi}, @var{oldv}) ## Perform one step of the Durbin-Levinson algorithm. ## -## The vector @var{c} specifies the autocovariances @code{[gamma_0, ..., +## The vector @var{c} specifies the autocovariances @code{[gamma_0, @dots{}, ## gamma_t]} from lag 0 to @var{t}, @var{oldphi} specifies the ## coefficients based on @var{c}(@var{t}-1) and @var{oldv} specifies the ## corresponding error.
--- a/scripts/signal/stft.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/signal/stft.m Thu Apr 19 21:47:41 2007 +0000 @@ -18,7 +18,7 @@ ## 02110-1301, USA. ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{y}, @var{c}]} = stft (@var{x}, @var{win_size}, @var{inc}, @var{num_coef}, @var{w_type}) +## @deftypefn {Function File} {[@var{y}, @var{c}] =} stft (@var{x}, @var{win_size}, @var{inc}, @var{num_coef}, @var{w_type}) ## Compute the short-term Fourier transform of the vector @var{x} with ## @var{num_coef} coefficients by applying a window of @var{win_size} data ## points and an increment of @var{inc} points.
--- a/scripts/sparse/pcg.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/sparse/pcg.m Thu Apr 19 21:47:41 2007 +0000 @@ -94,7 +94,8 @@ ## @code{@var{resvec} (i,1)} is the Euclidean norm of the residual, and ## @code{@var{resvec} (i,2)} is the preconditioned residual norm, ## after the (@var{i}-1)-th iteration, @code{@var{i} = -## 1,2,...@var{iter}+1}. The preconditioned residual norm is defined as +## 1, 2, @dots{}, @var{iter}+1}. The preconditioned residual norm +## is defined as ## @code{norm (@var{r}) ^ 2 = @var{r}' * (@var{m} \ @var{r})} where ## @code{@var{r} = @var{b} - @var{a} * @var{x}}, see also the ## description of @var{m}. If @var{eigest} is not required, only @@ -121,8 +122,8 @@ ## @example ## @group ## N = 10; -## A = diag([1:N]); A = sparse(A); -## b = rand(N,1); +## A = spdiag ([1:N]); +## b = rand (N, 1); ## @end group ## @end example ## @@ -137,11 +138,11 @@ ## ## @example ## @group -## function y = applyA(x) +## function y = applyA (x) ## y = [1:N]'.*x; ## endfunction ## -## x = pcg('applyA',b) +## x = pcg ("applyA", b) ## @end group ## @end example ## @@ -151,14 +152,14 @@ ## ## @example ## @group -## function y = applyM(x) -## K = floor(length(x)-2); -## y = x; -## y(1:K) = x(1:K)./[1:K]'; +## function y = applyM(x) +## K = floor (length (x) - 2); +## y = x; +## y(1:K) = x(1:K)./[1:K]'; ## endfunction ## -## [x, flag, relres, iter, resvec, eigest] = pcg(A,b,[],[],'applyM') -## semilogy([1:iter+1], resvec); +## [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], [], "applyM"); +## semilogy (1:iter+1, resvec); ## @end group ## @end example ## @@ -167,13 +168,14 @@ ## ## @example ## @group -## function y = applyM(x, varargin) +## function y = applyM (x, varargin) ## K = varargin@{1@}; -## y = x; y(1:K) = x(1:K)./[1:K]'; +## y = x; +## y(1:K) = x(1:K)./[1:K]'; ## endfuntion ## ## [x, flag, relres, iter, resvec, eigest] = ... -## pcg(A,b,[],[],'applyM',[],3) +## pcg (A, b, [], [], "applyM", [], 3) ## @end group ## @end example ##
--- a/scripts/sparse/spdiags.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/sparse/spdiags.m Thu Apr 19 21:47:41 2007 +0000 @@ -16,10 +16,10 @@ ## 02110-1301 USA ## -*- texinfo -*- -## @deftypefn {function File} {[@var{b}, @var{c}]} = spdiags (@var{a}) -## @deftypefnx {function File} {@var{b}} = spdiags (@var{a}, @var{c}) -## @deftypefnx {function File} {@var{b}} = spdiags (@var{v}, @var{c}, @var{a}) -## @deftypefnx {function File} {@var{b}} = spdiags (@var{v}, @var{c}, @var{m}, @var{n}) +## @deftypefn {function File} {[@var{b}, @var{c}] =} spdiags (@var{a}) +## @deftypefnx {function File} {@var{b} =} spdiags (@var{a}, @var{c}) +## @deftypefnx {function File} {@var{b} =} spdiags (@var{v}, @var{c}, @var{a}) +## @deftypefnx {function File} {@var{b} =} spdiags (@var{v}, @var{c}, @var{m}, @var{n}) ## A generalization of the function @code{spdiag}. Called with a single ## input argument, the non-zero diagonals @var{c} of @var{A} are extracted. ## With two arguments the diagonals to extract are given by the vector
--- a/scripts/sparse/spstats.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/sparse/spstats.m Thu Apr 19 21:47:41 2007 +0000 @@ -3,8 +3,8 @@ ## This program is free software and is in the public domain ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{count}, @var{mean}, @var{var}]} = spstats (@var{s}) -## @deftypefnx {Function File} {[@var{count}, @var{mean}, @var{var}]} = spstats (@var{s}, @var{j}) +## @deftypefn {Function File} {[@var{count}, @var{mean}, @var{var}] =} spstats (@var{s}) +## @deftypefnx {Function File} {[@var{count}, @var{mean}, @var{var}] =} spstats (@var{s}, @var{j}) ## Return the stats for the non-zero elements of the sparse matrix @var{s}. ## @var{count} is the number of non-zeros in each column, @var{mean} ## is the mean of the non-zeros in each column, and @var{var} is the
--- a/scripts/statistics/base/run_count.m Thu Apr 19 17:06:22 2007 +0000 +++ b/scripts/statistics/base/run_count.m Thu Apr 19 21:47:41 2007 +0000 @@ -20,7 +20,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} run_count (@var{x}, @var{n}) ## Count the upward runs along the first non-singleton dimension of -## @var{x} of length 1, 2, ..., @var{n}-1 and greater than or equal +## @var{x} of length 1, 2, @dots{}, @var{n}-1 and greater than or equal ## to @var{n}. If the optional argument @var{dim} is given operate ## along this dimension ## @end deftypefn
--- a/src/ChangeLog Thu Apr 19 17:06:22 2007 +0000 +++ b/src/ChangeLog Thu Apr 19 21:47:41 2007 +0000 @@ -1,3 +1,8 @@ +2007-04-19 John W. Eaton <jwe@octave.org> + + * lex.l (is_keyword_token): Delete all_va_args_kw switch case. + * octave.gperf: Remove all_va_args_kw from the list. + 2007-04-19 Daniel J. Sebald <daniel.sebald@ieee.org> * syscalls.cc: Fix popen2 test to stop trying after 100 times
--- a/src/DLD-FUNCTIONS/cellfun.cc Thu Apr 19 17:06:22 2007 +0000 +++ b/src/DLD-FUNCTIONS/cellfun.cc Thu Apr 19 21:47:41 2007 +0000 @@ -49,7 +49,7 @@ @deftypefnx {Lodable Function} {} cellfun (\"isclass\", @var{c}, @var{class})\n\ @deftypefnx {Lodable Function} {} cellfun (@var{func}, @var{c})\n\ @deftypefnx {Lodable Function} {} cellfun (@var{func}, @var{c}, @var{d})\n\ -@deftypefnx {Lodable Function} {[@var{a}, @var{b}]} = cellfun (@dots{})\n\ +@deftypefnx {Lodable Function} {[@var{a}, @var{b}] =} cellfun (@dots{})\n\ @deftypefnx {Lodable Function} {} cellfun (@dots{}, 'ErrorHandler',@var{errfunc})\n\ @deftypefnx {Lodable Function} {} cellfun (@dots{}, 'UniformOutput',@var{val})\n\ \n\
--- a/src/DLD-FUNCTIONS/gcd.cc Thu Apr 19 17:06:22 2007 +0000 +++ b/src/DLD-FUNCTIONS/gcd.cc Thu Apr 19 21:47:41 2007 +0000 @@ -41,8 +41,8 @@ DEFUN_DLD (gcd, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {@var{g} =} gcd (@var{a1}, @code{...})\n\ -@deftypefnx {Loadable Function} {[@var{g}, @var{v1}, @var{...}] =} gcd (@var{a1}, @code{...})\n\ +@deftypefn {Loadable Function} {@var{g} =} gcd (@var{a1}, @dots{})\n\ +@deftypefnx {Loadable Function} {[@var{g}, @var{v1}, @dots{}] =} gcd (@var{a1}, @dots{})\n\ \n\ If a single argument is given then compute the greatest common divisor of\n\ the elements of this argument. Otherwise if more than one argument is\n\ @@ -72,7 +72,7 @@ \n\ @ifinfo\n\ @example\n\ -@var{g} = @var{v1} .* @var{a1} + @var{v2} .* @var{a2} + @var{...}\n\ +@var{g} = @var{v1} .* @var{a1} + @var{v2} .* @var{a2} + @dots{}\n\ @end example\n\ @end ifinfo\n\ @iftex\n\ @@ -83,7 +83,7 @@ \n\ For backward compatiability with previous versions of this function, when\n\ all arguments are scalr, a single return argument @var{v1} containing\n\ -all of the values of @var{v1}, @var{...} is acceptable.\n\ +all of the values of @var{v1}, @dots{} is acceptable.\n\ @seealso{lcm, min, max, ceil, floor}\n\ @end deftypefn") {
--- a/src/DLD-FUNCTIONS/rand.cc Thu Apr 19 17:06:22 2007 +0000 +++ b/src/DLD-FUNCTIONS/rand.cc Thu Apr 19 21:47:41 2007 +0000 @@ -346,9 +346,9 @@ equidistributed uniform pseudorandom number generator'', ACM Trans. on\n\ Modeling and Computer Simulation Vol. 8, No. 1, Januray pp.3-30 1998,\n\ @url{http://www.math.keio.ac.jp/~matumoto/emt.html}).\n\ -Do NOT use for CRYPTOGRAPHY without securely hashing several returned\n\ -values together, otherwise the generator state can be learned after\n\ -reading 624 consecutive values.\n\ +Do @strong{not} use for cryptography without securely hashing\n\ +several returned values together, otherwise the generator state\n\ +can be learned after reading 624 consecutive values.\n\ \n\ @code{rand} includes a second random number generator, that was the\n\ previous generator used in Octave. The new generator is used by default\n\ @@ -479,7 +479,7 @@ J. Statistical Software, vol 5, 2000,\n\ @url{http://www.jstatsoft.org/v05/i08/})\n\ \n\ -@seealso{rand,rande,randg,randp}\n\ +@seealso{rand, rande, randg, randp}\n\ @end deftypefn") { octave_value retval; @@ -552,7 +552,7 @@ W.W. Tsang, 'Ziggurat method for generating random variables',\n\ J. Statistical Software, vol 5, 2000,\n\ @url{http://www.jstatsoft.org/v05/i08/})\n\ -@seealso{rand,randn,randg,randp}\n\ +@seealso{rand, randn, randg, randp}\n\ @end deftypefn") { octave_value retval; @@ -626,51 +626,51 @@ This can be used to generate many distributions:\n\ \n\ @table @asis\n\ -@item @code{gamma (a,b)} for @code{a > -1}, @code{b > 0}\n\ +@item @code{gamma (a, b)} for @code{a > -1}, @code{b > 0}\n\ @example\n\ -r = b*randg(a)\n\ +r = b * randg (a)\n\ @end example\n\ -@item @code{beta(a,b)} for @code{a > -1}, @code{b > -1}\n\ +@item @code{beta (a, b)} for @code{a > -1}, @code{b > -1}\n\ @example\n\ -r1 = randg(a,1)\n\ -r = r1 / (r1 + randg(b,1))\n\ +r1 = randg (a, 1)\n\ +r = r1 / (r1 + randg (b, 1))\n\ @end example\n\ -@item @code{Erlang(a, n)}\n\ +@item @code{Erlang (a, n)}\n\ @example\n\ -r = a*randg(n)\n\ +r = a * randg (n)\n\ @end example\n\ -@item @code{chisq(df)} for @code{df > 0}\n\ +@item @code{chisq (df)} for @code{df > 0}\n\ @example\n\ -r = 2*randg(df/2)\n\ +r = 2 * randg (df / 2)\n\ @end example\n\ @item @code{t(df)} for @code{0 < df < inf} (use randn if df is infinite)\n\ @example\n\ -r = randn() / sqrt(2*randg(df/2)/df)\n\ +r = randn () / sqrt (2 * randg (df / 2) / df)\n\ @end example\n\ -@item @code{F(n1,n2)} for @code{0 < n1}, @code{0 < n2}\n\ +@item @code{F (n1, n2)} for @code{0 < n1}, @code{0 < n2}\n\ @example\n\ -r1 = 2*randg(n1/2)/n1 or 1 if n1 is infinite\n\ -r2 = 2*randg(n2/2)/n2 or 1 if n2 is infinite\n\ +r1 = 2 * randg (n1 / 2) / n1 or 1 if n1 is infinite\n\ +r2 = 2 * randg (n2 / 2) / n2 or 1 if n2 is infinite\n\ r = r1 / r2\n\n\ @end example\n\ @item negative @code{binomial (n, p)} for @code{n > 0}, @code{0 < p <= 1}\n\ @example\n\ -r = randp((1-p)/p * randg(n))\n\ +r = randp ((1 - p) / p * randg (n))\n\ @end example\n\ -@item non-central @code{chisq(df,L)}, for @code{df >= 0} and @code{L > 0}\n\ +@item non-central @code{chisq (df, L)}, for @code{df >= 0} and @code{L > 0}\n\ (use chisq if @code{L = 0})\n\ @example\n\ -r = randp(L/2)\n\ -r(r > 0) = 2*randg(r(r > 0))\n\ -r(df > 0) += 2*randg(df(df > 0)/2)\n\ +r = randp (L / 2)\n\ +r(r > 0) = 2 * randg (r(r > 0))\n\ +r(df > 0) += 2 * randg (df(df > 0)/2)\n\ @end example\n\ -@item @code{Dirichlet(a1,...,ak)}\n\ +@item @code{Dirichlet (a1, ..., ak)}\n\ @example\n\ -r = (randg(a1),...,randg(ak))\n\ -r = r / sum(r)\n\ +r = (randg (a1), ..., randg (ak))\n\ +r = r / sum (r)\n\ @end example\n\ @end table\n\ -@seealso{rand,randn,rande,randp}\n\ +@seealso{rand, randn, rande, randp}\n\ @end deftypefn") { octave_value retval; @@ -884,7 +884,7 @@ L. Montanet, et al., 'Review of Particle Properties', Physical Review\n\ D 50 p1284, 1994\n\ @end table\n\ -@seealso{rand,randn,rande,randg}\n\ +@seealso{rand, randn, rande, randg}\n\ @end deftypefn") { octave_value retval;
--- a/src/DLD-FUNCTIONS/regexp.cc Thu Apr 19 17:06:22 2007 +0000 +++ b/src/DLD-FUNCTIONS/regexp.cc Thu Apr 19 21:47:41 2007 +0000 @@ -1390,7 +1390,7 @@ DEFUN_DLD(regexprep, args, , "-*- texinfo -*-\n\ -@deftypefn {Function File} @var{string} = regexprep(@var{string}, @var{pat}, @var{repstr}, @var{options})\n\ +@deftypefn {Function File} {@var{string} =} regexprep(@var{string}, @var{pat}, @var{repstr}, @var{options})\n\ Replace matches of @var{pat} in @var{string} with @var{repstr}.\n\ \n\ \n\
--- a/src/DLD-FUNCTIONS/sparse.cc Thu Apr 19 17:06:22 2007 +0000 +++ b/src/DLD-FUNCTIONS/sparse.cc Thu Apr 19 21:47:41 2007 +0000 @@ -61,7 +61,7 @@ DEFUN_DLD (sparse, args, , "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {@var{sparse_val} =} sparse (...)\n\ +@deftypefn {Loadable Function} {@var{sparse_val} =} sparse (@dots{})\n\ SPARSE: create a sparse matrix\n\ \n\ sparse can be called in the following ways:\n\
--- a/src/DLD-FUNCTIONS/spchol.cc Thu Apr 19 17:06:22 2007 +0000 +++ b/src/DLD-FUNCTIONS/spchol.cc Thu Apr 19 21:47:41 2007 +0000 @@ -333,7 +333,7 @@ DEFUN_DLD (symbfact, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {[@var{count}, @var{h}, @var{parent}, @var{post}, @var{r}]} = symbfact (@var{s}, @var{typ}, @var{mode})\n\ +@deftypefn {Loadable Function} {[@var{count}, @var{h}, @var{parent}, @var{post}, @var{r}] =} symbfact (@var{s}, @var{typ}, @var{mode})\n\ \n\ Performs a symbolic factorization analysis on the sparse matrix @var{s}.\n\ Where\n\
--- a/src/DLD-FUNCTIONS/urlwrite.cc Thu Apr 19 17:06:22 2007 +0000 +++ b/src/DLD-FUNCTIONS/urlwrite.cc Thu Apr 19 21:47:41 2007 +0000 @@ -330,7 +330,7 @@ @deftypefn {Loadable Function} {@var{s} =} urlread(@var{url})\n\ @deftypefnx {Loadable Function} {[@var{s}, @var{success}] =} urlread (@var{url})\n\ @deftypefnx {Loadable Function} {[@var{s}, @var{success}, @var{message}] =} urlread(@var{url})\n\ -@deftypefnx {Loadable Function} {[...] =} urlread (@var{url}, @var{method}, @var{param})\n\ +@deftypefnx {Loadable Function} {[@dots{}] =} urlread (@var{url}, @var{method}, @var{param})\n\ Download a remote file specified by its @var{URL} and return its content\n\ in string @var{s}. For example,\n\ \n\
--- a/src/lex.l Thu Apr 19 17:06:22 2007 +0000 +++ b/src/lex.l Thu Apr 19 21:47:41 2007 +0000 @@ -1003,7 +1003,6 @@ switch (kw->kw_id) { - case all_va_args_kw: case break_kw: case case_kw: case catch_kw:
--- a/src/octave.gperf Thu Apr 19 17:06:22 2007 +0000 +++ b/src/octave.gperf Thu Apr 19 21:47:41 2007 +0000 @@ -2,7 +2,6 @@ enum octave_kw_id { - all_va_args_kw, break_kw, case_kw, catch_kw,
--- a/src/ov-fcn-inline.cc Thu Apr 19 17:06:22 2007 +0000 +++ b/src/ov-fcn-inline.cc Thu Apr 19 21:47:41 2007 +0000 @@ -561,7 +561,7 @@ DEFUN (inline, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} inline (@var{str})\n\ -@deftypefnx {Built-in Function} {} inline (@var{str}, @var{arg1}, ...)\n\ +@deftypefnx {Built-in Function} {} inline (@var{str}, @var{arg1}, @dots{})\n\ @deftypefnx {Built-in Function} {} inline (@var{str}, @var{n})\n\ Create an inline function from the character string @var{str}.\n\ If called with a single argument, the arguments of the generated\n\