changeset 28661:bc8fde52687b

maint: merge stable to default.
author Rik <rik@octave.org>
date Fri, 28 Aug 2020 09:38:28 -0700
parents 6dbd32dd2a5f (current diff) dc80e087df4b (diff)
children 8d74ad753e5c
files NEWS doc/interpreter/genpropdoc.m etc/NEWS.6 libinterp/corefcn/load-save.cc scripts/ode/ode15s.m scripts/plot/appearance/legend.m
diffstat 8 files changed, 23 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/genpropdoc.m	Fri Aug 28 14:50:41 2020 +0200
+++ b/doc/interpreter/genpropdoc.m	Fri Aug 28 09:38:28 2020 -0700
@@ -832,7 +832,7 @@
 The four elements of the vector are the coordinates of the lower left corner \
 and width and height of the legend.  Changing this property also \
 switches the @qcode{\"location\"} to @qcode{\"none\"}.";
-          s.printdefault = false;          
+          s.printdefault = false;
         else
           s.doc = "Specify the position of the plot excluding titles, \
 axes, and legend.  The four elements of the vector are the \
--- a/etc/NEWS.6	Fri Aug 28 14:50:41 2020 +0200
+++ b/etc/NEWS.6	Fri Aug 28 09:38:28 2020 -0700
@@ -65,7 +65,7 @@
   range operator.  Each has a new warning ID so that it can be disabled
   if desired.
 
-  >  `Octave:colon-complex-argument`   : when any arg is complex  
+  >  `Octave:colon-complex-argument`   : when any arg is complex
   >  `Octave:colon-nonscalar-argument` : when any arg is non-scalar
 
 - The `regexp` and related functions now correctly handle and *require*
--- a/libinterp/corefcn/load-save.cc	Fri Aug 28 14:50:41 2020 +0200
+++ b/libinterp/corefcn/load-save.cc	Fri Aug 28 09:38:28 2020 -0700
@@ -1647,7 +1647,7 @@
 @itemx -6
 @itemx -mat
 @itemx -mat-binary
-Force Octave to assume the file is in @sc{matlab}'s version 6 binary format. 
+Force Octave to assume the file is in @sc{matlab}'s version 6 binary format.
 
 @item  -v4
 @itemx -V4
@@ -1799,7 +1799,7 @@
 If the variable is restored at a later time using @samp{load}, it will be
 restored as a global variable.
 
-Example: 
+Example:
 
 The command
 
--- a/scripts/general/quadgk.m	Fri Aug 28 14:50:41 2020 +0200
+++ b/scripts/general/quadgk.m	Fri Aug 28 09:38:28 2020 -0700
@@ -482,10 +482,10 @@
 %!assert (quadgk (@(x) 1./(sqrt (x) .* (x+1)),0,Inf), pi, 1e-10)
 %!assert <*57614> (quadgk (@(z) exp(z)./z, 1, 1,
 %!                        "Waypoints", [1+i, -1+i, -1-i, 1-i]),
-%!                 complex (0, 2*pi), 1e-10) 
+%!                 complex (0, 2*pi), 1e-10)
 %!assert <*57614> (quadgk (@(z) exp(z)./z, 1, 1,
 %!                        "Waypoints", [1-i, -1-i, -1+i, 1+i]),
-%!                 complex (0, -2*pi), 1e-10) 
+%!                 complex (0, -2*pi), 1e-10)
 %!assert (quadgk (@(z) log (z),1+1i,1+1i, "WayPoints", [1-1i, -1,-1i, -1+1i]),
 %!        complex (0, pi), 1e-10)
 %!assert (quadgk (@(x) exp (-x .^ 2),-Inf,Inf), sqrt (pi), -1e-6)
--- a/scripts/java/javarmpath.m	Fri Aug 28 14:50:41 2020 +0200
+++ b/scripts/java/javarmpath.m	Fri Aug 28 09:38:28 2020 -0700
@@ -54,7 +54,7 @@
 
     for clspath = arg
       clspath = clspath{1};
-    
+
       old_path = canonicalize_file_name (tilde_expand (clspath));
       if (isfolder (old_path))
         if (old_path(end) != filesep ())
