Mercurial > octave
changeset 20715:5b7643257978
Remove trailing whitespace at end of lines.
* stl_algo.h-fixed, container.txi, genpropdoc.m, gui.txi, plot.txi,
plotimages.m, RELEASE.PROCESS, Figure.cc, Figure.h, gl-render.h,
gl2ps-renderer.cc, gl2ps-renderer.h, graphics.cc, jit-typeinfo.cc, sub2ind.cc,
txt-eng-ft.cc, txt-eng-ft.h, ov-base-diag.h, ov-base-mat.cc, pt-eval.cc,
CMatrix.cc, acinclude.m4, quadgk.m, uicontextmenu.m, uicontrol.m, uipanel.m,
uipushtool.m, uitoggletool.m, uitoolbar.m, waitbar.m, imshow.m, viridis.m,
ode_event_handler.m, fminunc.m, fplot.m, plot.m, surfnorm.m, quantile.m,
datevec.m: Remove trailing whitespace at end of lines.
line wrap: on
line diff
--- a/.hgignore Wed Nov 18 16:12:41 2015 -0800 +++ b/.hgignore Wed Nov 18 16:40:22 2015 -0800 @@ -6,7 +6,7 @@ # gnulib makes these silly backup files .~$ -# This directory gets created by gnulib during the build. +# This directory gets created by gnulib during the build. # It contains no Octave files. ^libgnu/*
--- a/NEWS Wed Nov 18 16:12:41 2015 -0800 +++ b/NEWS Wed Nov 18 16:40:22 2015 -0800 @@ -38,7 +38,7 @@ => 'xyz' ** mkfifo now interprets the MODE argument as an octal, not decimal, integer. - This is consistent with the equivalent shell command. + This is consistent with the equivalent shell command. ** linspace now returns an empty matrix if the number of requested points is 0 or a negative number. This change was made to be compatible with @@ -245,7 +245,7 @@ ** The inpolygon function now returns true for points that are within the polygon OR on it's edge. This change was made for Matlab - compatibility. + compatibility. ** The archive family of functions (bzip2, gzip, zip, tar) and their unpacking routines (bunzip2, gunzip, unzip, untar, unpack) have
--- a/build-aux/stl_algo.h-fixed Wed Nov 18 16:12:41 2015 -0800 +++ b/build-aux/stl_algo.h-fixed Wed Nov 18 16:40:22 2015 -0800 @@ -383,10 +383,10 @@ template<typename _RandomAccessIter, typename _Integer, typename _Tp> _RandomAccessIter __search_n(_RandomAccessIter __first, _RandomAccessIter __last, - _Integer __count, const _Tp& __val, + _Integer __count, const _Tp& __val, std::random_access_iterator_tag) { - + typedef typename std::iterator_traits<_RandomAccessIter>::difference_type _DistanceType; @@ -399,7 +399,7 @@ __tailSize -= __remainder; // __first here is always pointing to one past the last element of // next possible match. - _RandomAccessIter __backTrack = __first; + _RandomAccessIter __backTrack = __first; while (*--__backTrack == __val) { if (--__remainder == 0) @@ -464,7 +464,7 @@ _Integer __count, const _Tp& __val, _BinaryPredicate __binary_pred, std::random_access_iterator_tag) { - + typedef typename std::iterator_traits<_RandomAccessIter>::difference_type _DistanceType; @@ -477,7 +477,7 @@ __tailSize -= __remainder; // __first here is always pointing to one past the last element of // next possible match. - _RandomAccessIter __backTrack = __first; + _RandomAccessIter __backTrack = __first; while (__binary_pred(*--__backTrack, __val)) { if (--__remainder == 0) @@ -1052,7 +1052,7 @@ __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate, typename iterator_traits<_InputIterator>::value_type>) __glibcxx_requires_valid_range(__first, __last); - + for (; __first != __last; ++__first) if (__pred(*__first)) { @@ -1657,7 +1657,7 @@ * @param __last A forward iterator. * @return Nothing. * - * Rotates the elements of the range @p [__first,__last) by + * Rotates the elements of the range @p [__first,__last) by * @p (__middle - __first) positions so that the element at @p __middle * is moved to @p __first, the element at @p __middle+1 is moved to * @p __first+1 and so on for each element in the range @@ -1696,13 +1696,13 @@ * @return An iterator designating the end of the resulting sequence. * * Copies the elements of the range @p [__first,__last) to the - * range beginning at @result, rotating the copied elements by + * range beginning at @result, rotating the copied elements by * @p (__middle-__first) positions so that the element at @p __middle * is moved to @p __result, the element at @p __middle+1 is moved * to @p __result+1 and so on for each element in the range @p * [__first,__last). * - * Performs + * Performs * @p *(__result+(n+(__last-__middle))%(__last-__first))=*(__first+n) * for each @p n in the range @p [0,__last-__first). */ @@ -2584,10 +2584,10 @@ __glibcxx_function_requires(_LessThanOpConcept<_ValueType, _Tp>) __glibcxx_function_requires(_LessThanOpConcept<_Tp, _ValueType>) __glibcxx_requires_partitioned_lower(__first, __last, __val); - __glibcxx_requires_partitioned_upper(__first, __last, __val); + __glibcxx_requires_partitioned_upper(__first, __last, __val); _DistanceType __len = std::distance(__first, __last); - + while (__len > 0) { _DistanceType __half = __len >> 1; @@ -2984,7 +2984,7 @@ } /// This is a helper function for the merge routines. - template<typename _BidirectionalIterator, typename _Distance, + template<typename _BidirectionalIterator, typename _Distance, typename _Pointer, typename _Compare> void __merge_adaptive(_BidirectionalIterator __first, @@ -4068,7 +4068,7 @@ * @ingroup sorting_algorithms * @param __first Start of range. * @param __last End of range. - * @return make_pair(m, M), where m is the first iterator i in + * @return make_pair(m, M), where m is the first iterator i in * [__first, __last) such that no other element in the range is * smaller, and where M is the last iterator i in [__first, __last) * such that no other element in the range is larger. @@ -4144,7 +4144,7 @@ * @param __first Start of range. * @param __last End of range. * @param __comp Comparison functor. - * @return make_pair(m, M), where m is the first iterator i in + * @return make_pair(m, M), where m is the first iterator i in * [__first, __last) such that no other element in the range is * smaller, and where M is the last iterator i in [__first, __last) * such that no other element in the range is larger. @@ -4262,7 +4262,7 @@ * @param __last1 End of first range. * @param __first2 Start of second range. * @return true if there exists a permutation of the elements in the range - * [__first2, __first2 + (__last1 - __first1)), beginning with + * [__first2, __first2 + (__last1 - __first1)), beginning with * ForwardIterator2 begin, such that equal(__first1, __last1, begin) * returns true; otherwise, returns false. */ @@ -4337,7 +4337,7 @@ if (__scan != _GLIBCXX_STD_A::find_if(__first1, __scan, std::bind(__pred, _1, *__scan))) continue; // We've seen this one before. - + auto __matches = std::count_if(__first2, __last2, std::bind(__pred, _1, *__scan)); if (0 == __matches @@ -5106,9 +5106,9 @@ * * _GLIBCXX_RESOLVE_LIB_DEFECTS * DR 241. Does unique_copy() require CopyConstructible and Assignable? - * + * * _GLIBCXX_RESOLVE_LIB_DEFECTS - * DR 538. 241 again: Does unique_copy() require CopyConstructible and + * DR 538. 241 again: Does unique_copy() require CopyConstructible and * Assignable? */ template<typename _InputIterator, typename _OutputIterator> @@ -5427,7 +5427,7 @@ * @return Nothing. * * Sorts the elements in the range @p [__first,__last) in ascending order, - * such that for each iterator @e i in the range @p [__first,__last-1), + * such that for each iterator @e i in the range @p [__first,__last-1), * *(i+1)<*i is false. * * The relative ordering of equivalent elements is not preserved, use @@ -6202,7 +6202,7 @@ ++__first1; ++__first2; } - return std::copy(__first2, __last2, + return std::copy(__first2, __last2, std::copy(__first1, __last1, __result)); }
--- a/doc/interpreter/container.txi Wed Nov 18 16:12:41 2015 -0800 +++ b/doc/interpreter/container.txi Wed Nov 18 16:40:22 2015 -0800 @@ -891,8 +891,9 @@ Strings}), @code{strcmp}, @code{strncmp}, @code{strcmpi}, @code{strncmpi} (@pxref{Comparing Strings}), @code{str2double}, @code{deblank}, @code{strtrim}, @code{strtrunc}, @code{strfind}, -@code{strmatch}, , @code{regexp}, @code{regexpi} (@pxref{Manipulating -Strings}) and @code{str2double} (@pxref{String Conversions}). +@code{strmatch}, , @code{regexp}, @code{regexpi} +(@pxref{Manipulating Strings}) and @code{str2double} +(@pxref{String Conversions}). The function @code{iscellstr} can be used to test if an object is a cell array of strings.
--- a/doc/interpreter/genpropdoc.m Wed Nov 18 16:12:41 2015 -0800 +++ b/doc/interpreter/genpropdoc.m Wed Nov 18 16:40:22 2015 -0800 @@ -172,7 +172,7 @@ s.doc = "Graphics handle of the uicontextmenu object that is \ currently associated to this __objname__ object."; s.valid = valid_handle; - + case "userdata" s.doc = "User-defined data to associate with the graphics object."; s.valid = "Any Octave data"; @@ -363,7 +363,7 @@ case "menubar" s.doc = "Control the display of the figure menu bar in the upper \ -left of the figure."; +left of the figure."; case "name" s.doc = "Name to be displayed in the figure title bar. The name is \ @@ -593,7 +593,7 @@ s.doc = doc_unused; case "gridlinestyle" - + case "labelfontsizemultiplier" s.doc = doc_unused; @@ -623,7 +623,7 @@ case "minorgridlinestyle" case "mousewheelzoom" - s.doc = "Fraction of axes limits to zoom for each wheel movement."; + s.doc = "Fraction of axes limits to zoom for each wheel movement."; s.valid = "scalar in the range (0, 1)"; case "nextplot" @@ -669,7 +669,7 @@ case "ticklabelinterpreter" s.doc = "Control the way x/y/zticklabel properties are interpreted.\n\ @xref{XREFinterpreterusage, , @w{Use of the interpreter property}}."; - + case "ticklength" s.doc = "Two-element vector @code{[2Dlen 3Dlen]} specifying the \ length of the tickmarks relative to the longest visible axis."; @@ -836,7 +836,7 @@ s.doc = doc_unused; case "interpreter" - + case "linestyle" s.doc = "@xref{Line Styles}."; @@ -942,7 +942,7 @@ s.doc = "Control the way the @qcode{\"string\"} property is \ interpreted.\n\ @xref{XREFinterpreterusage, , @w{Use of the interpreter property}}."; - + case "linestyle" s.doc = sprintf (doc_notimpl, "Background area"); @@ -1237,7 +1237,7 @@ s.valid = valid_vecmat; endswitch - + ## uimenu properties elseif (strcmp (objname, "uimenu")) switch (field) @@ -1253,8 +1253,8 @@ case "foregroundcolor" case "label" case "position" - case "separator" - + case "separator" + endswitch ## uicontextmenu properties @@ -1266,8 +1266,8 @@ ## Specific properties case "callback" - case "position" - + case "position" + endswitch ## uipanel properties
--- a/doc/interpreter/gui.txi Wed Nov 18 16:12:41 2015 -0800 +++ b/doc/interpreter/gui.txi Wed Nov 18 16:40:22 2015 -0800 @@ -28,7 +28,7 @@ results a script can open a dialog box and allow the user to choose a file. Similarly, if a calculation is expected to take a long time a script can display a progress bar. The various UI elements can be used to fully customize -the plot window with menubars, context menus, +the plot window with menubars, context menus, Several utility functions make it possible to store private data for use with a GUI which will not pollute the user's variable space.
--- a/doc/interpreter/plot.txi Wed Nov 18 16:12:41 2015 -0800 +++ b/doc/interpreter/plot.txi Wed Nov 18 16:40:22 2015 -0800 @@ -1004,7 +1004,7 @@ The user can select points on a plot with the @code{ginput} function or select the position at which to place text on the plot with the -@code{gtext} function using the mouse. +@code{gtext} function using the mouse. @DOCSTRING(ginput)
--- a/doc/interpreter/plotimages.m Wed Nov 18 16:12:41 2015 -0800 +++ b/doc/interpreter/plotimages.m Wed Nov 18 16:40:22 2015 -0800 @@ -97,7 +97,7 @@ '\int_{0}^{x}e^{-t^2} dt = 0.6175$']); ## Be very careful about modifying this. pdflatex expects to be in ## the same directory as the file it is operating on. - cd (make_absolute_filename (d)); + cd (make_absolute_filename (d)); print ([nm ".pdf"], "-dpdflatexstandalone"); [status, output] = system (["pdflatex " nm]); if (status)
--- a/etc/RELEASE.PROCESS Wed Nov 18 16:12:41 2015 -0800 +++ b/etc/RELEASE.PROCESS Wed Nov 18 16:40:22 2015 -0800 @@ -45,7 +45,7 @@ #: Completion Date: <!-----------------------------------------------------------------------------> # Run Octave test suite under [http://valgrind.org Valgrind] to check for memory leaks -#* Results posted to bug report: +#* Results posted to bug report: #: Completion Date: <!-----------------------------------------------------------------------------> # Review documentation
--- a/libgui/graphics/Figure.cc Wed Nov 18 16:12:41 2015 -0800 +++ b/libgui/graphics/Figure.cc Wed Nov 18 16:40:22 2015 -0800 @@ -163,10 +163,10 @@ win->setGeometry (m_innerRect.adjusted (0, -toffset, 0, boffset)); - // Enable mouse tracking unconditionally + // Enable mouse tracking unconditionally enableMouseTracking (); - // When this constructor gets called all properties are already + // When this constructor gets called all properties are already // set, even non default. We force "update" here to get things right. // Figure title @@ -179,7 +179,7 @@ // Visibility update (figure::properties::ID_VISIBLE); - + connect (this, SIGNAL (asyncUpdate (void)), this, SLOT (updateContainer (void)));
--- a/libgui/graphics/Figure.h Wed Nov 18 16:12:41 2015 -0800 +++ b/libgui/graphics/Figure.h Wed Nov 18 16:40:22 2015 -0800 @@ -113,7 +113,7 @@ void save_figure_callback (const std::string& file); void copy_figure_callback (const std::string& format); - void enableMouseTracking (void); + void enableMouseTracking (void); private slots: void setMouseMode (MouseMode mode);
--- a/libinterp/corefcn/gl-render.h Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/corefcn/gl-render.h Wed Nov 18 16:40:22 2015 -0800 @@ -127,7 +127,7 @@ virtual void text_to_strlist (const std::string& txt, std::list<ft_render::ft_string>& lst, Matrix& bbox, - int halign = 0, int valign = 0, + int halign = 0, int valign = 0, double rotation = 0.0); virtual Matrix render_text (const std::string& txt,
--- a/libinterp/corefcn/gl2ps-renderer.cc Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/corefcn/gl2ps-renderer.cc Wed Nov 18 16:40:22 2015 -0800 @@ -195,12 +195,12 @@ return gl2psa; } -void -glps_renderer::fix_strlist_position (double x, double y, double z, +void +glps_renderer::fix_strlist_position (double x, double y, double z, Matrix box, double rotation, std::list<ft_render::ft_string>& lst) { - for (std::list<ft_render::ft_string>::iterator p = lst.begin (); + for (std::list<ft_render::ft_string>::iterator p = lst.begin (); p != lst.end (); p++) { // Get pixel coordinates @@ -212,10 +212,10 @@ - ((*p).get_y () + box(1))*sin (rot); coord_pix(1) -= ((*p).get_y () + box(1))*cos (rot) + ((*p).get_x () + box(0))*sin (rot);; - + // Turn coordinates back into current gl coordinates - ColumnVector coord = - get_transform ().untransform (coord_pix(0), coord_pix(1), + ColumnVector coord = + get_transform ().untransform (coord_pix(0), coord_pix(1), coord_pix(2), false); (*p).set_x (coord(0)); (*p).set_y (coord(1)); @@ -223,7 +223,7 @@ } } -static std::string +static std::string code_to_symbol (uint32_t code) { std::string retval; @@ -378,7 +378,7 @@ } -static std::string +static std::string select_font (caseless_str fn, bool isbold, bool isitalic) { std::transform (fn.begin (), fn.end (), fn.begin (), ::tolower); @@ -395,7 +395,7 @@ fontname = "Times-Roman"; } else if (fn == "courier") - { + { if (isitalic && isbold) fontname = "Courier-BoldOblique"; else if (isitalic) @@ -423,7 +423,7 @@ return fontname; } -static void +static void escape_character (const std::string chr, std::string& str) { std::size_t idx = str.find (chr); @@ -443,8 +443,8 @@ if (txt.empty ()) return Matrix (1, 4, 0.0); - - // We have no way to get a bounding box from gl2ps, so we parse the raw + + // We have no way to get a bounding box from gl2ps, so we parse the raw // string using freetype Matrix bbox; std::string str = txt; @@ -452,9 +452,9 @@ text_to_strlist (str, lst, bbox, ha, va, rotation); - // When using "tex" or when the string has only one line and no + // When using "tex" or when the string has only one line and no // special characters, use gl2ps for alignment - if (lst.empty () || term.find ("tex") != std::string::npos + if (lst.empty () || term.find ("tex") != std::string::npos || (lst.size () == 1 && ! lst.front ().get_code ())) { std::string name = fontname; @@ -472,7 +472,7 @@ glRasterPos3d (x, y, z); // Escape parenthesis until gl2ps does it (see bug ##45301). - if (term.find ("svg") == std::string::npos + if (term.find ("svg") == std::string::npos && term.find ("tex") == std::string::npos) { escape_character ("(", str); @@ -487,16 +487,16 @@ // Translate and rotate coordinates in order to use bottom-left alignment fix_strlist_position (x, y, z, bbox, rotation, lst); - for (std::list<ft_render::ft_string>::iterator p = lst.begin (); + for (std::list<ft_render::ft_string>::iterator p = lst.begin (); p != lst.end (); p++) { - fontname = select_font ((*p).get_name (), + fontname = select_font ((*p).get_name (), (*p).get_weight () == "bold", (*p).get_angle () == "italic"); if ((*p).get_code ()) { - // This is only one character represented by a uint32 (utf8) code. - // We replace it by the corresponding character in the + // This is only one character represented by a uint32 (utf8) code. + // We replace it by the corresponding character in the // "Symbol" font except for svg which has built-in utf8 support. if (term.find ("svg") == std::string::npos) { @@ -520,13 +520,13 @@ escape_character (")", str); } } - + set_color ((*p).get_color ()); glRasterPos3d ((*p).get_x (), (*p).get_y (), (*p).get_z ()); gl2psTextOpt (str.c_str (), fontname.c_str (), (*p).get_size (), GL2PS_TEXT_BL, rotation); } - + fontname = saved_font; return bbox; } @@ -536,7 +536,7 @@ { opengl_renderer::set_font (props); - // Set the interpreter so that text_to_pixels can parse strings properly + // Set the interpreter so that text_to_pixels can parse strings properly if (props.has_property ("interpreter")) set_interpreter (props.get ("interpreter").string_value ()); @@ -585,8 +585,8 @@ return; // First set font properties: freetype will use them to compute - // coordinates and gl2ps will retrieve the color directly from the - // feedback buffer + // coordinates and gl2ps will retrieve the color directly from the + // feedback buffer set_font (props); set_color (props.get_color_rgb ());
--- a/libinterp/corefcn/gl2ps-renderer.h Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/corefcn/gl2ps-renderer.h Wed Nov 18 16:40:22 2015 -0800 @@ -36,7 +36,7 @@ { public: glps_renderer (FILE *_fp, const std::string& _term) - : opengl_renderer () , fp (_fp), term (_term), fontsize (), + : opengl_renderer () , fp (_fp), term (_term), fontsize (), fontname () { } ~glps_renderer (void) { } @@ -103,10 +103,10 @@ } private: - // Use xform to compute the coordinates of the ft_string list + // Use xform to compute the coordinates of the ft_string list // that have been parsed by freetype - void fix_strlist_position (double x, double y, double z, - Matrix box, double rotation, + void fix_strlist_position (double x, double y, double z, + Matrix box, double rotation, std::list<ft_render::ft_string>& lst); private:
--- a/libinterp/corefcn/graphics.cc Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/corefcn/graphics.cc Wed Nov 18 16:40:22 2015 -0800 @@ -6928,7 +6928,7 @@ significand = values(i) * std::pow (10., -exponent); os.str (std::string ()); - if ((std::abs (significand) - 1) > + if ((std::abs (significand) - 1) > std::numeric_limits<double>::epsilon()) os << significand << "."; else if (significand < 0) @@ -6982,7 +6982,7 @@ label.erase (0, label.find_first_not_of (" ")); label = label.substr (0, label.find_last_not_of (" ")+1); #ifdef HAVE_FREETYPE - ext = text_renderer.get_extent (label, 0.0, + ext = text_renderer.get_extent (label, 0.0, get_ticklabelinterpreter ()); wmax = std::max (wmax, ext(0)); hmax = std::max (hmax, ext(1));
--- a/libinterp/corefcn/jit-typeinfo.cc Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/corefcn/jit-typeinfo.cc Wed Nov 18 16:40:22 2015 -0800 @@ -221,7 +221,7 @@ extern "C" void octave_jit_ginvalid_index (void) { - // FIXME: 0-argument form of gripe_invalid_index removed in cset dd6345fd8a97 + // FIXME: 0-argument form of gripe_invalid_index removed in cset dd6345fd8a97 // Report -1 as the bad index for all occurrences. gripe_invalid_index (-1); }
--- a/libinterp/corefcn/sub2ind.cc Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/corefcn/sub2ind.cc Wed Nov 18 16:40:22 2015 -0800 @@ -201,7 +201,7 @@ if (nargout > dv.length ()) dv = dv.redim (nargout); - + retval = Array<octave_value> (ind2sub (dv, idx)); } catch (const index_exception& e)
--- a/libinterp/corefcn/txt-eng-ft.cc Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/corefcn/txt-eng-ft.cc Wed Nov 18 16:40:22 2015 -0800 @@ -642,7 +642,7 @@ memset (&ps, 0, sizeof (ps)); // Initialize state to 0. wchar_t wc; - ft_string fs (str, font.get_angle (), font.get_weight (), + ft_string fs (str, font.get_angle (), font.get_weight (), font.get_name (), font.get_size (), xoffset, yoffset); while (n > 0) @@ -658,7 +658,7 @@ if (wc == L'\n') { - // Finish previous string in srtlist before processing + // Finish previous string in srtlist before processing // the newline character fs.set_y (line_yoffset + yoffset); fs.set_color (color); @@ -677,10 +677,10 @@ previous = 0; // Start a new string in strlist idx = curr; - fs = ft_string (str.substr (idx), font.get_angle (), - font.get_weight (), font.get_name (), + fs = ft_string (str.substr (idx), font.get_angle (), + font.get_weight (), font.get_name (), font.get_size (), line_xoffset, yoffset); - + } else previous = glyph_index; @@ -837,8 +837,8 @@ ft_render::visit (text_element_symbol& e) { uint32_t code = e.get_symbol_code (); - - ft_string fs (std::string ("-"), font.get_angle (), font.get_weight (), + + ft_string fs (std::string ("-"), font.get_angle (), font.get_weight (), font.get_name (), font.get_size (), xoffset, yoffset); if (code != text_element_symbol::invalid_code && font.is_valid ()) @@ -1024,7 +1024,7 @@ ft_render::text_to_pixels (const std::string& txt, uint8NDArray& pixels_, Matrix& box, int _halign, int valign, double rotation, - const caseless_str& interpreter, + const caseless_str& interpreter, bool handle_rotation) { int rot_mode = rotation_to_mode (rotation);
--- a/libinterp/corefcn/txt-eng-ft.h Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/corefcn/txt-eng-ft.h Wed Nov 18 16:40:22 2015 -0800 @@ -55,7 +55,7 @@ }; public: - + ft_render (void); ~ft_render (void); @@ -168,7 +168,7 @@ FT_UInt process_character (FT_ULong code, FT_UInt previous = 0); public: - // A class to store informations on substrings after parsing. + // A class to store informations on substrings after parsing. class ft_string : public ft_font { public: @@ -178,7 +178,7 @@ : ft_font (nm, fontwgt, fontang, fontsz), string(s), x(x0), y(y0), z(0.0), code(0), color(Matrix (1,3,0.0)){ } - + void set_string (const std::string str) { string = str; } std::string get_string (void) const { return string; } @@ -199,15 +199,15 @@ uint32_t get_code (void) const { return code; } - void set_color (const uint8NDArray c) - { - color(0) = static_cast<double> (c(0)) / 255; + void set_color (const uint8NDArray c) + { + color(0) = static_cast<double> (c(0)) / 255; color(1) = static_cast<double> (c(1)) / 255; color(2) = static_cast<double> (c(2)) / 255; } Matrix get_color (void) const { return color; } - + private: std::string string; double x, y, z; @@ -218,12 +218,12 @@ void text_to_strlist (const std::string& txt, std::list<ft_string>& lst, Matrix& box, int ha, int va, double rot, - const caseless_str& interp = "tex") + const caseless_str& interp = "tex") { uint8NDArray pixels_; - // First run text_to_pixels which will also build the string list + // First run text_to_pixels which will also build the string list text_to_pixels (txt, pixels_, box, ha, va, rot, interp, false); - + lst = strlist; }
--- a/libinterp/octave-value/ov-base-diag.h Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/octave-value/ov-base-diag.h Wed Nov 18 16:40:22 2015 -0800 @@ -86,7 +86,7 @@ { return to_dense ().reshape (new_dims); } octave_value permute (const Array<int>& vec, bool inv = false) const - { + { if (vec.numel () == 2 && ((vec.xelem (0) == 1 && vec.xelem (1) == 0) || (vec.xelem (0) == 0 && vec.xelem (1) == 1)))
--- a/libinterp/octave-value/ov-base-mat.cc Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/octave-value/ov-base-mat.cc Wed Nov 18 16:40:22 2015 -0800 @@ -36,7 +36,7 @@ #include "ov-base-mat.h" #include "ov-base-scalar.h" #include "pr-output.h" - + template <class MT> octave_value octave_base_matrix<MT>::subsref (const std::string& type,
--- a/libinterp/parse-tree/pt-eval.cc Wed Nov 18 16:12:41 2015 -0800 +++ b/libinterp/parse-tree/pt-eval.cc Wed Nov 18 16:40:22 2015 -0800 @@ -859,7 +859,7 @@ tree_statement_list *try_code = cmd.body (); bool execution_error = false; - + if (try_code) { try
--- a/liboctave/array/CMatrix.cc Wed Nov 18 16:12:41 2015 -0800 +++ b/liboctave/array/CMatrix.cc Wed Nov 18 16:40:22 2015 -0800 @@ -1131,7 +1131,7 @@ // Calculate the norm of the matrix, for later use. double anorm; - //if (calc_cond) // Must always calculate anorm for bug #45577 + //if (calc_cond) // Must always calculate anorm for bug #45577 anorm = retval.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); // Work around bug #45577, LAPACK crashes Octave if norm is NaN @@ -1701,7 +1701,7 @@ // Calculate the norm of the matrix, for later use. double anorm = 0; - //if (calc_cond) // Must always calculate anorm for bug #45577 + //if (calc_cond) // Must always calculate anorm for bug #45577 anorm = xnorm (*this, 1); // Work around bug #45577, LAPACK crashes Octave if norm is NaN
--- a/m4/acinclude.m4 Wed Nov 18 16:12:41 2015 -0800 +++ b/m4/acinclude.m4 Wed Nov 18 16:40:22 2015 -0800 @@ -1059,7 +1059,7 @@ : fi ]) -dnl +dnl dnl Check whether sndfile library is modern enough to include things like Ogg dnl AC_DEFUN([OCTAVE_CHECK_LIB_SNDFILE_OK], [
--- a/scripts/general/quadgk.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/general/quadgk.m Wed Nov 18 16:40:22 2015 -0800 @@ -135,7 +135,7 @@ q = -q; return; endif - + abstol = []; reltol = []; waypoints = []; @@ -191,13 +191,13 @@ || isa (waypoints, "single")); if (isempty (abstol)) - abstol = ifelse (issingle, 1e-5, 1e-10); + abstol = ifelse (issingle, 1e-5, 1e-10); elseif (! isscalar (abstol) || abstol < 0) error ("quadv: ABSTOL must be a scalar >=0"); endif if (isempty (reltol)) - reltol = ifelse (issingle, 1e-4, 1e-6); + reltol = ifelse (issingle, 1e-4, 1e-6); elseif (! isscalar (reltol) || reltol < 0) error ("quadv: RELTOL must be a scalar >=0"); endif
--- a/scripts/gui/uicontextmenu.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/gui/uicontextmenu.m Wed Nov 18 16:40:22 2015 -0800 @@ -23,11 +23,11 @@ ## Create a uicontextmenu object and return a handle to it. ## ## If @var{h} is omitted then a uicontextmenu for the current figure is -## created. If no figure is available, a new figure is created first. +## created. If no figure is available, a new figure is created first. ## -## If @var{h} is given then a uicontextmenu relative to @var{h} is created. -## -## Any provided property value pairs will override the default values of the created +## If @var{h} is given then a uicontextmenu relative to @var{h} is created. +## +## Any provided property value pairs will override the default values of the created ## uicontextmenu object. ## ## Uicontextmenu propertes are documented at @ref{Uicontextmenu Properties}.
--- a/scripts/gui/uicontrol.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/gui/uicontrol.m Wed Nov 18 16:40:22 2015 -0800 @@ -26,12 +26,12 @@ ## uicontrols are used to create simple interactive controls such as push buttons, checkboxes, edit and list controls. ## ## If @var{parent} is omitted then a uicontrol for the current figure is -## created. If no figure is available, a new figure is created first. +## created. If no figure is available, a new figure is created first. ## -## If @var{parent} is given then a uicontrol relative to @var{parent} is created. -## -## Any provided property value pairs will override the default values of the created -## uicontrol object. +## If @var{parent} is given then a uicontrol relative to @var{parent} is created. +## +## Any provided property value pairs will override the default values of the created +## uicontrol object. ## ## Uicontrol propertes are documented at @ref{Uicontrol Properties}. ## @@ -48,11 +48,11 @@ ## Create a edit control that allows user input of single or multiple lines of text. ## ## @item @qcode{"listbox"} -## Create a listbox control that displays a lit of items and allows user slelection of +## Create a listbox control that displays a lit of items and allows user slelection of ## single or multiple items. ## ## @item @qcode{"popupmenu"} -## Create a popupmenu control that displays a list of options that can be selected +## Create a popupmenu control that displays a list of options that can be selected ## when the user clicks on the control. ## ## @item @qcode{"pushbutton"} @@ -63,14 +63,14 @@ ## of radiobutton controls. ## ## @item @qcode{"slider"} -## Create a slider control that allows user selection from a range of values by sliding +## Create a slider control that allows user selection from a range of values by sliding ## knob on the control. ## ## @item @qcode{"text"} ## Create a static text control to display single or multiple lines of text. ## ## @item @qcode{"togglebutton"} -## Create a toggle button control that appears like a push button but allows the user to +## Create a toggle button control that appears like a push button but allows the user to ## select between two states. ## ## @end table
--- a/scripts/gui/uipanel.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/gui/uipanel.m Wed Nov 18 16:40:22 2015 -0800 @@ -25,11 +25,11 @@ ## uipanels are used as containers to group other uicontrol objects. ## ## If @var{parent} is omitted then a uipanel for the current figure is -## created. If no figure is available, a new figure is created first. +## created. If no figure is available, a new figure is created first. ## -## If @var{parent} is given then a uipanel relative to @var{parent} is created. -## -## Any provided property value pairs will override the default values of the created +## If @var{parent} is given then a uipanel relative to @var{parent} is created. +## +## Any provided property value pairs will override the default values of the created ## uipanel object. ## ## Uipanel propertes are documented at @ref{Uipanel Properties}.
--- a/scripts/gui/uipushtool.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/gui/uipushtool.m Wed Nov 18 16:40:22 2015 -0800 @@ -29,9 +29,9 @@ ## created. If no figure is available, a new figure is created first. If a figure is ## available, but does not contain a uitoolbar, a uitoolbar will be created. ## -## If @var{parent} is given then a uipushtools is created on the @var{parent} uitoolbar. -## -## Any provided property value pairs will override the default values of the created +## If @var{parent} is given then a uipushtools is created on the @var{parent} uitoolbar. +## +## Any provided property value pairs will override the default values of the created ## uipushtool object. ## ## Uipushtool propertes are documented at @ref{Uipushtool Properties}.
--- a/scripts/gui/uitoggletool.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/gui/uitoggletool.m Wed Nov 18 16:40:22 2015 -0800 @@ -29,9 +29,9 @@ ## created. If no figure is available, a new figure is created first. If a figure is ## available, but does not contain a uitoolbar, a uitoolbar will be created. ## -## If @var{parent} is given then a uitoggletool is created on the @var{parent} uitoolbar. -## -## Any provided property value pairs will override the default values of the created +## If @var{parent} is given then a uitoggletool is created on the @var{parent} uitoolbar. +## +## Any provided property value pairs will override the default values of the created ## uitoggletool object. ## ## Uitoggletool propertes are documented at @ref{Uitoggletool Properties}.
--- a/scripts/gui/uitoolbar.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/gui/uitoolbar.m Wed Nov 18 16:40:22 2015 -0800 @@ -23,12 +23,12 @@ ## Create a uitoolbar object and return a handle to it. A uitoolbar displays uitoggletool and uipushtool buttons. ## ## If @var{parent} is omitted then a uitoolbar for the current figure is -## created. If no figure is available, a new figure is created first. +## created. If no figure is available, a new figure is created first. ## -## If @var{parent} is given then a uitoolbar relative to @var{parent} is created. -## -## Any provided property value pairs will override the default values of the created -## uitoolbar object. +## If @var{parent} is given then a uitoolbar relative to @var{parent} is created. +## +## Any provided property value pairs will override the default values of the created +## uitoolbar object. ## ## Uitoolbar propertes are documented at @ref{Uitoolbar Properties}. ## @@ -36,7 +36,7 @@ ## ## @example ## @group -## % create figure without a default toolbar +## % create figure without a default toolbar ## f = figure ("toolbar", "none"); ## % create empty toolbar ## t = uitoolbar (f);
--- a/scripts/gui/waitbar.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/gui/waitbar.m Wed Nov 18 16:40:22 2015 -0800 @@ -35,7 +35,7 @@ ## "createcancelbtn" property of waitbar figures. The action to be ## executed when the user presses the button is specified using a string or ## function handle @var{fcn}. -## +## ## The appearance of the waitbar figure window can be configured by passing ## @var{prop}/@var{val} pairs to the function. ## @@ -122,7 +122,7 @@ "integerhandle", "off", "handlevisibility", "callback", "tag", "waitbar"); - + ax = axes ("parent", hf, "xtick", [], "ytick", [], "xlim", [0, 1], "ylim", [0, 1], @@ -135,7 +135,7 @@ if (! isempty (varargin)) set (hf, varargin{:}); endif - + hp = patch (ax, [0; frac; frac; 0], [0; 0; 1; 1], [0, 0.35, 0.75]); ## Cache the axes and patch handles. @@ -173,13 +173,13 @@ fpos = get (hf, "position"); set (hax, "units", "pixels"); apos = get (hax, "position"); - + fpos (2) -= 40; fpos (4) += 40; apos (2) += 40; set (hf, "position", fpos); set (hax, "position", apos, "units", units); - + hbtn = uicontrol ("style", "pushbutton", "string", "Cancel", ... "position", [fpos(3)-100 10 60 25],... "callback", cb, "parent", hf); @@ -192,7 +192,7 @@ fpos = get (hf, "position"); set (hax, "units", "pixels"); apos = get (hax, "position"); - + fpos (2) += 40; fpos (4) -= 40; apos (2) -= 40; @@ -246,7 +246,7 @@ %! pause (0.5); %! close (h1); %! close (h2); - + %!demo %! clf (); %! niter = 9; @@ -254,7 +254,7 @@ %! xx = [0 l]; %! yy = [0 0]; %! hli = plot (xx, yy); -%! +%! %! disp ("Push the cancel to stop the process.") %! hf = waitbar(0,"0","Name","Building Koch curve ...",... %! "createcancelbtn", "setappdata (gcbf,'interrupt', true)"); @@ -268,18 +268,18 @@ %! else %! waitbar (ii/niter, hf, sprintf ("Step %d/%d", ii, niter)); %! endif -%! +%! %! ## Increasingly lengthy computation %! l /= 3; %! theta = angle (complex (diff (xx), diff (yy))); -%! +%! %! xy = @(th, x0, y0) [cos(th) -sin(th) x0 -%! sin(th) cos(th) y0] * [0 l l*3/2 2*l; +%! sin(th) cos(th) y0] * [0 l l*3/2 2*l; %! 0 0 l*(3)^.5/2 0; %! 1 1 1 1]; %! tmp = arrayfun (xy, theta, xx(1:end-1), yy(1:end-1), %! "uniformoutput", false); -%! +%! %! tmp = cell2mat (tmp); %! xx = [tmp(1,:) xx(end)]; %! yy = [tmp(2,:) yy(end)]; @@ -287,7 +287,7 @@ %! drawnow (); %! pause (0.5) %! endfor -%! +%! %! if (ishandle (hf)) %! delete (hf) %! endif
--- a/scripts/image/imshow.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/image/imshow.m Wed Nov 18 16:40:22 2015 -0800 @@ -140,7 +140,7 @@ warning ("imshow: zoom argument ignored -- use GUI features"); narg++; case "parent" - prop_val_args(end+(1:2)) = {"parent", varargin{narg++}}; + prop_val_args(end+(1:2)) = {"parent", varargin{narg++}}; if (! isaxes (prop_val_args{end})) error ("imshow: parent must be an axes handle"); endif
--- a/scripts/image/viridis.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/image/viridis.m Wed Nov 18 16:40:22 2015 -0800 @@ -23,7 +23,7 @@ ## @deftypefn {Function File} {@var{map} =} viridis () ## @deftypefnx {Function File} {@var{map} =} viridis (@var{n}) ## Create color colormap. The colors begin with dark purplish-blue and -## blue, range through green and end with yellow. +## blue, range through green and end with yellow. ## ## The argument @var{n} must be a scalar. ## If unspecified, the length of the current colormap, or 64, is used. @@ -40,7 +40,7 @@ ## http://creativecommons.org/publicdomain/zero/1.0 function c = viridis (n = rows (colormap ())) - + if (nargin > 1) print_usage (); elseif (! isscalar (n)) @@ -69,7 +69,7 @@ 0.28309095 0.11055307 0.43155375 0.28319704 0.11567966 0.43611482 0.28322882 0.12077701 0.44058404 - 0.28318684 0.12584799 0.44496 + 0.28318684 0.12584799 0.44496 0.283072 0.13089477 0.44924127 0.28288389 0.13592005 0.45342734 0.28262297 0.14092556 0.45751726 @@ -89,9 +89,9 @@ 0.27182812 0.20930306 0.50443413 0.27059473 0.21406899 0.50705243 0.26930756 0.21881782 0.50957678 - 0.26796846 0.22354911 0.5120084 - 0.26657984 0.2282621 0.5143487 - 0.2651445 0.23295593 0.5165993 + 0.26796846 0.22354911 0.5120084 + 0.26657984 0.2282621 0.5143487 + 0.2651445 0.23295593 0.5165993 0.2636632 0.23763078 0.51876163 0.26213801 0.24228619 0.52083736 0.26057103 0.2469217 0.52282822 @@ -107,19 +107,19 @@ 0.24311324 0.29209154 0.53851561 0.24123708 0.29648471 0.53970946 0.23934575 0.30085494 0.54084398 - 0.23744138 0.30520222 0.5419214 + 0.23744138 0.30520222 0.5419214 0.23552606 0.30952657 0.54294396 0.23360277 0.31382773 0.54391424 0.2316735 0.3181058 0.54483444 0.22973926 0.32236127 0.54570633 - 0.22780192 0.32659432 0.546532 + 0.22780192 0.32659432 0.546532 0.2258633 0.33080515 0.54731353 0.22392515 0.334994 0.54805291 0.22198915 0.33916114 0.54875211 0.22005691 0.34330688 0.54941304 0.21812995 0.34743154 0.55003755 0.21620971 0.35153548 0.55062743 - 0.21429757 0.35561907 0.5511844 + 0.21429757 0.35561907 0.5511844 0.21239477 0.35968273 0.55171011 0.2105031 0.36372671 0.55220646 0.20862342 0.36775151 0.55267486 @@ -137,7 +137,7 @@ 0.18723083 0.41474645 0.55654717 0.18555593 0.4185704 0.55675292 0.18389763 0.42238275 0.55694377 - 0.18225561 0.42618405 0.5571201 + 0.18225561 0.42618405 0.5571201 0.18062949 0.42997486 0.55728221 0.17901879 0.43375572 0.55743035 0.17742298 0.4375272 0.55756466 @@ -152,14 +152,14 @@ 0.16362543 0.47113278 0.55814842 0.16214155 0.47483821 0.55813967 0.16066467 0.47853961 0.55811466 - 0.15919413 0.4822374 0.5580728 + 0.15919413 0.4822374 0.5580728 0.15772933 0.48593197 0.55801347 - 0.15626973 0.4896237 0.557936 + 0.15626973 0.4896237 0.557936 0.15481488 0.49331293 0.55783967 0.15336445 0.49700003 0.55772371 0.1519182 0.50068529 0.55758733 0.15047605 0.50436904 0.55742968 - 0.14903918 0.50805136 0.5572505 + 0.14903918 0.50805136 0.5572505 0.14760731 0.51173263 0.55704861 0.14618026 0.51541316 0.55682271 0.14475863 0.51909319 0.55657181 @@ -176,9 +176,9 @@ 0.1299327 0.55958162 0.55186354 0.12872938 0.56326503 0.55122927 0.12756771 0.56694891 0.55055551 - 0.12645338 0.57063316 0.5498411 + 0.12645338 0.57063316 0.5498411 0.12539383 0.57431754 0.54908564 - 0.12439474 0.57800205 0.5482874 + 0.12439474 0.57800205 0.5482874 0.12346281 0.58168661 0.54744498 0.12260562 0.58537105 0.54655722 0.12183122 0.58905521 0.54562298 @@ -200,12 +200,12 @@ 0.12808703 0.64774881 0.52349092 0.13006688 0.65138436 0.52160791 0.13226797 0.65501363 0.51966086 - 0.13469183 0.65863619 0.5176488 + 0.13469183 0.65863619 0.5176488 0.13733921 0.66225157 0.51557101 - 0.14020991 0.66585927 0.5134268 + 0.14020991 0.66585927 0.5134268 0.14330291 0.66945881 0.51121549 0.1466164 0.67304968 0.50893644 - 0.15014782 0.67663139 0.5065889 + 0.15014782 0.67663139 0.5065889 0.15389405 0.68020343 0.50417217 0.15785146 0.68376525 0.50168574 0.16201598 0.68731632 0.49912906 @@ -217,7 +217,7 @@ 0.19109018 0.70836635 0.48228395 0.19657063 0.71182668 0.47922108 0.20221902 0.71527175 0.47608431 - 0.20803045 0.71870095 0.4728733 + 0.20803045 0.71870095 0.4728733 0.21400015 0.72211371 0.46958774 0.22012381 0.72550945 0.46622638 0.2263969 0.72888753 0.46278934 @@ -227,7 +227,7 @@ 0.25289851 0.74221104 0.44828355 0.25985676 0.74549162 0.44446673 0.26694127 0.74875084 0.44057284 - 0.27414922 0.75198807 0.4366009 + 0.27414922 0.75198807 0.4366009 0.28147681 0.75520266 0.43255207 0.28892102 0.75839399 0.42842626 0.29647899 0.76156142 0.42422341 @@ -240,14 +240,14 @@ 0.35235985 0.78301086 0.39263579 0.36074053 0.78596419 0.38781353 0.3692142 0.78888793 0.38291438 - 0.37777892 0.79178146 0.3779385 + 0.37777892 0.79178146 0.3779385 0.38643282 0.79464415 0.37288606 0.39517408 0.79747541 0.36775726 0.40400101 0.80027461 0.36255223 0.4129135 0.80304099 0.35726893 0.42190813 0.80577412 0.35191009 0.43098317 0.80847343 0.34647607 - 0.44013691 0.81113836 0.3409673 + 0.44013691 0.81113836 0.3409673 0.44936763 0.81376835 0.33538426 0.45867362 0.81636288 0.32972749 0.46805314 0.81892143 0.32399761 @@ -256,7 +256,7 @@ 0.49661536 0.82637633 0.30637661 0.5062713 0.82878621 0.30036211 0.51599182 0.83115784 0.29427888 - 0.52577622 0.83349064 0.2881265 + 0.52577622 0.83349064 0.2881265 0.5356211 0.83578452 0.28190832 0.5455244 0.83803918 0.27562602 0.55548397 0.84025437 0.26928147 @@ -286,7 +286,7 @@ 0.80418159 0.88204632 0.11496505 0.81457634 0.88339329 0.11034678 0.82494028 0.88472036 0.10621724 - 0.83526959 0.88602943 0.1026459 + 0.83526959 0.88602943 0.1026459 0.84556056 0.88732243 0.09970219 0.8558096 0.88860134 0.09745186 0.86601325 0.88986815 0.09595277 @@ -294,7 +294,7 @@ 0.88627146 0.89237353 0.09537439 0.89632002 0.89361614 0.09633538 0.90631121 0.89485467 0.09812496 - 0.91624212 0.89609127 0.1007168 + 0.91624212 0.89609127 0.1007168 0.92610579 0.89732977 0.10407067 0.93590444 0.8985704 0.10813094 0.94563626 0.899815 0.11283773
--- a/scripts/ode/private/ode_event_handler.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/ode/private/ode_event_handler.m Wed Nov 18 16:40:22 2015 -0800 @@ -96,7 +96,7 @@ evtold = evtold(:)'; term = term(:)'; dir = dir(:)'; told = t; yold = y; evtcnt = 1; retcell = cell (1,4); - ## Process the event, i.e., + ## Process the event, i.e., ## find the zero crossings for either a rising or falling edge elseif (isempty (flag))
--- a/scripts/optimization/fminunc.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/optimization/fminunc.m Wed Nov 18 16:40:22 2015 -0800 @@ -342,14 +342,14 @@ ## When info != 1, recalculate the gradient and Hessian using the final x. if (nargout > 4 && (info == -1 || info == 2 || info == 3)) - grad0 = grad; + grad0 = grad; if (has_grad) [fval, grad] = fcn (reshape (x, xsz)); grad = grad(:); else grad = __fdjac__ (fcn, reshape (x, xsz), fval, typicalx, cdif)(:); endif - + if (nargout > 5) ## Use the damped BFGS formula. y = grad - grad0;
--- a/scripts/plot/draw/fplot.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/plot/draw/fplot.m Wed Nov 18 16:40:22 2015 -0800 @@ -70,7 +70,7 @@ ## Consider this when writing user-defined functions and use @code{.*}, ## @code{./}, etc. See the function @code{vectorize} for potentially ## converting inline or anonymous functions to vectorized versions. -## +## ## @seealso{ezplot, plot, vectorize} ## @end deftypefn
--- a/scripts/plot/draw/plot.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/plot/draw/plot.m Wed Nov 18 16:40:22 2015 -0800 @@ -99,8 +99,8 @@ ## in pairs. These arguments are applied to the line objects drawn by ## @code{plot}. Useful properties to modify are @qcode{"linestyle"}, ## @qcode{"linewidth"}, @qcode{"color"}, @qcode{"marker"}, -## @qcode{"markersize"}, @qcode{"markeredgecolor"}, @qcode{"markerfacecolor"}. -## @xref{Line Properties}. +## @qcode{"markersize"}, @qcode{"markeredgecolor"}, @qcode{"markerfacecolor"}. +## @xref{Line Properties}. ## ## The @var{fmt} format argument can also be used to control the plot style. ## It is a string composed of four optional parts:
--- a/scripts/plot/draw/surfnorm.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/plot/draw/surfnorm.m Wed Nov 18 16:40:22 2015 -0800 @@ -145,7 +145,7 @@ ## And correct for the aspect ratio of the display daratio = daspect (hax); - damag = sqrt (sumsq (daratio)); + damag = sqrt (sumsq (daratio)); ## FIXME: May also want to normalize the vectors relative to the size ## of the diagonal.
--- a/scripts/statistics/base/quantile.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/statistics/base/quantile.m Wed Nov 18 16:40:22 2015 -0800 @@ -321,7 +321,7 @@ %! yexp = median (x, dim); %! assert (yobs, yexp); -## Bug #45455 +## Bug #45455 %!assert (quantile ([1 3 2], 0.5, 1), [1 3 2]) ## Test input validation
--- a/scripts/time/datevec.m Wed Nov 18 16:12:41 2015 -0800 +++ b/scripts/time/datevec.m Wed Nov 18 16:40:22 2015 -0800 @@ -257,23 +257,23 @@ ## Find location of FFF in ds. ## Might not match idx because of things like yyyy -> %y. [~, nc] = strptime (ds, f(1:idx-1)); - + msec = ds(nc:min (nc+2,end)); # pull 3-digit fractional seconds. msec_idx = find (! isdigit (msec), 1); - + if (! isempty (msec_idx)) # non-digits in msec msec = msec(1:msec_idx-1); msec(end+1:3) = "0"; # pad msec with trailing zeros ds = [ds(1:(nc-1)), msec, ds((nc-1)+msec_idx:end)]; # zero pad ds elseif (numel (msec) < 3) # less than three digits in msec - m_len = numel (msec); + m_len = numel (msec); msec(end+1:3) = "0"; # pad msec with trailing zeros ds = [ds(1:(nc-1)), msec, ds(nc+m_len:end)]; # zero pad ds as well endif - + ## replace FFF with digits to guarantee match in strptime. f(idx:idx+2) = msec; - + if (nc > 0) [tm, nc] = strptime (ds, f); tm.usec = 1000 * str2double (msec);