Mercurial > octave

changeset 29401:9bbe11da0c38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fill.m, fill3.m: Clean up functions. * fill.m: Add space between input parameters in function call to size_equal() for readability. Fix typo "annd" -> "and" in error() message. * fill3.m: Use serial comma in documentation. * __unimplemented__.m: Remove fill3 from list of unimplemented functions.
author Rik <rik@octave.org>
date Mon, 01 Mar 2021 13:46:01 -0800
parents 4362d6e42bc0
children 90a5d56fc1cc
files scripts/help/__unimplemented__.m scripts/plot/draw/fill.m scripts/plot/draw/fill3.m
diffstat 3 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/help/__unimplemented__.m	Sun Feb 28 20:12:27 2021 +0100
+++ b/scripts/help/__unimplemented__.m	Mon Mar 01 13:46:01 2021 -0800
@@ -758,7 +758,6 @@
   "filemarker",
   "fileMode",
   "fileName",
-  "fill3",
   "fillmissing",
   "filloutliers",
   "fimplicit",
--- a/scripts/plot/draw/fill.m	Sun Feb 28 20:12:27 2021 +0100
+++ b/scripts/plot/draw/fill.m	Mon Mar 01 13:46:01 2021 -0800
@@ -107,13 +107,13 @@
         y = varargin{iargs(i) + 1};
         cdata = varargin{iargs(i) + 2};
 
-        if (! size_equal (x,y))
+        if (! size_equal (x, y))
           if (iscolumn (y) && rows (y) == rows (x))
             y = repmat (y, [1, columns(x)]);
           elseif (iscolumn (x) && rows (x) == rows (y))
             x = repmat (x, [1, columns(y)]);
           else
-            error ("fill: X annd Y must have same number of rows");
+            error ("fill: X and Y must have same number of rows");
           endif
         endif
 
--- a/scripts/plot/draw/fill3.m	Sun Feb 28 20:12:27 2021 +0100
+++ b/scripts/plot/draw/fill3.m	Mon Mar 01 13:46:01 2021 -0800
@@ -31,7 +31,7 @@
 ## @deftypefnx {} {@var{h} =} fill3 (@dots{})
 ## Create one or more filled 3-D polygons.
 ##
-## The inputs @var{x}, @var{y} and @var{z} are the coordinates of the polygon
+## The inputs @var{x}, @var{y}, and @var{z} are the coordinates of the polygon
 ## vertices.  If the inputs are matrices then the rows represent different
 ## vertices and each column produces a different polygon.  @code{fill3} will
 ## close any open polygons before plotting.
@@ -41,13 +41,14 @@
 ## RGB-triple.  In this case the polygon(s) will have one unique color.  If
 ## @var{c} is a vector or matrix then the color data is first scaled using
 ## @code{caxis} and then indexed into the current colormap.  A row vector will
-## color each polygon (a column from matrices @var{x}, @var{y} and @var{z})
+## color each polygon (a column from matrices @var{x}, @var{y}, and @var{z})
 ## with a single computed color.  A matrix @var{c} of the same size as @var{x},
-## @var{y} and @var{z} will compute the color of each vertex and then
+## @var{y}, and @var{z} will compute the color of each vertex and then
 ## interpolate the face color between the vertices.
 ##
 ## Multiple property/value pairs for the underlying patch object may be
-## specified, but they must appear in pairs.
+## specified, but they must appear in pairs.  The full list of properties is
+## documented at @ref{Patch Properties}.
 ##
 ## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
@@ -111,7 +112,7 @@
 
         if (! size_equal (x, y, z))
           if (rows (x) != rows (y) || rows (x) != rows (z))
-            error ("fill3: X,Y and Z must have same number of rows");
+            error ("fill3: X, Y, and Z must have same number of rows");
           endif
 
           num_cols = max ([columns(x), columns(y), columns(z)]);
@@ -204,7 +205,7 @@
     endif
   elseif (isnumeric (arg))
     ## Assume any numeric argument is correctly formatted cdata.
-    ## Let patch worry about the multple different input formats.
+    ## Let patch worry about the multiple different input formats.
     retval = true;
   endif