# HG changeset patch # User John W. Eaton # Date 1389036695 18000 # Node ID 03226f21807734e590ebefda3134a3a3be426fda # Parent 615fdd2238c1837c23b52684054cb64f0c3a5672# Parent 6fd22474783ee66535202ad97e4894a894c3b73f maint: Periodic merge of stable to gui-release. diff -r 615fdd2238c1 -r 03226f218077 doc/interpreter/Makefile.am --- a/doc/interpreter/Makefile.am Mon Jan 06 12:02:04 2014 -0500 +++ b/doc/interpreter/Makefile.am Mon Jan 06 14:31:35 2014 -0500 @@ -32,6 +32,7 @@ dist_man_MANS = \ mkoctfile.1 \ + octave-cli.1 \ octave-config.1 \ octave.1 diff -r 615fdd2238c1 -r 03226f218077 doc/interpreter/contributors.in --- a/doc/interpreter/contributors.in Mon Jan 06 12:02:04 2014 -0500 +++ b/doc/interpreter/contributors.in Mon Jan 06 14:31:35 2014 -0500 @@ -133,7 +133,7 @@ Mumit Khan Paul Kienzle Aaron A. King -Erik Kjelsson +Erik Kjellson Arno J. Klaassen Alexander Klein Geoffrey Knauth diff -r 615fdd2238c1 -r 03226f218077 doc/interpreter/errors.txi --- a/doc/interpreter/errors.txi Mon Jan 06 12:02:04 2014 -0500 +++ b/doc/interpreter/errors.txi Mon Jan 06 14:31:35 2014 -0500 @@ -176,6 +176,22 @@ @end group @end example +@noindent +Alternatively, the output of the @code{lasterror} function can be found +in a variable indicated immediately after the @code{catch} keyword, as +in the example below showing how to redirect an error as a warning: + +@example +@group +try + @dots{} +catch err + warning(err.identifier, err.message); + @dots{} +end_try_catch +@end group +@end example + @DOCSTRING(lasterror) @DOCSTRING(lasterr) diff -r 615fdd2238c1 -r 03226f218077 doc/interpreter/mkoctfile.1 --- a/doc/interpreter/mkoctfile.1 Mon Jan 06 12:02:04 2014 -0500 +++ b/doc/interpreter/mkoctfile.1 Mon Jan 06 14:31:35 2014 -0500 @@ -28,7 +28,7 @@ .fi .. .\" -------------------------------------------------------------------- -.TH MKOCTFILE 1 "4 February 2011" "GNU Octave" +.TH MKOCTFILE 1 "3 January 2014" "GNU Octave" .SH NAME mkoctfile \- Compile dynamic-load modules for GNU Octave .SH SYNOPSIS @@ -140,11 +140,11 @@ .a library file .Ve .RE -.SH "SEE ALSO" -octave (1). .SH AUTHOR John W. Eaton This manual page was contributed by Dirk Eddelbuettel for the Debian GNU/Linux distribution but may be used by others. +.SH "SEE ALSO" +octave (1). diff -r 615fdd2238c1 -r 03226f218077 doc/interpreter/octave-cli.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/interpreter/octave-cli.1 Mon Jan 06 14:31:35 2014 -0500 @@ -0,0 +1,86 @@ +.\" Copyright (C) 1996-2014 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 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 +.\" . +.\" -------------------------------------------------------------------- +.de Vb \" (V)erbatim (b)egin. Use fixed width font and no justification +.ft CW +.nf +.. +.de Ve \" (V)erbatim (e)nd. Return to regular font and justification +.ft R +.fi +.. +.\" -------------------------------------------------------------------- +.TH OCTAVE-CLI 1 "03 January 2014" "GNU Octave" +.SH NAME +octave-cli \- A high-level interactive language for numerical computations. +.SH SYNOPSIS +\fBoctave-cli\fP [\fIoptions\fP]... [\fIfile\fP] +.SH DESCRIPTION +Octave is a high-level language, primarily intended for numerical +computations. It provides a convenient command line interface for +solving linear and nonlinear problems numerically. \fBoctave-cli\fP +has been compiled without any GUI support (Qt) which makes it smaller +than the default \fBoctave\fP executable, but also limits it to +providing just the command line interface (CLI). +.SH OPTIONS +The complete set of command-line options for \fBoctave-cli\fP is available +by running the following command from the shell. +.Vb + + octave-cli \-\-help +.Ve +.SH DOCUMENTATION +The primary documentation for Octave is written using Texinfo, the GNU +documentation system, which allows the same source files to be used to +produce online and printed versions of the manual. +.PP +You can read the online copy of the Octave documentation by issuing +the following command from within Octave. +.Vb + + octave:1> doc + +.Ve +The Info files may also be read with a stand-alone program such as +\fBinfo\fP or \fBxinfo\fP. HTML, Postscript, or PDF versions of the +documentation are installed on many systems as well. +.SH BUGS +The Octave project maintains a bug tracker at http://bugs.octave.org. +Before submitting a new item please read the instructions at +http://www.octave.org/bugs.html on how to submit a useful report. +.SH FILES +Upon startup Octave looks for four initialization files. Each file +may contain any number of valid Octave commands. +.TP +\fIoctave-home\fP/share/octave/site/m/startup/octaverc +Site-wide initialization file which changes options for all users. +\fIoctave-home\fP is the directory where Octave was installed such as +\fB/usr/local\fP. +.TP +\fIoctave-home\fP/share/octave/\fIversion\fP/m/startup/octaverc +Site-wide initialization file for Octave version \fIversion\fP. +.TP +~/.octaverc +User's personal initialization file. +.TP +\&\.octaverc +Project-specific initialization file located in the current directory. +.SH AUTHOR +John W. Eaton +.SH SEE ALSO +octave (1) diff -r 615fdd2238c1 -r 03226f218077 doc/interpreter/octave-config.1 --- a/doc/interpreter/octave-config.1 Mon Jan 06 12:02:04 2014 -0500 +++ b/doc/interpreter/octave-config.1 Mon Jan 06 14:31:35 2014 -0500 @@ -28,7 +28,7 @@ .fi .. .\" -------------------------------------------------------------------- -.TH OCTAVE-CONFIG 1 "4 February 2011" "GNU Octave" +.TH OCTAVE-CONFIG 1 "3 January 2014" "GNU Octave" .SH NAME octave-config - GNU Octave component and library information retrieval .SH SYNOPSIS @@ -81,3 +81,5 @@ This manual page was contributed by Dirk Eddelbuettel for the Debian GNU/Linux distribution but may be used by others. +.SH "SEE ALSO" +octave (1). diff -r 615fdd2238c1 -r 03226f218077 doc/interpreter/stmt.txi --- a/doc/interpreter/stmt.txi Mon Jan 06 12:02:04 2014 -0500 +++ b/doc/interpreter/stmt.txi Mon Jan 06 14:31:35 2014 -0500 @@ -815,16 +815,17 @@ point of the error and the statement to restore the value would not be executed. +In addition to unwind_protect, Octave supports another form of +exception handling, the @code{try} block. + + @node The try Statement @section The try Statement @cindex @code{try} statement @cindex @code{catch} @cindex @code{end_try_catch} -In addition to unwind_protect, Octave supports another limited form of -exception handling. - -The general form of a @code{try} block looks like this: +The original form of a @code{try} block looks like this: @example @group @@ -841,14 +842,27 @@ Octave expressions or commands. The statements in @var{cleanup} are only executed if an error occurs in @var{body}. -No warnings or error messages are printed while @var{body} is -executing. If an error does occur during the execution of @var{body}, -@var{cleanup} can use the function @code{lasterr} to access the text -of the message that would have been printed. This is the same -as @code{eval (@var{try}, @var{catch})} but it is more efficient since -the commands do not need to be parsed each time the @var{try} and -@var{catch} statements are evaluated. @xref{Errors and Warnings}, for more -information about the @code{lasterr} function. +No warnings or error messages are printed while @var{body} is executing. +If an error does occur during the execution of @var{body}, @var{cleanup} +can use the functions @code{lasterr} or @code{lasterror} to access the +text of the message that would have been printed, as well as its +identifier. The alternative form, + +@example +@group +try + @var{body} +catch @var{err} + @var{cleanup} +end_try_catch +@end group +@end example + +@noindent +will automatically store the output of @code{lasterror} in the structure +@var{err}. @xref{Errors and Warnings} for more information about the +@code{lasterr} and @code{lasterror} functions. + @node Continuation Lines @section Continuation Lines diff -r 615fdd2238c1 -r 03226f218077 scripts/pkg/private/fix_depends.m --- a/scripts/pkg/private/fix_depends.m Mon Jan 06 12:02:04 2014 -0500 +++ b/scripts/pkg/private/fix_depends.m Mon Jan 06 14:31:35 2014 -0500 @@ -29,7 +29,7 @@ deps = strtrim (ostrsplit (tolower (depends), ",")); deps_cell = cell (1, length (deps)); dep_pat = ... - '\s*(?\w+)+\s*(\(\s*(?[<>=]+)\s*(?\d+\.\d+(\.\d+)*)\s*\))*\s*'; + '\s*(?[-\w]+)\s*(\(\s*(?[<>=]+)\s*(?\d+\.\d+(\.\d+)*)\s*\))*\s*'; ## For each dependency. for i = 1:length (deps)