# HG changeset patch # User jwe # Date 1170326054 0 # Node ID 0078497b3b0b6dcc79d2600ec61014076324895a # Parent e5c3839f940387cc333253ecdd8f00588a315ee0 [project @ 2007-02-01 10:34:14 by jwe] diff --git a/scripts/plot/__pltopt__.m b/scripts/plot/__pltopt__.m --- a/scripts/plot/__pltopt__.m +++ b/scripts/plot/__pltopt__.m @@ -21,67 +21,61 @@ ## @deftypefn {Function File} {} __pltopt__ (@var{caller}, @var{opt}) ## Decode plot option strings. ## -## If @var{opt} is a valid option string, return a string of the form -## @code{"w l 2"} ("with lines 2"). Uses abbreviations for the options -## to avoid overrunning gnuplot's command line buffer unnecessarily. -## ## @var{opt} can currently be some combination of the following: ## ## @table @code ## @item "-" -## For lines plot style (default). -## -## @item "." -## For dots plot style. +## For solid linestyle (default). ## -## @item "@@" -## For points plot style. +## @item "--" +## For dashed line style. ## -## @item "-@@" +## @item "-." ## For linespoints plot style. ## -## @item "^" -## For impulses plot style. +## @item ":" +## For dots plot style. ## -## @item "L" -## For steps plot style. +## @item "r" +## Red line color. ## -## @item "#" -## For boxes plot style. +## @item "g" +## Green line color. ## -## @item "~" -## For yerrorbars plot style. -## -## @item ">" -## For xerrorbars plot style. +## @item "b" +## Blue line color. ## -## @item "~>" -## For xyerrorbars plot style. +## @item "c" +## Cyan line color. ## -## @item "#~" -## For boxerrorbars plot style. -## -## @item "#~>" -## For boxxyerrorbars plot style. +## @item "m" +## Magenta line color. ## -## @item "n" -## With @code{n} in 1-6 (wraps at 8), plot color +## @item "y" +## Yellow line color. ## -## @item "nm" -## With @code{m} in 1-6 (wraps at 6), point style (only valid for @code{"@@"} or -## @code{"-@@"}) +## @item "k" +## Black line color. ## -## @item @var{c} -## Where @var{c} is one of @code{"r"}, @code{"g"}, @code{"b"}, @code{"m"}, -## @code{"c"}, or @code{"w"} colors. +## @item "w" +## White line color. ## ## @item ";title;" ## Here @code{"title"} is the label for the key. ## -## @item + -## @itemx * -## @itemx o -## @itemx x +## @item "+" +## @itemx "o" +## @itemx "*" +## @itemx "." +## @itemx "x" +## @itemx "s" +## @itemx "d" +## @itemx "^" +## @itemx "v" +## @itemx ">" +## @itemx "<" +## @itemx "p" +## @itemx "h" ## Used in combination with the points or linespoints styles, set the point ## style. ## @end table @@ -89,20 +83,6 @@ ## The legend may be fixed to include the name of the variable ## plotted in some future version of Octave. ## -## The colors, line styles, and point styles have the following -## meanings for X11 and Postscript terminals under Gnuplot 3.6. -## -## @example -## Number ------ Color ------- Line Style ---- Points Style ---- -## x11 postscript postscript x11 postscript -## ===================================================================== -## 1 red green solid "o" "+" -## 2 green blue long dash "+" "x" -## 3 blue red short dash square "*" -## 4 magenta magenta dotted "x" open square -## 5 cyan cyan dot long dash triangle filled square -## 6 brown yellow dot short dash "*" "o" -## @end example ## @seealso{__pltopt1__} ## @end deftypefn diff --git a/scripts/plot/plot3.m b/scripts/plot/plot3.m --- a/scripts/plot/plot3.m +++ b/scripts/plot/plot3.m @@ -56,78 +56,8 @@ ## To save a plot, in one of several image formats such as PostScript ## or PNG, use the @code{print} command. ## -## An optional format argument can be given as -## -## @example -## plot3 (@var{x}, @var{y}, @var{z}, @var{fmt}) -## @end example -## -## If the @var{fmt} argument is supplied, it is interpreted as -## follows. If @var{fmt} is missing, the default gnuplot line style -## is assumed. -## -## @table @samp -## @item - -## Set lines plot style (default). -## -## @item . -## Set dots plot style. -## -## @item @@ -## Set points plot style. -## -## @item -@@ -## Set linespoints plot style. -## -## @item ^ -## Set impulses plot style. -## -## @item L -## Set steps plot style. -## -## @item @var{n} -## Interpreted as the plot color if @var{n} is an integer in the range 1 to -## 6. -## -## @item @var{nm} -## If @var{nm} is a two digit integer and @var{m} is an integer in the -## range 1 to 6, @var{m} is interpreted as the point style. This is only -## valid in combination with the @code{@@} or @code{-@@} specifiers. -## -## @item @var{c} -## If @var{c} is one of @code{"k"}, @code{"r"}, @code{"g"}, @code{"b"}, -## @code{"m"}, @code{"c"}, or @code{"w"}, it is interpreted as the plot -## color (black, red, green, blue, magenta, cyan, or white). -## -## @item ";title;" -## Here @code{"title"} is the label for the key. -## -## @item + -## @itemx * -## @itemx o -## @itemx x -## Used in combination with the points or linespoints styles, set the point -## style. -## @end table -## -## The color line styles have the following meanings on terminals that -## support color. -## -## @example -## Number Gnuplot colors (lines)points style -## 1 red * -## 2 green + -## 3 blue o -## 4 magenta x -## 5 cyan house -## 6 brown there exists -## @end example -## -## The @var{fmt} argument can also be used to assign key titles. -## To do so, include the desired title between semi-colons after the -## formatting sequence described above, e.g. "+3;Key Title;" -## Note that the last semi-colon is required and will generate an error if -## it is left out. +## See @code{__pltopt__} for a description of the optional format +## argument. ## ## Arguments can also be given in groups of three as ##