changeset 31789:5e9bfd2c11b5

maint: merge stable to default
author Rik <rik@octave.org>
date Fri, 27 Jan 2023 14:27:30 -0800
parents 53b2eb3cb06a (current diff) b482ed13ac1a (diff)
children 5cb96bc0adc8
files libinterp/corefcn/graphics.cc
diffstat 6 files changed, 35 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/container.txi	Fri Jan 27 14:09:11 2023 -0800
+++ b/doc/interpreter/container.txi	Fri Jan 27 14:27:30 2023 -0800
@@ -25,13 +25,13 @@
 with named fields; containers.Map objects, which store data in key/value pairs;
 and cell arrays, where each element of the array can have a different data type
 and or shape.  Multiple input arguments and return values of functions are
-organized as another data container, the comma separated list.
+organized as another data container, the comma-separated list.
 
 @menu
 * Structures::
 * containers.Map::
 * Cell Arrays::
-* Comma Separated Lists::
+* Comma-Separated Lists::
 @end menu
 
 @node Structures
@@ -300,8 +300,8 @@
 @end group
 @end example
 
-Furthermore, the structure array can return a comma separated list of
-field values (@pxref{Comma Separated Lists}), if indexed by one of its
+Furthermore, the structure array can return a comma-separated list of
+field values (@pxref{Comma-Separated Lists}), if indexed by one of its
 own field names.  For example:
 
 @example
@@ -313,7 +313,7 @@
 @end group
 @end example
 
-Here is another example, using this comma separated list on the
+Here is another example, using this comma-separated list on the
 left-hand side of an assignment:
 
 @example
@@ -806,7 +806,7 @@
 
 Accessing multiple elements of a cell array with the @samp{@{} and
 @samp{@}} operators will result in a comma-separated list of all the
-requested elements (@pxref{Comma Separated Lists}).  Using the
+requested elements (@pxref{Comma-Separated Lists}).  Using the
 @samp{@{} and @samp{@}} operators the first two rows in the above
 example can be swapped back like this:
 
@@ -943,12 +943,12 @@
 
 @DOCSTRING(cell2struct)
 
-@node Comma Separated Lists
-@section Comma Separated Lists
-@cindex comma separated lists
+@node Comma-Separated Lists
+@section Comma-Separated Lists
+@cindex comma-separated lists
 @cindex cs-lists
 
