Mercurial > octave
changeset 25172:7b1b504c2f12 stable
update future version numbers in doc strings and comments
* NEWS, octave-dock-widget.cc, graphics.in.h, gripes.cc, gripes.h,
oct-obj.h, oct.h, quadcc.cc, utils.cc, options-usage.h,
lo-array-gripes.cc, lo-array-gripes.h, bitmax.m, chop.m, desktop.m,
java2mat.m, mahalanobis.m, md5sum.m, octave_config_info.m,
onenormest.m, sleep.m, tmpnam.m, toascii.m, usleep.m, wavread.m,
wavwrite.m, annotation.m, __gnuplot_draw_axes__.m, deprecate-props.tst:
Refer to future versions as versions 5 and 6, not 4.5+, 4.6, 4.7+, or 4.8.
line wrap: on
line diff
--- a/NEWS Mon Apr 09 07:18:32 2018 -0400 +++ b/NEWS Mon Apr 09 07:54:15 2018 -0400 @@ -25,7 +25,7 @@ interface and Desktop launchers required the `--force-gui' option anyway. With this change, desktop launchers should change to use the new option `--gui'. The previous `--force-gui' will continue to - work and maps to `--gui' but will be removed in Octave 4.8. + work and maps to `--gui' but will be removed in Octave 6. ** A known bug in Qt (https://bugreports.qt.io/browse/QTBUG-55357) is addressed by limiting GUI sub-panel relocation capabilities for Qt @@ -74,7 +74,7 @@ quadcc (f, a, b, tol) => quadcc (f, a, b, [0, tol]) A warning that a single tolerance input is now interpreted as an - absolute tolerance will be issued in Octave versions 4.4 and 4.6, + absolute tolerance will be issued in Octave versions 4.4 and 5, after which it will be removed. The warning has ID "Octave:quadcc:RelTol-conversion" and can be disabled with @@ -306,7 +306,7 @@ ** Deprecated functions. The following functions have been deprecated in Octave 4.4 and will - be removed from Octave 4.8 (or whatever version is the second major + be removed from Octave 6 (or whatever version is the second major release after 4.4): Function | Replacement @@ -349,7 +349,7 @@ ** Deprecated graphics properties. The following properties or allowed corresponding values have been - deprecated in Octave 4.4 and will be removed from Octave 4.8 (or whatever + deprecated in Octave 4.4 and will be removed from Octave 6 (or whatever version is the second major release after 4.4): Object | Property | Value @@ -369,7 +369,7 @@ uibuttongroup | fontweight | "demi" and "light" ** The rectangle and ellipse annotation property "edgecolor" has been - deprecated and will be removed from Octave 4.8 (or whatever version + deprecated and will be removed from Octave 6 (or whatever version is the second major release after 4.4). Use the property "color" instead. @@ -893,7 +893,7 @@ ** The value "zero" for the axes properties "xaxislocation" and "yaxislocation" has been deprecated and will be removed from - Octave 4.6. Use "origin" instead. + Octave 5. Use "origin" instead. ** The publish function allows easy publication of Octave script files in HTML or other formats, including figures and output created by @@ -954,7 +954,7 @@ ** Deprecated functions. The following functions have been deprecated in Octave 4.2 and will - be removed from Octave 4.6 (or whatever version is the second major + be removed from Octave 5 (or whatever version is the second major release after 4.2): Function | Replacement @@ -1000,7 +1000,7 @@ ** The system for common errors and warnings has been renamed from gripe_XXX to either err_XXX if error is called or warn_XXX if warning is called. The gripe_XXX functions are deprecated and will - be removed in version 4.6. + be removed in version 5. ** New configure option, --enable-address-sanitizer-flags, to build Octave with memory allocator checks (similar to those in valgrind)
--- a/libgui/src/octave-dock-widget.cc Mon Apr 09 07:18:32 2018 -0400 +++ b/libgui/src/octave-dock-widget.cc Mon Apr 09 07:54:15 2018 -0400 @@ -460,7 +460,7 @@ // four incorrect keys are updated if still present in the settings files. // The keys are also used in the settings dialog, but // octave_dock_widget::handle_settings is already called at program start. - // These tests can be removed in a future version of Octave (version 4.8). + // These tests can be removed in a future version of Octave (version 6). resource_manager::update_settings_key ("Dockwidgets/title_bg_color", "DockWidgets/title_bg_color"); resource_manager::update_settings_key ("Dockwidgets/title_bg_color_active",
--- a/libinterp/corefcn/graphics.in.h Mon Apr 09 07:18:32 2018 -0400 +++ b/libinterp/corefcn/graphics.in.h Mon Apr 09 07:54:15 2018 -0400 @@ -3181,7 +3181,7 @@ // Obsolete properties: doublebuffer, mincolormap, wvisual, wvisualmode, // xdisplay, xvisual, xvisualmode - // FIXME: Remove in version 4.6 + // FIXME: DEPRECATED: Remove in version 5. bool_property doublebuffer hd , "on" double_property mincolormap hd , 64 string_property wvisual hmd , "" @@ -3661,7 +3661,7 @@ // FIXME: uicontextmenu should be moved here. radio_property units SU , "{normalized}|inches|centimeters|points|pixels|characters" array_property view u , default_axes_view () - // FIXME: Remove "zero" in 4.6 + // FIXME: DEPRECATED: Remove "zero" in version 5. radio_property xaxislocation u , "{bottom}|top|origin|zero" color_property xcolor mu , color_values (0.15, 0.15, 0.15) radio_property xcolormode , "{auto}|manual" @@ -3679,7 +3679,7 @@ radio_property xticklabelmode u , "{auto}|manual" double_property xticklabelrotation , 0.0 radio_property xtickmode u , "{auto}|manual" - // FIXME: Remove "zero" in 4.6 + // FIXME: DEPRECATED: Remove "zero" in version 5. radio_property yaxislocation u , "{left}|right|origin|zero" color_property ycolor mu , color_values (0.15, 0.15, 0.15) radio_property ycolormode , "{auto}|manual" @@ -3822,7 +3822,7 @@ } void update_yaxislocation (void) { - // FIXME: Remove warning with "zero" in 4.6 + // FIXME: DEPRECATED: Remove warning with "zero" in version 5. if (yaxislocation_is ("zero")) warning_with_id ("Octave:deprecated-property", "Setting 'yaxislocation' to 'zero' is deprecated, " @@ -3847,7 +3847,7 @@ } void update_xaxislocation (void) { - // FIXME: Remove warning with "zero" in 4.6 + // FIXME: DEPRECATED: Remove warning with "zero" in version 5. if (xaxislocation_is ("zero")) warning_with_id ("Octave:deprecated-property", "Setting 'xaxislocation' to 'zero' is deprecated, " @@ -4300,9 +4300,10 @@ BEGIN_PROPERTIES (line) color_property color , color_property (color_values (0, 0, 0), radio_values ("none")) string_property displayname , "" - // FIXME: Remove erasemode property in version 4.6. (rm all instances in file) + // FIXME: DEPRECATED: Remove erasemode property in version 5 + // (rm all instances in file). radio_property erasemode h , "{normal}|none|xor|background" - // FIXME: Remove interpreter property in version 4.8 + // FIXME: DEPRECATED: Remove interpreter property in version 6. radio_property interpreter hd , "{tex}|none|latex" radio_property linejoin , "{round}|miter|chamfer" radio_property linestyle , "{-}|--|:|-.|none" @@ -4513,7 +4514,8 @@ { update_font (); update_text_extent (); - // FIXME: Remove warning with demi and light in 4.7+ + // FIXME: DEPRECATED: Remove warning with demi and light in + // version 6. if (fontweight.is ("demi") || fontweight.is ("light")) warning_with_id ("Octave:deprecated-property", "Setting 'fontweight' to '%s' is deprecated, \ @@ -4869,7 +4871,7 @@ array_property faces u , default_patch_faces () array_property facevertexalphadata , Matrix () array_property facevertexcdata u , Matrix () - // FIXME: Remove interpreter property in version 4.8 + // FIXME: DEPRECATED: Remove interpreter property in version 6. radio_property interpreter hd , "{tex}|none|latex" radio_property linestyle , "{-}|--|:|-.|none" double_property linewidth , 0.5 @@ -5080,7 +5082,7 @@ radio_property facelighting , "none|{flat}|gouraud|phong" array_property facenormals m , Matrix () radio_property facenormalsmode , "{auto}|manual" - // FIXME: Remove interpreter property in version 4.8 + // FIXME: DEPRECATED: Remove interpreter property in version 6. radio_property interpreter hd , "{tex}|none|latex" radio_property linestyle , "{-}|--|:|-.|none" double_property linewidth , 0.5 @@ -5523,7 +5525,8 @@ void update_fontweight (void) { update_text_extent (); - // FIXME: Remove warning with demi and light in 4.7+ + // FIXME: DEPRECATED: Remove warning with demi and light in + // version 6. if (fontweight.is ("demi") || fontweight.is ("light")) warning_with_id ("Octave:deprecated-property", "Setting 'fontweight' to '%s' is deprecated, \ @@ -5620,7 +5623,7 @@ void update_fontweight (void) { - // FIXME: Remove this warning in 4.7+ + // FIXME: DEPRECATED: Remove this warning in version 6. if (fontweight.is ("demi") || fontweight.is ("light")) warning_with_id ("Octave:deprecated-property", "Setting 'fontweight' to '%s' is deprecated, \ @@ -5709,7 +5712,7 @@ void update_fontweight (void) { - // FIXME: Remove this warning in 4.7+ + // FIXME: DEPRECATED: Remove this warning in version 6. if (fontweight.is ("demi") || fontweight.is ("light")) warning_with_id ("Octave:deprecated-property", "Setting 'fontweight' to '%s' is deprecated, \
--- a/libinterp/corefcn/gripes.cc Mon Apr 09 07:18:32 2018 -0400 +++ b/libinterp/corefcn/gripes.cc Mon Apr 09 07:54:15 2018 -0400 @@ -20,7 +20,8 @@ */ -// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in 4.6 +// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in +// version 5. #if defined (HAVE_CONFIG_H) # include "config.h" @@ -151,7 +152,6 @@ error ("%s: not implemented", fcn); } -// FIXME: Deprecated in 4.2, remove in 4.6 void gripe_not_supported (const char *fcn) {
--- a/libinterp/corefcn/gripes.h Mon Apr 09 07:18:32 2018 -0400 +++ b/libinterp/corefcn/gripes.h Mon Apr 09 07:54:15 2018 -0400 @@ -20,7 +20,9 @@ */ -// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in 4.6 +// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in +// version 5. + #if ! defined (octave_gripes_h) #define octave_gripes_h 1
--- a/libinterp/corefcn/oct-obj.h Mon Apr 09 07:18:32 2018 -0400 +++ b/libinterp/corefcn/oct-obj.h Mon Apr 09 07:54:15 2018 -0400 @@ -22,7 +22,7 @@ //////////////////////////////////////////////////////////////////////// // Note: oct-obj.h was deprecated in version 4.2 and will be removed in -// version 4.6. +// version 5. //////////////////////////////////////////////////////////////////////// #if ! defined (octave_oct_obj_h)
--- a/libinterp/corefcn/oct.h Mon Apr 09 07:18:32 2018 -0400 +++ b/libinterp/corefcn/oct.h Mon Apr 09 07:54:15 2018 -0400 @@ -32,7 +32,8 @@ #include "defun-dld.h" #include "error.h" #include "errwarn.h" -// gripes.h was deprecated in version 4.2 and will be removed in 4.6 +// FIXME: gripes.h was deprecated in version 4.2 and will be removed +// in version 5. #include "gripes.h" #include "help.h" #include "ovl.h"
--- a/libinterp/corefcn/quadcc.cc Mon Apr 09 07:18:32 2018 -0400 +++ b/libinterp/corefcn/quadcc.cc Mon Apr 09 07:54:15 2018 -0400 @@ -1551,10 +1551,10 @@ successive interpolations of the integrand over the nodes of the respective quadrature rules. -@c FIXME: Remove in Octave version 4.8 +@c FIXME: DEPRECATED: Remove in Octave version 6. Implementation Note: For Octave versions @leq{} 4.2, @code{quadcc} accepted a single tolerance argument which specified the relative tolerance. For -versions 4.4 and 4.6, @code{quadcc} will issue a warning when called with a +versions 4.4 and 5, @code{quadcc} will issue a warning when called with a single tolerance argument indicating that the meaning of this input has changed from relative tolerance to absolute tolerance. The warning ID for this message is @qcode{"Octave:quadcc:RelTol-conversion"}. The warning may be @@ -1647,7 +1647,7 @@ if (tol.numel () == 1) { - // FIXME: Remove warning in Octave version 4.8 + // FIXME: DEPRECATED: Remove warning in Octave version 6. static bool do_warn = true; if (do_warn) {
--- a/libinterp/corefcn/utils.cc Mon Apr 09 07:18:32 2018 -0400 +++ b/libinterp/corefcn/utils.cc Mon Apr 09 07:54:15 2018 -0400 @@ -539,7 +539,7 @@ return retval; } -// Deprecated in 4.2, remove in 4.6. +// Deprecated in 4.2, remove in version 5. // See if there is a .oct file in the path. // If so, return the full path to the file. @@ -576,7 +576,7 @@ return retval; } -// Deprecated in 4.2, remove in 4.6. +// Deprecated in 4.2, remove in version 5. // See if there is a .mex file in the path. // If so, return the full path to the file.
--- a/libinterp/options-usage.h Mon Apr 09 07:18:32 2018 -0400 +++ b/libinterp/options-usage.h Mon Apr 09 07:54:15 2018 -0400 @@ -59,7 +59,8 @@ #define DOC_CACHE_FILE_OPTION 2 #define EVAL_OPTION 3 #define EXEC_PATH_OPTION 4 -#define FORCE_GUI_OPTION 5 // ignored since Octave 4.4, remove for 4.8 +// FIXME: DEPRECATED: ignored since Octave 4.4, remove for version 6. +#define FORCE_GUI_OPTION 5 #define GUI_OPTION 5 #define IMAGE_PATH_OPTION 6 #define INFO_FILE_OPTION 7
--- a/liboctave/util/lo-array-gripes.cc Mon Apr 09 07:18:32 2018 -0400 +++ b/liboctave/util/lo-array-gripes.cc Mon Apr 09 07:54:15 2018 -0400 @@ -21,7 +21,8 @@ */ -// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in 4.6 +// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in +// version 5. #if defined (HAVE_CONFIG_H) # include "config.h"
--- a/liboctave/util/lo-array-gripes.h Mon Apr 09 07:18:32 2018 -0400 +++ b/liboctave/util/lo-array-gripes.h Mon Apr 09 07:54:15 2018 -0400 @@ -20,7 +20,8 @@ */ -// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in 4.6 +// FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in +// version 5. #if ! defined (octave_lo_array_gripes_h) #define octave_lo_array_gripes_h 1
--- a/scripts/deprecated/bitmax.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/bitmax.m Mon Apr 09 07:54:15 2018 -0400 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {} {@var{r} =} bitmax (@var{precision}) ## -## @code{bitmax} is deprecated and will be removed in Octave version 4.6. +## @code{bitmax} is deprecated and will be removed in Octave version 5. ## Use @code{flintmax (precision) - 1} for the equivalent functionality. ## ## Return the largest integer @var{r} that can be represented within a
--- a/scripts/deprecated/chop.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/chop.m Mon Apr 09 07:54:15 2018 -0400 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {} {} chop (@var{x}, @var{ndigits}, @var{base}) ## -## @code{chop} is deprecated and will be removed in Octave version 4.8. +## @code{chop} is deprecated and will be removed in Octave version 6. ## ## Truncate elements of @var{x} to a length of @var{ndigits} such that the ## resulting numbers are exactly divisible by @var{base}.
--- a/scripts/deprecated/desktop.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/desktop.m Mon Apr 09 07:54:15 2018 -0400 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {} {@var{used} =} desktop ("-inuse") ## -## @code{desktop} is deprecated and will be removed in Octave version 4.8. +## @code{desktop} is deprecated and will be removed in Octave version 6. ## Use @code{isguirunning} for the equivalent functionality. ## ## Return true if the desktop (GUI) is currently in use.
--- a/scripts/deprecated/java2mat.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/java2mat.m Mon Apr 09 07:54:15 2018 -0400 @@ -18,7 +18,7 @@ ## -*- texinfo -*- ## @deftypefn {} {} java2mat (@var{javaobj}) -## @code{java2mat} is deprecated and will be removed in Octave version 4.8. +## @code{java2mat} is deprecated and will be removed in Octave version 6. ## ## For the next two releases, use @code{__java2mat__} if necessary, and file ## a bug report explaining your programming use of @code{java2mat} and how it
--- a/scripts/deprecated/mahalanobis.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/mahalanobis.m Mon Apr 09 07:54:15 2018 -0400 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {} {} mahalanobis (@var{x}, @var{y}) ## -## @code{mahalanobis} is deprecated and will be removed in Octave version 4.6. +## @code{mahalanobis} is deprecated and will be removed in Octave version 5. ## See the @code{mahal} function in the statistics package from Octave-Forge ## for equivalent functionality. ##
--- a/scripts/deprecated/md5sum.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/md5sum.m Mon Apr 09 07:54:15 2018 -0400 @@ -20,7 +20,7 @@ ## @deftypefn {} {} md5sum (@var{file}) ## @deftypefnx {} {} md5sum (@var{str}, @var{opt}) ## -## @code{md5sum} is deprecated and will be removed in Octave version 4.6. +## @code{md5sum} is deprecated and will be removed in Octave version 5. ## For equivalent functionality replace calls like @code{md5sum (@var{file})} ## with: ##
--- a/scripts/deprecated/octave_config_info.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/octave_config_info.m Mon Apr 09 07:54:15 2018 -0400 @@ -21,7 +21,7 @@ ## @deftypefnx {} {} octave_config_info (@var{option}) ## ## @code{octave_config_info} is deprecated and will be removed in -## Octave version 4.6. Use @code{__have_feature__ (@var{option})} or +## Octave version 5. Use @code{__have_feature__ (@var{option})} or ## @code{__octave_config_info__} as a replacement. ## ## Return a structure containing configuration and installation
--- a/scripts/deprecated/onenormest.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/onenormest.m Mon Apr 09 07:54:15 2018 -0400 @@ -20,7 +20,7 @@ ## @deftypefn {} {[@var{est}, @var{v}, @var{w}, @var{iter}] =} onenormest (@var{A}, @var{t}) ## @deftypefnx {} {[@var{est}, @var{v}, @var{w}, @var{iter}] =} onenormest (@var{apply}, @var{apply_t}, @var{n}, @var{t}) ## -## @code{onenormest} is deprecated and will be removed in Octave version 4.6. +## @code{onenormest} is deprecated and will be removed in Octave version 5. ## Use @code{normest1} for the equivalent functionality. ## ## Apply @nospell{Higham and Tisseur's} randomized block 1-norm estimator to
--- a/scripts/deprecated/sleep.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/sleep.m Mon Apr 09 07:54:15 2018 -0400 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {} {} sleep (@var{seconds}) ## -## @code{sleep} is deprecated and will be removed in Octave version 4.6. +## @code{sleep} is deprecated and will be removed in Octave version 5. ## Use @code{pause} instead. ## ## Suspend the execution of the program for the given number of seconds.
--- a/scripts/deprecated/tmpnam.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/tmpnam.m Mon Apr 09 07:54:15 2018 -0400 @@ -20,7 +20,7 @@ ## @deftypefn {} {@var{fname} =} tmpnam () ## @deftypefnx {} {@var{fname} =} tmpnam (@var{dir}) ## @deftypefnx {} {@var{fname} =} tmpnam (@var{dir}, @var{prefix}) -## @code{tmpnam} is deprecated and will be removed in Octave version 4.8. +## @code{tmpnam} is deprecated and will be removed in Octave version 6. ## Use @code{tempname} instead. ## ## Return a unique temporary filename as a string. @@ -37,7 +37,7 @@ ## see @code{tmpfile}. The functions @code{tmpnam} and @code{tempname} are ## equivalent with the latter provided for @sc{matlab} compatibility. ## -## @strong{Caution}: @code{tmpnam} will be removed in Octave version 4.8, or +## @strong{Caution}: @code{tmpnam} will be removed in Octave version 6, or ## whatever the version number is two releases from 4.4. Use the equivalent ## @code{tempname} in all new code. ## @seealso{tempname, mkstemp, tempdir, P_tmpdir, tmpfile}
--- a/scripts/deprecated/toascii.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/toascii.m Mon Apr 09 07:54:15 2018 -0400 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {} {} toascii (@var{str}) ## -## @code{toascii} is deprecated and will be removed in Octave version 4.8. +## @code{toascii} is deprecated and will be removed in Octave version 6. ## Use @code{double} instead. ## ## Return ASCII representation of @var{str} in a matrix. @@ -36,7 +36,7 @@ ## @seealso{double, char} ## @end deftypefn -## Remove in version 4.8. +## FIXME: DEPRECATED: Remove in version 6. function retval = toascii (str)
--- a/scripts/deprecated/usleep.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/usleep.m Mon Apr 09 07:54:15 2018 -0400 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {} {} usleep (@var{microseconds}) ## -## @code{usleep} is deprecated and will be removed in Octave version 4.6. +## @code{usleep} is deprecated and will be removed in Octave version 5. ## Use @code{pause} instead. ## ## Suspend the execution of the program for the given number of
--- a/scripts/deprecated/wavread.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/wavread.m Mon Apr 09 07:54:15 2018 -0400 @@ -26,7 +26,7 @@ ## @deftypefnx {} {@var{sz} =} wavread (@var{filename}, "size") ## @deftypefnx {} {[@var{n_samp}, @var{n_chan}] =} wavread (@var{filename}, "size") ## -## @code{wavread} is deprecated and will be removed in Octave version 4.6. +## @code{wavread} is deprecated and will be removed in Octave version 5. ## Use @code{audioread} for the equivalent functionality. ## ## Read the audio signal @var{y} from the RIFF/WAVE sound file @var{filename}.
--- a/scripts/deprecated/wavwrite.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/deprecated/wavwrite.m Mon Apr 09 07:54:15 2018 -0400 @@ -22,7 +22,7 @@ ## @deftypefnx {} {} wavwrite (@var{y}, @var{fs}, @var{filename}) ## @deftypefnx {} {} wavwrite (@var{y}, @var{fs}, @var{nbits}, @var{filename}) ## -## @code{wavwrite} is deprecated and will be removed in Octave version 4.6. +## @code{wavwrite} is deprecated and will be removed in Octave version 5. ## Use @code{audiowrite} for the equivalent functionality. ## ## Write the audio signal @var{y} to the RIFF/WAVE sound file @var{filename}.
--- a/scripts/plot/appearance/annotation.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/plot/appearance/annotation.m Mon Apr 09 07:54:15 2018 -0400 @@ -480,7 +480,7 @@ hr = patch (x, y, "parent", h); - ## FIXME: Remove warn state switching in Octave 4.8 + ## FIXME: DEPRECATED: Remove warn state switching in version 6. old_warn_state = warning ("off", "Octave:deprecated-property"); propnames = rectprops ("names"); for ii = 1:numel (propnames) @@ -800,7 +800,7 @@ function props = rectprops (varargin) - ## FIXME: Remove "edgecolor" in Octave 4.8 + ## FIXME: DEPRECATED: Remove "edgecolor" in version 6. props = {"color", "patchedgecolor", "k", ... "edgecolor", "patchedgecolor", "k", ... "facealpha", "patchfacealpha", 1, ... @@ -1279,7 +1279,7 @@ set (hre, "edgecolor", get (h, prop)); case "edgecolor" - ## FIXME: Remove "edgecolor" in Octave 4.8 + ## FIXME: DEPRECATED: Remove "edgecolor" in version 6. warning ("Octave:deprecated-property", ['annotation: Property "edgecolor" for ' typ ' annotations'... ' is deprecated and will be removed from a future version'...
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m Mon Apr 09 07:18:32 2018 -0400 +++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m Mon Apr 09 07:54:15 2018 -0400 @@ -247,7 +247,8 @@ else xaxisloc = "x"; xaxisloc_using = "x1"; - if (any (strcmp (axis_obj.xaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 +### FIXME: DEPRECATED: Remove "zero" in version 5. + if (any (strcmp (axis_obj.xaxislocation, {"origin", "zero"}))) fputs (plot_stream, "set xzeroaxis;\n"); endif endif @@ -257,7 +258,8 @@ else yaxisloc = "y"; yaxisloc_using = "y1"; - if (any (strcmp (axis_obj.yaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 +### FIXME: DEPRECATED: Remove "zero" in version 5. + if (any (strcmp (axis_obj.yaxislocation, {"origin", "zero"}))) fputs (plot_stream, "set yzeroaxis;\n"); endif endif @@ -1807,10 +1809,12 @@ arrow (4, obj.ycolor, obj.linewidth, [1,0,0], [1,1,0]); endif - if (any (strcmp (obj.xaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 +### FIXME: DEPRECATED: Remove "zero" in version 5. + if (any (strcmp (obj.xaxislocation, {"origin", "zero"}))) idx = zeroaxis (idx, obj.xcolor, "x"); endif - if (any (strcmp (obj.yaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 +### FIXME: DEPRECATED: Remove "zero" in version 5. + if (any (strcmp (obj.yaxislocation, {"origin", "zero"}))) idx = zeroaxis (idx, obj.ycolor, "y"); endif @@ -2176,7 +2180,8 @@ obj.xcolor, "x", plot_stream, true, "border", "", "", fontname, fontspec, obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term); - elseif (any (strcmp (obj.xaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 +### FIXME: DEPRECATED: Remove "zero" in version 5. + elseif (any (strcmp (obj.xaxislocation, {"origin", "zero"}))) do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, obj.xticklabel, obj.xcolor, "x", plot_stream, true, "axis", obj.tickdir, ticklength, fontname, fontspec, @@ -2204,7 +2209,8 @@ obj.ycolor, "y", plot_stream, ymirror, "border", "", "", fontname, fontspec, obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term); - elseif (any (strcmp (obj.yaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 +### FIXME: DEPRECATED: Remove "zero" in version 5. + elseif (any (strcmp (obj.yaxislocation, {"origin", "zero"}))) do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, "axis", obj.tickdir, ticklength, fontname, fontspec,
--- a/test/deprecate-props.tst Mon Apr 09 07:18:32 2018 -0400 +++ b/test/deprecate-props.tst Mon Apr 09 07:54:15 2018 -0400 @@ -34,12 +34,12 @@ %! endif %!endfunction -## patch/surface "normalmode" deprecated in 4.2, remove from 4.5.+ +## patch/surface "normalmode" deprecated in 4.2, remove from version 5. %!test %! hf = figure ("visible", "off"); %! unwind_protect %! hp = patch (); -%! testprop (hp, "normalmode", "4.4"); +%! testprop (hp, "normalmode", "5.0"); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect @@ -47,60 +47,61 @@ %! hf = figure ("visible", "off"); %! unwind_protect %! hs = surface (); -%! testprop (hs, "normalmode", "4.4"); +%! testprop (hs, "normalmode", "5.0"); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect -## axes, "zero" value for "x/yaxislocation" deprecated in 4.2, remove from 4.5.+ +## axes, "zero" value for "x/yaxislocation" deprecated in 4.2, remove +## from version 5. %!test %! hf = figure ("visible", "off"); %! unwind_protect %! ha = axes (); -%! testprop (ha, "xaxislocation", "4.4", "zero"); -%! testprop (ha, "yaxislocation", "4.4", "zero"); +%! testprop (ha, "xaxislocation", "5.0", "zero"); +%! testprop (ha, "yaxislocation", "5.0", "zero"); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect -## annotation rectangle "edgecolor" deprecated in 4.4, remove from 4.7.+ +## annotation rectangle "edgecolor" deprecated in 4.4, remove from version 6. %!test %! hf = figure ("visible", "off"); %! unwind_protect %! ha = annotation ("rectangle"); -%! testprop (ha, "edgecolor", "4.6"); +%! testprop (ha, "edgecolor", "6.0"); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect ## figure "doublebuffer, mincolormap, wvisual, wvisualmode, xdisplay, -## xvisual, xvisualmode" deprecated in 4.4, remove from 4.7.+ +## xvisual, xvisualmode" deprecated in 4.4, remove from version 6. %!test %! hf = figure ("visible", "off"); %! unwind_protect -%! testprop (hf, "doublebuffer", "4.6"); -%! testprop (hf, "mincolormap", "4.6"); -%! testprop (hf, "wvisual", "4.6"); -%! testprop (hf, "wvisualmode", "4.6"); -%! testprop (hf, "xdisplay", "4.6"); -%! testprop (hf, "xvisual", "4.6"); -%! testprop (hf, "xvisualmode", "4.6"); +%! testprop (hf, "doublebuffer", "6.0"); +%! testprop (hf, "mincolormap", "6.0"); +%! testprop (hf, "wvisual", "6.0"); +%! testprop (hf, "wvisualmode", "6.0"); +%! testprop (hf, "xdisplay", "6.0"); +%! testprop (hf, "xvisual", "6.0"); +%! testprop (hf, "xvisualmode", "6.0"); %! unwind_protect_cleanup %! close (hf) %! end_unwind_protect -## axes "drawmode" deprecated in 4.4, remove from 4.7.+ +## axes "drawmode" deprecated in 4.4, remove from version 6. %!test %! hf = figure ("visible", "off"); %! unwind_protect %! hax = axes (); -%! testprop (hax, "drawmode", "4.6"); +%! testprop (hax, "drawmode", "6.0"); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect ## text/uicontrol/uipanel/uibuttongroup "demi" and "light" values for -## "fontweight" property are deprecated in 4.4, remove from 4.7.+: +## "fontweight" property are deprecated in 4.4, remove from version 6: ## * remove "demi" and "light" options in graphics.in.h, ## QtHandlesUtils.cc and ft-text-renderer.cc ## * remove warnings from update_fontweight in graphics.in.h @@ -108,17 +109,17 @@ %! hf = figure ("visible", "off"); %! unwind_protect %! ht = text (); -%! testprop (ht, "fontweight", "4.6", "demi"); -%! testprop (ht, "fontweight", "4.6", "light"); +%! testprop (ht, "fontweight", "6.0", "demi"); +%! testprop (ht, "fontweight", "6.0", "light"); %! hui = uicontrol (); -%! testprop (hui, "fontweight", "4.6", "demi"); -%! testprop (hui, "fontweight", "4.6", "light"); +%! testprop (hui, "fontweight", "6.0", "demi"); +%! testprop (hui, "fontweight", "6.0", "light"); %! hui = uipanel (); -%! testprop (hui, "fontweight", "4.6", "demi"); -%! testprop (hui, "fontweight", "4.6", "light"); +%! testprop (hui, "fontweight", "6.0", "demi"); +%! testprop (hui, "fontweight", "6.0", "light"); %! hui = uibuttongroup (); -%! testprop (hui, "fontweight", "4.6", "demi"); -%! testprop (hui, "fontweight", "4.6", "light"); +%! testprop (hui, "fontweight", "6.0", "demi"); +%! testprop (hui, "fontweight", "6.0", "light"); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect