# HG changeset patch # User Rik # Date 1431447721 25200 # Node ID aa36fb998a4dc4ae6cfbb674a495dfbb7ec3fc35 # Parent cc5ffacb15ab399684d5172688ce6ba0615dfa5a maint: Remove unnecessary whitespace at end of lines. * libgui/Makefile.am, libgui/graphics/Canvas.cc, libgui/graphics/EditControl.cc, libgui/graphics/Figure.cc, libgui/graphics/MouseModeActionGroup.cc, libgui/graphics/annotation-dialog.cc, libgui/graphics/annotation-dialog.h, libgui/graphics/gl-select.cc, libgui/graphics/module.mk, libgui/kb-layouts/default.keytab, libgui/kb-layouts/linux.keytab, libgui/kb-layouts/vt420pc.keytab, libgui/src/m-editor/find-dialog.cc, libgui/src/main-window.cc, libgui/src/octave-qt-link.cc, libgui/src/octave-qt-link.h, libgui/src/shortcut-manager.h, libinterp/corefcn/error.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/octave-link.cc, libinterp/corefcn/quadcc.cc, libinterp/corefcn/strfns.cc, libinterp/corefcn/syscalls.cc, libinterp/corefcn/sysdep.cc, libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc, libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/colamd.cc, libinterp/octave-value/ov-bool-sparse.cc, libinterp/octave-value/ov-classdef.cc, libinterp/octave-value/ov-re-sparse.cc, libinterp/octave-value/ov-struct.cc, libinterp/parse-tree/pt-arg-list.cc, scripts/audio/@audiorecorder/play.m, scripts/audio/wavwrite.m, scripts/general/cart2sph.m, scripts/geometry/inpolygon.m, scripts/gui/listdlg.m, scripts/gui/msgbox.m, scripts/gui/private/message_dialog.m, scripts/help/get_first_help_sentence.m, scripts/help/lookfor.m, scripts/image/imshow.m, scripts/io/strread.m, scripts/java/javamem.m, scripts/miscellaneous/dir.m, scripts/miscellaneous/edit.m, scripts/miscellaneous/genvarname.m, scripts/miscellaneous/gzip.m, scripts/miscellaneous/private/__w2mpth__.m, scripts/plot/appearance/annotation.m, scripts/plot/draw/colorbar.m, scripts/plot/draw/quiver3.m, scripts/plot/util/hold.m, scripts/plot/util/print.m, scripts/polynomial/mkpp.m, scripts/polynomial/polyder.m, scripts/polynomial/spline.m, scripts/polynomial/unmkpp.m, scripts/signal/arma_rnd.m, scripts/sparse/gplot.m, scripts/statistics/tests/t_test.m, scripts/statistics/tests/t_test_regression.m, scripts/strings/mat2str.m, scripts/strings/strsplit.m, scripts/strings/strtrunc.m, scripts/strings/untabify.m, scripts/testfun/assert.m: maint: Remove unnecessary whitespace at end of lines. diff -r cc5ffacb15ab -r aa36fb998a4d libgui/Makefile.am --- a/libgui/Makefile.am Tue May 12 08:01:42 2015 -0700 +++ b/libgui/Makefile.am Tue May 12 09:22:01 2015 -0700 @@ -126,7 +126,7 @@ AM_V_lrelease = $(am__v_lrelease_$(V)) am__v_lrelease_ = $(am__v_lrelease_$(AM_DEFAULT_VERBOSITY)) am__v_lrelease_0 = -silent -am__v_lrelease_1 = +am__v_lrelease_1 = %.qm: %.ts $(AM_V_GEN)$(MKDIR_P) languages && \ diff -r cc5ffacb15ab -r aa36fb998a4d libgui/graphics/Canvas.cc --- a/libgui/graphics/Canvas.cc Tue May 12 08:01:42 2015 -0700 +++ b/libgui/graphics/Canvas.cc Tue May 12 09:22:01 2015 -0700 @@ -204,7 +204,7 @@ redraw (); } - + void Canvas::canvasToggleAxes (const graphics_handle& handle) { @@ -785,11 +785,11 @@ else if (m_mouseMode == TextMode) { gh_manager::auto_lock lock; - - graphics_object figObj = + + graphics_object figObj = gh_manager::get_object (m_handle).get_ancestor ("figure"); if (figObj.valid_object ()) - { + { QWidget *w = qWidget (); if (w) { @@ -802,7 +802,7 @@ octave_value_list props = ovl("textbox", bb); annotation_dialog anno_dlg (w, props); - + if (anno_dlg.exec () == QDialog::Accepted) { props = anno_dlg.get_properties (); diff -r cc5ffacb15ab -r aa36fb998a4d libgui/graphics/EditControl.cc --- a/libgui/graphics/EditControl.cc Tue May 12 08:01:42 2015 -0700 +++ b/libgui/graphics/EditControl.cc Tue May 12 09:22:01 2015 -0700 @@ -217,7 +217,7 @@ m_textChanged = true; } -void +void EditControl::returnPressed (void) { QString txt = (m_multiLine diff -r cc5ffacb15ab -r aa36fb998a4d libgui/graphics/Figure.cc --- a/libgui/graphics/Figure.cc Tue May 12 08:01:42 2015 -0700 +++ b/libgui/graphics/Figure.cc Tue May 12 09:22:01 2015 -0700 @@ -135,7 +135,7 @@ createFigureToolBarAndMenuBar (); int offset = 0; - if (fp.toolbar_is ("figure") || + if (fp.toolbar_is ("figure") || (fp.toolbar_is ("auto") && fp.menubar_is ("figure") && ! hasUiControlChildren (fp))) offset += m_figureToolBar->sizeHint ().height (); @@ -275,7 +275,7 @@ std::string direction = zm.getfield ("Direction").string_value (); mode += " " + direction; - } + } return mouse_mode_from_string (mode); } @@ -835,7 +835,7 @@ octave_link::copy_image_to_clipboard (file); } - + void Figure::fileSaveFigureAs (void) { @@ -936,7 +936,7 @@ if (canvas) canvas->toggleAxes (m_handle); } - + void Figure::toggleGrid (void) { @@ -945,7 +945,7 @@ if (canvas) canvas->toggleGrid (m_handle); } - + void Figure::autoAxes (void) { @@ -954,5 +954,5 @@ if (canvas) canvas->autoAxes (m_handle); } - + }; // namespace QtHandles diff -r cc5ffacb15ab -r aa36fb998a4d libgui/graphics/MouseModeActionGroup.cc --- a/libgui/graphics/MouseModeActionGroup.cc Tue May 12 08:01:42 2015 -0700 +++ b/libgui/graphics/MouseModeActionGroup.cc Tue May 12 09:22:01 2015 -0700 @@ -39,11 +39,11 @@ m_actions.append (new QAction (QIcon (":/images/rotate.png"), tr ("Rotate"), this)); QAction *zoom_in = new QAction ("Z+", this); - zoom_in->setToolTip (tr ("Zoom In")); + zoom_in->setToolTip (tr ("Zoom In")); m_actions.append (zoom_in); QAction *zoom_out = new QAction ("Z-", this); - zoom_out->setToolTip (tr ("Zoom Out")); + zoom_out->setToolTip (tr ("Zoom Out")); m_actions.append (zoom_out); m_actions.append (new QAction (QIcon (":/images/pan.png"), @@ -108,5 +108,5 @@ if (mode == SelectMode) m_actions[SelectMode-1]->setChecked (false); } - + }; diff -r cc5ffacb15ab -r aa36fb998a4d libgui/graphics/annotation-dialog.cc --- a/libgui/graphics/annotation-dialog.cc Tue May 12 08:01:42 2015 -0700 +++ b/libgui/graphics/annotation-dialog.cc Tue May 12 09:22:01 2015 -0700 @@ -60,7 +60,7 @@ this, SLOT (button_clicked (QAbstractButton *))); - connect (ui->edit_string, SIGNAL (textChanged (const QString&)), + connect (ui->edit_string, SIGNAL (textChanged (const QString&)), this, SLOT (edit_string_changed (const QString&))); connect (ui->btn_color, SIGNAL (clicked ()), @@ -127,7 +127,7 @@ position(2) = ui->sb_width->value (); position(3) = ui->sb_height->value (); props.append (ovl ("textbox", position)); - + props.append (ovl ("string", ui->edit_string->text ().toStdString ())); props.append (ovl ("fitboxtotext", ui->cb_fit_box_to_text->isChecked() ? "on" : "off" )); props.append (ovl ("units", ui->cb_units->currentText ().toStdString () )); @@ -179,14 +179,14 @@ else if (name == "string") { // FIXME: handle if is array of strings ? - ui->edit_string->setText (props(2*i +1).string_value ().c_str ()); + ui->edit_string->setText (props(2*i +1).string_value ().c_str ()); } else if (name == "fitboxtotext") { ui->cb_fit_box_to_text->setChecked ( props(1*i +1).string_value () == "on" ); } else if (name == "units") - { + { ui->cb_units->setCurrentIndex ( ui->cb_units->findText(props(1*i +1).string_value ().c_str ()) ); } else if (name == "horizontalalignment") @@ -229,7 +229,7 @@ edit_string_changed (ui->edit_string->text ()); } - + void annotation_dialog::edit_string_changed (const QString &str) { @@ -243,7 +243,7 @@ if (widg) { QColor color = widg->palette ().color (QPalette::Button); - + color = QColorDialog::getColor(color, this); if (color.isValid ()) @@ -253,7 +253,7 @@ QString css = QString ("background-color: %1; border: 1px solid %2;") .arg (color.name ()) .arg ("#000000"); - + widg->setStyleSheet (css); widg->update (); } diff -r cc5ffacb15ab -r aa36fb998a4d libgui/graphics/annotation-dialog.h --- a/libgui/graphics/annotation-dialog.h Tue May 12 08:01:42 2015 -0700 +++ b/libgui/graphics/annotation-dialog.h Tue May 12 09:22:01 2015 -0700 @@ -36,7 +36,7 @@ class annotation_dialog : public QDialog { - Q_OBJECT + Q_OBJECT public: explicit annotation_dialog (QWidget * parent, const octave_value_list &pr); ~annotation_dialog (); diff -r cc5ffacb15ab -r aa36fb998a4d libgui/graphics/gl-select.cc --- a/libgui/graphics/gl-select.cc Tue May 12 08:01:42 2015 -0700 +++ b/libgui/graphics/gl-select.cc Tue May 12 09:22:01 2015 -0700 @@ -225,7 +225,7 @@ p4(0) = xd(0) - x_pix_size/2; p4(1) = yd(1) + y_pix_size/2; - + glBegin (GL_QUADS); glVertex3dv (p1.data ()); glVertex3dv (p2.data ()); diff -r cc5ffacb15ab -r aa36fb998a4d libgui/graphics/module.mk --- a/libgui/graphics/module.mk Tue May 12 08:01:42 2015 -0700 +++ b/libgui/graphics/module.mk Tue May 12 09:22:01 2015 -0700 @@ -7,7 +7,7 @@ graphics/images/select.png \ graphics/images/zoom-in.png \ graphics/images/zoom-out.png \ - $(octave_gui_graphics_UI) + $(octave_gui_graphics_UI) octave_gui_MOC += \ graphics/moc-annotation-dialog.cc \ diff -r cc5ffacb15ab -r aa36fb998a4d libgui/kb-layouts/default.keytab --- a/libgui/kb-layouts/default.keytab Tue May 12 08:01:42 2015 -0700 +++ b/libgui/kb-layouts/default.keytab Tue May 12 09:22:01 2015 -0700 @@ -67,10 +67,10 @@ key Enter+NewLine : "\r\n" key Enter-NewLine : "\r" -key Home -AnyMod -AppCuKeys : "\E[H" -key End -AnyMod -AppCuKeys : "\E[F" -key Home -AnyMod +AppCuKeys : "\EOH" -key End -AnyMod +AppCuKeys : "\EOF" +key Home -AnyMod -AppCuKeys : "\E[H" +key End -AnyMod -AppCuKeys : "\E[F" +key Home -AnyMod +AppCuKeys : "\EOH" +key End -AnyMod +AppCuKeys : "\EOF" key Home +AnyMod : "\E[1;*H" key End +AnyMod : "\E[1;*F" diff -r cc5ffacb15ab -r aa36fb998a4d libgui/kb-layouts/linux.keytab --- a/libgui/kb-layouts/linux.keytab Tue May 12 08:01:42 2015 -0700 +++ b/libgui/kb-layouts/linux.keytab Tue May 12 09:22:01 2015 -0700 @@ -10,14 +10,14 @@ # This configuration table allows to customize the # meaning of the keys. # -# The syntax is that each entry has the form : +# The syntax is that each entry has the form : # # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in with the # "Qt::Key_" removed. (We'd better insert the list here) # -# Mode names are : +# Mode names are : # # - Shift # - Alt @@ -26,7 +26,7 @@ # The VT100 emulation has two modes that can affect the # sequences emitted by certain keys. These modes are # under control of the client program. -# +# # - Newline : effects Return and Enter key. # - Application : effects Up and Down key. # @@ -53,7 +53,7 @@ # VT100 can add an extra \n after return. # The NewLine mode is set by an escape sequence. -key Return-NewLine : "\r" +key Return-NewLine : "\r" key Return+NewLine : "\r\n" # Some desperately try to save the ^H. @@ -86,31 +86,31 @@ # linux functions keys F1-F5 differ from xterm -key F1 : "\E[[A" -key F2 : "\E[[B" -key F3 : "\E[[C" -key F4 : "\E[[D" -key F5 : "\E[[E" +key F1 : "\E[[A" +key F2 : "\E[[B" +key F3 : "\E[[C" +key F4 : "\E[[D" +key F5 : "\E[[E" -key F6 : "\E[17~" -key F7 : "\E[18~" -key F8 : "\E[19~" -key F9 : "\E[20~" -key F10 : "\E[21~" -key F11 : "\E[23~" -key F12 : "\E[24~" +key F6 : "\E[17~" +key F7 : "\E[18~" +key F8 : "\E[19~" +key F9 : "\E[20~" +key F10 : "\E[21~" +key F11 : "\E[23~" +key F12 : "\E[24~" -key Home : "\E[1~" -key End : "\E[4~" +key Home : "\E[1~" +key End : "\E[4~" -key Prior -Shift : "\E[5~" -key Next -Shift : "\E[6~" -key Insert-Shift : "\E[2~" +key Prior -Shift : "\E[5~" +key Next -Shift : "\E[6~" +key Insert-Shift : "\E[2~" # Keypad-Enter. See comment on Return above. key Enter+NewLine : "\r\n" -key Enter-NewLine : "\r" +key Enter-NewLine : "\r" key Space +Control : "\x00" diff -r cc5ffacb15ab -r aa36fb998a4d libgui/kb-layouts/vt420pc.keytab --- a/libgui/kb-layouts/vt420pc.keytab Tue May 12 08:01:42 2015 -0700 +++ b/libgui/kb-layouts/vt420pc.keytab Tue May 12 09:22:01 2015 -0700 @@ -4,14 +4,14 @@ # ################################################################ # -# The escape sequences emmited by the +# The escape sequences emmited by the # keys Shift+F1 to Shift+F12 might not fit your needs # ################# IMPORTANT NOTICE ############################# -# the key bindings (Kcontrol -> look and feel -> keybindgs) -# overrule the settings in this file. The key bindings might be +# the key bindings (Kcontrol -> look and feel -> keybindgs) +# overrule the settings in this file. The key bindings might be # changed by the user WITHOUT notification of the maintainer of -# the keytab file. Konsole will not work as expected by +# the keytab file. Konsole will not work as expected by # the maintainer of the keytab file. ################################################################ # @@ -24,14 +24,14 @@ # This configuration table allows to customize the # meaning of the keys. # -# The syntax is that each entry has the form : +# The syntax is that each entry has the form : # # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in with the # "Qt::Key_" removed. (We'd better insert the list here) # -# Mode names are : +# Mode names are : # # - Shift # - Alt @@ -40,7 +40,7 @@ # The VT100 emulation has two modes that can affect the # sequences emitted by certain keys. These modes are # under control of the client program. -# +# # - Newline : effects Return and Enter key. # - Application : effects Up and Down key. # @@ -68,7 +68,7 @@ # VT100 can add an extra \n after return. # The NewLine mode is set by an escape sequence. -key Return-NewLine : "\r" +key Return-NewLine : "\r" key Return+NewLine : "\r\n" # Some desperately try to save the ^H. @@ -100,9 +100,9 @@ key Right-Shift+Ansi-AppCuKeys : "\E[C" key Left -Shift+Ansi-AppCuKeys : "\E[D" -# function keys +# function keys -key F1 -Shift : "\E[11~" +key F1 -Shift : "\E[11~" key F2 -Shift : "\E[12~" key F3 -Shift : "\E[13~" key F4 -Shift : "\E[14~" @@ -113,7 +113,7 @@ key F9 -Shift : "\E[20~" key F10-Shift : "\E[21~" key F11-Shift : "\E[23~" -key F12-Shift : "\E[24~" +key F12-Shift : "\E[24~" # # Shift F1-F12 # @@ -122,25 +122,25 @@ key F3 +Shift : "\E[13;2~" key F4 +Shift : "\E[14;2~" key F5 +Shift : "\E[15;2~" -key F6 +Shift : "\E[17;2~" -key F7 +Shift : "\E[18;2~" -key F8 +Shift : "\E[19;2~" -key F9 +Shift : "\E[20;2~" -key F10+Shift : "\E[21;2~" -key F11+Shift : "\E[23;2~" -key F12+Shift : "\E[24;2~" +key F6 +Shift : "\E[17;2~" +key F7 +Shift : "\E[18;2~" +key F8 +Shift : "\E[19;2~" +key F9 +Shift : "\E[20;2~" +key F10+Shift : "\E[21;2~" +key F11+Shift : "\E[23;2~" +key F12+Shift : "\E[24;2~" -key Home : "\E[H" -key End : "\E[F" +key Home : "\E[H" +key End : "\E[F" -key Prior -Shift : "\E[5~" -key Next -Shift : "\E[6~" -key Insert-Shift : "\E[2~" +key Prior -Shift : "\E[5~" +key Next -Shift : "\E[6~" +key Insert-Shift : "\E[2~" # Keypad-Enter. See comment on Return above. key Enter+NewLine : "\r\n" -key Enter-NewLine : "\r" +key Enter-NewLine : "\r" key Space +Control : "\x00" diff -r cc5ffacb15ab -r aa36fb998a4d libgui/src/m-editor/find-dialog.cc --- a/libgui/src/m-editor/find-dialog.cc Tue May 12 08:01:42 2015 -0700 +++ b/libgui/src/m-editor/find-dialog.cc Tue May 12 09:22:01 2015 -0700 @@ -297,7 +297,7 @@ { int currpos = _edit_area->positionFromLineIndex(line,col); currpos -= (_search_line_edit->text ().length ()); - if (currpos < 0) + if (currpos < 0) currpos = 0; _edit_area->lineIndexFromPosition(currpos, &line,&col); } diff -r cc5ffacb15ab -r aa36fb998a4d libgui/src/main-window.cc --- a/libgui/src/main-window.cc Tue May 12 08:01:42 2015 -0700 +++ b/libgui/src/main-window.cc Tue May 12 09:22:01 2015 -0700 @@ -1760,7 +1760,7 @@ edit_menu->addSeparator (); - _find_files_action + _find_files_action = edit_menu->addAction (resource_manager::icon ("edit-find"), tr ("Find Files...")); @@ -1805,8 +1805,8 @@ main_window::construct_debug_menu_item (const char *icon, const QString& item, const char *member) { - QAction *action = add_action (_debug_menu, - resource_manager::icon (QString (icon)), + QAction *action = add_action (_debug_menu, + resource_manager::icon (QString (icon)), item, member); action->setEnabled (false); diff -r cc5ffacb15ab -r aa36fb998a4d libgui/src/octave-qt-link.cc --- a/libgui/src/octave-qt-link.cc Tue May 12 08:01:42 2015 -0700 +++ b/libgui/src/octave-qt-link.cc Tue May 12 09:22:01 2015 -0700 @@ -448,7 +448,7 @@ } void -octave_qt_link::do_set_workspace (bool top_level, bool debug, +octave_qt_link::do_set_workspace (bool top_level, bool debug, const std::list& ws) { if (! top_level && ! debug) diff -r cc5ffacb15ab -r aa36fb998a4d libgui/src/octave-qt-link.h --- a/libgui/src/octave-qt-link.h Tue May 12 08:01:42 2015 -0700 +++ b/libgui/src/octave-qt-link.h Tue May 12 09:22:01 2015 -0700 @@ -108,7 +108,7 @@ void do_execute_command_in_terminal (const std::string& command); - void do_set_workspace (bool top_level, bool debug, + void do_set_workspace (bool top_level, bool debug, const std::list& ws); void do_clear_workspace (void); diff -r cc5ffacb15ab -r aa36fb998a4d libgui/src/shortcut-manager.h --- a/libgui/src/shortcut-manager.h Tue May 12 08:01:42 2015 -0700 +++ b/libgui/src/shortcut-manager.h Tue May 12 09:22:01 2015 -0700 @@ -137,7 +137,7 @@ shortcut_t (const shortcut_t& x) : tree_item (x.tree_item), description (x.description), - settings_key (x.settings_key), + settings_key (x.settings_key), actual_sc (new QKeySequence[2]), default_sc (new QKeySequence[2]) { actual_sc[0] = x.actual_sc[0]; diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/error.cc --- a/libinterp/corefcn/error.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/error.cc Tue May 12 09:22:01 2015 -0700 @@ -169,7 +169,7 @@ if (name) msg_string = std::string (name) + ": "; - + msg_string += base_msg + "\n"; Vlast_warning_id = id; diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/find.cc --- a/libinterp/corefcn/find.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/find.cc Tue May 12 09:22:01 2015 -0700 @@ -336,7 +336,7 @@ @var{x} is a row vector or as a column otherwise.\n\ \n\ To obtain a single index for each matrix element, Octave pretends that the\n\ -columns of a matrix form one long vector (like Fortran arrays are stored). \n\ +columns of a matrix form one long vector (like Fortran arrays are stored).\n\ For example:\n\ \n\ @example\n\ diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/gl2ps-renderer.cc --- a/libinterp/corefcn/gl2ps-renderer.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/gl2ps-renderer.cc Tue May 12 09:22:01 2015 -0700 @@ -228,9 +228,9 @@ fontsize = props.get ("fontsize_points").double_value (); caseless_str fn = props.get ("fontname").xtolower ().string_value (); - bool isbold = + bool isbold = (props.get ("fontweight").xtolower ().string_value () == "bold"); - bool isitalic = + bool isitalic = (props.get ("fontangle").xtolower ().string_value () == "italic"); fontname = ""; diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/graphics.cc --- a/libinterp/corefcn/graphics.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/graphics.cc Tue May 12 09:22:01 2015 -0700 @@ -3102,7 +3102,7 @@ { if (uicontextmenu.get ().is_empty ()) return; - + graphics_object obj = gh_manager::get_object (uicontextmenu.get ()); if (obj && obj.isa ("uicontextmenu")) { @@ -3233,7 +3233,7 @@ } } -void +void base_graphics_object::build_user_defaults_map (property_list::pval_map_type &def, const std::string go_name) const { property_list local_defaults = get_defaults_list (); @@ -8841,14 +8841,14 @@ // --------------------------------------------------------------------- uicontextmenu::~uicontextmenu (void) -{ +{ std::list lst = xproperties.get_dependent_obj_list (); std::list::const_iterator it; - + for (it = lst.begin (); it != lst.end (); it++) { graphics_object go = gh_manager::get_object (*it); - + if (go.valid_object () && go.get ("uicontextmenu") == xproperties.get___myhandle__ ()) go.set ("uicontextmenu", Matrix ()); diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/graphics.in.h --- a/libinterp/corefcn/graphics.in.h Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/graphics.in.h Tue May 12 09:22:01 2015 -0700 @@ -5357,13 +5357,13 @@ class OCTINTERP_API properties : public base_properties { public: - - void add_dependent_obj (graphics_handle gh) + + void add_dependent_obj (graphics_handle gh) { dependent_obj_list.push_back (gh); } - // FIXME: the list may contain duplicates. - // Should we return only unique elements? - const std::list get_dependent_obj_list (void) + // FIXME: the list may contain duplicates. + // Should we return only unique elements? + const std::list get_dependent_obj_list (void) { return dependent_obj_list; } // See the genprops.awk script for an explanation of the diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/octave-link.cc --- a/libinterp/corefcn/octave-link.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/octave-link.cc Tue May 12 09:22:01 2015 -0700 @@ -61,7 +61,7 @@ if (enabled ()) instance->do_set_workspace ((symbol_table::current_scope () == symbol_table::top_scope ()), - instance->debugging, + instance->debugging, symbol_table::workspace_info ()); } diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/quadcc.cc --- a/libinterp/corefcn/quadcc.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/quadcc.cc Tue May 12 09:22:01 2015 -0700 @@ -1496,7 +1496,7 @@ \n\ @var{f} is a function handle, inline function, or string containing the name\n\ of the function to evaluate. The function @var{f} must be vectorized and\n\ -must return a vector of output values if given a vector of input values. \n\ +must return a vector of output values if given a vector of input values.\n\ For example,\n\ \n\ @example\n\ diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/strfns.cc --- a/libinterp/corefcn/strfns.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/strfns.cc Tue May 12 09:22:01 2015 -0700 @@ -50,7 +50,7 @@ matrices, or cell arrays.\n\ \n\ Arguments are concatenated vertically. The returned values are padded with\n\ -blanks as needed to make each row of the string array have the same length. \n\ +blanks as needed to make each row of the string array have the same length.\n\ Empty input strings are significant and will concatenated in the output.\n\ \n\ For numerical input, each element is converted to the corresponding ASCII\n\ @@ -181,7 +181,7 @@ matrices, or cell arrays.\n\ \n\ Arguments are concatenated vertically. The returned values are padded with\n\ -blanks as needed to make each row of the string array have the same length. \n\ +blanks as needed to make each row of the string array have the same length.\n\ Unlike @code{char}, empty strings are removed and will not appear in the\n\ output.\n\ \n\ diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/syscalls.cc --- a/libinterp/corefcn/syscalls.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/syscalls.cc Tue May 12 09:22:01 2015 -0700 @@ -168,7 +168,7 @@ Replace current process with a new process.\n\ \n\ Calling @code{exec} without first calling @code{fork} will terminate your\n\ -current Octave process and replace it with the program named by @var{file}. \n\ +current Octave process and replace it with the program named by @var{file}.\n\ For example,\n\ \n\ @example\n\ @@ -1386,7 +1386,7 @@ \n\ If the returned value of @var{pid} is greater than 0, it is the process ID\n\ of the child process that exited. If an error occurs, @var{pid} will be\n\ -less than zero and @var{msg} will contain a system-dependent error message. \n\ +less than zero and @var{msg} will contain a system-dependent error message.\n\ The value of @var{status} contains additional system-dependent information\n\ about the subprocess that exited.\n\ @seealso{WCONTINUE, WCOREDUMP, WEXITSTATUS, WIFCONTINUED, WIFSIGNALED, WIFSTOPPED, WNOHANG, WSTOPSIG, WTERMSIG, WUNTRACED}\n\ @@ -1538,7 +1538,7 @@ Given @var{status} from a call to @code{waitpid}, return\n\ true if the child produced a core dump.\n\ \n\ -This function should only be employed if @code{WIFSIGNALED} returned true. \n\ +This function should only be employed if @code{WIFSIGNALED} returned true.\n\ The macro used to implement this function is not specified in POSIX.1-2001\n\ and is not available on some Unix implementations (e.g., AIX, SunOS).\n\ @seealso{waitpid, WIFEXITED, WEXITSTATUS, WIFSIGNALED, WTERMSIG, WIFSTOPPED, WSTOPSIG, WIFCONTINUED}\n\ diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/sysdep.cc --- a/libinterp/corefcn/sysdep.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/sysdep.cc Tue May 12 09:22:01 2015 -0700 @@ -1040,7 +1040,7 @@ /* %!test %! if (! ispc ()) -%! assert (get_home_directory (), getenv ("HOME")); +%! assert (get_home_directory (), getenv ("HOME")); %! endif */ diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/urlwrite.cc --- a/libinterp/corefcn/urlwrite.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/urlwrite.cc Tue May 12 09:22:01 2015 -0700 @@ -310,7 +310,7 @@ \n\ The variable @var{success} is 1 if the download was successful,\n\ otherwise it is 0 in which case @var{message} contains an error message.\n\ - \n\ +\n\ If no output argument is specified and an error occurs, then the error is\n\ signaled through Octave's error handling mechanism.\n\ \n\ diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/utils.cc --- a/libinterp/corefcn/utils.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/utils.cc Tue May 12 09:22:01 2015 -0700 @@ -303,7 +303,7 @@ matches.\n\ \n\ If the second optional argument @qcode{\"all\"} is supplied, return a cell\n\ -array containing the list of all files that have the same name in the path. \n\ +array containing the list of all files that have the same name in the path.\n\ If no files are found, return an empty cell array.\n\ @seealso{file_in_path, dir_in_loadpath, path}\n\ @end deftypefn") @@ -382,7 +382,7 @@ the path for element of the cell array and return the first that matches.\n\ \n\ If the third optional argument @qcode{\"all\"} is supplied, return a cell\n\ -array containing the list of all files that have the same name in the path. \n\ +array containing the list of all files that have the same name in the path.\n\ If no files are found, return an empty cell array.\n\ @seealso{file_in_loadpath, dir_in_loadpath, path}\n\ @end deftypefn") diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/corefcn/variables.cc --- a/libinterp/corefcn/variables.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/corefcn/variables.cc Tue May 12 09:22:01 2015 -0700 @@ -648,10 +648,10 @@ %!assert (exist ("./plot.m", "file"), 0); %!assert (exist ("./%nonexistentfile%", "file"), 0); %!assert (exist ("%nonexistentfile%", "file"), 0); - + ## Don't search path for absolute file names %!test -%! tname = tempname (pwd ()); +%! tname = tempname (pwd ()); %! unwind_protect %! ## open/close file to create it, equivalent of touch %! fid = fopen (tname, "w"); diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/dldfcn/__init_fltk__.cc --- a/libinterp/dldfcn/__init_fltk__.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/dldfcn/__init_fltk__.cc Tue May 12 09:22:01 2015 -0700 @@ -586,7 +586,7 @@ // if no pos yet, delay adding menu until after other menus int pos = kprop.get_position (); if (pos <= 0) - delayed_menus.push_back ((len - (ii + 1))); + delayed_menus.push_back ((len - (ii + 1))); else { add_to_menu (kprop); @@ -628,7 +628,7 @@ // if no pos yet, delay adding menu until after other menus int pos = kprop.get_position (); if (pos <= 0) - delayed_menus.push_back ((len - (ii + 1))); + delayed_menus.push_back ((len - (ii + 1))); else { add_to_menu (kprop); diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/dldfcn/ccolamd.cc --- a/libinterp/dldfcn/ccolamd.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/dldfcn/ccolamd.cc Tue May 12 09:22:01 2015 -0700 @@ -349,7 +349,7 @@ vector @var{p} such that @code{@var{S}(@var{p},@var{p})} tends to have a\n\ sparser Cholesky@tie{}factor than @var{S}.\n\ \n\ -Sometimes @code{csymamd} works well for symmetric indefinite matrices too. \n\ +Sometimes @code{csymamd} works well for symmetric indefinite matrices too. \n\ The matrix @var{S} is assumed to be symmetric; only the strictly lower\n\ triangular part is referenced. @var{S} must be square. The ordering is\n\ followed by an elimination tree post-ordering.\n\ diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/dldfcn/colamd.cc --- a/libinterp/dldfcn/colamd.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/dldfcn/colamd.cc Tue May 12 09:22:01 2015 -0700 @@ -461,7 +461,7 @@ vector p such that @code{@var{S}(@var{p}, @var{p})} tends to have a\n\ sparser Cholesky@tie{}factor than @var{S}.\n\ \n\ -Sometimes @code{symamd} works well for symmetric indefinite matrices too. \n\ +Sometimes @code{symamd} works well for symmetric indefinite matrices too. \n\ The matrix @var{S} is assumed to be symmetric; only the strictly lower\n\ triangular part is referenced. @var{S} must be square.\n\ \n\ diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/octave-value/ov-bool-sparse.cc --- a/libinterp/octave-value/ov-bool-sparse.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/octave-value/ov-bool-sparse.cc Tue May 12 09:22:01 2015 -0700 @@ -551,7 +551,7 @@ #else gripe_save ("hdf5"); #endif - + return retval; } diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/octave-value/ov-classdef.cc --- a/libinterp/octave-value/ov-classdef.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/octave-value/ov-classdef.cc Tue May 12 09:22:01 2015 -0700 @@ -3081,7 +3081,7 @@ prop.put (ait->first, ait->second); // Install property access methods, if any. Remove the - // accessor methods from the temporary storage map, so we can + // accessor methods from the temporary storage map, so we can // detect which ones are invalid and do not correspond to a // defined property. diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/octave-value/ov-re-sparse.cc --- a/libinterp/octave-value/ov-re-sparse.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/octave-value/ov-re-sparse.cc Tue May 12 09:22:01 2015 -0700 @@ -865,7 +865,7 @@ #else gripe_load ("hdf5"); #endif - + return retval; } diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/octave-value/ov-struct.cc --- a/libinterp/octave-value/ov-struct.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/octave-value/ov-struct.cc Tue May 12 09:22:01 2015 -0700 @@ -1792,7 +1792,7 @@ \n\ If the values are cell arrays, create a structure array and initialize its\n\ values. The dimensions of each cell array of values must match. Singleton\n\ -cells and non-cell values are repeated so that they fill the entire array. \n\ +cells and non-cell values are repeated so that they fill the entire array. \n\ If the cells are empty, create an empty structure array with the specified\n\ field names.\n\ \n\ diff -r cc5ffacb15ab -r aa36fb998a4d libinterp/parse-tree/pt-arg-list.cc --- a/libinterp/parse-tree/pt-arg-list.cc Tue May 12 08:01:42 2015 -0700 +++ b/libinterp/parse-tree/pt-arg-list.cc Tue May 12 09:22:01 2015 -0700 @@ -136,7 +136,7 @@ \n\ @example\n\ @group\n\ -@var{x} = [ 1 2 3 \n\ +@var{x} = [ 1 2 3\n\ 4 5 6 ];\n\ @var{x}(1,end)\n\ @result{} 3\n\ diff -r cc5ffacb15ab -r aa36fb998a4d scripts/audio/@audiorecorder/play.m --- a/scripts/audio/@audiorecorder/play.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/audio/@audiorecorder/play.m Tue May 12 09:22:01 2015 -0700 @@ -22,10 +22,10 @@ ## @deftypefnx {Function File} {@var{player} =} play (@var{recorder}, [@var{start}, @var{end}]) ## Play the audio recorded in @var{recorder} and return a corresponding ## audioplayer object. -## +## ## If the optional argument @var{start} is provided, begin playing ## @var{start} seconds in to the recording. -## +## ## If the optional argument @var{end} is provided, stop playing at ## @var{end} seconds in the recording. ## @end deftypefn diff -r cc5ffacb15ab -r aa36fb998a4d scripts/audio/wavwrite.m --- a/scripts/audio/wavwrite.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/audio/wavwrite.m Tue May 12 09:22:01 2015 -0700 @@ -27,7 +27,7 @@ ## ## The optional argument @var{fs} specifies the sample rate of the audio signal ## in Hz. -## +## ## The optional argument @var{nbits} specifies the number of bits per sample ## to write to @var{filename}. ## diff -r cc5ffacb15ab -r aa36fb998a4d scripts/general/cart2sph.m --- a/scripts/general/cart2sph.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/general/cart2sph.m Tue May 12 09:22:01 2015 -0700 @@ -25,7 +25,7 @@ ## The inputs @var{x}, @var{y}, and @var{z} must be the same shape, or scalar. ## If called with a single matrix argument then each row of @var{C} represents ## the Cartesian coordinate (@var{x}, @var{y}, @var{z}). -## +## ## @var{theta} describes the angle relative to the positive x-axis. ## ## @var{phi} is the angle relative to the xy-plane. diff -r cc5ffacb15ab -r aa36fb998a4d scripts/geometry/inpolygon.m --- a/scripts/geometry/inpolygon.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/geometry/inpolygon.m Tue May 12 09:22:01 2015 -0700 @@ -81,7 +81,7 @@ j = i; endfor - ## Matlab definition include both in polygon and on polygon points. + ## Matlab definition include both in polygon and on polygon points. in |= on; endfunction diff -r cc5ffacb15ab -r aa36fb998a4d scripts/gui/listdlg.m --- a/scripts/gui/listdlg.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/gui/listdlg.m Tue May 12 09:22:01 2015 -0700 @@ -122,7 +122,7 @@ ## make sure listcell strings are a cell array if (! iscell (listcell)) listcell = {listcell}; - elseif (iscellstr (listcell{1})) + elseif (iscellstr (listcell{1})) listcell = listcell{1}; endif diff -r cc5ffacb15ab -r aa36fb998a4d scripts/gui/msgbox.m --- a/scripts/gui/msgbox.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/gui/msgbox.m Tue May 12 09:22:01 2015 -0700 @@ -37,7 +37,7 @@ ## ## Compatibility Note: The optional argument @var{createmode} is accepted for ## @sc{matlab} compatibility, but is not implemented. -## +## ## @seealso{errordlg, helpdlg, inputdlg, listdlg, questdlg, warndlg} ## @end deftypefn diff -r cc5ffacb15ab -r aa36fb998a4d scripts/gui/private/message_dialog.m --- a/scripts/gui/private/message_dialog.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/gui/private/message_dialog.m Tue May 12 09:22:01 2015 -0700 @@ -68,7 +68,7 @@ error ("%s: CREATEMODE is not a valid type", caller); endswitch endif - + if (__octave_link_enabled__ ()) retval = __octave_link_message_dialog__ (icon, msg, title); elseif (__have_feature__ ("JAVA")) diff -r cc5ffacb15ab -r aa36fb998a4d scripts/help/get_first_help_sentence.m --- a/scripts/help/get_first_help_sentence.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/help/get_first_help_sentence.m Tue May 12 09:22:01 2015 -0700 @@ -24,7 +24,7 @@ ## ## The first sentence is defined as the text after the function declaration ## until either the first period (".") or the first appearance of two -## consecutive newlines ("\n\n"). The text is truncated to a maximum length of +## consecutive newlines ("\n\n"). The text is truncated to a maximum length of ## @var{max_len}, which defaults to 80. ## ## The optional output argument @var{status} returns the status reported by diff -r cc5ffacb15ab -r aa36fb998a4d scripts/help/lookfor.m --- a/scripts/help/lookfor.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/help/lookfor.m Tue May 12 09:22:01 2015 -0700 @@ -26,7 +26,7 @@ ## ## By default, @code{lookfor} looks for @var{str} in just the first sentence of ## the help string for each function found. The entire help text of each -## function can be searched by using the @qcode{"-all"} argument. All searches +## function can be searched by using the @qcode{"-all"} argument. All searches ## are case insensitive. ## ## When called with no output arguments, @code{lookfor} prints the list of diff -r cc5ffacb15ab -r aa36fb998a4d scripts/image/imshow.m --- a/scripts/image/imshow.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/image/imshow.m Tue May 12 09:22:01 2015 -0700 @@ -37,7 +37,7 @@ ## ## If a file name is given instead of an image, the file will be read and shown. ## -## If given, the parameter @var{string_param1} has value @var{value1}. +## If given, the parameter @var{string_param1} has value @var{value1}. ## @var{string_param1} can be any of the following: ## ## @table @asis diff -r cc5ffacb15ab -r aa36fb998a4d scripts/io/strread.m --- a/scripts/io/strread.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/io/strread.m Tue May 12 09:22:01 2015 -0700 @@ -149,7 +149,7 @@ ## processing of special characters like @qcode{"@xbackslashchar{}t"}. The ## default value for whitespace is ## @c Note: the next line specifically has a newline which generates a space -## @c in the output of qcode, but keeps the next line < 80 characters. +## @c in the output of qcode, but keeps the next line < 80 characters. ## @qcode{" ## @xbackslashchar{}b@xbackslashchar{}r@xbackslashchar{}n@xbackslashchar{}t"} ## (note the space). Unless whitespace is set to @qcode{""} (empty) AND at diff -r cc5ffacb15ab -r aa36fb998a4d scripts/java/javamem.m --- a/scripts/java/javamem.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/java/javamem.m Tue May 12 09:22:01 2015 -0700 @@ -50,7 +50,7 @@ ## limited available physical memory or if you get Java memory errors. ## ## @qcode{"Total memory"} is what the operating system has currently assigned -## to the JVM and depends on actual and active memory usage. +## to the JVM and depends on actual and active memory usage. ## @qcode{"Free memory"} is self-explanatory. During operation of Java-based ## Octave functions the amount of Total and Free memory will vary, due to ## Java's own cleaning up and your operating system's memory management. diff -r cc5ffacb15ab -r aa36fb998a4d scripts/miscellaneous/dir.m --- a/scripts/miscellaneous/dir.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/miscellaneous/dir.m Tue May 12 09:22:01 2015 -0700 @@ -56,7 +56,7 @@ ## @samp{\}. ## ## Note that for symbolic links, @code{dir} returns information about the -## file that the symbolic link points to rather than the link itself. +## file that the symbolic link points to rather than the link itself. ## However, if the link points to a nonexistent file, @code{dir} returns ## information about the link. ## @seealso{ls, readdir, glob, what, stat, lstat} diff -r cc5ffacb15ab -r aa36fb998a4d scripts/miscellaneous/edit.m --- a/scripts/miscellaneous/edit.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/miscellaneous/edit.m Tue May 12 09:22:01 2015 -0700 @@ -62,7 +62,7 @@ ## If @code{edit} is called with @var{field} and @var{value} variables, the ## value of the control field @var{field} will be set to @var{value}. If an ## output argument is requested and the first input argument is @code{get} -## then @code{edit} will return the value of the control field @var{field}. +## then @code{edit} will return the value of the control field @var{field}. ## If the control field does not exist, edit will return a structure ## containing all fields and values. Thus, @code{edit get all} returns a ## complete control structure. @@ -71,7 +71,7 @@ ## ## @table @samp ## @item home -## This is the location of user local m-files. Be sure it is in your path. +## This is the location of user local m-files. Be sure it is in your path. ## The default is @file{~/octave}. ## ## @item author diff -r cc5ffacb15ab -r aa36fb998a4d scripts/miscellaneous/genvarname.m --- a/scripts/miscellaneous/genvarname.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/miscellaneous/genvarname.m Tue May 12 09:22:01 2015 -0700 @@ -48,7 +48,7 @@ ## @end example ## ## Note that the result is a char array or cell array of strings, not the -## variables themselves. To define a variable, @code{eval()} can be used. +## variables themselves. To define a variable, @code{eval()} can be used. ## The following trivial example sets @code{x} to @code{42}. ## ## @example diff -r cc5ffacb15ab -r aa36fb998a4d scripts/miscellaneous/gzip.m --- a/scripts/miscellaneous/gzip.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/miscellaneous/gzip.m Tue May 12 09:22:01 2015 -0700 @@ -30,7 +30,7 @@ ## directory. ## ## If @var{dir} is defined the compressed files are placed in this directory, -## rather than the original directory where the uncompressed file resides. +## rather than the original directory where the uncompressed file resides. ## If @var{dir} does not exist it is created. ## ## The optional output @var{filelist} is a list of the compressed files. diff -r cc5ffacb15ab -r aa36fb998a4d scripts/miscellaneous/private/__w2mpth__.m --- a/scripts/miscellaneous/private/__w2mpth__.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/miscellaneous/private/__w2mpth__.m Tue May 12 09:22:01 2015 -0700 @@ -16,7 +16,7 @@ ## along with Octave; see the file COPYING. If not, see ## . -## -*- texinfo -*- +## -*- texinfo -*- ## @deftypefn {Function File} {@var{mingwpath} =} __w2mpth__ (@var{winpath}) ## Convert a Windows-style relative or full path name to MinGW style. ## diff -r cc5ffacb15ab -r aa36fb998a4d scripts/plot/appearance/annotation.m --- a/scripts/plot/appearance/annotation.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/plot/appearance/annotation.m Tue May 12 09:22:01 2015 -0700 @@ -367,17 +367,17 @@ linemenu (hui, h); set (hli, "uicontextmenu", hui); - + ## create patch(s) and text if (strcmp (objtype, "arrow")) [x, y] = arrowcoordinates (h); hpa = patch (x, y, get (h, "color"), "parent", h, "edgecolor", get (h, "color")); update_arrow (h, {}, "position", hpa); - + arrowmenu (hui, h); set (hpa, "uicontextmenu", hui); - + elseif (strcmp (objtype, "doublearrow")) [x, y] = arrowcoordinates (h, 1); hpa = patch (x, y, get (h, "color"), "parent", h, @@ -388,10 +388,10 @@ "edgecolor", get (h, "color")); update_arrow (h, {}, "position", hpa); - + dblarrowmenu (hui, h); set (hpa, "uicontextmenu", hui); - + elseif (strcmp (objtype, "textarrow")) [x, y] = arrowcoordinates (h); hpa = patch (x, y, get (h, "color"), "parent", h, @@ -412,7 +412,7 @@ textmenu (hui, h); set (hpa, "uicontextmenu", hui); set (hte, "uicontextmenu", hui); - + endif ## updaters @@ -513,7 +513,7 @@ for ii = 1:numel (propnames) update_textbox (h, {}, propnames{ii}, [hte hpa]); endfor - + textboxmenu (hui, h); set (hpa, "uicontextmenu", hui); set (hte, "uicontextmenu", hui); @@ -534,7 +534,7 @@ endfunction function props = lineprops (varargin) - ## FIXME: Use "axesx(y)lim" instead of "linex(y)data" + ## FIXME: Use "axesx(y)lim" instead of "linex(y)data" props = {"color", "color", [0 0 0], ... "linestyle", "linelinestyle", "-", ... "linewidth", "linelinewidth", 0.5, ... @@ -552,11 +552,11 @@ function linemenu (hui, hpar) hm = uimenu ("parent", hui, "label", "Line"); - + ## Color vals = basecolors (); addbasemenu (hm, hpar, "Color", vals); - + ## Linestyle vals = set (hpar, "linestyle"); @@ -578,7 +578,7 @@ function arrowmenu (hui, hpar) hm = uimenu ("parent", hui, "label", "Arrowhead"); - + ## Headlength/width vals = 6:2:16; addbasemenu (hm, hpar, "headlength", vals, "Length"); @@ -604,7 +604,7 @@ function dblarrowmenu (hui, hpar) hm1 = uimenu ("parent", hui, "label", "Arrowhead #1"); hm2 = uimenu ("parent", hui, "label", "Arrowhead #2"); - + ## Headlength/width vals = 6:2:16; addbasemenu (hm1, hpar, "head1length", vals, "Length"); @@ -648,9 +648,9 @@ prompt = ""; def = {def}; endif - + cstr = inputdlg (prompt, prop, 1, def); - + if (! isempty (cstr)) set (hpar, prop, cstr) endif @@ -663,7 +663,7 @@ prop = "String"; fcn = @() stringdlg (hpar, prop); uimenu (hm, "label", prop, "callback", fcn); - + ## Font properties prop = "textcolor"; vals = basecolors (); @@ -680,7 +680,7 @@ prop = "textrotation"; vals = 0:90:270; addbasemenu (hm, hpar, prop, vals, "Rotation"); - + prop = "horizontalalignment"; vals = set (hpar, prop); addbasemenu (hm, hpar, prop, vals, "Horizontal Alignment", ... @@ -690,7 +690,7 @@ addbasemenu (hm, hpar, prop, vals, "Vertical Alignment"); ## FIXME: Add text background properties when they are supported - + prop = "interpreter"; vals = set (hpar, prop); addbasemenu (hm, hpar, prop, vals, "Interpreter", ... @@ -724,11 +724,11 @@ function textboxmenu (hui, hpar) ## Text properties hm1 = uimenu ("parent", hui, "label", "Text"); - + prop = "String"; fcn = @() stringdlg (hpar, prop); uimenu (hm1, "label", prop, "callback", fcn); - + prop = "Color"; vals = basecolors (); addbasemenu (hm1, hpar, prop, vals); @@ -741,7 +741,7 @@ prop = "fontweight"; vals = set (hpar, prop); addbasemenu (hm1, hpar, prop, vals, "Weight"); - + prop = "horizontalalignment"; vals = set (hpar, prop); addbasemenu (hm1, hpar, prop, vals, "Horizontal Alignment", ... @@ -752,7 +752,7 @@ prop = "Margin"; vals = 2:2:10; addbasemenu (hm1, hpar, prop, vals); - + prop = "interpreter"; vals = set (hpar, prop); addbasemenu (hm1, hpar, prop, vals, "Interpreter", ... @@ -760,7 +760,7 @@ ## Background properties hm2 = uimenu ("parent", hui, "label", "Background"); - + prop = "fitboxtotext"; vals = set (hpar, prop); addbasemenu (hm2, hpar, prop, vals, "Fit box to text"); @@ -813,7 +813,7 @@ if (isempty (mainlabel)) mainlabel = pname; endif - + h = uimenu ("parent", hm, "label", mainlabel); is_numeric = ! iscell (vals); @@ -826,7 +826,7 @@ val = vals(ii); label = num2str (val); endif - + fcn = @() set (hpar, pname, val); htmp(ii) = uimenu (h, "label", label, "callback", fcn); endfor @@ -840,7 +840,7 @@ if (is_numeric) current = num2str (current); endif - + idx = strcmp (vals, current); set (hmenus(idx), "checked", "on"); set (hmenus(! idx), "checked", "off"); diff -r cc5ffacb15ab -r aa36fb998a4d scripts/plot/draw/colorbar.m --- a/scripts/plot/draw/colorbar.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/plot/draw/colorbar.m Tue May 12 09:22:01 2015 -0700 @@ -180,7 +180,7 @@ obj = get (ax); obj.__cbar_hax__ = ax; position = obj.position; - + hpar = ancestor (ax, "figure"); clen = rows (get (hpar, "colormap")); cext = get (ax, "clim"); diff -r cc5ffacb15ab -r aa36fb998a4d scripts/plot/draw/quiver3.m --- a/scripts/plot/draw/quiver3.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/plot/draw/quiver3.m Tue May 12 09:22:01 2015 -0700 @@ -26,7 +26,7 @@ ## @deftypefnx {Function File} {@var{h} =} quiver3 (@dots{}) ## ## Plot a 3-D vector field with arrows. -## +## ## Plot the (@var{u}, @var{v}, @var{w}) components of a vector field in ## an (@var{x}, @var{y}, @var{z}) meshgrid. If the grid is uniform then ## @var{x}, @var{y}, and @var{z} can be specified as vectors. diff -r cc5ffacb15ab -r aa36fb998a4d scripts/plot/util/hold.m --- a/scripts/plot/util/hold.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/plot/util/hold.m Tue May 12 09:22:01 2015 -0700 @@ -56,7 +56,7 @@ if (nargin > 0 && isscalar (varargin{1}) && isaxes (varargin{1})) hax = varargin{1}; varargin(1) = []; - nargs = numel (varargin); + nargs = numel (varargin); hfig = ancestor (hax, "figure"); elseif (nargin > 0 && numel (varargin{1}) > 1 && ishandle (varargin{1})) print_usage (); diff -r cc5ffacb15ab -r aa36fb998a4d scripts/plot/util/print.m --- a/scripts/plot/util/print.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/plot/util/print.m Tue May 12 09:22:01 2015 -0700 @@ -79,7 +79,7 @@ ## Octave is able to produce output for various printers, bitmaps, and ## vector formats by using Ghostscript. For bitmap and printer output ## anti-aliasing is applied using Ghostscript's TextAlphaBits and -## GraphicsAlphaBits options. The default number of bits for each is 4. +## GraphicsAlphaBits options. The default number of bits for each is 4. ## Allowed values for @var{N} are 1, 2, or 4. ## ## @item -d@var{device} diff -r cc5ffacb15ab -r aa36fb998a4d scripts/polynomial/mkpp.m --- a/scripts/polynomial/mkpp.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/polynomial/mkpp.m Tue May 12 09:22:01 2015 -0700 @@ -25,7 +25,7 @@ ## ## @var{breaks} must be a vector of strictly increasing values. The number of ## intervals is given by @code{@var{ni} = length (@var{breaks}) - 1}. -## +## ## When @var{m} is the polynomial order @var{coefs} must be of size: ## @var{ni} x @var{m} + 1. ## diff -r cc5ffacb15ab -r aa36fb998a4d scripts/polynomial/polyder.m --- a/scripts/polynomial/polyder.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/polynomial/polyder.m Tue May 12 09:22:01 2015 -0700 @@ -25,7 +25,7 @@ ## ## If a pair of polynomials is given, return the derivative of the product ## @math{@var{a}*@var{b}}. -## +## ## If two inputs and two outputs are given, return the derivative of the ## polynomial quotient @math{@var{b}/@var{a}}. The quotient numerator is ## in @var{q} and the denominator in @var{d}. diff -r cc5ffacb15ab -r aa36fb998a4d scripts/polynomial/spline.m --- a/scripts/polynomial/spline.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/polynomial/spline.m Tue May 12 09:22:01 2015 -0700 @@ -35,7 +35,7 @@ ## ## @var{y} can be either a vector or array. If @var{y} is a vector it must ## have a length of either @var{n} or @code{@var{n} + 2}. If the length of -## @var{y} is @var{n}, then the @qcode{"not-a-knot"} end condition is used. +## @var{y} is @var{n}, then the @qcode{"not-a-knot"} end condition is used. ## If the length of @var{y} is @code{@var{n} + 2}, then the first and last ## values of the vector @var{y} are the values of the first derivative of the ## cubic spline at the endpoints. diff -r cc5ffacb15ab -r aa36fb998a4d scripts/polynomial/unmkpp.m --- a/scripts/polynomial/unmkpp.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/polynomial/unmkpp.m Tue May 12 09:22:01 2015 -0700 @@ -29,7 +29,7 @@ ## ## @item @var{p} ## Polynomial coefficients for points in sample interval. -## @code{@var{p} (@var{i}, :)} contains the coefficients for the polynomial +## @code{@var{p} (@var{i}, :)} contains the coefficients for the polynomial ## over interval @var{i} ordered from highest to lowest. If ## @code{@var{d} > 1}, @code{@var{p} (@var{r}, @var{i}, :)} contains the ## coefficients for the r-th polynomial defined on interval @var{i}. diff -r cc5ffacb15ab -r aa36fb998a4d scripts/signal/arma_rnd.m --- a/scripts/signal/arma_rnd.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/signal/arma_rnd.m Tue May 12 09:22:01 2015 -0700 @@ -31,7 +31,7 @@ ## ## @noindent ## in which @var{k} is the length of vector @var{a}, @var{l} is the length of -## vector @var{b} and @var{e} is Gaussian white noise with variance @var{v}. +## vector @var{b} and @var{e} is Gaussian white noise with variance @var{v}. ## The function returns a vector of length @var{t}. ## ## The optional parameter @var{n} gives the number of dummy @var{x}(@var{i}) diff -r cc5ffacb15ab -r aa36fb998a4d scripts/sparse/gplot.m --- a/scripts/sparse/gplot.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/sparse/gplot.m Tue May 12 09:22:01 2015 -0700 @@ -26,7 +26,7 @@ ## an @var{n}-by-2 matrix containing the coordinates of the nodes of the graph. ## ## The optional parameter @var{line_style} defines the output style for the -## plot. Called with no output arguments the graph is plotted directly. +## plot. Called with no output arguments the graph is plotted directly. ## Otherwise, return the coordinates of the plot in @var{x} and @var{y}. ## @seealso{treeplot, etreeplot, spy} ## @end deftypefn diff -r cc5ffacb15ab -r aa36fb998a4d scripts/statistics/tests/t_test.m --- a/scripts/statistics/tests/t_test.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/statistics/tests/t_test.m Tue May 12 09:22:01 2015 -0700 @@ -30,7 +30,7 @@ ## is tested against the two-sided alternative @code{mean (@var{x}) != ## @var{m}}. If @var{alt} is @qcode{">"}, the one-sided alternative ## @code{mean (@var{x}) > @var{m}} is considered. Similarly for @var{"<"}, -## the one-sided alternative @code{mean (@var{x}) < @var{m}} is considered. +## the one-sided alternative @code{mean (@var{x}) < @var{m}} is considered. ## The default is the two-sided case. ## ## The p-value of the test is returned in @var{pval}. diff -r cc5ffacb15ab -r aa36fb998a4d scripts/statistics/tests/t_test_regression.m --- a/scripts/statistics/tests/t_test_regression.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/statistics/tests/t_test_regression.m Tue May 12 09:22:01 2015 -0700 @@ -31,7 +31,7 @@ ## can be selected. If @var{alt} is @qcode{"!="} or @qcode{"<>"}, the null ## is tested against the two-sided alternative @nospell{@code{@var{rr} * ## @var{b} != @var{r}}}. If @var{alt} is @qcode{">"}, the one-sided -## alternative @nospell{@code{@var{rr} * @var{b} > @var{r}}} is used. +## alternative @nospell{@code{@var{rr} * @var{b} > @var{r}}} is used. ## Similarly for @var{"<"}, the one-sided alternative @nospell{@code{@var{rr} ## * @var{b} < @var{r}}} is used. The default is the two-sided case. ## diff -r cc5ffacb15ab -r aa36fb998a4d scripts/strings/mat2str.m --- a/scripts/strings/mat2str.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/strings/mat2str.m Tue May 12 09:22:01 2015 -0700 @@ -27,7 +27,7 @@ ## The precision of the values is given by @var{n}. If @var{n} is a scalar ## then both real and imaginary parts of the matrix are printed to the same ## precision. Otherwise @code{@var{n}(1)} defines the precision of the real -## part and @code{@var{n}(2)} defines the precision of the imaginary part. +## part and @code{@var{n}(2)} defines the precision of the imaginary part. ## The default for @var{n} is 15. ## ## If the argument @qcode{"class"} is given then the class of @var{x} is diff -r cc5ffacb15ab -r aa36fb998a4d scripts/strings/strsplit.m --- a/scripts/strings/strsplit.m Tue May 12 08:01:42 2015 -0700 +++ b/scripts/strings/strsplit.m Tue May 12 09:22:01 2015 -0700 @@ -182,9 +182,9 @@ endif if (strncmpi (args.delimitertype, "simple", length_deltype)) - is_simple = true; + is_simple = true; elseif (strncmpi (args.delimitertype, "regularexpression", length_deltype)) - is_simple = false; + is_simple = false; else error ("strsplit:invalid_delimitertype", "strsplit: Invalid DELIMITERTYPE"); endif @@ -298,8 +298,8 @@ %! assert (strsplit ("aaa", "a"), {"", ""}) ## Bug #44641 -%!assert (strsplit ("xxx abs (@var{tol})}. -## +## ## If @var{tol} is negative then it is a relative tolerance which will produce ## an error if @code{abs (@var{observed} - @var{expected}) > ## abs (@var{tol} * @var{expected})}.