-Comma separated lists @footnote{Comma-separated lists are also sometimes
+Comma-separated lists @footnote{Comma-separated lists are also sometimes
 informally referred to as @dfn{cs-lists}.} are the basic argument type
 to all Octave functions - both for input and return arguments.  In the
 example
@@ -958,7 +958,7 @@
 @end example
 
 @noindent
-@samp{@var{a}, @var{b}} is a comma separated list.  Comma separated lists
+@samp{@var{a}, @var{b}} is a comma-separated list.  Comma-separated lists
 can appear on both the right and left hand side of an assignment.  For
 example
 
@@ -970,12 +970,12 @@
 @end example
 
 @noindent
-Here, @samp{@var{x}, 2, "last"} is a comma separated list constituting
+Here, @samp{@var{x}, 2, "last"} is a comma-separated list constituting
 the input arguments of @code{find}.  @code{find} returns a comma
 separated list of output arguments which is assigned element by
-element to the comma separated list @samp{@var{i}, @var{j}}.
+element to the comma-separated list @samp{@var{i}, @var{j}}.
 
-Another example of where comma separated lists are used is in the
+Another example of where comma-separated lists are used is in the
 creation of a new array with @code{[]} (@pxref{Matrices}) or the
 creation of a cell array with @code{@{@}} (@pxref{Basic Usage of Cell
 Arrays}).  In the expressions
@@ -988,24 +988,24 @@
 @end example
 
 @noindent
-both @samp{1, 2, 3, 4} and @samp{4, 5, 6, 7} are comma separated lists.
+both @samp{1, 2, 3, 4} and @samp{4, 5, 6, 7} are comma-separated lists.
 
-Comma separated lists cannot be directly manipulated by the
+Comma-separated lists cannot be directly manipulated by the
 user.  However, both structure arrays and cell arrays can be converted
-into comma separated lists, and thus used in place of explicitly
-written comma separated lists.  This feature is useful in many ways,
+into comma-separated lists, and thus used in place of explicitly
+written comma-separated lists.  This feature is useful in many ways,
 as will be shown in the following subsections.
 
 @menu
-* Comma Separated Lists Generated from Cell Arrays::
-* Comma Separated Lists Generated from Structure Arrays::
+* Comma-Separated Lists Generated from Cell Arrays::
+* Comma-Separated Lists Generated from Structure Arrays::
 @end menu
 
-@node Comma Separated Lists Generated from Cell Arrays
-@subsection Comma Separated Lists Generated from Cell Arrays
+@node Comma-Separated Lists Generated from Cell Arrays
+@subsection Comma-Separated Lists Generated from Cell Arrays
 
 As has been mentioned above (@pxref{Indexing Cell Arrays}), elements
-of a cell array can be extracted into a comma separated list with the
+of a cell array can be extracted into a comma-separated list with the
 @code{@{} and @code{@}} operators.  By surrounding this list with
 @code{[} and @code{]}, it can be concatenated into an array.  For example:
 
@@ -1052,7 +1052,7 @@
 @end group
 @end example
 
-If used on the left-hand side of an assignment, a comma separated list
+If used on the left-hand side of an assignment, a comma-separated list
 generated with @code{@{@}} can be assigned to.  An example is
 
 @example
@@ -1081,9 +1081,9 @@
 @end example
 
 
-@node Comma Separated Lists Generated from Structure Arrays
-@subsection Comma Separated Lists Generated from Structure Arrays
-Structure arrays can equally be used to create comma separated
+@node Comma-Separated Lists Generated from Structure Arrays
+@subsection Comma-Separated Lists Generated from Structure Arrays
+Structure arrays can equally be used to create comma-separated
 lists.  This is done by addressing one of the fields of a structure
 array.  For example:
 
--- a/doc/interpreter/octave.texi	Fri Jan 27 14:09:11 2023 -0800
+++ b/doc/interpreter/octave.texi	Fri Jan 27 14:27:30 2023 -0800
@@ -326,7 +326,7 @@
 * Structures::
 * containers.Map::
 * Cell Arrays::
-* Comma Separated Lists::
+* Comma-Separated Lists::
 
 Structures
 
@@ -344,10 +344,10 @@
 * Cell Arrays of Strings::
 * Processing Data in Cell Arrays::
 
-Comma Separated Lists
+Comma-Separated Lists
 
-* Comma Separated Lists Generated from Cell Arrays::
-* Comma Separated Lists Generated from Structure Arrays::
+* Comma-Separated Lists Generated from Cell Arrays::
+* Comma-Separated Lists Generated from Structure Arrays::
 
 Variables
 
--- a/libinterp/corefcn/graphics.cc	Fri Jan 27 14:09:11 2023 -0800
+++ b/libinterp/corefcn/graphics.cc	Fri Jan 27 14:27:30 2023 -0800
@@ -12096,7 +12096,7 @@
 There are three ways to give the property names and values:
 
 @itemize
-@item as a comma separated list of @var{property}, @var{value} pairs
+@item as a comma-separated list of @var{property}, @var{value} pairs
 
 Each @var{property} is a string containing the property name, each @var{value}
 is a value of the appropriate type for the property.  When there are multiple
--- a/scripts/general/deal.m	Fri Jan 27 14:09:11 2023 -0800
+++ b/scripts/general/deal.m	Fri Jan 27 14:27:30 2023 -0800
@@ -63,7 +63,7 @@
 ## a = b = c = x;
 ## @end example
 ##
-## Programming Note: @code{deal} is often used with comma separated lists
+## Programming Note: @code{deal} is often used with comma-separated lists
 ## derived from cell arrays or structures.  This is unnecessary as the
 ## interpreter can perform the same action without the overhead of a function
 ## call.  For example:
--- a/scripts/io/importdata.m	Fri Jan 27 14:09:11 2023 -0800
+++ b/scripts/io/importdata.m	Fri Jan 27 14:27:30 2023 -0800
@@ -358,7 +358,7 @@
 
 
 %!test
-%! ## Comma separated values
+%! ## Comma-separated values
 %! A = [3.1 -7.2 0; 0.012 6.5 128];
 %! fn  = tempname ();
 %! fid = fopen (fn, "w");
--- a/scripts/testfun/test.m	Fri Jan 27 14:09:11 2023 -0800
+++ b/scripts/testfun/test.m	Fri Jan 27 14:27:30 2023 -0800
@@ -1100,7 +1100,7 @@
 ## %!invalid                   # unknown block type
 ## %!error  toeplitz ([1,2,3]); # correct usage
 ## %!test   syntax errors)     # syntax errors fail properly
-## %!shared garbage in         # variables must be comma separated
+## %!shared garbage in         # variables must be comma-separated
 ## %!error  syntax++error      # error test fails on syntax errors
 ## %!error  "succeeds.";       # error test fails if code succeeds
 ## %!error <wrong pattern> error ("message")  # error pattern must match