--- a/scripts/ode/ode15i.m	Fri Aug 28 14:50:41 2020 +0200
+++ b/scripts/ode/ode15i.m	Fri Aug 28 09:38:28 2020 -0700
@@ -181,7 +181,7 @@
         J1 = options.Jacobian{1};
         J2 = options.Jacobian{2};
         if (   ! issquare (J1) || ! issquare (J2)
-            || rows (J1) != n || rows (J2) != n  
+            || rows (J1) != n || rows (J2) != n
             || ! isnumeric (J1) || ! isnumeric (J2)
             || ! isreal (J1) || ! isreal (J2))
           error ("Octave:invalid-input-arg",
--- a/scripts/ode/ode15s.m	Fri Aug 28 14:50:41 2020 +0200
+++ b/scripts/ode/ode15s.m	Fri Aug 28 09:38:28 2020 -0700
@@ -233,7 +233,7 @@
         error ("Octave:invalid-input-arg",
                'ode15s: invalid value assigned to field "Jacobian"');
       endif
-    else  # matrix input 
+    else  # matrix input
       if (! issquare (options.Jacobian) || rows (options.Jacobian) != n
           || ! isnumeric (options.Jacobian) || ! isreal (options.Jacobian))
         error ("Octave:invalid-input-arg",
--- a/scripts/plot/appearance/legend.m	Fri Aug 28 14:50:41 2020 +0200
+++ b/scripts/plot/appearance/legend.m	Fri Aug 28 09:38:28 2020 -0700
@@ -94,7 +94,7 @@
 ## @c The following table is obtained by copying the output of
 ## @c genpropdoc ("legend", "", {"autoupdate", "box", "location", "numcolumns", "orientation", "string", "textcolor"})
 ## @table @asis
-## 
+##
 ## @item @code{autoupdate}: @qcode{"off"} | @{@qcode{"on"}@}
 ## Control whether the number of legend items is updated automatically when objects are added to (or deleted from) the peer axes.
 ## For example:
@@ -113,16 +113,16 @@
 ## plot ((1:10) * 3);
 ## @end group
 ## @end example
-## 
-## 
+##
+##
 ## @item @code{box}: @qcode{"off"} | @{@qcode{"on"}@}
 ## Control whether the legend has a surrounding box.
-## 
-## 
+##
+##
 ## @item @code{location}: @qcode{"best"} | @qcode{"bestoutside"} | @qcode{"east"} | @qcode{"eastoutside"} | @qcode{"none"} | @qcode{"north"} | @{@qcode{"northeast"}@} | @qcode{"northeastoutside"} | @qcode{"northoutside"} | @qcode{"northwest"}| @qcode{"northwestoutside"} | @qcode{"south"} | @qcode{"southeast"} | @qcode{"southeastoutside"} | @qcode{"southoutside"} | @qcode{"southwest"} | @qcode{"southwestoutside"} | @qcode{"west"} | @qcode{"westoutside"}
 ## Control the location of the legend.
-## 
-## 
+##
+##
 ## @item @code{numcolumns}: scalar interger, def. @code{1}
 ## Control the number of columns used in the layout of the legend items.  For example:
 ## @example
@@ -133,12 +133,12 @@
 ## @end group
 ## @end example
 ## Setting @code{numcolumns} also forces the @code{numcolumnsmode} property to be set to @qcode{"manual"}.
-## 
-## 
+##
+##
 ## @item @code{orientation}: @qcode{"horizontal"} | @{@qcode{"vertical"}@}
 ## Control whether the legend items are arranged vertically (column-wise) or horizontally (row-wise).
-## 
-## 
+##
+##
 ## @item @code{string}: string | cell array of strings
 ## List of labels for the legend items.  For example:
 ## @example
@@ -153,11 +153,11 @@
 ## set (hl, "string", str);
 ## @end group
 ## @end example
-## 
-## 
+##
+##
 ## @item @code{textcolor}: colorspec, def. @code{[0   0   0]}
 ## Control the color of the text strings for legend item.
-## 
+##
 ## @end table
 ##
 ## The full list of supported legend specific properties can be found at