[no merge] Octave devel branch summer 2025

@chebfun/disp.m

@@ -7,7 +7,16 @@ function disp(f)
 % See http://www.chebfun.org/ for Chebfun information.
 
 % If the 'format loose' setting is enabled, we print additional linebreaks:
-loose = strcmp(get(0, 'FormatSpacing'), 'loose');
+if (exist('OCTAVE_VERSION', 'builtin') )
+    if (compare_versions(OCTAVE_VERSION(), '4.3.0', '>='))
+        [fmt, spacing] = format();
+        loose = strcmp(spacing, 'loose');
+    else
+        loose = eval('! __compactformat__ ()');
+    end
+else
+    loose = strcmp(get(0, 'FormatSpacing'), 'loose');
+end
 
 s = '';
 
@@ -90,8 +99,9 @@ function disp(f)
         end
 
         % Print information to screen:
+        temp = f.domain;   % TODO: improve chaining in subsref?
         s = [s, sprintf('[%8.2g,%8.2g]   %6i  %8.2g %8.2g %s\n', ...
-            f.domain(j), f.domain(j+1), len(j), endvals, extraData{j})];
+            temp(j), temp(j+1), len(j), endvals, extraData{j})];
 
     end
 end

@chebfun/display.m

@@ -13,7 +13,18 @@ function display(X)
 % Copyright 2017 by The University of Oxford and The Chebfun Developers. 
 % See http://www.chebfun.org/ for Chebfun information.
 
-if ( isequal(get(0, 'FormatSpacing'), 'compact') )
+if (exist('OCTAVE_VERSION', 'builtin') )
+    if (compare_versions(OCTAVE_VERSION(), '4.3.0', '>='))
+        [fmt, spacing] = format();
+        loose = strcmp(spacing, 'loose');
+    else
+        loose = eval('! __compactformat__ ()');
+    end
+else
+    loose = strcmp(get(0, 'FormatSpacing'), 'loose');
+end
+
+if ( ~ loose )
     disp([inputname(1), ' =']);
     disp(X);
 else

@chebfun/get.m

@@ -100,14 +100,6 @@
         out = hscale(f);
     case 'ishappy'
         out = ishappy(f);
-    case fieldnames(f)
-        out = cell(1, numel(f));
-        for k = 1:1:numel(f)
-            out{k} = f(k).(prop);
-        end
-        if ( numel(out) == 1 )
-            out = out{1};
-        end
     case 'lval'
         dom = domain(f);
         out = feval(f, dom(1));
