changeset 29675:d3a02b27fa6a

maint: merge stable to default.
author Rik <rik@octave.org>
date Fri, 14 May 2021 14:43:09 -0700
parents 1311b9a3590e (current diff) 101d1d8df273 (diff)
children df0f97c4fb18
files doc/interpreter/func.txi doc/interpreter/plot.txi libinterp/corefcn/help.cc scripts/plot/draw/area.m scripts/plot/draw/stairs.m scripts/plot/util/print.m scripts/plot/util/subplot.m
diffstat 6 files changed, 21 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/basics.txi	Fri May 14 10:47:28 2021 +0200
+++ b/doc/interpreter/basics.txi	Fri May 14 14:43:09 2021 -0700
@@ -1079,7 +1079,7 @@
 
 To write m-files that can act as executable programs when called from the shell
 or as normal functions when called from within Octave, use default input
-arguments initialized with the @code{argv} function.  
+arguments initialized with the @code{argv} function.
 
 If a function is called from the shell Octave will not pass any input
 parameters to the function and therefore the default argument is used.  But
@@ -1109,6 +1109,7 @@
 mysin.m 1.5
 @end example
 
+@noindent
 or from Octave with
 
 @example
--- a/doc/interpreter/func.txi	Fri May 14 10:47:28 2021 +0200
+++ b/doc/interpreter/func.txi	Fri May 14 14:43:09 2021 -0700
@@ -1925,6 +1925,7 @@
 
 If an argument including spaces should be passed to a function in command
 syntax, (double-)quotes can be used.  For example,
+
 @example
 my_command "first argument" "second argument"
 @end example
--- a/doc/interpreter/plot.txi	Fri May 14 10:47:28 2021 +0200
+++ b/doc/interpreter/plot.txi	Fri May 14 14:43:09 2021 -0700
@@ -2812,19 +2812,19 @@
 
 The OpenGL graphics toolkits (@qcode{"qt"} and @qcode{"fltk"}) use single
 precision for rendering.  This limitation in particular applies to plots of
-timeseries against serial dates as used by the @code{datenum}, @code{datestr},
+time series against serial dates as used by the @code{datenum}, @code{datestr},
 @code{datestruct}, and @code{datetick} functions.
 
 Serial dates encode timestamps as days elapsed since the year zero with hours,
-minutes, seconds as the fractional part. On December 31st 1999, the serial date
-representation was 730485.  A double precision variable with this integer part
-allows for a resolution in its fractional part of 1.2e-10, representing about 5
-microseconds.  But with single precision, the resolution is reduced to about
-0.06, representing 45 minutes.  Any attempt to plot timestamped data with finer
-granularity will result in a distorted graph.
+minutes, seconds as the fractional part.  On December 31st 1999, the serial
+date representation was 730485.  A double precision variable with this integer
+part allows for a resolution in its fractional part of 1.2e-10, representing
+about 5 microseconds.  But with single precision, the resolution is reduced to
+about 0.06, representing 45 minutes.  Any attempt to plot timestamped data
+with finer granularity will result in a distorted graph.
 
 As a workaround, it is possible to use the @qcode{"gnuplot"} graphics toolkit
-or subtract 2000 years---i.e. @code{datenum (2000, 0, 0)} or 730485---from the
+or subtract 2000 years---i.e., @code{datenum (2000, 0, 0)} or 730485---from the
 time values.  Due to the fact that the calendar structure repeats every 2000
 years, the relation between year, month, day of month and day of week will stay
 unchanged and the ticks and ticklabels produced by the @code{datetick} function
@@ -2836,7 +2836,7 @@
 # timestamps of 24 hours in one minute steps
 t = datenum (2020, 1, 1):(1/1440):datenum (2020, 1, 2);
 
-# some example timeseries data
+# some example time series data
 x = -cos (2*pi*t) + rand (size (t)) / 10;
 
 subplot (1, 2, 1);
--- a/libinterp/corefcn/help.cc	Fri May 14 10:47:28 2021 +0200
+++ b/libinterp/corefcn/help.cc	Fri May 14 14:43:09 2021 -0700
@@ -1024,9 +1024,9 @@
 Query or set the internal variable that specifies the name of the
 info program to run.
 
-The default value is "@file{info}".  The default value may be overridden by the
-environment variable @w{@env{OCTAVE_INFO_PROGRAM}}, or the command line
-argument @option{--info-program NAME}.
+The default value is @file{info}.  The default value may be
+overridden by the environment variable @w{@env{OCTAVE_INFO_PROGRAM}}, or the
+command line argument @option{--info-program NAME}.
 
 When called from inside a function with the @qcode{"local"} option, the
 variable is changed locally for the function and any subroutines it calls.
--- a/scripts/plot/util/print.m	Fri May 14 10:47:28 2021 +0200
+++ b/scripts/plot/util/print.m	Fri May 14 14:43:09 2021 -0700
@@ -120,11 +120,11 @@
 ## @itemx -painters
 ##   Specifies whether the opengl (pixel-based) or painters (vector-based)
 ## renderer is used.  This is equivalent to changing the figure's
-## @qcode{"Renderer"} property.  When the figure @qcode{"RendererMode"}
-## property is @qcode{"auto"} (the default) Octave will use the
-## @qcode{"opengl"} renderer for raster formats (e.g., JPEG) and
-## @qcode{"painters"} for vector formats (e.g., PDF).  Those options are only
-## supported for the "qt" graphics toolkit.
+## @qcode{"Renderer"} property.  When the figure
+## @nospell{@qcode{"RendererMode"}} property is @qcode{"auto"} (the default)
+## Octave will use the @qcode{"opengl"} renderer for raster formats (e.g.,
+## JPEG) and @qcode{"painters"} for vector formats (e.g., PDF).  Those options
+## are only supported for the "qt" graphics toolkit.
 ##
 ## @item -svgconvert
 ##   When using the @option{-painters} renderer, this enables a different
--- a/scripts/plot/util/subplot.m	Fri May 14 10:47:28 2021 +0200
+++ b/scripts/plot/util/subplot.m	Fri May 14 14:43:09 2021 -0700
@@ -110,6 +110,7 @@
 ## position.
 ##
 ## Example:
+##
 ## @example
 ## @group
 ## x = 1:10;