Mercurial > hg > octave-shane
changeset 6444:af8e28709a2c
[project @ 2007-03-23 16:42:50 by jwe]
author | jwe |
---|---|
date | Fri, 23 Mar 2007 16:44:12 +0000 |
parents | 9dc77e3c9313 |
children | 407c08a8e5b7 |
files | octMakefile.in scripts/ChangeLog scripts/plot/__pltopt1__.m |
diffstat | 3 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/octMakefile.in +++ b/octMakefile.in @@ -56,6 +56,7 @@ SHELL_SCRIPTS = octave-bug octave-config mkoctfile run-octave all: $(SHELL_SCRIPTS) $(filter-out libcruft liboctave, $(SUBDIRS)) dist-info-files + @echo "" @echo "Octave successfully built. Now choose from the following:" @echo "" @echo " ./run-octave - to run in place"
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,6 +1,7 @@ 2007-03-23 John W. Eaton <jwe@octave.org> * plot/__pltopt1__.m: Handle "@" marker same as "+". + Handle numeric color specs. * plot/plot.m: Remove "-@" and "@" from docstring. * plot/orient.m: Fix tests to avoid creating a plot window.
--- a/scripts/plot/__pltopt1__.m +++ b/scripts/plot/__pltopt1__.m @@ -65,21 +65,22 @@ topt = "+"; endif options.marker = topt; - elseif (topt == "k") +### Numeric color specs for backward compatibility. Leave undocumented. + elseif (topt == "k" || topt == "0") options.color = [0, 0, 0]; - elseif (topt == "r") + elseif (topt == "r" || topt == "1") options.color = [1, 0, 0]; - elseif (topt == "g") + elseif (topt == "g" || topt == "2") options.color = [0, 1, 0]; - elseif (topt == "b") + elseif (topt == "b" || topt == "3") options.color = [0, 0, 1]; elseif (topt == "y") options.color = [1, 1, 0]; - elseif (topt == "m") + elseif (topt == "m" || topt == "4") options.color = [1, 0, 1]; - elseif (topt == "c") + elseif (topt == "c" || topt == "5") options.color = [0, 1, 1]; - elseif (topt == "w") + elseif (topt == "w" || topt == "6") options.color = [1, 1, 1]; elseif (isspace (topt)) ## Do nothing.