@@ -167,6 +159,14 @@ case fieldnames(f)
         warning('CHEBFUN:CHEBFUN:get:imps', ...
             '''imps'' property is deprecated.  Use ''deltas'' instead.');
         out = get(f, 'deltas');
+    case fieldnames(f)
+        out = cell(1, numel(f));
+        for k = 1:1:numel(f)
+            out{k} = f(k).(prop);
+        end
+        if ( numel(out) == 1 )
+            out = out{1};
+        end
     otherwise
         error('CHEBFUN:CHEBFUN:get:badProp', ...
             '''%s'' is not a recognized CHEBFUN property name.', prop);

@chebfun/plot.m

@@ -303,7 +303,7 @@
 %% Plotting starts here:
 
 % Acquire initial color cycle if running R2014b+.
-if ( ~verLessThan('matlab', '8.4') )
+if ( ~compatible_verLessThan('matlab', '8.4') )
     if ( ~holdState )
         set(gca, 'ColorOrderIndex', 1);
     end
@@ -318,7 +318,7 @@
 hold on
 
 % Get color cycle prior to point plot if running R2014b.
-if ( ~verLessThan('matlab', '8.4') )
+if ( ~compatible_verLessThan('matlab', '8.4') )
     newColorOrder = get(gca, 'ColorOrderIndex');
     set(gca, 'ColorOrderIndex', originalColorOrder)
 end
@@ -333,7 +333,7 @@
 end
 
 % Reset color cycle prior to jump plot if running R2014b.
-if ( ~verLessThan('matlab', '8.4') )
+if ( ~compatible_verLessThan('matlab', '8.4') )
     set(gca, 'ColorOrderIndex', originalColorOrder);
 end
 
@@ -366,7 +366,7 @@
 end    
 
 % Reset colors prior to legend data plot if running R2014b.
-if ( ~verLessThan('matlab', '8.4') )
+if ( ~compatible_verLessThan('matlab', '8.4') )
     set(gca, 'ColorOrderIndex', originalColorOrder);
 end
 
@@ -387,7 +387,7 @@
 end
 
 % Reset colors prior to legend data plot if running R2014b.
-if ( ~verLessThan('matlab', '8.4') )
+if ( ~compatible_verLessThan('matlab', '8.4') )
     set(gca, 'ColorOrderIndex', newColorOrder);
 end
 
@@ -446,14 +446,14 @@
     h = [];
 
     % Get and save the current ColorOrder if running on R2014a or earlier.
-    if ( verLessThan('matlab', '8.4') )
+    if ( compatible_verLessThan('matlab', '8.4') )
         originalColorOrder = get(gca, 'ColorOrder');
         colorOrder = circshift(originalColorOrder, 1);
     end
 
     for k = 1:1:numel(deltaData)
         % Set color for the next delta function plot.
-        if ( verLessThan('matlab', '8.4') )
+        if ( compatible_verLessThan('matlab', '8.4') )
             % Manually manipulate the ColorOrder for R2014a or earlier.
             colorOrder = circshift(colorOrder, -1);
             set(gca, 'ColorOrder', colorOrder);
@@ -466,7 +466,7 @@
     end
 
     % Restore the ColorOrder if running on R2014a or earlier.
-    if ( verLessThan('matlab', '8.4') )
+    if ( compatible_verLessThan('matlab', '8.4') )
         set(gca, 'ColorOrder', originalColorOrder);
     end
 end

@chebfun/plotData.m

@@ -37,7 +37,7 @@
         % Get the data from the FUN:
         dataNew = plotData(f.funs{k});
 
-        if ( ~any(ismember(fields(dataNew), 'xDeltas' )) )
+        if ( ~any(ismember(fieldnames(dataNew), 'xDeltas' )) )
             dataNew.xDeltas = NaN;
             dataNew.yDeltas = NaN;
             dataNew.yDeltaBase = NaN;
@@ -103,7 +103,8 @@
         % Get the data from the FUN objects:
         dataNew = plotData(f.funs{k}, g.funs{k});
 
-        if ( ~any(ismember(fields(dataNew), 'xDeltas' )) )
+        class(dataNew)
+        if ( ~any(ismember(fieldnames(dataNew), 'xDeltas' )) )
             dataNew.xDeltas = [];
             dataNew.yDeltas = [];
             dataNew.yDeltaBase = [];
@@ -163,7 +164,7 @@
         % Get the data from the FUN objects:
         dataNew = plotData(f.funs{k}, g.funs{k}, h.funs{k});
 
-        if ( ~any(ismember(fields(dataNew), 'xDeltas' )) )
+        if ( ~any(ismember(fieldnames(dataNew), 'xDeltas' )) )
             dataNew.xDeltas = [];
             dataNew.yDeltas = [];
         end

@chebtech/isequal.m

@@ -6,6 +6,13 @@
 % Copyright 2017 by The University of Oxford and The Chebfun Developers. 
 % See http://www.chebfun.org/ for Chebfun information.
 
+% OCTAVE: temporary workaround for lack of InferiorClasses support
+if ( isa(g, 'singfun') )
+    out = isequal(g, f);
+    return
+end
+
+
 out = all(size(f.coeffs) == size(g.coeffs))  ...
     && all(f.coeffs(:) == g.coeffs(:));