Mercurial > octave-nkf
changeset 6099:2b065bbbd1c2
[project @ 2006-10-26 15:56:30 by jwe]
| author | jwe |
|---|---|
| date | Thu, 26 Oct 2006 15:56:30 +0000 |
| parents | 70158d7ab8ef |
| children | 8137e2bbd1dd |
| files | src/ChangeLog src/help.cc src/ov-bool.h |
| diffstat | 3 files changed, 23 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Oct 26 14:51:37 2006 +0000 +++ b/src/ChangeLog Thu Oct 26 15:56:30 2006 +0000 @@ -1,3 +1,13 @@ +2006-10-26 Michael Goffioul <michael.goffioul@swing.be> + + * help.cc (display_help_text): Quote sed patterns with ". + +2006-10-26 John W. Eaton <jwe@octave.org> + + * ov-bool.h (octave_bool::sparse_matrix_value, + octave_bool::sparse_complex_matrix_value + octave_bool::sparse_bool_matrix_value): New functions. + 2006-10-25 John W. Eaton <jwe@octave.org> * sighandlers.cc: Check defined (RETSIGTYPE_IS_VOID) instead of
--- a/src/help.cc Thu Oct 26 14:51:37 2006 +0000 +++ b/src/help.cc Thu Oct 26 15:56:30 2006 +0000 @@ -779,7 +779,9 @@ std::ostringstream buf; - buf << "sed -e 's/^[#%][#%]* *//' -e 's/^ *@/@/' | " + // Use double quotes to quote the sed patterns for Windows. + + buf << "sed -e \"s/^[#%][#%]* *//\" -e \"s/^ *@/@/\" | " << "\"" << Vmakeinfo_program << "\"" << " -D \"VERSION " << OCTAVE_VERSION << "\"" << " -D \"OCTAVEHOME " << OCTAVE_PREFIX << "\""
--- a/src/ov-bool.h Thu Oct 26 14:51:37 2006 +0000 +++ b/src/ov-bool.h Thu Oct 26 15:56:30 2006 +0000 @@ -136,6 +136,16 @@ ComplexNDArray complex_array_value (bool = false) const { return ComplexNDArray (dim_vector (1, 1), Complex (scalar)); } + SparseMatrix sparse_matrix_value (bool = false) const + { return SparseMatrix (Matrix (1, 1, scalar)); } + + // XXX FIXME XXX Need SparseComplexMatrix (Matrix) constructor!!! + SparseComplexMatrix sparse_complex_matrix_value (bool = false) const + { return SparseComplexMatrix (sparse_matrix_value ()); } + + SparseBoolMatrix sparse_bool_matrix_value (bool = false) const + { return SparseBoolMatrix (boolMatrix (1, 1, scalar)); } + charNDArray char_array_value (bool = false) const {