Mercurial > hg > octave-nkf
changeset 6548:ecc8d30fa288
[project @ 2007-04-20 05:31:41 by jwe]
author | jwe |
---|---|
date | Fri, 20 Apr 2007 05:31:41 +0000 |
parents | 4fb053f24fd6 |
children | 5a5a09d7deb8 |
files | doc/refcard/refcard.tex emacs/octave-mod.el run-octave.in src/ChangeLog src/DLD-FUNCTIONS/__gnuplot_raw__.l |
diffstat | 5 files changed, 20 insertions(+), 82 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/refcard/refcard.tex +++ b/doc/refcard/refcard.tex @@ -555,7 +555,7 @@ they are also declared global within the function.}\span\cr \endsec -\sec Selected Built-in Variables; +\sec Selected Built-in Functions; EDITOR&editor to use with {\tt edit\_history}\cr Inf, NaN&IEEE infinity, NaN\cr PAGER&program to use to paginate output\cr @@ -565,37 +565,6 @@ realmax&maximum representable value\cr realmin&minimum representable value\cr \endsec -\vskip -\secskip -\vskip -2\lskip -\altsec \null; -automatic\_replot&automatically redraw plots\cr -do\_fortran\_indexing&Fortran-style indexing of matrices\cr -implicit\_str\_to\_num\_ok&allow strings to become numbers\cr -output\_max\_field\_width&maximum numeric field width\cr -output\_precision&min significant figures displayed\cr -page\_screen\_output&control whether output is paged\cr -prefer\_column\_vectors&create column vectors by default\cr -resize\_on\_range\_error&automatic resizing of matrices\cr -save\_precision&digits stored by {\tt save} command\cr -silent\_functions&suppress output from functions\cr -warn\_divide\_by\_zero&suppress divide by zero errors\cr -\endsec -\vskip -\secskip -\vskip -2\lskip -\widesec \null; -commas\_in\_literal\_matrix\vskip\lskip\cr -\omit\hfill\vbox{\hsize=\idnwid\rm - control handling of spaces in matrices\vskip3\lskip}\cr -ignore\_function\_time\_stamp\cr -\omit\hfill\vbox{\hsize=\idnwid\rm - ignore changes in function files during session\vskip3\lskip}\cr -ok\_to\_lose\_imaginary\_part\cr -\omit\hfill\vbox{\hsize=\idnwid\rm - allow complex to real conversion\vskip3\lskip}\cr -prefer\_zero\_one\_indexing\cr -\omit\hfill\vbox{\hsize=\idnwid\rm - if ambiguous, prefer 0-1 style indexing\vskip3\lskip}\cr -\endsec \vfill\eject @@ -880,36 +849,10 @@ \vfill\eject -\sec Basic Plotting; -\omit \vbox{\tt -gplot \opt{{\it ranges}} {\it expr} \opt{{\it using}} - \opt{{\it title}} \opt{{\it style}}\hfill{\rm 2D plotting} - \par\vskip \lskip}\span\cr -\omit \vbox{\tt -gsplot \opt{{\it ranges}} {\it expr} \opt{{\it using}} - \opt{{\it title}} \opt{{\it style}}\hfill{\rm 3D plotting} - \par\vskip \lskip}\span\cr -\quad{\it ranges}&specify data ranges\cr -\quad{\it expr}&expression to plot\cr -\quad{\it using}&specify columns to plot\cr -\quad{\it title}&specify line title for legend\cr -\quad{\it style}&specify line style\cr -\omit \vbox{\rm\vskip0.85ex - If {\it ranges\/} are supplied, they must come before the expression - to plot. The {\it using\/}, {\it title\/}, and {\it style\/} - options may appear in any order after {\it expr\/}. Multiple - expressions may be plotted with a single command by separating them - with commas.\vskip1ex}\span\cr -set {\it options}&set plotting options\cr -show {\it options}&show plotting options\cr -replot&redisplay current plot\cr -closeplot&close stream to {\tt gnuplot} process\cr -purge\_tmp\_files&clean up temporary plotting files\cr -automatic\_replot&built-in variable\cr -\endsec - -\sec Other Plotting Functions; +\sec Plotting Functions; plot ({\it args})&2D plot with linear axes\cr +plot3 ({\it args})&3D plot with linear axes\cr +line ({\it args})&2D or 3D line\cr semilogx ({\it args})&2D plot with logarithmic x-axis\cr semilogy ({\it args})&2D plot with logarithmic y-axis\cr loglog ({\it args})&2D plot with logarithmic axes\cr @@ -920,6 +863,8 @@ axis ({\it limits})&set axis ranges\cr xlabel ({\it string})&set x-axis label\cr ylabel ({\it string})&set y-axis label\cr +zlabel ({\it string})&set z-axis label\cr +legend ({\it string})&set label in plot key\cr grid \opt{on$|$off}&set grid state\cr hold \opt{on$|$off}&set hold state\cr ishold&return 1 if hold is on, 0 otherwise\cr\cr @@ -932,8 +877,8 @@ \par\vskip10pt {\smrm\parskip=6pt Edition \refcardedition for Octave Version \octaveversion. Copyright -1996, John W. Eaton -(jwe@che.utexas.edu). The author assumes no responsibility for any +1996, 2007, John W. Eaton +(jwe@bevo.che.wisc.edu). The author assumes no responsibility for any errors on this card. This card may be freely distributed under the terms of the GNU
--- a/emacs/octave-mod.el +++ b/emacs/octave-mod.el @@ -78,11 +78,8 @@ (define-abbrev octave-abbrev-table "`f" "for" nil) (define-abbrev octave-abbrev-table "`fu" "function" nil) (define-abbrev octave-abbrev-table "`gl" "global" nil) - (define-abbrev octave-abbrev-table "`gp" "gplot" nil) - (define-abbrev octave-abbrev-table "`gs" "gsplot" nil) (define-abbrev octave-abbrev-table "`if" "if ()" nil) (define-abbrev octave-abbrev-table "`o" "otherwise" nil) - (define-abbrev octave-abbrev-table "`rp" "replot" nil) (define-abbrev octave-abbrev-table "`r" "return" nil) (define-abbrev octave-abbrev-table "`s" "switch" nil) (define-abbrev octave-abbrev-table "`t" "try" nil) @@ -115,14 +112,13 @@ (append octave-begin-keywords octave-else-keywords octave-end-keywords - '("all_va_args" "break" "continue" "end" "global" "gplot" "gsplot" - "replot" "return")) + '("all_va_args" "break" "continue" "end" "global" "return")) "Reserved words in Octave.") (defvar octave-text-functions '("casesen" "cd" "chdir" "clear" "diary" "dir" "document" "echo" - "edit_history" "format" "graw" "gset" "gshow" "help" "history" "hold" - "load" "ls" "more" "run_history" "save" "set" "show" "type" + "edit_history" "format" "help" "history" "hold" + "load" "ls" "more" "run_history" "save" "type" "which" "who" "whos") "Text functions in Octave (these names are also reserved).") @@ -141,7 +137,7 @@ "__i__" "__inf__" "__j__" "__nan__" "__pi__" "__program_invocation_name__" "__program_name__" "__realmax__" "__realmin__" "__stderr__" "__stdin__" "__stdout__" "ans" "argv" - "automatic_replot" "beep_on_error" "completion_append_char" + "beep_on_error" "completion_append_char" "crash_dumps_octave_core" "default_save_format" "e" "echo_executing_commands" "eps" "error_text" "gnuplot_binary" "history_file" @@ -154,15 +150,7 @@ "saving_history" "sighup_dumps_octave_core" "sigterm_dumps_octave_core" "silent_functions" "split_long_rows" "stderr" "stdin" "stdout" "string_fill_char" "struct_levels_to_print" - "suppress_verbose_help_message" "warn_assign_as_truth_value" - "warn_divide_by_zero" "warn_empty_list_elements" - "warn_fortran_indexing" "warn_function_name_clash" - "warn_future_time_stamp" "warn_imag_to_real" - "warn_matlab_incompatible" "warn_missing_semicolon" - "warn_neg_dim_as_zero" "warn_num_to_str" "warn_precedence_change" - "warn_reload_forces_clear" "warn_separator_insert" - "warn_single_quote_string" "warn_str_to_num" - "warn_undefined_return_values" "warn_variable_switch_label") + "suppress_verbose_help_message") "Builtin variables in Octave.") (defvar octave-function-header-regexp
--- a/run-octave.in +++ b/run-octave.in @@ -31,7 +31,7 @@ IMAGEPATH="$top_srcdir/scripts/image" INFOFILE="$builddir/doc/interperter/octave.info" -args="--no-initial-path --path=\"$LOADPATH\" --image-path=\"$IMAGEPATH\" --info=file=\"$INFOFILE\"" +args="--no-initial-path --path=\"$LOADPATH\" --image-path=\"$IMAGEPATH\" --info-file=\"$INFOFILE\"" if [ $# -gt 0 ]; then if [ "x$1" = "x-g" ]; then
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-04-20 John W. Eaton <jwe@octave.org> + + * DLD-FUNCTIONS/__gnuplot_raw__.l (gnuplot::makeplot): Check + whether caller is "splot", not "gsplot". + 2007-04-19 John W. Eaton <jwe@octave.org> * lex.l (is_keyword_token): Delete all_va_args_kw switch case.
--- a/src/DLD-FUNCTIONS/__gnuplot_raw__.l +++ b/src/DLD-FUNCTIONS/__gnuplot_raw__.l @@ -1342,7 +1342,7 @@ std::string yrange_end_str = read_until (endbracketp, tok); outstr += printrange (yrange_start_str, yrange_end_str) + " "; tok = gptlex (); - if (tok == START_BRACKET && caller == "gsplot") + if (tok == START_BRACKET && caller == "splot") { std::string zrange_start_str = read_until (colonp, tok); std::string zrange_end_str = read_until (endbracketp, tok);