Mercurial > octave

changeset 23395:c14cf947142f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Thu, 13 Apr 2017 10:32:21 -0400
parents 675ad11b5c05 (current diff) 7ca04e85f9e3 (diff)
children 945b53af4655
files doc/interpreter/genpropdoc.m libgui/graphics/Canvas.h libinterp/corefcn/dlmread.cc scripts/plot/appearance/datetick.m scripts/time/datenum.m
diffstat 5 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/genpropdoc.m	Thu Apr 13 10:23:26 2017 -0400
+++ b/doc/interpreter/genpropdoc.m	Thu Apr 13 10:32:21 2017 -0400
@@ -474,7 +474,7 @@
 
       case "renderer"
         s.doc = doc_unused;
-        
+
       case "renderermode"
         s.doc = doc_unused;
 
@@ -709,7 +709,7 @@
 @xref{XREFnewplot, , @w{newplot function}}.  The state of __prop__ \
 is typically controlled using the @code{hold} function.  \
 @xref{XREFhold, , @w{hold function}}.";
-        
+
       case "outerposition"
         s.doc = "Specify the position of the plot including titles, \
 axes, and legend.  The four elements of the vector are the \
@@ -727,7 +727,7 @@
       case "plotboxaspectratio"
         s.doc = "@xref{XREFpbaspect, , pbaspect function}.  \
 __modemsg__.";
-        
+
       case "plotboxaspectratiomode"
       case "position"
         s.doc = "Specify the position of the plot excluding titles, \
@@ -765,7 +765,7 @@
         s.doc = "Size of the @code{[left bottom right top]} margins \
 around the axes that enclose labels and title annotations.";
         s.valid = valid_4elvec;
-        
+
       case "title"
         s.doc = "Graphics handle of the title text object.";
         s.valid = valid_handle;
@@ -780,7 +780,7 @@
 
       case "units"
         s.doc = "Units used to interpret the @qcode{\"position\"}, \
-@qcode{\"outerposition\"}, and @qcode{\"tightinset\"} properties."; 
+@qcode{\"outerposition\"}, and @qcode{\"tightinset\"} properties.";
 
       case "view"
         s.doc = "Two-element vector @code{[azimuth elevation]} specifying \
@@ -789,7 +789,7 @@
 
       case "xaxislocation"
         s.doc = "Control the x axis location.";
-        
+
       case "xcolor"
         s.doc = "Color of the x-axis.  @xref{Colors, , colorspec}.  \
 __modemsg__.";
@@ -800,7 +800,7 @@
       case "xdir"
         s.doc = "Direction of the x axis: @qcode{\"normal\"} is left \
 to right.";
-        
+
       case "xgrid"
         s.doc = "Control whether major x grid lines are displayed.";
 
@@ -818,7 +818,7 @@
         s.doc = "Control whether minor x grid lines are displayed.";
 
       case "xminortick"
-      case "xscale"        
+      case "xscale"
       case "xtick"
         s.doc = "Position of x tick marks.  __modemsg__.";
         s.valid = "vector";
@@ -835,7 +835,7 @@
       case "xtickmode"
       case "yaxislocation"
         s.doc = "Control the y-axis location.";
-        
+
       case "ycolor"
         s.doc = "Color of the y-axis.  @xref{Colors, , colorspec}.";
         s.valid = packopt ({markdef(valid_color), "@qcode{\"none\"}"});
@@ -1023,7 +1023,7 @@
         s.doc = "Vector @code{[x0 y0 width height]} indicating the size \
 and location of the text string.";
         s.valid = valid_4elvec;
-      
+
       case "fontangle"
         s.doc = doc_fontangle;
         
--- a/libgui/graphics/Canvas.h	Thu Apr 13 10:23:26 2017 -0400
+++ b/libgui/graphics/Canvas.h	Thu Apr 13 10:32:21 2017 -0400
@@ -108,7 +108,7 @@
     void annotation_callback (const octave_value_list& args);
     void select_object (graphics_object obj, QMouseEvent* event,
                         graphics_object &currentObj, graphics_object &axesObj,
-                        bool axes_only = false, 
+                        bool axes_only = false,
                         std::vector<std::string> omit = std::vector<std::string> ());
 
   private:
--- a/libinterp/corefcn/dlmread.cc	Thu Apr 13 10:23:26 2017 -0400
+++ b/libinterp/corefcn/dlmread.cc	Thu Apr 13 10:32:21 2017 -0400
@@ -269,7 +269,7 @@
       if (r0 < 0 || c0 < 0)
         error ("dlmread: left & top must be positive");
 
-      // Short-circuit and return if range is empty 
+      // Short-circuit and return if range is empty
       if (r1 < r0 || c1 < c0)
         return ovl (Matrix (0,0));
     }
--- a/scripts/plot/appearance/datetick.m	Thu Apr 13 10:23:26 2017 -0400
+++ b/scripts/plot/appearance/datetick.m	Thu Apr 13 10:32:21 2017 -0400
@@ -229,7 +229,7 @@
         maxyear = sep * ceil (maxyear / sep);
         rangeyear = (minyear:sep:maxyear)';
         tickmonth = round (1 + 12*mod (rangeyear, 1));
-        ticks = datenum ([floor(rangeyear), ... 
+        ticks = datenum ([floor(rangeyear), ...
                           tickmonth, ...
                           ones(rows (rangeyear), 1)]);
       endif
--- a/scripts/time/datenum.m	Thu Apr 13 10:23:26 2017 -0400
+++ b/scripts/time/datenum.m	Thu Apr 13 10:32:21 2017 -0400
@@ -165,7 +165,7 @@
     year = floor (year);
     day += fracyear .* (365 + is_leap_year (year+1));
   endif
-  
+
   ## Add number of days to the start of the current year.  Correct
   ## for leap year every 4 years except centuries not divisible by 400.
   day += 365*year + floor (year/4) - floor (year/100) + floor (year/400);