Mercurial > hg > octave-lojdl
changeset 7081:503001863427
[project @ 2007-10-31 01:08:14 by jwe]
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-10-30 David Bateman <dbateman@free.fr> + + * examples/addtwomatrices.cc, examples/celldemo.cc, + examples/firstmexdemo.c, examples/fortdemo.cc, examples/fortsub.f, + examples/funcdemo.cc, examples/globaldemo.cc, + examples/helloworld.cc, examples/mycell.c, examples/myfeval.c, + examples/myfunc.c, examples/mypow2.c, examples/mysparse.c, + examples/mystring.c, examples/mystruct.c, examples/paramdemo.cc, + examples/stringdemo.cc, examples/structdemo.cc, + examples/unwinddemo.cc: Doc fixes for small book format. + 2007-10-26 Michael Goffioul <michael.goffioul@gmail.com> * Makeconf.in: Remove UNSETCOMSPEC trick.
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,10 @@ +2007-10-30 David Bateman <dbateman@free.fr> + + * interpreter/dynamic.txi, interpreter/install.txi, + interpreter/stats.txi, interpreter/strings.txi, + interpreter/testfun.txi, interpreter/tips.txi: + Doc fixes for small book format. + 2007-10-26 Michael Goffioul <michael.goffioul@gmail.com> * interpreter/Makefile.in, faq/Makefile.in, liboctave/Makefile.in:
--- a/doc/interpreter/dynamic.txi +++ b/doc/interpreter/dynamic.txi @@ -353,7 +353,7 @@ In Octave a character string is just a special @code{Array} class. Consider the example -@examplefile{stringdemo.cc} +@longexamplefile{stringdemo.cc} An example of the of the use of this function is @@ -381,9 +381,11 @@ @example @group if (args(0).is_sq_string ()) - octave_stdout << "First argument is a singularly quoted string\n"; + octave_stdout << + "First argument is a singularly quoted string\n"; else if (args(0).is_dq_string ()) - octave_stdout << "First argument is a doubly quoted string\n"; + octave_stdout << + "First argument is a doubly quoted string\n"; @end group @end example @@ -442,7 +444,7 @@ A simple example demonstrating the use of structures within oct-files is -@examplefile{structdemo.cc} +@longexamplefile{structdemo.cc} An example of its use is @@ -731,7 +733,8 @@ @} sm.cidx(j+1) = ii; @} -sm.maybe_compress (); // If don't know a-priori the final no of nz. +sm.maybe_compress (); // If don't know a-priori + // the final no of nz. @end group @end example @@ -772,7 +775,8 @@ @} sm.cidx(j+1) = ii; @} -sm.maybe_mutate (); // If don't know a-priori the final no of nz. +sm.maybe_mutate (); // If don't know a-priori + // the final no of nz. @end group @end example @@ -796,7 +800,8 @@ octave_value_list retval; SparseMatrix sm = args(0).sparse_matrix_value (); -SparseComplexMatrix scm = args(1).sparse_complex_matrix_value (); +SparseComplexMatrix scm = + args(1).sparse_complex_matrix_value (); SparseBoolMatrix sbm = args(2).sparse_bool_matrix_value (); @dots{} retval(2) = sbm; @@ -820,7 +825,7 @@ that no global variable of the desired name is found. An example of the use of these two functions is -@examplefile{globaldemo.cc} +@longexamplefile{globaldemo.cc} An example of its use is @@ -859,7 +864,7 @@ The example below demonstrates an example that accepts all four means of passing a function to an oct-file. -@examplefile{funcdemo.cc} +@longexamplefile{funcdemo.cc} The first argument to this demonstration is the user supplied function and the following arguments are all passed to the user function. @@ -954,12 +959,12 @@ An example of the inclusion of a Fortran function in an oct-file is given in the following example, where the C++ wrapper is -@examplefile{fortdemo.cc} +@longexamplefile{fortdemo.cc} @noindent and the fortran function is -@examplefile{fortsub.f} +@longexamplefile{fortsub.f} This example demonstrates most of the features needed to link to an external Fortran function, including passing arrays and strings, as well @@ -1016,7 +1021,7 @@ more specialized functions. Some of the more common ones are demonstrated in the following example -@examplefile{paramdemo.cc} +@longexamplefile{paramdemo.cc} @noindent and an example of its use is @@ -1085,7 +1090,7 @@ to allow variables, etc to be restored even if an exception occurs. An example of the use of this mechanism is -@examplefile{unwinddemo.cc} +@longexamplefile{unwinddemo.cc} As can be seen in the example @@ -1121,8 +1126,8 @@ DEFUN_DLD (do_what_i_want, args, nargout, "-*- texinfo -*-\n\ @@deftypefn @{Function File@} @{@} do_what_i_say (@@var@{n@})\n\ -A function that does what the user actually wants rather than what\n\ -they requested.\n\ +A function that does what the user actually wants rather\n\ +than what they requested.\n\ @@end deftypefn") @{ @dots{} @@ -1345,7 +1350,7 @@ double precision arrays is given by the file @file{mypow2.c} as given below. -@examplefile{mypow2.c} +@longexamplefile{mypow2.c} @noindent with an example of its use @@ -1359,8 +1364,8 @@ @end example -The example above uses the @code{mxGetNumberOfElements}, -@code{mxGetNumberOfDimensions} and @code{mxGetDimensions}, to work with +The example above uses @code{mxGetDimensions}, +@code{mxGetNumberOfElements}, @code{mxGetNumberOfDimensions}, to work with the dimensional parameters of multi-dimensional arrays. The also exists the functions @code{mxGetM}, and @code{mxGetN} that probe the number of rows and columns in a matrix. @@ -1374,7 +1379,7 @@ use, that parallels the demo in @file{stringdemo.cc}, is given in the file @file{mystring.c}, as seen below. -@examplefile{mystring.c} +@longexamplefile{mystring.c} @noindent An example of its expected output is @@ -1448,9 +1453,11 @@ @example @group -mxArray *mxCreateStructArray (int ndims, int *dims, int num_keys, +mxArray *mxCreateStructArray (int ndims, int *dims, + int num_keys, const char **keys); -mxArray *mxCreateStructMatrix (int rows, int cols, int num_keys, +mxArray *mxCreateStructMatrix (int rows, int cols, + int num_keys, const char **keys); @end group @end example @@ -1461,7 +1468,8 @@ @example @group -mxArray *mxGetField (const mxArray *ptr, mwIndex index, const char *key); +mxArray *mxGetField (const mxArray *ptr, mwIndex index, + const char *key); mxArray *mxGetFieldByNumber (const mxArray *ptr, mwIndex index, int key_num); void mxSetField (mxArray *ptr, mwIndex index, @@ -1480,13 +1488,14 @@ An example that demonstrates the use of structures in mex-file can be found in the file @file{mystruct.c}, as seen below -@examplefile{mystruct.c} +@longexamplefile{mystruct.c} An example of the behavior of this function within Octave is then @example @group -a(1).f1 = "f11"; a(1).f2 = "f12"; a(2).f1 = "f21"; a(2).f2 = "f22"; +a(1).f1 = "f11"; a(1).f2 = "f12"; +a(2).f1 = "f21"; a(2).f2 = "f22"; b = mystruct(a) @result{} field f1(0) = f11 field f1(1) = f21 @@ -1579,7 +1588,7 @@ using @code{mexCallMATLAB}. An example of the use of @code{mexCallMATLAB} can be see in the example below -@examplefile{myfeval.c} +@longexamplefile{myfeval.c} If this code is in the file @file{myfeval.c}, and is compiled to @file{myfeval.mex}, then an example of its use is
--- a/doc/interpreter/install.txi +++ b/doc/interpreter/install.txi @@ -76,10 +76,7 @@ libraries in order to use dynamically linked functions. You may also want to build a shared version of @code{libstdc++}, if your -system doesn't already have one. Note that a patch is needed to build -shared versions of version 2.7.2 of @code{libstdc++} on the HP-PA -architecture. You can find the patch at -@url{ftp://ftp.cygnus.com/pub/g++/libg++-2.7.2-hppa-gcc-fix}. +system doesn't already have one. @item --enable-dl Use @code{dlopen} and friends to make Octave capable of dynamically @@ -306,7 +303,8 @@ or @example -warning: ANSI C++ prohibits conversion from `(int)' to `(...)' +warning: ANSI C++ prohibits conversion from `(int)' + to `(...)' @end example @noindent @@ -380,8 +378,10 @@ On NeXT systems, if you get errors like this: @example -/usr/tmp/cc007458.s:unknown:Undefined local symbol LBB7656 -/usr/tmp/cc007458.s:unknown:Undefined local symbol LBE7656 +/usr/tmp/cc007458.s:unknown:Undefined local + symbol LBB7656 +/usr/tmp/cc007458.s:unknown:Undefined local + symbol LBE7656 @end example @noindent
--- a/doc/interpreter/stats.txi +++ b/doc/interpreter/stats.txi @@ -146,6 +146,35 @@ Octave can perform several different statistical tests. The following table summarizes the available tests. +@iftex +@tex +\vskip 6pt +{\hbox to \hsize {\hfill\vbox{\offinterlineskip \tabskip=0pt +\halign{ +\vrule height2.0ex depth1.ex width 0.6pt #\tabskip=0.3em & +# \hfil & \vrule # & # \hfil & # \vrule width 0.6pt \tabskip=0pt\cr +\noalign{\hrule height 0.6pt} +& @strong{Hypothesis} && {\bf Test Functions} &\cr +\noalign{\hrule} +& Equal mean values && anova, hotelling\_test2, t\_test\_2, &\cr +& && welch\_test, wilcoxon\_test, z\_test\_2 &\cr +& Equal medians && kruskal\_wallis\_test, sign\_test &\cr +& Equal variances && bartlett\_test, manova, var\_test &\cr +& Equal distributions && chisquare\_test\_homogeneity, &\cr +& && kolmogorov\_smirnov\_test\_2, u\_test &\cr +& Equal marginal frequencies && mcnemar\_test &\cr +& Equal success probabilities && prop\_test\_2 &\cr +& Independent observations && chisquare\_test\_independence, &\cr +& && run\_test &\cr +& Uncorrelated observations && cor\_test &\cr +& Given mean value && hotelling\_test, t\_test, z\_test &\cr +& Observations from distribution && kolmogorov\_smirnov\_test &\cr +& Regression && f\_test\_regression, t\_test\_regression &\cr +\noalign{\hrule height 0.6pt} +}}\hfill}} +@end tex +@end iftex +@ifnottex @multitable @columnfractions .4 .5 @item @strong{Hypothesis} @tab @strong{Test Functions} @@ -174,6 +203,7 @@ @item Regression @tab @code{f_test_regression}, @code{t_test_regression} @end multitable +@end ifnottex The tests return a p-value that describes the outcome of the test. Assuming that the test hypothesis is true, the p-value is the probability @@ -246,7 +276,47 @@ The following table summarizes the supported distributions (in alphabetical order). -@multitable @columnfractions .4 .2 .2 .2 +@c Do the table explicitly in TeX if possible to get a better layout. +@iftex +@tex +\vskip 6pt +{\hbox to \hsize {\hfill\vbox{\offinterlineskip \tabskip=0pt +\halign{ +\vrule height2.0ex depth1.ex width 0.6pt #\tabskip=0.3em & +# \hfil & \vrule # & # \hfil & \vrule # & # \hfil & \vrule # & # \hfil & +# \vrule width 0.6pt \tabskip=0pt\cr +\noalign{\hrule height 0.6pt} +& {\bf Distribution} && {\bf PDF} && {\bf CDF} && {\bf Quantile}&\cr +\noalign{\hrule} +&Beta && betapdf && betacdf && betainv&\cr +&Binomial && binopdf && binocdf && binoinv&\cr +&Cauchy && cauchy\_pdf && cauchy\_cdf && cauchy\_inv&\cr +&Chi-Square && chi2pdf && chi2cdf && chi2inv&\cr +&Univariate Discrete && discrete\_pdf && discrete\_cdf && discrete\_inv&\cr +&Empirical && empirical\_pdf && empirical\_cdf && empirical\_inv&\cr +&Exponential && exppdf && expcdf && expinv&\cr +&F && fpdf && fcdf && finv&\cr +&Gamma && gampdf && gamcdf && gaminv&\cr +&Geometric && geopdf && geocdf && geoinv&\cr +&Hypergeometric && hygepdf && hygecdf && hygeinv&\cr +&Kolmogorov Smirnov && {\it Not Available} && kolmogorov\_&& {\it Not Available}&\cr +& && && smirnov\_cdf &&&\cr +&Laplace && laplace\_pdf && laplace\_cdf && laplace\_inv&\cr +&Logistic && logistic\_pdf && logistic\_cdf && logistic\_inv&\cr +&Log-Normal && lognpdf && logncdf && logninv&\cr +&Pascal && nbinpdf && nbincdf && nbininv&\cr +&Univariate Normal && normpdf && normcdf && norminv&\cr +&Poisson && poisspdf && poisscdf && poissinv&\cr +&t (Student) && tpdf && tcdf && tinv&\cr +&Univariate Discrete && unidpdf && unidcdf && unidinv&\cr +&Uniform && unifpdf && unifcdf && unifinv&\cr +&Weibull && wblpdf && wblcdf && wblinv&\cr +\noalign{\hrule height 0.6pt} +}}\hfill}} +@end tex +@end iftex +@ifnottex +@multitable @columnfractions .31 .23 .23 .23 @item @strong{Distribution} @tab @strong{PDF} @tab @strong{CDF} @@ -327,7 +397,7 @@ @tab @code{tpdf} @tab @code{tcdf} @tab @code{tinv} -@item Univariate Discrete Distribution +@item Univariate Discrete Distribution @tab @code{unidpdf} @tab @code{unidcdf} @tab @code{unidinv} @@ -340,6 +410,7 @@ @tab @code{wblcdf} @tab @code{wblinv} @end multitable +@end ifnottex @DOCSTRING(betacdf) @@ -480,6 +551,43 @@ The following table summarizes the available random number generators (in alphabetical order). +@iftex +@tex +\vskip 6pt +{\hbox to \hsize {\hfill\vbox{\offinterlineskip \tabskip=0pt +\halign{ +\vrule height2.0ex depth1.ex width 0.6pt #\tabskip=0.3em & +# \hfil & \vrule # & # \hfil & # \vrule width 0.6pt \tabskip=0pt\cr +\noalign{\hrule height 0.6pt} +& {\bf Distribution} && {\bf Function} &\cr +\noalign{\hrule} +& Beta Distribution && betarnd &\cr +& Binomial Distribution && binornd &\cr +& Cauchy Distribution && cauchy\_rnd &\cr +& Chi-Square Distribution && chi2rnd &\cr +& Univariate Discrete Distribution && discrete\_rnd &\cr +& Empirical Distribution && empirical\_rnd &\cr +& Exponential Distribution && exprnd &\cr +& F Distribution && frnd &\cr +& Gamma Distribution && gamrnd &\cr +& Geometric Distribution && geornd &\cr +& Hypergeometric Distribution && hygernd &\cr +& Laplace Distribution && laplace\_rnd &\cr +& Logistic Distribution && logistic\_rnd &\cr +& Log-Normal Distribution && lognrnd &\cr +& Pascal Distribution && nbinrnd &\cr +& Univariate Normal Distribution && normrnd &\cr +& Poisson Distribution && poissrnd &\cr +& t (Student) Distribution && trnd &\cr +& Univariate Discrete Distribution && unidrnd &\cr +& Uniform Distribution && unifrnd &\cr +& Weibull Distribution && wblrnd &\cr +& Wiener Process && wienrnd &\cr +\noalign{\hrule height 0.6pt} +}}\hfill}} +@end tex +@end iftex +@ifnottex @multitable @columnfractions .4 .3 @item @strong{Distribution} @tab @strong{Function} @item Beta Distribution @tab @code{betarnd} @@ -505,6 +613,7 @@ @item Weibull Distribution @tab @code{wblrnd} @item Wiener Process @tab @code{wienrnd} @end multitable +@end ifnottex @DOCSTRING(betarnd)
--- a/doc/interpreter/strings.txi +++ b/doc/interpreter/strings.txi @@ -237,9 +237,11 @@ all blank characters with underscores. @example -quote = "First things first, but not necessarily in that order"; +quote = ... + "First things first, but not necessarily in that order"; quote( quote == " " ) = "_" - @print{} quote = First_things_first,_but_not_necessarily_in_that_order +@result{} quote = + First_things_first,_but_not_necessarily_in_that_order @end example For more complex manipulations, such as searching, replacing, and
--- a/doc/interpreter/testfun.txi +++ b/doc/interpreter/testfun.txi @@ -47,7 +47,7 @@ @example @group %!test error ("this test fails!"); - %!test "this test doesn't fail since it doesn't generate an error"; + %!test "test doesn't fail. it doesn't generate an error"; @end group @end example
--- a/doc/interpreter/tips.txi +++ b/doc/interpreter/tips.txi @@ -183,8 +183,8 @@ ## Octave is free software; you can redistribute it and/or ## modify it under the terms of the GNU General Public ## License as published by the Free Software Foundation; -## either version 3 of the License, or (at your option) any later -## version. +## either version 3 of the License, or (at your option) any +## later version. ## ## Octave is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied @@ -382,12 +382,12 @@ @example @group -*- texinfo -*- -@@deftypefn@{Function File@} @{@@var@{return_value@} = @} function_name (@dots{}) +@@deftypefn@{Function File@} @{@@var@{ret@} = @} fn (@dots{}) @@cindex index term -Help text in Texinfo format. Code samples should be marked like -@@code@{sample of code@} and variables should be marked as -@@var@{variable@}. -@@seealso@{function2@} +Help text in Texinfo format. Code samples should be marked +like @@code@{sample of code@} and variables should be marked +as @@var@{variable@}. +@@seealso@{fn2@} @@end deftypefn @end group @end example @@ -491,8 +491,8 @@ @example @group -*- texinfo -*- -@@deftypefn@{Function File@} @{@@var@{a@} = @} function_name (@@var@{x@}, @dots{}) -@@deftypefnx@{Function File@} @{@@var@{a@} = @} function_name (@@var@{y@}, @dots{}) +@@deftypefn@{Function File@} @{@@var@{a@} = @} fn (@@var@{x@}, @dots{}) +@@deftypefnx@{Function File@} @{@@var@{a@} = @} fn (@@var@{y@}, @dots{}) Help text in Texinfo format. @@end deftypefn @end group @@ -506,11 +506,11 @@ @example @group -*- texinfo -*- -@@deftypefn @{Function File@} @{@@var@{c@} =@} nchoosek (@@var@{n@}, @@var@{k@}) +@@deftypefn @{Function File@} @{@} nchoosek (@@var@{n@}, @@var@{k@}) -Compute the binomial coefficient or all combinations of @@var@{n@}. -If @@var@{n@} is a scalar then, calculate the binomial coefficient -of @@var@{n@} and @@var@{k@}, defined as +Compute the binomial coefficient or all combinations of +@@var@{n@}. If @@var@{n@} is a scalar then, calculate the +binomial coefficient of @@var@{n@} and @@var@{k@}, defined as @@iftex @@tex @@ -532,10 +532,10 @@ @@end example @@end ifinfo -If @@var@{n@} is a vector, this generates all combinations of the elements -of @@var@{n@}, taken @@var@{k@} at a time, one row per combination. The -resulting @@var@{c@} has size @@code@{[nchoosek (length (@@var@{n@}), -@@var@{k@}), @@var@{k@}]@}. +If @@var@{n@} is a vector, this generates all combinations +of the elements of @@var@{n@}, taken @@var@{k@} at a time, +one row per combination. The resulting @@var@{c@} has size +@@code@{[nchoosek (length (@@var@{n@}),@@var@{k@}), @@var@{k@}]@}. @@seealso@{bincoeff@} @@end deftypefn @@ -552,19 +552,20 @@ @example @group -- Function File: C = nchoosek (N, K) - Compute the binomial coefficient or all combinations of N. If N - is a scalar then, calculate the binomial coefficient of N and K, - defined as + Compute the binomial coefficient or all combinations + of N. If N is a scalar then, calculate the binomial + coefficient of N and K, defined as / \ - | n | n (n-1) (n-2) ... (n-k+1) - | | = ------------------------- - | k | k! + | n | n (n-1) (n-2) ... (n-k+1) n! + | | = ------------------------- = --------- + | k | k! k! (n-k)! \ / - If N is a vector generate all combinations of the elements of N, - taken K at a time, one row per combination. The resulting C has - size `[nchoosek (length (N), K), K]'. + If N is a vector generate all combinations of the + elements of N, taken K at a time, one row per + combination. The resulting C has size `[nchoosek + (length (N), K), K]'. See also: bincoeff.
--- a/examples/addtwomatrices.cc +++ b/examples/addtwomatrices.cc @@ -1,22 +1,23 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */
--- a/examples/celldemo.cc +++ b/examples/celldemo.cc @@ -1,22 +1,23 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */
--- a/examples/firstmexdemo.c +++ b/examples/firstmexdemo.c @@ -1,29 +1,31 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ #include "mex.h" void -mexFunction (int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) +mexFunction (int nlhs, mxArray *plhs[], int nrhs, + const mxArray *prhs[]) { mxArray *v = mxCreateDoubleMatrix (1, 1, mxREAL); double *data = mxGetPr (v);
--- a/examples/fortdemo.cc +++ b/examples/fortdemo.cc @@ -1,22 +1,23 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ @@ -47,7 +48,7 @@ OCTAVE_LOCAL_BUFFER (char, ctmp, 128); F77_XFCN (fortsub, FORTSUB, (na, av, ctmp - F77_CHAR_ARG_LEN (128))); + F77_CHAR_ARG_LEN (128))); if (f77_exception_encountered) error ("fortdemo: error in fortran");
--- a/examples/fortsub.f +++ b/examples/fortsub.f @@ -2,19 +2,21 @@ c c This file is part of Octave. c -c Octave is free software; you can redistribute it and/or modify it -c under the terms of the GNU General Public License as published by the -c Free Software Foundation; either version 3 of the License, or (at your -c option) any later version. +c Octave is free software; you can redistribute it and/or +c modify it under the terms of the GNU General Public +c License as published by the Free Software Foundation; +c either version 3 of the License, or (at your option) any +c later version. c -c Octave is distributed in the hope that it will be useful, but WITHOUT -c ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -c FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -c for more details. +c Octave is distributed in the hope that it will be useful, +c but WITHOUT ANY WARRANTY; without even the implied +c warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +c PURPOSE. See the GNU General Public License for more +c details. c -c You should have received a copy of the GNU General Public License -c along with Octave; see the file COPYING. If not, see -c <http://www.gnu.org/licenses/>. +c You should have received a copy of the GNU General Public +c License along with Octave; see the file COPYING. If not, +c see <http://www.gnu.org/licenses/>. subroutine fortsub (n, a, s) implicit none @@ -29,8 +31,8 @@ endif enddo write (unit = s, fmt = '(a,i3,a,a)', iostat = ioerr) - $ 'There are ', n, ' values in the input vector', - $ char(0) + $ 'There are ', n, + $ ' values in the input vector', char(0) if (ioerr .ne. 0) then call xstopx ('fortsub: error writing string') endif
--- a/examples/funcdemo.cc +++ b/examples/funcdemo.cc @@ -1,22 +1,23 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ @@ -49,7 +50,8 @@ retval = feval (fcn, newargs, nargout); } else - error ("funcdemo: expected string, inline or function handle"); + error ("funcdemo: expected string,", + " inline or function handle"); } return retval; }
--- a/examples/globaldemo.cc +++ b/examples/globaldemo.cc @@ -1,22 +1,23 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */
--- a/examples/helloworld.cc +++ b/examples/helloworld.cc @@ -1,22 +1,23 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */
--- a/examples/mycell.c +++ b/examples/mycell.c @@ -1,29 +1,31 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ #include "mex.h" void -mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) +mexFunction (int nlhs, mxArray* plhs[], int nrhs, + const mxArray* prhs[]) { mwSize n; mwIndex i;
--- a/examples/myfeval.c +++ b/examples/myfeval.c @@ -4,39 +4,42 @@ This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ #include "mex.h" void -mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) +mexFunction (int nlhs, mxArray* plhs[], int nrhs, + const mxArray* prhs[]) { char *str; mexPrintf ("Hello, World!\n"); - mexPrintf ("I have %d inputs and %d outputs\n", nrhs, nlhs); + mexPrintf ("I have %d inputs and %d outputs\n", nrhs, + nlhs); if (nrhs < 1 || ! mxIsString (prhs[0])) mexErrMsgTxt ("function name expected"); str = mxArrayToString (prhs[0]); - mexPrintf ("I'm going to call the interpreter function %s\n", str); + mexPrintf ("I'm going to call the function %s\n", str); mexCallMATLAB (nlhs, plhs, nrhs-1, prhs+1, str);
--- a/examples/myfunc.c +++ b/examples/myfunc.c @@ -1,29 +1,31 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ #include "mex.h" void -mexFunction (int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) +mexFunction (int nlhs, mxArray *plhs[], int nrhs, + const mxArray *prhs[]) { const char *nm; nm = mexFunctionName ();
--- a/examples/mypow2.c +++ b/examples/mypow2.c @@ -1,29 +1,31 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ #include "mex.h" void -mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) +mexFunction (int nlhs, mxArray* plhs[], int nrhs, + const mxArray* prhs[]) { mwIndex i; mwSize n;
--- a/examples/mysparse.c +++ b/examples/mysparse.c @@ -4,26 +4,28 @@ This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ #include "mex.h" void -mexFunction (int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) +mexFunction (int nlhs, mxArray *plhs[], int nrhs, + const mxArray *prhs[]) { mwSize n, m, nz; mxArray *v; @@ -42,7 +44,8 @@ if (mxIsComplex (prhs[0])) { - mexPrintf ("Matrix is %d-by-%d complex sparse matrix", m, n); + mexPrintf ("Matrix is %d-by-%d complex", + " sparse matrix", m, n); mexPrintf (" with %d elements\n", nz); pr = mxGetPr (prhs[0]); @@ -52,8 +55,9 @@ i = n; while (jc[i] == jc[i-1] && i != 0) i--; - mexPrintf ("last non-zero element (%d, %d) = (%g, %g)\n", - ir[nz-1]+ 1, i, pr[nz-1], pi[nz-1]); + mexPrintf ("last non-zero element (%d, %d) =", + ir[nz-1]+ 1, i); + mexPrintf (" (%g, %g)\n", pr[nz-1], pi[nz-1]); v = mxCreateSparse (m, n, nz, mxCOMPLEX); pr2 = mxGetPr (v); @@ -76,7 +80,8 @@ else if (mxIsLogical (prhs[0])) { bool *pbr, *pbr2; - mexPrintf ("Matrix is %d-by-%d logical sparse matrix", m, n); + mexPrintf ("Matrix is %d-by-%d logical", + " sparse matrix", m, n); mexPrintf (" with %d elements\n", nz); pbr = mxGetLogicals (prhs[0]); @@ -85,8 +90,8 @@ i = n; while (jc[i] == jc[i-1] && i != 0) i--; - mexPrintf ("last non-zero element (%d, %d) = %d\n", ir[nz-1]+ 1, - i, pbr[nz-1]); + mexPrintf ("last non-zero element (%d, %d) = %d\n", + ir[nz-1]+ 1, i, pbr[nz-1]); v = mxCreateSparseLogicalMatrix (m, n, nz); pbr2 = mxGetLogicals (v); @@ -106,7 +111,8 @@ } else { - mexPrintf ("Matrix is %d-by-%d real sparse matrix", m, n); + mexPrintf ("Matrix is %d-by-%d real", + " sparse matrix", m, n); mexPrintf (" with %d elements\n", nz); pr = mxGetPr (prhs[0]); @@ -115,8 +121,8 @@ i = n; while (jc[i] == jc[i-1] && i != 0) i--; - mexPrintf ("last non-zero element (%d, %d) = %g\n", ir[nz-1]+ 1, - i, pr[nz-1]); + mexPrintf ("last non-zero element (%d, %d) = %g\n", + ir[nz-1]+ 1, i, pr[nz-1]); v = mxCreateSparse (m, n, nz, mxREAL); pr2 = mxGetPr (v);
--- a/examples/mystring.c +++ b/examples/mystring.c @@ -1,22 +1,23 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ @@ -24,7 +25,8 @@ #include "mex.h" void -mexFunction (int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) +mexFunction (int nlhs, mxArray *plhs[], int nrhs, + const mxArray *prhs[]) { mwIndex i, j; mwSize m, n; @@ -37,7 +39,8 @@ m = mxGetM (prhs[0]); n = mxGetN (prhs[0]); pi = mxGetChars (prhs[0]); - plhs[0] = mxCreateNumericMatrix (m, n, mxCHAR_CLASS, mxREAL); + plhs[0] = mxCreateNumericMatrix (m, n, mxCHAR_CLASS, + mxREAL); po = mxGetChars (plhs[0]); for (j = 0; j < n; j++)
--- a/examples/mystruct.c +++ b/examples/mystruct.c @@ -4,26 +4,28 @@ This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ #include "mex.h" void -mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) +mexFunction (int nlhs, mxArray* plhs[], int nrhs, + const mxArray* prhs[]) { int i; mwIndex j;
--- a/examples/paramdemo.cc +++ b/examples/paramdemo.cc @@ -1,28 +1,30 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ #include <octave/oct.h> -DEFUN_DLD (paramdemo, args, nargout, "Parameter Check Demo.") +DEFUN_DLD (paramdemo, args, nargout, + "Parameter Check Demo.") { int nargin = args.length (); octave_value retval; @@ -42,11 +44,14 @@ if (m.any_element_is_inf_or_nan()) octave_stdout << " includes Inf or NaN values\n"; if (m.any_element_not_one_or_zero()) - octave_stdout << " includes other values than 1 and 0\n"; + octave_stdout << + " includes other values than 1 and 0\n"; if (m.all_elements_are_int_or_inf_or_nan()) - octave_stdout << " includes only int, Inf or NaN values\n"; + octave_stdout << + " includes only int, Inf or NaN values\n"; if (m.all_integers (min_val, max_val)) - octave_stdout << " includes only integers in [-10,10]\n"; + octave_stdout << + " includes only integers in [-10,10]\n"; } return retval; }
--- a/examples/stringdemo.cc +++ b/examples/stringdemo.cc @@ -1,22 +1,23 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ @@ -44,7 +45,8 @@ for (octave_idx_type i = 0; i < nr / 2; i++) { std::string tmp = ch.row_as_string (i); - ch.insert (ch.row_as_string(nr-i-1).c_str(), i, 0); + ch.insert (ch.row_as_string(nr-i-1).c_str(), + i, 0); ch.insert (tmp.c_str(), nr-i-1, 0); } retval(0) = octave_value (ch, true);
--- a/examples/structdemo.cc +++ b/examples/structdemo.cc @@ -1,22 +1,23 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ @@ -39,7 +40,8 @@ { // The following two lines might be written as // octave_value tmp; - // for (Octave_map::iterator p0 = arg0.begin() ; + // for (Octave_map::iterator p0 = + // arg0.begin(); // p0 != arg0.end(); p0++ ) // if (arg0.key (p0) == arg1) // {
--- a/examples/unwinddemo.cc +++ b/examples/unwinddemo.cc @@ -1,22 +1,23 @@ /* -Copyright (C) 2007 John W. Eaton +Copyright (C) 2006, 2007 John W. Eaton This file is part of Octave. -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. +Octave is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either +version 3 of the License, or (at your option) any later +version. -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. +Octave is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, see -<http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public +License along with Octave; see the file COPYING. If not, +see <http://www.gnu.org/licenses/>. */ @@ -43,7 +44,8 @@ if (! error_state) { unwind_protect::begin_frame ("Funwinddemo"); - unwind_protect_ptr (current_liboctave_warning_handler); + unwind_protect_ptr + (current_liboctave_warning_handler); set_liboctave_warning_handler(err_hand); retval = octave_value (quotient (a, b)); unwind_protect::run_frame ("Funwinddemo");
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +2007-10-30 David Bateman <dbateman@free.fr> + + * DASRT-opts.in, LSODE-opts.in: Doc fixes for small book format. + 2007-10-30 John W. Eaton <jwe@octave.org> * CMatrix.cc (lssolve): Compute size of rwork and iwork arrays.
--- a/liboctave/DASRT-opts.in +++ b/liboctave/DASRT-opts.in @@ -55,7 +55,8 @@ The local error test applied at each integration step is @example - abs (local error in x(i)) <= rtol(i) * abs (Y(i)) + atol(i) + abs (local error in x(i)) <= ... + rtol(i) * abs (Y(i)) + atol(i) @end example END_DOC_ITEM TYPE = "Array<double>"
--- a/liboctave/LSODE-opts.in +++ b/liboctave/LSODE-opts.in @@ -54,7 +54,8 @@ The local error test applied at each integration step is @example - abs (local error in x(i)) <= rtol * abs (y(i)) + atol(i) + abs (local error in x(i)) <= ... + rtol * abs (y(i)) + atol(i) @end example END_DOC_ITEM TYPE = "double"
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,5 +1,7 @@ 2007-10-30 David Bateman <dbateman@free.fr> + * control/base/DEMOcontrol.m: Doc fixes for small book format. + * plot/__go_draw_axes__.m (do_linestyle_command): Use point type 0 for ".".
--- a/scripts/control/base/DEMOcontrol.m +++ b/scripts/control/base/DEMOcontrol.m @@ -24,7 +24,6 @@ ## @example ## @group ## octave:1> DEMOcontrol -## O C T A V E C O N T R O L S Y S T E M S T O O L B O X ## Octave Controls System Toolbox Demo ## ## [ 1] System representation @@ -47,8 +46,6 @@ function DEMOcontrol () - puts ("O C T A V E C O N T R O L S Y S T E M S T O O L B O X"); - while (1) clc ();
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-10-30 David Bateman <dbateman@free.fr> + + * symtab.cc: Doc fixes for small book format. + 2007-10-30 John W. Eaton <jwe@octave.org> * file-io.cc (fopen_mode_to_ios_mode): Handle 'W' as 'w' and 'R'
--- a/src/symtab.cc +++ b/src/symtab.cc @@ -1967,7 +1967,11 @@ @end table\n\ \n\ A command is composed like this:\n\ -%[modifier]<command>[:size_of_parameter[:center-specific[:print_dims[:balance]]]];\n\ +\n\ +@example\n\ +%[modifier]<command>[:size_of_parameter[:center-specific[\n\ + :print_dims[:balance]]]];\n\ +@end example\n\ \n\ Command and modifier is already explained. Size_of_parameter\n\ tells how many columns the parameter will need for printing.\n\