Mercurial > octave
changeset 25173:ff3d24a818a1
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 09 Apr 2018 08:22:32 -0400 |
parents | 512b68611097 (current diff) 7b1b504c2f12 (diff) |
children | 8fdc6df8bab0 |
files | NEWS libinterp/corefcn/graphics.in.h libinterp/corefcn/oct.h libinterp/corefcn/utils.cc scripts/deprecated/tmpnam.m scripts/deprecated/toascii.m scripts/plot/util/private/__gnuplot_draw_axes__.m test/deprecate-props.tst |
diffstat | 12 files changed, 38 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Sun Apr 08 19:53:57 2018 -0700 +++ b/NEWS Mon Apr 09 08:22:32 2018 -0400 @@ -38,7 +38,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 @@ -87,7 +87,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 @@ -319,7 +319,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 @@ -362,7 +362,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 @@ -382,7 +382,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. @@ -906,7 +906,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 @@ -967,7 +967,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 @@ -1013,7 +1013,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/doc/interpreter/bugs.txi Sun Apr 08 19:53:57 2018 -0700 +++ b/doc/interpreter/bugs.txi Mon Apr 09 08:22:32 2018 -0400 @@ -30,7 +30,7 @@ This file documents known bugs in Octave and describes where and how to report any bugs that you may find. -Copyright (C) 1996, 1997, 2007 John W. Eaton. You may copy, distribute, and +Copyright (C) 1996-2018 John W. Eaton. You may copy, distribute, and modify it freely as long as you preserve this copyright notice and permission notice.
--- a/libgui/src/octave-dock-widget.cc Sun Apr 08 19:53:57 2018 -0700 +++ b/libgui/src/octave-dock-widget.cc Mon Apr 09 08:22:32 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 Sun Apr 08 19:53:57 2018 -0700 +++ b/libinterp/corefcn/graphics.in.h Mon Apr 09 08:22:32 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 , "" @@ -4288,9 +4288,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" @@ -4501,7 +4502,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, \ @@ -4857,7 +4859,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 @@ -5051,7 +5053,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 @@ -5477,7 +5479,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, \ @@ -5574,7 +5577,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, \ @@ -5663,7 +5666,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/oct-obj.h Sun Apr 08 19:53:57 2018 -0700 +++ b/libinterp/corefcn/oct-obj.h Mon Apr 09 08:22:32 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/quadcc.cc Sun Apr 08 19:53:57 2018 -0700 +++ b/libinterp/corefcn/quadcc.cc Mon Apr 09 08:22:32 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/options-usage.h Sun Apr 08 19:53:57 2018 -0700 +++ b/libinterp/options-usage.h Mon Apr 09 08:22:32 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/scripts/deprecated/tmpnam.m Sun Apr 08 19:53:57 2018 -0700 +++ b/scripts/deprecated/tmpnam.m Mon Apr 09 08:22:32 2018 -0400 @@ -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 Sun Apr 08 19:53:57 2018 -0700 +++ b/scripts/deprecated/toascii.m Mon Apr 09 08:22:32 2018 -0400 @@ -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/general/repelem.m Sun Apr 08 19:53:57 2018 -0700 +++ b/scripts/general/repelem.m Mon Apr 09 08:22:32 2018 -0400 @@ -1,4 +1,4 @@ -## Copyright (C) 2015 Markus Bergholz +## Copyright (C) 2015-2018 Markus Bergholz ## ## This file is part of Octave. ##
--- a/scripts/plot/appearance/annotation.m Sun Apr 08 19:53:57 2018 -0700 +++ b/scripts/plot/appearance/annotation.m Mon Apr 09 08:22:32 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/test/deprecate-props.tst Sun Apr 08 19:53:57 2018 -0700 +++ b/test/deprecate-props.tst Mon Apr 09 08:22:32 2018 -0400 @@ -34,7 +34,7 @@ %! endif %!endfunction -## annotation rectangle "edgecolor" deprecated in 4.4, remove from 6. +## annotation rectangle "edgecolor" deprecated in 4.4, remove from version 6. %!test %! hf = figure ("visible", "off"); %! unwind_protect @@ -45,7 +45,7 @@ %! end_unwind_protect ## figure "doublebuffer, mincolormap, wvisual, wvisualmode, xdisplay, -## xvisual, xvisualmode" deprecated in 4.4, remove from 6. +## xvisual, xvisualmode" deprecated in 4.4, remove from version 6. %!test %! hf = figure ("visible", "off"); %! unwind_protect @@ -60,7 +60,7 @@ %! close (hf) %! end_unwind_protect -## axes "drawmode" deprecated in 4.4, remove from 6. +## axes "drawmode" deprecated in 4.4, remove from version 6. %!test %! hf = figure ("visible", "off"); %! unwind_protect @@ -71,7 +71,7 @@ %! end_unwind_protect ## text/uicontrol/uipanel/uibuttongroup "demi" and "light" values for -## "fontweight" property are deprecated in 4.4, remove from 6. +## "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