Mercurial > octave-nkf
changeset 19631:db92e7e28e1f
strip trailing whitespace from most source files
* NEWS, doc/interpreter/contributors.in, doc/interpreter/func.txi,
doc/interpreter/genpropdoc.m, doc/interpreter/octave_logo.eps,
doc/interpreter/plot.txi, doc/interpreter/stmt.txi,
examples/data/Makefile.am, libinterp/corefcn/data.cc,
libinterp/corefcn/debug.cc, libinterp/corefcn/error.cc,
libinterp/corefcn/file-io.cc, libinterp/corefcn/gl-render.cc,
libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h,
libinterp/corefcn/load-path.cc, libinterp/corefcn/pr-output.cc,
libinterp/corefcn/pt-jit.cc, libinterp/corefcn/strfind.cc,
libinterp/corefcn/toplev.cc, libinterp/corefcn/toplev.h,
libinterp/corefcn/urlwrite.cc, libinterp/corefcn/variables.cc,
libinterp/octave-value/ov-classdef.cc,
libinterp/octave-value/ov-classdef.h, libinterp/octave.cc,
libinterp/parse-tree/lex.h, libinterp/parse-tree/oct-parse.in.yy,
libinterp/parse-tree/pt-classdef.h, liboctave/system/file-ops.cc,
liboctave/system/oct-env.cc, m4/acinclude.m4,
scripts/deprecated/finite.m, scripts/deprecated/fmod.m,
scripts/deprecated/fnmatch.m, scripts/deprecated/luinc.m,
scripts/deprecated/octave_tmp_file_name.m, scripts/deprecated/syl.m,
scripts/deprecated/usage.m, scripts/general/inputParser.m,
scripts/general/interp1.m, scripts/general/interp2.m,
scripts/general/interp3.m, scripts/general/isequal.m,
scripts/general/private/__isequal__.m, scripts/geometry/voronoi.m,
scripts/image/image.m, scripts/image/imshow.m,
scripts/image/ind2rgb.m, scripts/linear-algebra/bandwidth.m,
scripts/linear-algebra/isbanded.m, scripts/miscellaneous/bzip2.m,
scripts/miscellaneous/cast.m, scripts/miscellaneous/copyfile.m,
scripts/miscellaneous/delete.m, scripts/miscellaneous/fullfile.m,
scripts/miscellaneous/getappdata.m, scripts/miscellaneous/gunzip.m,
scripts/miscellaneous/isappdata.m, scripts/miscellaneous/ls.m,
scripts/miscellaneous/mex.m, scripts/miscellaneous/movefile.m,
scripts/miscellaneous/orderfields.m, scripts/miscellaneous/recycle.m,
scripts/miscellaneous/rmappdata.m, scripts/miscellaneous/setfield.m,
scripts/miscellaneous/symvar.m, scripts/miscellaneous/tar.m,
scripts/miscellaneous/tmpnam.m, scripts/miscellaneous/unpack.m,
scripts/miscellaneous/ver.m, scripts/miscellaneous/what.m,
scripts/miscellaneous/xor.m, scripts/miscellaneous/zip.m,
scripts/optimization/fminbnd.m, scripts/optimization/sqp.m,
scripts/path/private/getsavepath.m, scripts/path/savepath.m,
scripts/pkg/pkg.m, scripts/pkg/private/installed_packages.m,
scripts/plot/draw/plotyy.m, scripts/plot/draw/polar.m,
scripts/plot/draw/private/__quiver__.m,
scripts/plot/draw/private/__scatter__.m,
scripts/plot/draw/private/__stem__.m, scripts/plot/draw/surface.m,
scripts/plot/draw/surfnorm.m, scripts/plot/util/copyobj.m,
scripts/plot/util/hgload.m, scripts/plot/util/hgsave.m,
scripts/plot/util/isprop.m, scripts/plot/util/linkprop.m,
scripts/plot/util/private/__go_draw_axes__.m, scripts/set/setdiff.m,
scripts/set/union.m, scripts/signal/periodogram.m,
scripts/sparse/eigs.m, scripts/sparse/ilu.m, scripts/sparse/qmr.m,
scripts/sparse/sprand.m, scripts/sparse/sprandn.m,
scripts/specfun/beta.m, scripts/specfun/ellipke.m,
scripts/specfun/isprime.m, scripts/statistics/base/lscov.m,
scripts/testfun/__run_test_suite__.m, scripts/testfun/test.m:
Strip trailing whitespace.
line wrap: on
line diff
--- a/NEWS Tue Jan 20 10:24:46 2015 -0500 +++ b/NEWS Tue Jan 20 10:29:54 2015 -0500 @@ -22,7 +22,7 @@ ** Other new classes in Octave 4.2: audioplayer inputParser - audiorecorder + audiorecorder ** Optional stricter Matlab compatibility for ranges, diagonal matrices, and permutation matrices. @@ -153,7 +153,7 @@ Functions created through the use of inline are scheduled for deprecation by Matlab. When this occurs Octave will continue to support inline functions for an indeterminate amount of time before also removing support. - All new code should use anonymous functions in place of inline functions. + All new code should use anonymous functions in place of inline functions. ** Deprecated functions.
--- a/doc/interpreter/contributors.in Tue Jan 20 10:24:46 2015 -0500 +++ b/doc/interpreter/contributors.in Tue Jan 20 10:29:54 2015 -0500 @@ -85,7 +85,7 @@ Walter Gautschi Klaus Gebhardt Driss Ghaddab -Eugenio Gianniti +Eugenio Gianniti Nicolo Giorgetti Arun Giridhar Michael D. Godfrey
--- a/doc/interpreter/func.txi Tue Jan 20 10:24:46 2015 -0500 +++ b/doc/interpreter/func.txi Tue Jan 20 10:29:54 2015 -0500 @@ -1404,7 +1404,7 @@ anonymous function. Instead of writing @example -f = @@(x, y) x + y +f = @@(x, y) x + y @end example @noindent
--- a/doc/interpreter/genpropdoc.m Tue Jan 20 10:24:46 2015 -0500 +++ b/doc/interpreter/genpropdoc.m Tue Jan 20 10:29:54 2015 -0500 @@ -1,20 +1,20 @@ ## Copyright (C) 2014 Pantxo Diribarne -## +## ## This program is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. -## +## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -## +## ## You should have received a copy of the GNU General Public License ## along with this program. If not, see ## <http://www.gnu.org/licenses/>. -## -*- texinfo -*- +## -*- texinfo -*- ## @deftypefn {Function File} {@var{retval} =} genpropdoc (@var{OBJNAME}, @var{FILENAME}) ## ## Print FILENAME texinfo source file associated to OBJNAME objects. @@ -24,11 +24,11 @@ ## All the hard coded documentation is written in getdoc ## function. See the comments in getdoc bellow for instruction on how ## to document a graphics property. -## +## ## @seealso{} ## @end deftypefn -function genpropdoc (objname, fname) +function genpropdoc (objname, fname) objnames = {"root", "figure", "axes", "line", ... "text", "image", "patch", "surface"}; @@ -44,19 +44,19 @@ ## Docstring str = printdoc (objname, obj); - + fid = fopen (fname, "w+"); if (fid < 0) error ("genpropdoc: couldn't open %s.", fname); endif - + fprintf (fid, str); fclose (fid); endfunction function s = getdoc (objname, field, base) ## Properties are represented by a struct with fields : - ## + ## ## -"doc": string to be printed verbatim after being expanded ## through expand_doc function. Special keywords are: ## "__objname__" further replaced by the current object name; @@ -65,26 +65,26 @@ ## the propmode will be toggled to "manual". ## You may also cross reference properties using the label format ## OBJNAMEPROPERTY, e.g, "@xref{XREFaxescolor, , axes color - ## property}." - ## + ## property}." + ## ## -"valid": string that describes valid values for the ## current property. Use "packopt" function to join options with ## " | " separator and "markdef" to mark default among valid - ## values between curly braces. + ## values between curly braces. ## If not provided, valid values for radio properties are ## automatically retrieved using set function. - ## + ## ## -"default": string. If not provided the default value is ## automatically retrieved using get function. ## ## -"printdefault": a boolean (def. true) that specifies whether the ## default value should be printed. It is useful for properties - ## like root "screendepth" that default to screen dependant values. + ## like root "screendepth" that default to screen dependant values. packopt = @(c) strjoin (c, ' | '); markdef = @(s) ["@{" s "@}"]; - - ## Some generic templates: + + ## Some generic templates: valid_color = "colorspec"; valid_handle = "graphics handle"; valid_string = "string"; @@ -95,7 +95,7 @@ valid_4elvec = "four elements vector"; valid_vecmat = packopt ({"vector", "matrix"}); valid_scalmat = packopt ({"scalar", "matrix"}); - + doc_notimpl = "%s is not yet implemented for __objname__ \ objects. __prop__ is unused."; doc_unused = "__prop__ is unused."; @@ -112,7 +112,7 @@ ## Base properties: write generic documentation as it will, by ## default, be included in the list of each graphics object. ## If a given graphics object interprets the property differently - ## than most others, the doc will have to be rewritten for this object. + ## than most others, the doc will have to be rewritten for this object. if (strcmp (objname, "base")) switch field case "beingdeleted" @@ -122,52 +122,52 @@ case "children" s.doc = "Graphics handles of the __objname__'s children."; s.valid = "vector of graphics handles"; - + case "clipping" s.doc = "If __prop__ is @qcode{\"on\"}, the __objname__ is \ clipped in its parent axes limits."; - + case "createfcn" s.doc = "Callback functions to be executed right after \ the __objname__ has been created. Those functions have to be set by \ default using e.g. @code{set (0, \"default__objname__createfcn\", \ 'disp (\"__objname__ created!\")') }."; s.valid = valid_fcn; - + case "deletefcn" s.doc = "Callback functions to be executed right before \ the __objname__ is deleted."; s.valid = valid_fcn; - + case "handlevisibility" s.doc = "If __prop__ is @qcode{\"off\"}, the __objname__'s \ handle is not visible into its parent's children list."; - + case "hittest" case "interruptible" case "parent" s.doc = "Handle of the parent graphics object."; s.valid = valid_handle; - + case "selected" case "selectionhighlight" case "tag" s.valid = valid_string; - + case "type" s.doc = "Class name of the graphics object. __prop__ is \ always @qcode{\"__objname__\"}"; s.valid = valid_string; s.printdefault = false; - + case "uicontextmenu" case "userdata" case "visible" s.doc = "If __prop__ is @qcode{\"off\"}, the __objname__ is \ not rendered on screen."; endswitch - - ## Root properties: + + ## Root properties: elseif (strcmp (objname, "root")) switch field ## Overridden shared properties @@ -176,86 +176,86 @@ "hittest", "interruptible", "selected", ... "selectionhighlight", "uicontextmenu", "visible"} s.doc = doc_unused; - + case "parent" s.doc = "Root figure has no parent graphics object. __prop__ \ is always empty."; - + ## Specific properties case "callbackobject" s.valid = valid_handle; - + case "commandwindowsize" case "currentfigure" s.doc = "Graphics handle of the current figure."; s.valid = valid_handle; - + case "diary" s.doc = "If __prop__ is @qcode{\"on\"}, the octave \ command window session is saved to file. @xref{XREFrootdiaryfile, , \ diaryfile property}."; s.valid = valid_string; - + case "diaryfile" s.doc = "The name of the diary file. \ @xref{XREFdiary, , diary function}."; s.valid = valid_string; - + case "echo" s.doc = "Control whether octave displays commands executed \ from scripts. @xref{XREFecho, , echo function}."; - + case "errormessage" s.doc = "The last error message octave raised. \ @xref{XREFlasterr, , lasterr function}."; s.valid = valid_string; - + case "fixedwidthfontname" s.valid = valid_string; - + case "format" s.doc = "This property is a wrapper around @code{format} \ function. @xref{XREFformat, , format function}."; - + case "formatspacing" s.doc = "This property is a wrapper around @code{format} \ function. @xref{XREFformat, , format function}."; - + case "language" s.valid = valid_string; - + case "monitorpositions" s.valid = valid_4elvec; - + case "pointerlocation" s.valid = valid_2elvec; - + case "pointerwindow" s.valid = valid_handle; - + case "recursionlimit" s.doc = "The maximum number of times a function can be \ called recursively. @xref{XREFmax_recursion_depth, , \ max_recursion_depth function}."; s.valid = "double"; - + case "screendepth" s.valid = "double"; s.printdefault = false; - + case "screenpixelsperinch" s.valid = "double"; s.printdefault = false; - + case "screensize" s.valid = valid_4elvec; s.printdefault = false; - + case "showhiddenhandles" s.doc = "If __prop__ is @qcode{\"on\"}, all graphics objects \ handle are visible in their parents' children list, regardless of \ -the value of their @code{handlevisibility} property."; - +the value of their @code{handlevisibility} property."; + case "units" endswitch @@ -271,27 +271,27 @@ s.doc = sprintf (doc_notimpl, "Transparency"); case "closerequestfcn" s.valid = valid_fcn; - + case "color" s.doc = "Color of the figure background. @xref{Colors, , \ colorspec}."; s.valid = valid_color; - + case "colormap" s.doc = "A matrix containing the RGB color map for \ the current axes."; s.valid = "N-by-3 matrix"; - + case "currentaxes" s.doc = "Handle to the graphics object of the current axes."; s.valid = valid_handle; - + case "currentcharacter" s.doc = doc_unused; - + case "currentobject" s.valid = valid_handle; - + case "currentpoint" s.doc = "A 1-by-2 matrix which holds the coordinates of \ the point over which the mouse pointer was when a mouse event \ @@ -309,17 +309,17 @@ defined \n\ @end table"; s.valid = valid_2elvec; - + case "dockcontrols" s.doc = doc_unused; - + case "doublebuffer" case "filename" case "integerhandle" case "inverthardcopy" case "keypressfcn" s.valid = valid_fcn; - + case "keyreleasefcn" s.doc = "With @code{keypressfcn}, the keyboard callback \ functions. These callback functions get called when a key is \ @@ -337,7 +337,7 @@ with the key.\n\ @end table"; s.valid = valid_fcn; - + case "menubar" case "mincolormap" case "name" @@ -345,69 +345,69 @@ __prop__ is empty, the title of the figure is \"figure\" followed \ by the figure handle value."; s.valid = valid_string; - + case "nextplot" case "numbertitle" case "outerposition" s.valid = valid_4elvec; - + case "paperorientation" case "paperposition" s.doc = "Vector @qcode{[x0 y0 width height]} defining the \ position of the figure (in @code{paperunits} units) in the printed \ -page. __modemsg__."; +page. __modemsg__."; s.valid = valid_4elvec; - + case "paperpositionmode" s.doc = "If __prop__ is set to @qcode{\"auto\"}, the \ @qcode{\"paperposition\"} property is automatically computed: the \ printed figure will have the same size as on-screen figure and will \ -be centered in the output page."; +be centered in the output page."; case "papersize" s.doc = "Vector @qcode{[width height]} defining the size of the \ printing paper. Setting this property forces the @code{papertype} \ property to be set to @qcode{\"<custom>\"}."; s.valid = valid_2elvec; - + case "papertype" s.doc = "Name of the paper to be used for printed output. \ Setting __prop__ also changes @code{papersize} accordingly."; - + case "paperunits" s.doc = "The unit used to compute the @code{paperposition} \ property."; - + case "pointer" case "pointershapecdata" s.doc = doc_unused; - + case "pointershapehotspot" s.doc = doc_unused; - + case "position" s.valid = valid_4elvec; - + case "renderer" case "renderermode" case "resize" case "resizefcn" s.valid = valid_fcn; - + case "selectiontype" case "toolbar" case "units" s.doc = "The unit used to compute the @code{position} and \ @code{outerposition} properties."; - case "windowbuttondownfcn" + case "windowbuttondownfcn" s.doc = "@xref{XREFfigurewindowbuttonupfcn, , \ windowbuttonupfcn property}."; s.valid = valid_fcn; - + case "windowbuttonmotionfcn" s.doc = "@xref{XREFfigurewindowbuttonupfcn, , \ windowbuttonupfcn property}."; s.valid = valid_fcn; - + case "windowbuttonupfcn" s.doc = "With @code{windowbuttondownfcn} and \ @code{windowbuttonmotionfcn}, the mouse callback functions. These \ @@ -416,16 +416,16 @@ are called, the @code{currentpoint} property holds the current \ coordinates of the cursor."; s.valid = valid_fcn; - + case "windowkeypressfcn" s.valid = valid_fcn; - + case "windowkeyreleasefcn" s.valid = valid_fcn; - + case "windowscrollwheelfcn" s.valid = valid_fcn; - + case "windowstyle" case "wvisual" case "wvisualmode" @@ -437,7 +437,7 @@ figure. @xref{XREFavailable_graphics_toolkits, , \ available_graphics_toolkits function}."; endswitch - + ## Axes properties elseif (strcmp (objname, "axes")) switch field @@ -454,39 +454,39 @@ s.doc = sprintf (doc_notimpl, "Light"); case "box" s.doc = "Control wether the axes has a surrounding box."; - + case "cameraposition" s.valid = valid_3elvec; - + case "camerapositionmode" case "cameratarget" s.valid = valid_3elvec; - + case "cameratargetmode" case "cameraupvector" s.valid = valid_3elvec; - + case "cameraupvectormode" case "cameraviewangle" s.valid = "scalar"; - + case "cameraviewanglemode" case "clim" s.valid = valid_2elvec; s.doc = "Define the limits for the color axis of image \ children. __modemsg__. @xref{XREFpcolor, , pcolor function}."; - + case "climmode" case "color" s.doc = "Color of the axes background. @xref{Colors, , \ colorspec}."; s.valid = valid_color; - + case "colororder" s.doc = "RGB values to be used by plot function for \ automatic line coloring."; s.valid = "N-by-3 RGB matrix"; - + case "currentpoint" s.doc = "Matrix @qcode{[xf, yf, zf; xb, yb, zb]} which holds \ the coordinates of the point over which the mouse pointer was when \ @@ -498,29 +498,29 @@ furthest point. The two points forms a line which is perpendicular \ to the screen."; s.valid = "2-by-3 matrix"; - + case "dataaspectratio" s.doc = "Specify the relative height and width of the data \ displayed in the axes. Setting @code{dataaspectratio} to @samp{[1, \ 2]} causes the length of one unit as displayed on the y-axis to be \ the same as the length of 2 units on the x-axis. __modemsg__."; s.valid = valid_3elvec; - + case "dataaspectratiomode" case "drawmode" case "fontangle" case "fontname" s.doc = "Name of the font to be used for axes annotations."; s.valid = valid_string; - + case "fontsize" s.doc = "Size of the font to be used for axes annotations. \ @xref{XREFaxesfontunits, , fontunits property}."; s.valid = "scalar"; - + case "fontunits" s.doc = "Unit used to interpret @code{fontsize} property."; - + case "fontweight" case "gridlinestyle" case "interpreter" @@ -538,7 +538,7 @@ left corner of the axes at @math{(0.2, 0.3)} and the width and \ height to be 0.4 and 0.5 respectively. @xref{XREFaxesposition, , position property}."; s.valid = valid_4elvec; - + case "plotboxaspectratio" case "plotboxaspectratiomode" case "position" @@ -549,9 +549,9 @@ window. For example, @qcode{[0.2, 0.3, 0.4, 0.5]} sets the lower \ left corner of the axes at @math{(0.2, 0.3)} and the width and \ height to be 0.4 and 0.5 respectively. @xref{XREFaxesouterposition, , \ -outerposition property}."; +outerposition property}."; s.valid = valid_4elvec; - + case "projection" case "tickdir" case "tickdirmode" @@ -560,45 +560,45 @@ case "title" s.doc = "Graphics handle of the title text object."; s.valid = valid_handle; - + case "units" case "view" s.doc = "Specify the view point for three-dimensional plots"; s.valid = valid_2elvec; - + case "xaxislocation" case "xcolor" s.doc = "Color of the x-axis. @xref{Colors, , colorspec}."; s.valid = packopt ({markdef(valid_color), ... "@qcode{\"none\"}"}); - + case "xdir" case "xgrid" s.doc = "Control wether major x grid lines are displayed."; - + case "xlabel" s.doc = "Graphics handle of the x label text object."; s.valid = valid_handle; - + case "xlim" s.doc = "Specify the limits for x-axis. __modemsg__. \ @xref{XREFxlim, , xlim function}."; s.valid = valid_2elvec; - + case "xlimmode" case "xminorgrid" s.doc = "Control wether minor x grid lines are displayed."; - + case "xminortick" case "xscale" case "xtick" s.doc = "Position of x tick marks. __modemsg__."; s.valid = "vector"; - + case "xticklabel" s.doc = "Labels of x tick marks. __modemsg__."; s.valid = valid_cellstring; - + case "xticklabelmode" case "xtickmode" case "yaxislocation" @@ -606,147 +606,147 @@ s.doc = "Color of the y-axis. @xref{Colors, , colorspec}."; s.valid = packopt ({markdef(valid_color), ... "@qcode{\"none\"}"}); - + case "ydir" case "ygrid" s.doc = "Control wether major y grid lines are displayed."; - + case "ylabel" s.doc = "Graphics handle of the y label text object."; s.valid = valid_handle; - + case "ylim" s.doc = "Specify the limits for y-axis. __modemsg__. \ @xref{XREFylim, , ylim function}."; s.valid = valid_2elvec; - + case "ylimmode" case "yminorgrid" s.doc = "Control wether minor y grid lines are displayed."; - + case "yminortick" case "yscale" case "ytick" s.doc = "Position of y tick marks. __modemsg__."; s.valid = "vector"; - + case "yticklabel" s.doc = "Labels of y tick marks. __modemsg__."; s.valid = valid_cellstring; - + case "yticklabelmode" case "ytickmode" case "zcolor" s.doc = "Color of the z-axis. @xref{Colors, , colorspec}."; s.valid = packopt ({markdef(valid_color), ... "@qcode{\"none\"}"}); - + case "zdir" case "zgrid" s.doc = "Control wether major z grid lines are displayed."; - + case "zlabel" s.doc = "Graphics handle of the z label text object."; s.valid = valid_handle; - + case "zlim" s.doc = "Specify the limits for z-axis. __modemsg__. \ @xref{XREFzlim, , zlim function}."; s.valid = valid_2elvec; - + case "zlimmode" case "zminorgrid" s.doc = "Control wether minor z grid lines are displayed."; - + case "zminortick" case "zscale" case "ztick" s.doc = "Position of z tick marks. __modemsg__."; s.valid = "vector"; - + case "zticklabel" s.doc = "Labels of z tick marks. __modemsg__."; s.valid = valid_cellstring; - + case "zticklabelmode" case "ztickmode" endswitch - + ## Line properties elseif (strcmp (objname, "line")) switch field ## Overridden shared properties case "children" s.doc = doc_unused; - + ## Specific properties case "color" s.doc = "Color of the line object. @xref{Colors, , \ colorspec}."; s.valid = valid_color; - + case "displayname" s.doc = "The text of the legend entry corresponding to this \ line."; s.valid = valid_cellstring; - + case "erasemode" s.doc = doc_unused; - + case "interpreter" case "linestyle" s.doc = "@xref{Line Styles}."; - + case "linewidth" s.doc = "Width in points of the line object."; - + case "marker" s.doc = "The shape of the marker to be used. @xref{Marker \ Styles}."; - + case "markeredgecolor" s.doc = "Color of the edge of the markers. If set \ @qcode{\"auto\"}, the markers edges have the same color as the line. If \ set @qcode{\"none\"}, the markers edges are not displayed. This property \ can also be set to any color. @xref{Colors, , colorspec}."; - + case "markerfacecolor" s.doc = "Color of the face of the markers. If set \ @qcode{\"auto\"}, the markers faces have the same color as the line. If \ set @qcode{\"none\"}, the markers faces are not displayed. This property \ can also be set to any color. @xref{Colors, , colorspec}."; - + case "markersize" s.doc = "Size of the markers in points."; s.valid = "scalar"; - + case "xdata" s.doc = "Vector of x data to be plotted."; s.valid = "vector"; - + case "xdatasource" s.valid = valid_string; s.doc = "Name of the vector in the current base workspace \ that should be used as x data."; - + case "ydata" s.doc = "Vector of y data to be plotted."; s.valid = "vector"; - + case "ydatasource" s.valid = valid_string; s.doc = "Name of the vector in the current base workspace \ that should be used as y data."; - + case "zdata" s.doc = "Vector of z data to be plotted."; s.valid = "vector"; - + case "zdatasource" s.valid = valid_string; s.doc = "Name of the vector in the current base workspace \ that should be used as z data."; - + endswitch ## Text properties @@ -760,68 +760,68 @@ case "backgroundcolor" s.doc = sprintf (doc_notimpl, "Background area"); s.valid = valid_color; - + case "color" s.doc = "Color of the text. @xref{Colors, ,colorspec}. "; s.valid = valid_color; - + case "displayname" case "edgecolor" s.doc = sprintf (doc_notimpl, "Background area"); s.valid = valid_color; - + case "editing" case "erasemode" s.doc = doc_unused; - + case "extent" case "fontangle" s.doc = "Flag whether the font is italic or normal. \ @code{fontangle} is currently unused."; - + case "fontname" s.doc = "The font used for the text."; s.valid = valid_string; - + case "fontsize" s.doc = "The font size of the text."; s.valid = "scalar"; - + case "fontunits" s.doc = "The units used to interpret @code{fontsize} \ property."; - + case "fontweight" s.doc = "Flag whether the font is bold, etc."; - + case "horizontalalignment" case "interpreter" case "linestyle" s.doc = sprintf (doc_notimpl, "Background area"); - + case "linewidth" s.doc = sprintf (doc_notimpl, "Background area"); s.valid = "scalar"; - + case "margin" s.doc = sprintf (doc_notimpl, "Background area"); s.valid = "scalar"; - + case "position" s.doc = "Vector @qcode{[X0 Y0 Z0]} where X0, Y0 and Z0 \ indicate the position of the text anchor as defined by \ @code{verticalalignment} and @code{horizontalalignment}."; s.valid = valid_4elvec; - + case "rotation" s.doc = "The angle of rotation for the displayed text, \ measured in degrees."; s.valid = "scalar"; - + case "string" s.doc = "The text object string content."; s.valid = valid_string; - + case "units" case "verticalalignment" endswitch @@ -837,38 +837,38 @@ case "alphadata" s.doc = sprintf (doc_notimpl, "Transparency"); s.valid = valid_scalmat; - + case "alphadatamapping" s.doc = sprintf (doc_notimpl, "Transparency"); - + case "cdata" s.valid = "matrix"; - + case "cdatamapping" case "displayname" s.doc = "The text of the legend entry corresponding to this \ image."; s.valid = valid_cellstring; - + case "erasemode" s.doc = doc_unused; - + case "xdata" s.doc = "Two element vector @qcode{[xmin xmax]} specifying the x \ coordinates of the first and last columns of the image. \ \n\nSetting @code{xdata} empty matrix makes octave automatically \ affect it the value @qcode{[1 columns(image)]}."; s.valid = valid_2elvec; - + case "ydata" s.doc = "Vector @qcode{[ymin ymax]} specifying the y \ coordinates of the first and last columns of the image. \ \n\nSetting @code{ydata} empty matrix makes octave automatically \ affect it the value @qcode{[1 rows(image)]}."; s.valid = valid_2elvec; - + endswitch - + ## Surface properties elseif (strcmp (objname, "surface")) switch field @@ -880,96 +880,96 @@ case "alphadata" s.doc = sprintf (doc_notimpl, "Transparency"); s.valid = valid_scalmat; - + case "alphadatamapping" s.doc = sprintf (doc_notimpl, "Transparency"); - + case "ambientstrength" s.doc = sprintf (doc_notimpl, "Light"); - + case "backfacelighting" s.doc = sprintf (doc_notimpl, "Light"); - + case "cdata" s.valid = "matrix"; - + case "cdatamapping" case "cdatasource" case "diffusestrength" s.doc = sprintf (doc_notimpl, "Light"); - + case "displayname" s.doc = "The text of the legend entry corresponding to this \ surface."; - + case "edgealpha" s.doc = sprintf (doc_notimpl, "Transparency"); s.valid = "scalar"; - + case "edgecolor" case "edgelighting" s.doc = sprintf (doc_notimpl, "Light"); - + case "erasemode" s.doc = doc_unused; case "facealpha" s.doc = sprintf (doc_notimpl, "Transparency"); s.valid = valid_scalmat; - + case "facecolor" case "facelighting" s.doc = sprintf (doc_notimpl, "Light"); - + case "interpreter" case "linestyle" s.doc = "@xref{Line Styles}."; - + case "linewidth" s.doc = "@xref{XREFlinelinewidth, , line linewidth \ property}."; - + case "marker" s.doc = "@xref{Marker Styles}."; - + case "markeredgecolor" s.doc = "@xref{XREFlinemarkeredgecolor, , line \ -markeredgecolor property}."; - +markeredgecolor property}."; + case "markerfacecolor" s.doc = "@xref{XREFlinemarkerfacecolor, , line \ -markerfacecolor property}."; - +markerfacecolor property}."; + case "markersize" s.doc = "@xref{XREFlinemarkersize, , line \ -markersize property}."; +markersize property}."; s.valid = "scalar"; - + case "meshstyle" case "normalmode" case "specularcolorreflectance" s.doc = sprintf (doc_notimpl, "Light"); - + case "specularexponent" s.doc = sprintf (doc_notimpl, "Light"); - + case "specularstrength" s.doc = sprintf (doc_notimpl, "Light"); - + case "vertexnormals" case "xdata" s.valid = "matrix"; - + case "xdatasource" case "ydata" s.valid = "matrix"; - + case "ydatasource" case "zdata" s.valid = "matrix"; - + case "zdatasource" endswitch - + ## Patch properties elseif (strcmp (objname, "patch")) switch field @@ -980,14 +980,14 @@ ## Specific properties case "alphadatamapping" s.doc = sprintf (doc_notimpl, "Transparency"); - + case "ambientstrength" s.doc = sprintf (doc_notimpl, "Light"); s.valid = "scalar"; - + case "backfacelighting" s.doc = sprintf (doc_notimpl, "Light"); - + case "cdata" s.doc = "Data defining the patch object color.\n\ Patch color can be defined for faces or for vertices. \n\n\ @@ -998,29 +998,29 @@ If @code{cdata} is a N-by-M or a N-by-M-by-3 (RGB) \ matrix, it defines the color all vertices."; s.valid = valid_scalmat; - + case "diffusestrength" s.doc = sprintf (doc_notimpl, "Light"); s.valid = "scalar"; - + case "displayname" s.doc = "The text of the legend entry corresponding to this \ patch."; case "edgealpha" s.doc = sprintf (doc_notimpl, "Transparency"); s.valid = valid_scalmat; - + case "edgecolor" case "edgelighting" s.doc = sprintf (doc_notimpl, "Light"); - + case "erasemode" s.doc = doc_unused; - + case "facealpha" s.doc = sprintf (doc_notimpl, "Transparency"); s.valid = valid_scalmat; - + case "facecolor" ## Don't provide a default value, and mark colorspec with ## braces, this forces the default rgb triplet to be displayed @@ -1028,74 +1028,74 @@ "@qcode{\"flat\"}", ... "@qcode{\"none\"}", ... "@qcode{\"interp\"}"}); - + case "facelighting" s.doc = sprintf (doc_notimpl, "Light"); - + case "faces" case "xdata" s.valid = valid_vecmat; - + case "facevertexalphadata" s.doc = sprintf (doc_notimpl, "Transparency"); s.valid = valid_scalmat; - + case "facevertexcdata" case "interpreter" s.doc = doc_unused; - + case "linestyle" case "linewidth" case "marker" s.doc = "@xref{XREFlinemarker, , line marker property}."; - + case "markeredgecolor" s.doc = "@xref{XREFlinemarkeredgecolor, , line \ -markeredgecolor property}."; - +markeredgecolor property}."; + case "markerfacecolor" s.doc = "@xref{XREFlinemarkerfacecolor, , line \ -markerfacecolor property}."; - +markerfacecolor property}."; + case "markersize" s.doc = "@xref{XREFlinemarkersize, , line \ -markersize property}."; +markersize property}."; s.valid = "scalar"; - + case "normalmode" case "specularcolorreflectance" s.doc = sprintf (doc_notimpl, "Light"); s.valid = "scalar"; - + case "specularexponent" s.doc = sprintf (doc_notimpl, "Light"); s.valid = "scalar"; - + case "specularstrength" s.doc = sprintf (doc_notimpl, "Light"); s.valid = "scalar"; - + case "vertexnormals" case "vertices" s.valid = valid_vecmat; - + case "xdata" s.valid = valid_vecmat; - + case "ydata" s.valid = valid_vecmat; - + case "zdata" s.valid = valid_vecmat; - + endswitch endif - + ## Replace keywords if (! isempty (s.doc) && ! strcmp (objname, "base")) s.doc = expand_doc (s.doc, field, objname); endif - + endfunction function strout = expand_doc (strin, field, objname) @@ -1112,7 +1112,7 @@ hf = []; if (! strcmp (objname, "root")) ## Use an improbable figure number to avoid ishandle to return - ## true for 1 + ## true for 1 hf = figure (2265465, "visible", "off"); endif @@ -1130,7 +1130,7 @@ else eval (["h = " objname " ();"]); endif - + gprop = get (h); sprop = set (h); @@ -1142,12 +1142,12 @@ ## Get hard coded documentation val = getdoc (objname, field, base); - + ## Extract the default values that are not hard coded in getdoc if (isempty (val.default) && val.printdefault) val.default = getdefault (h, objname, field); endif - + val.isreadonly = ! isfield (sprop, field); ## Extract the valid values that are not hard coded in getdoc @@ -1161,7 +1161,7 @@ val.valid = strjoin (val.valid, ' | '); endif endif - + args{2*(ii-1)+1} = field; args{2*ii} = val; endfor @@ -1178,11 +1178,11 @@ endif endfunction -function def = getdefault (h, objname, field) +function def = getdefault (h, objname, field) ## This function is meant to be run without initialization file so ## that the properties we get are the default. def = get (h, field); - + ## Don't print default values for graphics handles if (isscalar (def) && def != 0 && ishandle (def)) def = ""; @@ -1206,16 +1206,16 @@ str = strrep (str, "\n", "; "); endif endif - + ## Replace texinfo reserved characters def = strrep (str, "{", "@{"); def = strrep (def, "}", "@}"); def = strrep (def, "@", "@@"); - + def = ["@code{" def "}"]; else args = arrayfun (@(x) num2str (x), size (def), - "uniformoutput", false); + "uniformoutput", false); def = [strjoin(args, "-by-") " " class(def)]; endif endif @@ -1230,14 +1230,14 @@ ## File header and begining of properties table str = [warn_autogen() "\n\n@table @asis"]; - - for ii = 1:nf + + for ii = 1:nf field = fields{ii}; str = sprintf ("%s\n\n", str); ## @anchor: cross reference using XREFobjnamefield label ## Concept index: call info from octave with - ## 'doc ("objname field")' + ## 'doc ("objname field")' str = sprintf ("%s@anchor{XREF%s%s}\n@cindex %s %s\n", str, objname, field, objname, field); @@ -1250,7 +1250,7 @@ else str = sprintf ("%s:", str); endif - + ## Print valid and default values tmp = print_options (obj.(field).valid, obj.(field).default); @@ -1263,7 +1263,7 @@ ## Print documentation str = sprintf ("%s%s\n", str, obj.(field).doc); endfor - + ## End of properties table str = sprintf ("%s\n@end table", str); endfunction
--- a/doc/interpreter/octave_logo.eps Tue Jan 20 10:24:46 2015 -0500 +++ b/doc/interpreter/octave_logo.eps Tue Jan 20 10:29:54 2015 -0500 @@ -69,9 +69,9 @@ %%EndPageSetup q 1 0.498039 0.164706 rg -16.258 153.068 m 61.023 153.068 l 67.812 153.068 73.277 147.599 73.277 -140.81 c 73.277 96.048 l 73.277 89.259 67.812 83.791 61.023 83.791 c -16.258 83.791 l 9.469 83.791 4.004 89.259 4.004 96.048 c 4.004 140.81 l +16.258 153.068 m 61.023 153.068 l 67.812 153.068 73.277 147.599 73.277 +140.81 c 73.277 96.048 l 73.277 89.259 67.812 83.791 61.023 83.791 c +16.258 83.791 l 9.469 83.791 4.004 89.259 4.004 96.048 c 4.004 140.81 l 4.004 147.599 9.469 153.068 16.258 153.068 c h 16.258 153.068 m f 0.831373 0.333333 0 rg @@ -80,9 +80,9 @@ 0 j [] 0.0 d 4 M q 1 0 0 -1 0 230.399994 cm -16.258 77.332 m 61.023 77.332 l 67.812 77.332 73.277 82.801 73.277 -89.59 c 73.277 134.352 l 73.277 141.141 67.812 146.609 61.023 146.609 c -16.258 146.609 l 9.469 146.609 4.004 141.141 4.004 134.352 c 4.004 +16.258 77.332 m 61.023 77.332 l 67.812 77.332 73.277 82.801 73.277 +89.59 c 73.277 134.352 l 73.277 141.141 67.812 146.609 61.023 146.609 c +16.258 146.609 l 9.469 146.609 4.004 141.141 4.004 134.352 c 4.004 89.59 l 4.004 82.801 9.469 77.332 16.258 77.332 c h 16.258 77.332 m S Q Q q
--- a/doc/interpreter/plot.txi Tue Jan 20 10:24:46 2015 -0500 +++ b/doc/interpreter/plot.txi Tue Jan 20 10:29:54 2015 -0500 @@ -1355,12 +1355,12 @@ In this Section the graphics object properties are discussed in detail, starting with the root figure properties and continuing through the objects -hierarchy. The documentation about a specific graphics object can be displayed -using @code{doc} function, e.g., @code{doc ("axes properties")} will show -@ref{Axes Properties}. - -The allowed values for radio (string) properties can be retrieved -programmatically or displayed using the one or +hierarchy. The documentation about a specific graphics object can be displayed +using @code{doc} function, e.g., @code{doc ("axes properties")} will show +@ref{Axes Properties}. + +The allowed values for radio (string) properties can be retrieved +programmatically or displayed using the one or two arguments call to @code{set} function. @xref{XREFset, , set}. In the following documentation, default values are enclosed in @{ @}.
--- a/doc/interpreter/stmt.txi Tue Jan 20 10:24:46 2015 -0500 +++ b/doc/interpreter/stmt.txi Tue Jan 20 10:29:54 2015 -0500 @@ -465,7 +465,7 @@ condition in an @code{if} statement, the condition in a @code{do-until} statement is considered true if its value is nonzero, and false if its value is zero. If the value of the conditional expression in a -@code{do-until} statement is a vector or a matrix, it is considered +@code{do-until} statement is a vector or a matrix, it is considered true only if it is non-empty and @emph{all} of the elements are nonzero. Octave's @code{do-until} statement looks like this:
--- a/examples/data/Makefile.am Tue Jan 20 10:24:46 2015 -0500 +++ b/examples/data/Makefile.am Tue Jan 20 10:29:54 2015 -0500 @@ -3,17 +3,17 @@ # Copyright (C) 2012-2013 John W. Eaton # # This file is part of Octave. -# +# # Octave is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the # Free Software Foundation; either version 3 of the License, or (at # your option) any later version. -# +# # Octave is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. -# +# # You should have received a copy of the GNU General Public License # along with Octave; see the file COPYING. If not, see # <http://www.gnu.org/licenses/>.
--- a/libinterp/corefcn/data.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/data.cc Tue Jan 20 10:29:54 2015 -0500 @@ -3077,7 +3077,7 @@ MAKE_INT_BRANCH (uint32); MAKE_INT_BRANCH (uint64); #undef MAKE_INT_BRANCH - + // GAGME: Accursed Matlab compatibility... case btyp_char: if (isextra)
--- a/libinterp/corefcn/debug.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/debug.cc Tue Jan 20 10:29:54 2015 -0500 @@ -722,7 +722,7 @@ std::string symbol_name = ""; bp_table::intmap lines; - int nargin = args.length (); + int nargin = args.length (); parse_dbfunction_params ("dbclear", args, symbol_name, lines); @@ -921,13 +921,13 @@ if (fs) { int line = 1; - std::string text; + std::string text; while (std::getline (fs, text) && line <= end) { if (line >= start) os << line << "\t" << text << "\n"; - + line++; } }
--- a/libinterp/corefcn/error.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/error.cc Tue Jan 20 10:29:54 2015 -0500 @@ -1257,7 +1257,7 @@ os << "By default, warnings are treated as errors."; else panic_impossible (); - + if (nel > 1) os << "\n\n";
--- a/libinterp/corefcn/file-io.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/file-io.cc Tue Jan 20 10:29:54 2015 -0500 @@ -1995,30 +1995,30 @@ %! unwind_protect %! ## Test 0-argument form %! fname = tempname (); -%! [tmpdir, tmpfname] = fileparts (fname); +%! [tmpdir, tmpfname] = fileparts (fname); %! assert (tmpdir, P_tmpdir); %! assert (tmpfname (1:4), "oct-"); -%! ## Test 1-argument form +%! ## Test 1-argument form %! tmp_tmpdir = [P_tmpdir filesep() substr(tmpfname, -5)]; %! mkdir (tmp_tmpdir) || error ("Unable to create tmp dir"); %! setenv (envname, P_tmpdir); %! fname = tempname (tmp_tmpdir); -%! [tmpdir, tmpfname] = fileparts (fname); +%! [tmpdir, tmpfname] = fileparts (fname); %! assert (tmpdir, tmp_tmpdir); %! assert (tmpfname (1:4), "oct-"); %! ## Test 1-argument form w/null tmpdir %! fname = tempname (""); -%! [tmpdir, tmpfname] = fileparts (fname); +%! [tmpdir, tmpfname] = fileparts (fname); %! assert (tmpdir, P_tmpdir); %! assert (tmpfname (1:4), "oct-"); -%! ## Test 2-argument form +%! ## Test 2-argument form %! fname = tempname (tmp_tmpdir, "pfx-"); -%! [tmpdir, tmpfname] = fileparts (fname); +%! [tmpdir, tmpfname] = fileparts (fname); %! assert (tmpdir, tmp_tmpdir); %! assert (tmpfname (1:4), "pfx-"); %! ## Test 2-argument form w/null prefix %! fname = tempname (tmp_tmpdir, ""); -%! [tmpdir, tmpfname] = fileparts (fname); +%! [tmpdir, tmpfname] = fileparts (fname); %! assert (tmpdir, tmp_tmpdir); %! assert (tmpfname (1:4), "file"); %! unwind_protect_cleanup
--- a/libinterp/corefcn/gl-render.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/gl-render.cc Tue Jan 20 10:29:54 2015 -0500 @@ -1453,7 +1453,7 @@ setup_opengl_transformation (props); - // Disable line smoothing for axes + // Disable line smoothing for axes GLboolean antialias; glGetBooleanv (GL_LINE_SMOOTH, &antialias); if (antialias == GL_TRUE) @@ -2477,7 +2477,7 @@ // filled portion of the patch above. The tesselator uses // GLU_TESS_BOUNDARY_ONLY to get the outline of the patch and OpenGL // automatically sets the glType to GL_LINE_LOOP. This primitive is - // not supported by glPolygonOffset which is used to do Z offsets. + // not supported by glPolygonOffset which is used to do Z offsets. patch_tesselator tess (this, ec_mode, el_mode); for (int i = 0; i < nf; i++)
--- a/libinterp/corefcn/graphics.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/graphics.cc Tue Jan 20 10:29:54 2015 -0500 @@ -2773,7 +2773,7 @@ pname.find ("__") != 0 && pname.find ("current") != 0 && pname != "uicontextmenu" && pname != "parent") { - // Store *mode prop/val in order to set them last + // Store *mode prop/val in order to set them last if (pname.find ("mode") == (pname.length () - 4)) pval[pname] = it->second; else @@ -2936,8 +2936,8 @@ graphics_object old_parent_obj; old_parent_obj = gh_manager::get_object (get_parent ()); - - if (old_parent_obj.get_handle () != hnp) + + if (old_parent_obj.get_handle () != hnp) old_parent_obj.remove_child (__myhandle__); else // Do nothing more @@ -3134,15 +3134,15 @@ } } -void +void base_graphics_object::reset_default_properties (void) { if (valid_object ()) { - property_list::pval_map_type factory_pval = + property_list::pval_map_type factory_pval = gh_manager::get_object (0).get_factory_defaults_list () .find (type ())->second; - + xreset_default_properties (get_handle (), factory_pval); override_defaults (*this); @@ -3352,7 +3352,7 @@ { // Input checking and abrev. matching diary.set (val, false); - + if (! error_state) { Fdiary (ovl (diary.current_value ())); @@ -3375,7 +3375,7 @@ { // Input checking and abrev. matching diaryfile.set (val, false); - + if (! error_state) { Fdiary (ovl (diaryfile.string_value ())); @@ -3402,7 +3402,7 @@ { // Input checking and abrev. matching echo.set (val, false); - + if (! error_state) { Fecho (ovl (echo.current_value ())); @@ -3431,10 +3431,10 @@ { // Input checking and abrev. matching format.set (val, false); - + if (! error_state) { - Fformat (ovl (format.current_value ())); + Fformat (ovl (format.current_value ())); format.run_listeners (); } @@ -3458,7 +3458,7 @@ { // Input checking and abrev. matching formatspacing.set (val, false); - + if (! error_state) { std::string strval = formatspacing.current_value (); @@ -3487,7 +3487,7 @@ { // Input checking and abrev. matching recursionlimit.set (val, false); - + if (! error_state) { double dval = recursionlimit.double_value (); @@ -3639,7 +3639,7 @@ // empty list of local defaults default_properties = property_list (); - xreset_default_properties (get_handle (), + xreset_default_properties (get_handle (), xproperties.factory_defaults ()); } @@ -3687,7 +3687,7 @@ } } -void +void figure::properties::adopt (const graphics_handle& h) { base_properties::adopt (h); @@ -3829,7 +3829,7 @@ position.run_listeners (POSTSET); mark_modified (); } - + if (paperpositionmode.is ("auto")) paperposition.set (get_auto_paperposition ()); } @@ -4057,11 +4057,11 @@ { Matrix pos = get_position ().matrix_value (); Matrix sz; - + caseless_str funits = get_units (); caseless_str punits = get_paperunits (); - // Convert position from figure units to paperunits + // Convert position from figure units to paperunits if (funits == "normalized" || punits == "normalized") { sz = screen_size_pixels (); @@ -4090,13 +4090,13 @@ %! in_pos = [0 0 4 5]; %! tol = 20 * eps (); %! unwind_protect -%! ## paperpositionmode "auto" converts figure size to paper units +%! ## paperpositionmode "auto" converts figure size to paper units %! set (hf, "units", "inches"); %! set (hf, "position", in_pos); %! set (hf, "paperunits", "centimeters"); %! psz = get (hf, "papersize"); %! fsz = in_pos(3:4) * 2.54; -%! pos = [(psz/2 .- fsz/2) fsz]; +%! pos = [(psz/2 .- fsz/2) fsz]; %! set (hf, "paperpositionmode", "auto"); %! assert (get (hf, "paperposition"), pos, tol) %! unwind_protect_cleanup @@ -4108,13 +4108,13 @@ %! in_pos = [0 0 4 5]; %! tol = 20 * eps (); %! unwind_protect -%! ## likewise with normalized units +%! ## likewise with normalized units %! set (hf, "units", "inches"); %! set (hf, "position", in_pos); %! psz = get (hf, "papersize"); %! set (hf, "paperunits", "normalized"); %! fsz = in_pos(3:4) ./ psz; -%! pos = [([0.5 0.5] .- fsz/2) fsz]; +%! pos = [([0.5 0.5] .- fsz/2) fsz]; %! assert (get (hf, "paperposition"), pos, tol) %! unwind_protect_cleanup %! close (hf); @@ -4125,13 +4125,13 @@ %! in_pos = [0 0 4 5]; %! tol = 20 * eps (); %! unwind_protect -%! ## changing papertype updates paperposition +%! ## changing papertype updates paperposition %! set (hf, "units", "inches"); %! set (hf, "position", in_pos); %! set (hf, "papertype", "a4"); %! psz = get (hf, "papersize"); %! fsz = in_pos(3:4); -%! pos = [(psz/2 .- fsz/2) fsz]; +%! pos = [(psz/2 .- fsz/2) fsz]; %! assert (get (hf, "paperposition"), pos, tol) %! unwind_protect_cleanup %! close (hf); @@ -4148,7 +4148,7 @@ %! set (hf, "paperorientation", "landscape"); %! psz = get (hf, "papersize"); %! fsz = in_pos(3:4); -%! pos = [(psz/2 .- fsz/2) fsz]; +%! pos = [(psz/2 .- fsz/2) fsz]; %! assert (get (hf, "paperposition"), pos, tol) %! unwind_protect_cleanup %! close (hf); @@ -4971,7 +4971,7 @@ position = default_axes_position (); activepositionproperty = "outerposition"; } - + if (mode != "reset") { delete_children (true); @@ -6879,7 +6879,7 @@ } double tick_sep; - + if (is_logscale) { if (! (xisinf (hi) || xisinf (lo))) @@ -7132,7 +7132,7 @@ axes::update_axis_limits (const std::string& axis_type, const graphics_handle& h) { - if (updating_axis_limits.find (get_handle ().value ()) != + if (updating_axis_limits.find (get_handle ().value ()) != updating_axis_limits.end ()) return; @@ -7335,7 +7335,7 @@ void axes::update_axis_limits (const std::string& axis_type) { - if ((updating_axis_limits.find (get_handle ().value ()) != + if ((updating_axis_limits.find (get_handle ().value ()) != updating_axis_limits.end ()) || (updating_aspectratios.find (get_handle ().value ()) != updating_aspectratios.end ())) @@ -8009,7 +8009,7 @@ NDArray cd = get_cdata ().array_value (); bad_data_msg = std::string (); - if (xd.dims () != yd.dims () || + if (xd.dims () != yd.dims () || (xd.dims () != zd.dims () && ! zd.is_empty ())) { bad_data_msg = "x/y/zdata should have the same dimensions"; @@ -8121,7 +8121,7 @@ } } } - + // Build cdata dim_vector dv = dim_vector::alloc (3); NDArray cd; @@ -8134,7 +8134,7 @@ dv(2) = fvc.columns (); cd = fvc.reshape (dv); } - else + else { if (! fvc.is_empty ()) { @@ -8146,8 +8146,8 @@ } } - // Build x,y,zdata and eventually per vertex cdata - Matrix xd (idx.dims ()); + // Build x,y,zdata and eventually per vertex cdata + Matrix xd (idx.dims ()); Matrix yd (idx.dims ()); Matrix zd; bool has_zd = false; @@ -8157,7 +8157,7 @@ has_zd = true; } - + for (octave_idx_type jj = 0; jj < nfaces; jj++) { for (octave_idx_type ii = 0; ii < idx.rows (); ii++) @@ -8168,7 +8168,7 @@ if (has_zd) zd(ii,jj) = vert(row,2); - + if (pervertex) for (int kk = 0; kk < fvc.columns (); kk++) cd(ii,jj,kk) = fvc(row,kk); @@ -8829,7 +8829,7 @@ // empty list of local defaults default_properties = property_list (); - xreset_default_properties (get_handle (), + xreset_default_properties (get_handle (), xproperties.factory_defaults ()); // override with parents' defaults @@ -9502,18 +9502,18 @@ %! unwind_protect %! tol = 20 * eps; %! hax = axes ("defaultlinelinewidth", 3); -%! +%! %! hli = line (1:10, 1:10, 1:10, "marker", "o", %! "markerfacecolor", "b", "linestyle", ":"); -%! +%! %! reset (hli); %! assert (get (hli, "marker"), get (0, "defaultlinemarker")); -%! assert (get (hli, "markerfacecolor"), +%! assert (get (hli, "markerfacecolor"), %! get (0, "defaultlinemarkerfacecolor")); -%! assert (get (hli, "linestyle"), +%! assert (get (hli, "linestyle"), %! get (0, "defaultlinelinestyle")); -%! assert (get (hli, "linewidth"), 3, tol); # parent axes defaults -%! +%! assert (get (hli, "linewidth"), 3, tol); # parent axes defaults +%! %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect @@ -9560,7 +9560,7 @@ %!test # image object %! hf = figure ("visible", "off"); %! unwind_protect -%! tol = 20 * eps; +%! tol = 20 * eps; %! him = image (rand (10,10), "cdatamapping", "scaled"); %! %! reset (him); @@ -9574,7 +9574,7 @@ %!test # text object %! hf = figure ("visible", "off"); %! unwind_protect -%! tol = 20 * eps; +%! tol = 20 * eps; %! hte = text (5, 5, "Hi!", "fontsize", 20 ,"color", "r"); %! %! reset (hte); @@ -9585,14 +9585,14 @@ %! close (hf); %! end_unwind_protect -%!test # axes object +%!test # axes object %! hf = figure ("visible", "off"); %! unwind_protect %! tol = 20 * eps; %! pos = get (0, "defaultaxesposition") * .5; %! hax = axes ("linewidth", 2, "position", pos); %! title ("Reset me, please!"); -%! +%! %! reset (hax); %! assert (get (hax, "linewidth"), get (0, "defaultaxeslinewidth"), tol); %! assert (get (hax, "position"), pos, tol); # axes position is unchanged @@ -9604,7 +9604,7 @@ %!test # root figure object %! set (0, "defaultfigurevisible", "off"); -%! hf = figure ("visible", "off", "paperunits", "centimeters", +%! hf = figure ("visible", "off", "paperunits", "centimeters", %! "papertype", "a4"); %! unwind_protect %! reset (hf); @@ -9732,7 +9732,7 @@ else if (nargin == 2 && args(1).is_string ()) { std::string property = args(1).string_value (); - + octave_map pmap = obj.values_as_struct (); if (obj.has_readonly_property (property))
--- a/libinterp/corefcn/graphics.in.h Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/graphics.in.h Tue Jan 20 10:29:54 2015 -0500 @@ -1997,25 +1997,25 @@ const_iterator find (const std::string pname) const { const_iterator it; - + for (it = (*this).begin (); it != (*this).end (); it++) if (pname.compare ((*it).first) == 0) return it; - + return (*this).end (); } iterator find (const std::string pname) { iterator it; - + for (it = (*this).begin (); it != (*this).end (); it++) if (pname.compare ((*it).first) == 0) return it; - + return (*this).end (); } - + octave_value lookup (const std::string pname) const { octave_value retval; @@ -2028,16 +2028,16 @@ return retval; } - octave_value& operator [] (const std::string pname) + octave_value& operator [] (const std::string pname) { iterator it = find (pname); - + if (it == (*this).end ()) { push_back (pval_pair (pname, octave_value ())); return (*this).back ().second; } - + return (*it).second; } @@ -2047,7 +2047,7 @@ if (it != (*this).end ()) erase (it); } - + void erase (iterator it) { std::vector <pval_pair>::erase (it); @@ -3051,9 +3051,9 @@ std::string values_as_string (void) { return rep->values_as_string (); } - std::string value_as_string (const std::string& prop) - { - return rep->value_as_string (prop); + std::string value_as_string (const std::string& prop) + { + return rep->value_as_string (prop); } octave_map values_as_struct (void) { return rep->values_as_struct (); } @@ -3305,7 +3305,7 @@ bool valid_object (void) const { return true; } void reset_default_properties (void); - + bool has_readonly_property (const caseless_str& pname) const { bool retval = xproperties.has_readonly_property (pname); @@ -3472,7 +3472,7 @@ position.add_constraint (dim_vector (1, 4)); } - private: + private: Matrix get_auto_paperposition (void); void update_paperpositionmode (void) @@ -3547,7 +3547,7 @@ bool valid_object (void) const { return true; } void reset_default_properties (void); - + bool has_readonly_property (const caseless_str& pname) const { bool retval = xproperties.has_readonly_property (pname); @@ -4648,7 +4648,7 @@ if (xdatamode.is ("auto")) update_xdata (); - + if (ydatamode.is ("auto")) update_ydata (); } @@ -4657,13 +4657,13 @@ { if (xdata.get ().is_empty ()) set_xdatamode ("auto"); - + if (xdatamode.is ("auto")) { set_xdata (get_auto_xdata ()); set_xdatamode ("auto"); } - + Matrix limits = xdata.get_limits (); float dp = pixel_xsize (); @@ -4676,13 +4676,13 @@ { if (ydata.get ().is_empty ()) set_ydatamode ("auto"); - + if (ydatamode.is ("auto")) { - set_ydata (get_auto_ydata ()); + set_ydata (get_auto_ydata ()); set_ydatamode ("auto"); } - + Matrix limits = ydata.get_limits (); float dp = pixel_ysize (); @@ -4783,9 +4783,9 @@ octave_value get_color_data (void) const; // Matlab allows incoherent data to be stored into patch properties. - // The patch should then be ignored by the renderer. - bool has_bad_data (std::string &msg) const - { + // The patch should then be ignored by the renderer. + bool has_bad_data (std::string &msg) const + { msg = bad_data_msg; return ! msg.empty (); } @@ -4882,13 +4882,13 @@ void update_fvc (void); - void update_xdata (void) - { + void update_xdata (void) + { if (get_xdata ().is_empty ()) { - // For compatibility with matlab behavior, - // if x/ydata are set empty, silently empty other *data and - // faces properties while vertices remain unchanged. + // For compatibility with matlab behavior, + // if x/ydata are set empty, silently empty other *data and + // faces properties while vertices remain unchanged. set_ydata (Matrix ()); set_zdata (Matrix ()); set_cdata (Matrix ()); @@ -4900,8 +4900,8 @@ set_xlim (xdata.get_limits ()); } - void update_ydata (void) - { + void update_ydata (void) + { if (get_ydata ().is_empty ()) { set_xdata (Matrix ()); @@ -4915,8 +4915,8 @@ set_ylim (ydata.get_limits ()); } - void update_zdata (void) - { + void update_zdata (void) + { update_fvc (); set_zlim (zdata.get_limits ()); }
--- a/libinterp/corefcn/load-path.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/load-path.cc Tue Jan 20 10:29:54 2015 -0500 @@ -520,7 +520,7 @@ { std::string dir_name = di.dir_name; - std::list<std::string>::iterator s = + std::list<std::string>::iterator s = std::find (dir_list.begin (), dir_list.end (), dir_name); if (s != dir_list.end ())
--- a/libinterp/corefcn/pr-output.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/pr-output.cc Tue Jan 20 10:29:54 2015 -0500 @@ -3872,7 +3872,7 @@ { error ("format: unrecognized format state '%s'", arg.c_str ()); return; - } + } } else {
--- a/libinterp/corefcn/pt-jit.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/pt-jit.cc Tue Jan 20 10:29:54 2015 -0500 @@ -2066,7 +2066,7 @@ #ifdef LEGACY_PASSMANAGER module_pass_manager = new llvm::legacy::PassManager (); - pass_manager = new llvm::legacy::FunctionPassManager (module); + pass_manager = new llvm::legacy::FunctionPassManager (module); #else module_pass_manager = new llvm::PassManager (); pass_manager = new llvm::FunctionPassManager (module);
--- a/libinterp/corefcn/strfind.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/strfind.cc Tue Jan 20 10:29:54 2015 -0500 @@ -332,7 +332,7 @@ if (retsiz == 0) ret.clear (dim_vector (0, 0)); - else + else { ret.clear (dim_vector (1, retsiz)); const char *src = str.data ();
--- a/libinterp/corefcn/toplev.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/toplev.cc Tue Jan 20 10:29:54 2015 -0500 @@ -126,7 +126,7 @@ } else retval = "<unknown>"; - + return retval; } @@ -368,7 +368,7 @@ = do_backtrace_frames (nskip, curr_user_frame); size_t nframes = frames.size (); - + octave_map retval (dim_vector (nframes, 1), bt_fields); Cell& file = retval.contents (0); @@ -481,7 +481,7 @@ break; } } - else if (incr == 0) // Break out of infinite loop by choosing an incr. + else if (incr == 0) // Break out of infinite loop by choosing an incr. incr = -1; // There is no need to set scope and context here. That will
--- a/libinterp/corefcn/toplev.h Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/toplev.h Tue Jan 20 10:29:54 2015 -0500 @@ -300,7 +300,7 @@ ? instance->do_backtrace (nskip, curr_user_frame, true) : octave_map (); } - + static octave_map backtrace (size_t nskip, octave_idx_type& curr_user_frame, bool print_subfn = true) { @@ -318,7 +318,7 @@ ? instance->do_backtrace_frames (nskip, curr_user_frame) : std::list<octave_call_stack::stack_frame> (); } - + static std::list<octave_call_stack::stack_frame> backtrace_frames (size_t nskip, octave_idx_type& curr_user_frame) {
--- a/libinterp/corefcn/urlwrite.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/urlwrite.cc Tue Jan 20 10:29:54 2015 -0500 @@ -346,7 +346,7 @@ return retval; } - if (! args(0).is_string ()) + if (! args(0).is_string ()) { error ("urlwrite: URL must be a string"); return retval; @@ -354,7 +354,7 @@ std::string url = args(0).string_value (); - if (! args(1).is_string ()) + if (! args(1).is_string ()) { error ("urlwrite: LOCALFILE must be a string"); return retval; @@ -368,7 +368,7 @@ if (nargin == 4) { - if (! args(2).is_string ()) + if (! args(2).is_string ()) { error ("urlwrite: METHOD must be a string"); return retval; @@ -503,7 +503,7 @@ return retval; } - if (! args(0).is_string ()) + if (! args(0).is_string ()) { error ("urlread: URL must be a string"); return retval; @@ -516,7 +516,7 @@ if (nargin == 3) { - if (! args(1).is_string ()) + if (! args(1).is_string ()) { error ("urlread: METHOD must be a string"); return retval;
--- a/libinterp/corefcn/variables.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/corefcn/variables.cc Tue Jan 20 10:29:54 2015 -0500 @@ -936,7 +936,7 @@ if (nargin == 1) { - if (args(0).is_string ()) + if (args(0).is_string ()) { std::string sval = args(0).string_value (); @@ -977,7 +977,7 @@ if (nargin == 1) { - if (args(0).is_string ()) + if (args(0).is_string ()) { std::string sval = args(0).string_value ();
--- a/libinterp/octave-value/ov-classdef.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/octave-value/ov-classdef.cc Tue Jan 20 10:29:54 2015 -0500 @@ -411,7 +411,7 @@ else error ("invalid property/method access in class `%s'", cls.get_name ().c_str ()); - + return false; } @@ -1394,7 +1394,7 @@ if (cls.ok ()) return cls.get_names (); - + return string_vector (); } @@ -1534,7 +1534,7 @@ } else { - octave_value val = + octave_value val = prop.get_value (obj, true, "subsasgn"); if (! error_state) @@ -1900,7 +1900,7 @@ } } } - + bool cdef_object_scalar::is_constructed_for (const cdef_class& cls) const { return (is_constructed () @@ -3117,7 +3117,7 @@ return retval; } } - + octave_value get_fcn = get ("GetMethod"); // FIXME: should check whether we're already in get accessor method @@ -3129,7 +3129,7 @@ octave_value_list args; args(0) = to_ov (obj); - + args = execute_ov (get_fcn, args, 1); if (! error_state) @@ -3184,7 +3184,7 @@ return; } } - + octave_value set_fcn = get ("SetMethod"); if (set_fcn.is_empty () || is_method_executing (set_fcn, obj))
--- a/libinterp/octave-value/ov-classdef.h Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/octave-value/ov-classdef.h Tue Jan 20 10:29:54 2015 -0500 @@ -540,7 +540,7 @@ virtual bool is_method (void) const { return false; } virtual bool is_package (void) const { return false; } - + virtual octave_value_list meta_subsref (const std::string& /* type */, const std::list<octave_value_list>& /* idx */, @@ -605,7 +605,7 @@ private: cdef_meta_object_rep* get_rep (void) { return dynamic_cast<cdef_meta_object_rep *> (cdef_object::get_rep ()); } - + const cdef_meta_object_rep* get_rep (void) const { return dynamic_cast<const cdef_meta_object_rep *> (cdef_object::get_rep ()); } }; @@ -710,7 +710,7 @@ void load_all_methods (void); void find_names (std::set<std::string>& names, bool all); - + void find_properties (std::map<std::string,cdef_property>& props, int mode = 0); @@ -804,7 +804,7 @@ Cell get_methods (void) { return get_rep ()->get_methods (); } cdef_property find_property (const std::string& nm); - + void install_property (const cdef_property& prop) { get_rep ()->install_property (prop); } @@ -886,7 +886,7 @@ private: cdef_class_rep* get_rep (void) { return dynamic_cast<cdef_class_rep *> (cdef_object::get_rep ()); } - + const cdef_class_rep* get_rep (void) const { return dynamic_cast<const cdef_class_rep *> (cdef_object::get_rep ()); } @@ -961,7 +961,7 @@ : cdef_meta_object_rep (p) { } bool is_recursive_set (const cdef_object& obj) const; - + cdef_property wrap (void) { refcount++; @@ -1010,7 +1010,7 @@ bool check_get_access (void) const { return get_rep ()->check_get_access (); } - + bool check_set_access (void) const { return get_rep ()->check_set_access (); } @@ -1021,7 +1021,7 @@ private: cdef_property_rep* get_rep (void) { return dynamic_cast<cdef_property_rep *> (cdef_object::get_rep ()); } - + const cdef_property_rep* get_rep (void) const { return dynamic_cast<const cdef_property_rep *> (cdef_object::get_rep ()); } }; @@ -1142,7 +1142,7 @@ { return get_rep ()->execute (obj, args, nargout, do_check_access, who); } bool check_access (void) const { return get_rep ()->check_access (); } - + std::string get_name (void) const { return get_rep ()->get_name (); } bool is_static (void) const { return get_rep ()->is_static (); } @@ -1164,7 +1164,7 @@ private: cdef_method_rep* get_rep (void) { return dynamic_cast<cdef_method_rep *> (cdef_object::get_rep ()); } - + const cdef_method_rep* get_rep (void) const { return dynamic_cast<const cdef_method_rep *> (cdef_object::get_rep ()); } }; @@ -1391,7 +1391,7 @@ private: cdef_package_rep* get_rep (void) { return dynamic_cast<cdef_package_rep *> (cdef_object::get_rep ()); } - + const cdef_package_rep* get_rep (void) const { return dynamic_cast<const cdef_package_rep *> (cdef_object::get_rep ()); }
--- a/libinterp/octave.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/octave.cc Tue Jan 20 10:29:54 2015 -0500 @@ -317,7 +317,7 @@ if (read_init_files) { // Try to execute commands from $HOME/$OCTAVE_INITFILE and - // $OCTAVE_INITFILE. If $OCTAVE_INITFILE is not set, + // $OCTAVE_INITFILE. If $OCTAVE_INITFILE is not set, // .octaverc is assumed. bool home_rc_already_executed = false;
--- a/libinterp/parse-tree/lex.h Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/parse-tree/lex.h Tue Jan 20 10:29:54 2015 -0500 @@ -263,7 +263,7 @@ looking_at_indirect_ref (false), parsing_class_method (false), parsing_classdef (false), maybe_classdef_get_set_method (false), parsing_classdef_get_method (false), - parsing_classdef_set_method (false), + parsing_classdef_set_method (false), quote_is_transpose (false), force_script (false), reading_fcn_file (false), reading_script_file (false), reading_classdef_file (false),
--- a/libinterp/parse-tree/oct-parse.in.yy Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/parse-tree/oct-parse.in.yy Tue Jan 20 10:29:54 2015 -0500 @@ -3397,7 +3397,7 @@ int l = expr->line (); int c = expr->column (); - if (! expr->is_postfix_indexed ()) + if (! expr->is_postfix_indexed ()) expr->set_postfix_index (type); if (expr->is_index_expression ()) @@ -3425,7 +3425,7 @@ int l = expr->line (); int c = expr->column (); - if (! expr->is_postfix_indexed ()) + if (! expr->is_postfix_indexed ()) expr->set_postfix_index ('.'); if (expr->is_index_expression ()) @@ -3455,7 +3455,7 @@ int l = expr->line (); int c = expr->column (); - if (! expr->is_postfix_indexed ()) + if (! expr->is_postfix_indexed ()) expr->set_postfix_index ('.'); if (expr->is_index_expression ())
--- a/libinterp/parse-tree/pt-classdef.h Tue Jan 20 10:24:46 2015 -0500 +++ b/libinterp/parse-tree/pt-classdef.h Tue Jan 20 10:29:54 2015 -0500 @@ -60,7 +60,7 @@ void accept (tree_walker&); private: - + tree_identifier *id; tree_expression *expr; bool neg; @@ -182,7 +182,7 @@ // The list of objects contained in this block. octave_base_list<T> *elt_list; - + // Comment preceding the token marking the beginning of the block. octave_comment_list *lead_comm;
--- a/liboctave/system/file-ops.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/liboctave/system/file-ops.cc Tue Jan 20 10:29:54 2015 -0500 @@ -712,7 +712,7 @@ msg = gnulib::strerror (errno); else retval = tname; - + return retval; }
--- a/liboctave/system/oct-env.cc Tue Jan 20 10:24:46 2015 -0500 +++ b/liboctave/system/oct-env.cc Tue Jan 20 10:29:54 2015 -0500 @@ -197,7 +197,7 @@ std::string tempd; #if defined (__MINGW32__) || defined (_MSC_VER) - + tempd = do_getenv ("TEMP"); if (tempd.empty ())
--- a/m4/acinclude.m4 Tue Jan 20 10:24:46 2015 -0500 +++ b/m4/acinclude.m4 Tue Jan 20 10:29:54 2015 -0500 @@ -1844,7 +1844,7 @@ ]], [[ llvm::Module *module; llvm::legacy::PassManager *module_pass_manager; - llvm::legacy::FunctionPassManager *pass_manager; + llvm::legacy::FunctionPassManager *pass_manager; module_pass_manager = new llvm::legacy::PassManager (); pass_manager = new llvm::legacy::FunctionPassManager (module); ]])],
--- a/scripts/deprecated/finite.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/deprecated/finite.m Tue Jan 20 10:29:54 2015 -0500 @@ -25,7 +25,7 @@ ## Return a logical array which is true where the elements of @var{x} are ## finite values and false where they are not. ## For example: -## +## ## @example ## @group ## finite ([13, Inf, NA, NaN])
--- a/scripts/deprecated/fmod.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/deprecated/fmod.m Tue Jan 20 10:29:54 2015 -0500 @@ -24,11 +24,11 @@ ## ## Return the remainder of the division @code{@var{x} / @var{y}}, computed ## using the expression -## +## ## @example ## x - y .* fix (x ./ y) ## @end example -## +## ## An error message is printed if the dimensions of the arguments do not ## agree, or if either of the arguments is complex. ## @seealso{rem, mod}
--- a/scripts/deprecated/fnmatch.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/deprecated/fnmatch.m Tue Jan 20 10:29:54 2015 -0500 @@ -25,7 +25,7 @@ ## Return true or false for each element of @var{string} that matches any of ## the elements of the string array @var{pattern}, using the rules of ## filename pattern matching. For example: -## +## ## @example ## @group ## fnmatch (\"a*b\", @{\"ab\"; \"axyzb\"; \"xyzab\"@})
--- a/scripts/deprecated/luinc.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/deprecated/luinc.m Tue Jan 20 10:29:54 2015 -0500 @@ -26,51 +26,51 @@ ## Produce the incomplete LU@tie{}factorization of the sparse matrix @var{A}. ## Two types of incomplete factorization are possible, and the type ## is determined by the second argument to @code{luinc}. -## +## ## Called with a second argument of @qcode{'0'}, the zero-level incomplete ## LU@tie{}factorization is produced. This creates a factorization of @var{A} ## where the position of the nonzero arguments correspond to the same ## positions as in the matrix @var{A}. -## +## ## Alternatively, the fill-in of the incomplete LU@tie{}factorization can ## be controlled through the variable @var{droptol} or the structure ## @var{opts}. The @sc{umfpack} multifrontal factorization code by Tim A. ## Davis is used for the incomplete LU@tie{}factorization, (availability ## @url{http://www.cise.ufl.edu/research/sparse/umfpack/}) -## +## ## @var{droptol} determines the values below which the values in the ## LU@tie{} factorization are dropped and replaced by zero. It must be a ## positive scalar, and any values in the factorization whose absolute value ## are less than this value are dropped, expect if leaving them increase the ## sparsity of the matrix. Setting @var{droptol} to zero results in a complete ## LU@tie{}factorization which is the default. -## +## ## @var{opts} is a structure containing one or more of the fields -## +## ## @table @code ## @item droptol ## The drop tolerance as above. If @var{opts} only contains @code{droptol} ## then this is equivalent to using the variable @var{droptol}. -## +## ## @item milu ## A logical variable flagging whether to use the modified incomplete ## LU@tie{} factorization. In the case that @code{milu} is true, the dropped ## values are subtracted from the diagonal of the matrix @var{U} of the ## factorization. The default is @code{false}. -## +## ## @item udiag ## A logical variable that flags whether zero elements on the diagonal of ## @var{U} should be replaced with @var{droptol} to attempt to avoid singular ## factors. The default is @code{false}. -## +## ## @item thresh ## Defines the pivot threshold in the interval [0,1]. Values outside that ## range are ignored. ## @end table -## +## ## All other fields in @var{opts} are ignored. The outputs from @code{luinc} ## are the same as for @code{lu}. -## +## ## Given the string argument @qcode{\"vector\"}, @code{luinc} returns the ## values of @var{p} @var{q} as vector values. ## @seealso{ilu, ichol, lu, sparse}
--- a/scripts/deprecated/octave_tmp_file_name.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/deprecated/octave_tmp_file_name.m Tue Jan 20 10:29:54 2015 -0500 @@ -25,7 +25,7 @@ ## version 4.6. Use @code{tempname} for equivalent functionality. ## ## Return a unique temporary file name as a string. -## +## ## If @var{prefix} is omitted, a value of @qcode{"oct-"} is used. ## If @var{dir} is also omitted, the default directory for temporary files ## (@code{P_tmpdir} is used. If @var{dir} is provided, it must exist,
--- a/scripts/deprecated/syl.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/deprecated/syl.m Tue Jan 20 10:29:54 2015 -0500 @@ -29,14 +29,14 @@ ## $$ ## @end tex ## @ifnottex -## +## ## @example ## A X + X B + C = 0 ## @end example -## +## ## @end ifnottex ## using standard @sc{lapack} subroutines. For example: -## +## ## @example ## @group ## syl ([1, 2; 3, 4], [5, 6; 7, 8], [9, 10; 11, 12])
--- a/scripts/deprecated/usage.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/deprecated/usage.m Tue Jan 20 10:29:54 2015 -0500 @@ -26,16 +26,16 @@ ## set Octave's internal error state such that control will return to the ## top level without evaluating any more commands. This is useful for ## aborting from functions. -## +## ## After @code{usage} is evaluated, Octave will print a traceback of all ## the function calls leading to the usage message. -## +## ## You should use this function for reporting problems errors that result ## from an improper call to a function, such as calling a function with an ## incorrect number of arguments, or with arguments of the wrong type. For ## example, most functions distributed with Octave begin with code like ## this -## +## ## @example ## @group ## if (nargin != 2) @@ -43,7 +43,7 @@ ## endif ## @end group ## @end example -## +## ## @noindent ## to check for the proper number of arguments. ## @seealso{print_usage}
--- a/scripts/general/inputParser.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/general/inputParser.m Tue Jan 20 10:29:54 2015 -0500 @@ -145,7 +145,7 @@ ## @deftypefn {Function File} {} addOptional (@var{argname}, @var{default}) ## @deftypefnx {Function File} {} addOptional (@var{argname}, @var{default}, @var{validator}) ## Add new optional argument to the object @var{parser} of the class inputParser -## to implement an ordered arguments type of API +## to implement an ordered arguments type of API ## ## @var{argname} must be a string with the name of the new argument. The order ## in which new arguments are added with @command{addOptional}, represents the @@ -515,7 +515,7 @@ %! p = create_p (); %! p.parse ("file", "line", "circle"); %! r = p.Results; -%! assert ({r.req1, r.op1, r.op2, r.verbose, r.line}, +%! assert ({r.req1, r.op1, r.op2, r.verbose, r.line}, %! {"file", "val", 78, false, "circle"}); ## check case insensitivity
--- a/scripts/general/interp1.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/general/interp1.m Tue Jan 20 10:29:54 2015 -0500 @@ -102,7 +102,7 @@ ## near = interp1 (xp, yp, xf, "nearest"); ## pch = interp1 (xp, yp, xf, "pchip"); ## spl = interp1 (xp, yp, xf, "spline"); -## plot (xf,yf,"r", xf,near,"g", xf,lin,"b", xf,pch,"c", xf,spl,"m", +## plot (xf,yf,"r", xf,near,"g", xf,lin,"b", xf,pch,"c", xf,spl,"m", ## xp,yp,"r*"); ## legend ("original", "nearest", "linear", "pchip", "spline"); ## @end group @@ -197,7 +197,7 @@ if (any (strcmp (method, {"previous", "*previous", "next", "*next"}))) rightcontinuous = NaN; # needed for these methods to work - endif + endif if (isnan (rightcontinuous)) ## If not specified, set the continuity condition @@ -222,7 +222,7 @@ elseif (strcmp (method, "*next")) x = flipud (x); y = flipud (y); - method = "*previous"; + method = "*previous"; endif starmethod = method(1) == "*"; @@ -543,7 +543,7 @@ %! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]) ## This test is expected to fail, so commented out. ## "previous" and "next" options are not symmetric w.r.t to flipping xp,yp -#%!assert (interp1 (xp,yp,xi,style),... +#%!assert (interp1 (xp,yp,xi,style),... #%! interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps) %!assert (ppval (interp1 (xp,yp,style,"pp"),xi), %! interp1 (xp,yp,xi,style,"extrap"),10*eps) @@ -560,7 +560,7 @@ %!assert (isempty (interp1 (xp,yp,[],style))) %!assert (interp1 (xp,[yp',yp'],xi(:),style),... %! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]) -# %!assert (interp1 (xp,yp,xi,style),... +# %!assert (interp1 (xp,yp,xi,style),... # %! interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps) %!assert (ppval (interp1 (xp,yp,style,"pp"),xi), %! interp1 (xp,yp,xi,style,"extrap"),10*eps) @@ -578,7 +578,7 @@ %!assert (isempty (interp1 (xp,yp,[],style))) %!assert (interp1 (xp,[yp',yp'],xi(:),style),... %! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]) -# %!assert (interp1 (xp,yp,xi,style),... +# %!assert (interp1 (xp,yp,xi,style),... # %! interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps) %!assert (ppval (interp1 (xp,yp,style,"pp"),xi), %! interp1 (xp,yp,xi,style,"extrap"),10*eps) @@ -595,7 +595,7 @@ %!assert (isempty (interp1 (xp,yp,[],style))) %!assert (interp1 (xp,[yp',yp'],xi(:),style),... %! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]) -# %!assert (interp1 (xp,yp,xi,style),... +# %!assert (interp1 (xp,yp,xi,style),... # %! interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps) %!assert (ppval (interp1 (xp,yp,style,"pp"),xi), %! interp1 (xp,yp,xi,style,"extrap"),10*eps)
--- a/scripts/general/interp2.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/general/interp2.m Tue Jan 20 10:29:54 2015 -0500 @@ -193,14 +193,14 @@ dx = diff (X); if (all (dx < 0)) X = flipud (X); - Z = fliplr (Z); + Z = fliplr (Z); elseif (any (dx <= 0)) error ("interp2: X must be strictly monotonic"); endif dy = diff (Y); if (all (dy < 0)) Y = flipud (Y); - Z = flipud (Z); + Z = flipud (Z); elseif (any (dy <= 0)) error ("interp2: Y must be strictly monotonic"); endif
--- a/scripts/general/interp3.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/general/interp3.m Tue Jan 20 10:29:54 2015 -0500 @@ -193,7 +193,7 @@ %!test # meshgridded xi, yi, zi %! x = z = 1:2; y = 1:3; %! v = ones ([3,2,2]); v(:,2,1) = [7;5;4]; v(:,1,2) = [2;3;5]; -%! xi = zi = .6:1.6; yi = 1; +%! xi = zi = .6:1.6; yi = 1; %! [xxi3, yyi3, zzi3] = meshgrid (xi, yi, zi); %! [xxi, yyi, zzi] = ndgrid (yi, xi, zi); %! vi = interp3 (x, y, z, v, xxi3, yyi3, zzi3, "nearest"); @@ -203,7 +203,7 @@ %!test # vector xi, yi, zi %! x = z = 1:2; y = 1:3; %! v = ones ([3,2,2]); v(:,2,1) = [7;5;4]; v(:,1,2) = [2;3;5]; -%! xi = zi = .6:1.6; yi = 1; +%! xi = zi = .6:1.6; yi = 1; %! vi = interp3 (x, y, z, v, xi, yi, zi, "nearest"); %! vi2 = interpn (y, x, z, v, yi, xi, zi,"nearest"); %! assert (vi, vi2); @@ -211,7 +211,7 @@ %!test # vector xi+1 with extrap value %! x = z = 1:2; y = 1:3; %! v = ones ([3,2,2]); v(:,2,1) = [7;5;4]; v(:,1,2) = [2;3;5]; -%! xi = zi = .6:1.6; yi = 1; +%! xi = zi = .6:1.6; yi = 1; %! vi = interp3 (x, y, z, v, xi+1, yi, zi, "nearest", 3); %! vi2 = interpn (y, x, z, v, yi, xi+1, zi, "nearest", 3); %! assert (vi, vi2); @@ -219,7 +219,7 @@ %!test # input value matrix--no x,y,z %! x = z = 1:2; y = 1:3; %! v = ones ([3,2,2]); v(:,2,1) = [7;5;4]; v(:,1,2) = [2;3;5]; -%! xi = zi = .6:1.6; yi = 1; +%! xi = zi = .6:1.6; yi = 1; %! vi = interp3 (v, xi, yi, zi, "nearest"); %! vi2 = interpn (v, yi, xi, zi,"nearest"); %! assert (vi, vi2); @@ -227,7 +227,7 @@ %!test # input value matrix--no x,y,z, with extrap value %! x = z = 1:2; y = 1:3; %! v = ones ([3,2,2]); v(:,2,1) = [7;5;4]; v(:,1,2) = [2;3;5]; -%! xi = zi = .6:1.6; yi = 1; +%! xi = zi = .6:1.6; yi = 1; %! vi = interp3 (v, xi, yi, zi, "nearest", 3); %! vi2 = interpn (v, yi, xi, zi, "nearest", 3); %! assert (vi, vi2);
--- a/scripts/general/isequal.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/general/isequal.m Tue Jan 20 10:29:54 2015 -0500 @@ -67,9 +67,9 @@ %! double (0), single (0), %! double (complex (0,0)), single (complex (0,0))), %! true) -%!assert (isequal (true, logical (1), char (1), -%! int8 (1), int16 (1), int32 (1), int64 (1), -%! uint8 (1), uint16 (1), uint32 (1), uint64 (1), +%!assert (isequal (true, logical (1), char (1), +%! int8 (1), int16 (1), int32 (1), int64 (1), +%! uint8 (1), uint16 (1), uint32 (1), uint64 (1), %! double (1), single (1), %! double (complex (1,0)), single (complex (1,0))), %! true) @@ -101,7 +101,7 @@ %!assert (isequal (struct ("a","abc","b",2), struct ("a","abc","b",2)), true) ## recursive structure -%!test +%!test %! x.a = "a1"; %! x.b.a = "ba1"; %! x.b.b = "bb1"; @@ -155,7 +155,7 @@ %!assert (isequal (NaN, Inf), false) %!assert (isequal (NaN, 1.0), false) %!assert (isequal ([1,2,NaN,4], [1,2,NaN,4]), false) -%!assert (isequal (struct ("a",NaN,"b",2), struct ("a",NaN,"b",2), +%!assert (isequal (struct ("a",NaN,"b",2), struct ("a",NaN,"b",2), %! struct ("a",NaN,"b",2)), false) ## test input validation
--- a/scripts/general/private/__isequal__.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/general/private/__isequal__.m Tue Jan 20 10:29:54 2015 -0500 @@ -122,7 +122,7 @@ while (t && idx < l_x) idx++; args = cell (1, 2+l_v); - args(1:2) = {nans_compare_equal, x{idx}}; + args(1:2) = {nans_compare_equal, x{idx}}; args(3:end) = [cellindexmat(varargin, idx){:}]; t = __isequal__ (args{:});
--- a/scripts/geometry/voronoi.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/geometry/voronoi.m Tue Jan 20 10:29:54 2015 -0500 @@ -153,7 +153,7 @@ edges(:, edgeoutside) = []; else ## look for the edge between the two given points - for edge = edges(1:2,:) + for edge = edges(1:2,:) if (det ([[[1;1],p(edge,1:2)];1,x(1),y(1)]) * det ([[[1;1],p(edge,1:2)];1,x(2),y(2)]) < 0) edges = edge;
--- a/scripts/image/image.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/image/image.m Tue Jan 20 10:29:54 2015 -0500 @@ -233,13 +233,13 @@ %! set (hi, "cdata", cdata(1:2:end, 1:2:end)) %! assert (get (hi, "xdata"), [1 nx/2]) %! assert (get (hi, "ydata"), [1 ny/2]) -%! +%! %! set (hi, "xdata", [10 100]) # xdatamode is now manual %! set (hi, "ydata", [10 1000]) # ydatamode is now manual %! set (hi, "cdata", cdata) %! assert (get (hi, "xdata"), [10 100]) %! assert (get (hi, "ydata"), [10 1000]) -%! +%! %! set (hi, "ydata", []) # ydatamode is now auto %! set (hi, "cdata", cdata(1:2:end, 1:2:end)) %! assert (get (hi, "xdata"), [10 100])
--- a/scripts/image/imshow.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/image/imshow.m Tue Jan 20 10:29:54 2015 -0500 @@ -266,12 +266,12 @@ %! hf = figure ("visible", "off"); %! unwind_protect %! fail ("imshow ([1,1], [2 0 0])", "invalid colormap MAP"); -%! fail ("imshow ([1,1], [1 0 0 0])", "argument number 2 is invalid"); -%! fail ('imshow ([1,1], "colormap", [2 0 0])', "invalid colormap"); -%! fail ('imshow ([1,1], "xdata", ones (2,2))', "xdata must be a vector"); -%! fail ('imshow ([1,1], "ydata", ones (2,2))', "ydata must be a vector"); +%! fail ("imshow ([1,1], [1 0 0 0])", "argument number 2 is invalid"); +%! fail ('imshow ([1,1], "colormap", [2 0 0])', "invalid colormap"); +%! fail ('imshow ([1,1], "xdata", ones (2,2))', "xdata must be a vector"); +%! fail ('imshow ([1,1], "ydata", ones (2,2))', "ydata must be a vector"); %! fail ('imshow ([1,1], "foobar")', "warning", "unrecognized property foobar") -%! fail ("imshow ([1,1], {1})", "argument number 2 is invalid"); +%! fail ("imshow ([1,1], {1})", "argument number 2 is invalid"); %! fail ("imshow ([1+i,1-i])", "warning", "only showing real part of complex image"); %! unwind_protect_cleanup %! close (hf);
--- a/scripts/image/ind2rgb.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/image/ind2rgb.m Tue Jan 20 10:29:54 2015 -0500 @@ -91,7 +91,7 @@ %! [rgb] = ind2rgb (img, map); %! assert (ergb, rgb); %!test -%! ## Check that values below lower bound are mapped to first color value +%! ## Check that values below lower bound are mapped to first color value %! rgb = ind2rgb ([-1 0 2], gray (64)); %! assert (rgb(:,1:2,:), zeros (1,2,3)); %! assert (rgb(:,3,:), 1/63 * ones (1,1,3));
--- a/scripts/linear-algebra/bandwidth.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/linear-algebra/bandwidth.m Tue Jan 20 10:29:54 2015 -0500 @@ -24,11 +24,11 @@ ## The @var{type} argument is the string @qcode{"lower"} for the lower ## bandwidth and @qcode{"upper"} for the upper bandwidth. ## If no @var{type} is specified return both the lower and upper bandwidth -## of @var{A}. +## of @var{A}. ## ## The lower/upper bandwidth of a matrix is the number of ## subdiagonals/superdiagonals with nonzero entries. -## +## ## @seealso{isbanded, isdiag, istril, istriu} ## @end deftypefn
--- a/scripts/linear-algebra/isbanded.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/linear-algebra/isbanded.m Tue Jan 20 10:29:54 2015 -0500 @@ -40,7 +40,7 @@ if (isempty (A)) retval = []; - else + else retval = (isnumeric (A) || islogical (A)) && ndims (A) == 2; if (retval) [i, j] = find (A);
--- a/scripts/miscellaneous/bzip2.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/bzip2.m Tue Jan 20 10:29:54 2015 -0500 @@ -26,7 +26,7 @@ ## wildcards in the filename such as @samp{*} or @samp{?} are accepted and ## expanded. Each file is compressed separately and a new file with a ## @file{".bz2"} extension is created. The original files are not modified, -## but existing compressed files will be silently overwritten. +## but existing compressed files will be silently overwritten. ## ## If @var{dir} is defined the compressed files are placed in this directory, ## rather than the original directory where the uncompressed file resides.
--- a/scripts/miscellaneous/cast.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/cast.m Tue Jan 20 10:29:54 2015 -0500 @@ -21,7 +21,7 @@ ## Convert @var{val} to data type @var{type}. ## ## @var{val} must be one of the numeric classes: -## +## ## @example ## @group ## "double" @@ -70,7 +70,7 @@ "double"; "single"; "logical"; "char"}))) error ("cast: TYPE '%s' is not a built-in type", type); endif - + retval = feval (type, val); endfunction
--- a/scripts/miscellaneous/copyfile.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/copyfile.m Tue Jan 20 10:29:54 2015 -0500 @@ -137,7 +137,7 @@ %! save (f1, "tmp_var"); %! f2 = tempname; %! assert (copyfile (f1, f2)); -%! assert (exist (f2, "file")); +%! assert (exist (f2, "file")); %! fid = fopen (f1, "rb"); %! assert (fid >= 0); %! orig_data = fread (fid); @@ -160,5 +160,5 @@ %!error copyfile (1,2,3,4) %!error <F1 must be a string> copyfile (1, "foobar") %!error <F2 must be a string> copyfile ("foobar", 1) -%!error <F2 must be a directory> copyfile ({"a", "b"}, "%_NOT_A_DIR_%") +%!error <F2 must be a directory> copyfile ({"a", "b"}, "%_NOT_A_DIR_%")
--- a/scripts/miscellaneous/delete.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/delete.m Tue Jan 20 10:29:54 2015 -0500 @@ -80,11 +80,11 @@ %!test %! unwind_protect -%! hf = figure ("visible", "off"); +%! hf = figure ("visible", "off"); %! hl = plot (1:10); -%! assert (get (gca, "children"), hl); +%! assert (get (gca, "children"), hl); %! delete (hl); -%! assert (get (gca, "children"), zeros (0,1)); +%! assert (get (gca, "children"), zeros (0,1)); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect
--- a/scripts/miscellaneous/fullfile.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/fullfile.m Tue Jan 20 10:29:54 2015 -0500 @@ -111,7 +111,7 @@ %% Windows specific - drive letters and file sep type, cell array %!test -%! if (ispc) +%! if (ispc) %! tmp = fullfile ({"\\\/B:\//", "A://c", "\\\C:/g/h/i/j\/"}); %! assert (tmp{1}, 'B:\'); %! assert (tmp{2}, 'A:\c');
--- a/scripts/miscellaneous/getappdata.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/getappdata.m Tue Jan 20 10:29:54 2015 -0500 @@ -40,13 +40,13 @@ if (! all (ishandle (h(:)))) error ("getappdata: H must be a scalar or vector of graphic handles"); - endif + endif if (nargin == 2) if (! ischar (name)) error ("getappdata: NAME must be a string"); endif - + ## FIXME: Is there a better way to handle non-existent appdata ## and missing fields? value = cell (numel (h), 1);
--- a/scripts/miscellaneous/gunzip.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/gunzip.m Tue Jan 20 10:29:54 2015 -0500 @@ -22,7 +22,7 @@ ## Unpack the gzip archive @var{gzfile}. ## ## If @var{gzfile} is a directory, all gzfiles in the directory will be -## recursively unpacked. +## recursively unpacked. ## ## If @var{dir} is specified the files are unpacked in this directory rather ## than the one where @var{gzfile} is located.
--- a/scripts/miscellaneous/isappdata.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/isappdata.m Tue Jan 20 10:29:54 2015 -0500 @@ -38,7 +38,7 @@ error ("isappdata: H must be a scalar or vector of graphic handles"); elseif (! ischar (name)) error ("isappdata: NAME must be a string"); - endif + endif valid = false (size (h)); for i = 1:numel (h)
--- a/scripts/miscellaneous/ls.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/ls.m Tue Jan 20 10:29:54 2015 -0500 @@ -70,7 +70,7 @@ if (ispc () && ! isunix ()) idx = ! strncmp (args, '/', 1); ## Enclose paths, potentially having spaces, in double quotes: - args(idx) = strcat ('"', args(idx), '"'); + args(idx) = strcat ('"', args(idx), '"'); ## shell (cmd.exe) on MinGW uses '^' as escape character args = regexprep (args, '([^\w.*?])', '^$1'); else @@ -122,7 +122,7 @@ %! list2 = (list2')(:)'; # transform to a single row vector %! assert (! isempty (strfind (list2, "sbin"))); %! assert (rows (list) == rows (list2)); -%! endif +%! endif %!error <all arguments must be character strings> ls (1) ## Test below is valid, but produces confusing output on screen
--- a/scripts/miscellaneous/mex.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/mex.m Tue Jan 20 10:29:54 2015 -0500 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {Command} {} mex [options] file @dots{} ## Compile source code written in C, C++, or Fortran, to a MEX file. -## +## ## This is equivalent to @code{mkoctfile --mex [options] file}. ## @seealso{mkoctfile, mexext} ## @end deftypefn @@ -38,6 +38,6 @@ endfunction -## Remove from test statistics. All real tests are in mkoctfile. +## Remove from test statistics. All real tests are in mkoctfile. %!assert (1)
--- a/scripts/miscellaneous/movefile.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/movefile.m Tue Jan 20 10:29:54 2015 -0500 @@ -147,8 +147,8 @@ %! fclose (fid); %! f2 = tempname; %! assert (movefile (f1, f2)); -%! assert (! exist (f1, "file")); -%! assert (exist (f2, "file")); +%! assert (! exist (f1, "file")); +%! assert (exist (f2, "file")); %! fid = fopen (f2, "rb"); %! assert (fid >= 0); %! new_data = fread (fid); @@ -165,5 +165,5 @@ %!error movefile (1,2,3,4) %!error <F1 must be a string> movefile (1, "foobar") %!error <F2 must be a string> movefile ("foobar", 1) -%!error <F2 must be a directory> movefile ({"a", "b"}, "%_NOT_A_DIR_%") +%!error <F2 must be a directory> movefile ({"a", "b"}, "%_NOT_A_DIR_%")
--- a/scripts/miscellaneous/orderfields.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/orderfields.m Tue Jan 20 10:29:54 2015 -0500 @@ -30,7 +30,7 @@ ## If a second struct argument is given, arrange field names in @var{s1} as they ## appear in @var{s2}. The second argument may also specify the order in a ## cell array of strings @var{cellstr}. The second argument may also be a -## permutation vector. +## permutation vector. ## ## The optional second output argument @var{p} is the permutation vector which ## converts the original name order to the new name order.
--- a/scripts/miscellaneous/recycle.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/recycle.m Tue Jan 20 10:29:54 2015 -0500 @@ -50,7 +50,7 @@ if (! ischar (state)) error ("recycle: STATE must be a character string"); endif - + if (strcmpi (state, "on")) error ("recycle: recycling files is not implemented"); elseif (strcmpi (state, "off"))
--- a/scripts/miscellaneous/rmappdata.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/rmappdata.m Tue Jan 20 10:29:54 2015 -0500 @@ -52,7 +52,7 @@ ## FIXME: Should we bother to error out? Or just silently continue? missing = varargin{find (! vld, 1)}; error ("rmappdata: appdata '%s' is not present", missing); - endif + endif appdata = rmfield (appdata, varargin); set (hg, "__appdata__", appdata); endif
--- a/scripts/miscellaneous/setfield.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/setfield.m Tue Jan 20 10:29:54 2015 -0500 @@ -73,7 +73,7 @@ ## @end group ## @end example ## -## The example begins with an ordinary scalar structure to which a nested +## The example begins with an ordinary scalar structure to which a nested ## scalar structure is added. In all cases, if the structure index @var{sidx} ## is not specified it defaults to 1 (scalar structure). Thus, the example ## above could be written more concisely as
--- a/scripts/miscellaneous/symvar.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/symvar.m Tue Jan 20 10:29:54 2015 -0500 @@ -41,10 +41,10 @@ function vars = symvar (str) vars = argnames (inline (str)); - ## Correct for auto-generated 'x' variable when no symvar was found. + ## Correct for auto-generated 'x' variable when no symvar was found. if (numel (vars) == 1 && strcmp (vars{1}, "x") && ! any (str == "x")) vars = {}; - endif + endif endfunction
--- a/scripts/miscellaneous/tar.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/tar.m Tue Jan 20 10:29:54 2015 -0500 @@ -54,7 +54,7 @@ rootdir = tilde_expand (rootdir); tarfile = make_absolute_filename (tarfile); - + cmd = sprintf ("tar cvf %s -C %s %s", tarfile, rootdir, sprintf (" %s", files{:})); @@ -89,11 +89,11 @@ %! fid = fopen (fname1, "wt"); %! assert (fid >= 0); %! fdisp (fid, "Hello World"); -%! fclose (fid); +%! fclose (fid); %! fid = fopen (fname2, "wt"); %! assert (fid >= 0); %! fdisp (fid, "Goodbye World"); -%! fclose (fid); +%! fclose (fid); %! tarname = [tempname ".tar"]; %! filelist = tar (tarname, {dirname2, fname1}); %! if (! strcmp (filelist{3}, fname1))
--- a/scripts/miscellaneous/tmpnam.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/tmpnam.m Tue Jan 20 10:29:54 2015 -0500 @@ -21,7 +21,7 @@ ## @deftypefnx {Function File} {@var{fname} =} tmpnam (@var{dir}) ## @deftypefnx {Function File} {@var{fname} =} tmpnam (@var{dir}, @var{prefix}) ## Return a unique temporary file name as a string. -## +## ## If @var{prefix} is omitted, a value of @qcode{"oct-"} is used. ## If @var{dir} is also omitted, the default directory for temporary files ## (@code{P_tmpdir} is used. If @var{dir} is provided, it must exist,
--- a/scripts/miscellaneous/unpack.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/unpack.m Tue Jan 20 10:29:54 2015 -0500 @@ -194,7 +194,7 @@ [commandv, commandq, parsefcn, move] = deal (commandlist.(nodotext){:}); origdir = pwd (); if (move) - startdir = fileparts (file); + startdir = fileparts (file); else startdir = origdir; endif @@ -306,7 +306,7 @@ %! gzip (filename, dirname); %! [~, f] = fileparts (filename); %! filelist = unpack (fullfile (dirname, [f ".gz"]), P_tmpdir); -%! assert (filelist{1}, filename); +%! assert (filelist{1}, filename); %! fid = fopen ([filename ".orig"], "rb"); %! assert (fid >= 0); %! orig_data = fread (fid);
--- a/scripts/miscellaneous/ver.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/ver.m Tue Jan 20 10:29:54 2015 -0500 @@ -98,7 +98,7 @@ elseif (strcmpi (package, "Octave")) retval = struct ("Name", "Octave", "Version", version, "Release", [], "Date", []); - else + else lst = pkg ("list", package); if (isempty (lst)) retval = struct ("Name", "", "Version", [],
--- a/scripts/miscellaneous/what.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/what.m Tue Jan 20 10:29:54 2015 -0500 @@ -106,7 +106,7 @@ if (strcmp (n, ".") || strcmp (n, "..")) continue; else - ## Ignore mdl, slx, p, and packages since they are not + ## Ignore mdl, slx, p, and packages since they are not [~, f, e] = fileparts (n); if (strcmp (e, ".m")) w.m{end+1} = n;
--- a/scripts/miscellaneous/xor.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/xor.m Tue Jan 20 10:29:54 2015 -0500 @@ -62,7 +62,7 @@ ## Slow expansion to multiple arguments. ## Probably okay number of elements ## will be small. if (! isempty (varargin)) - for i = 1:numel (varargin) + for i = 1:numel (varargin) z = __xor__ (z, varargin{i}); endfor endif
--- a/scripts/miscellaneous/zip.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/miscellaneous/zip.m Tue Jan 20 10:29:54 2015 -0500 @@ -50,11 +50,11 @@ elseif (! iscellstr (files)) error ("zip: FILES must be a character array or cellstr"); endif - + rootdir = tilde_expand (rootdir); zipfile = make_absolute_filename (zipfile); - + cmd = sprintf ("cd %s; zip -r %s %s", rootdir, zipfile, sprintf (" %s", files{:}));
--- a/scripts/optimization/fminbnd.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/optimization/fminbnd.m Tue Jan 20 10:29:54 2015 -0500 @@ -70,7 +70,7 @@ if (nargin < 2 || nargin > 4) print_usage (); endif - + if (xmin > xmax) error ("Octave:invalid-input-arg", "fminbnd: the lower bound cannot be greater than the upper one"); @@ -288,8 +288,8 @@ %!assert (fminbnd (@(x) (x - 1e-3)^4, -1, 1, opt0), 1e-3, 10e-3*sqrt (eps)) %!assert (fminbnd (@(x) abs (x-1e7), 0, 1e10, opt0), 1e7, 10e7*sqrt (eps)) %!assert (fminbnd (@(x) x^2 + sin (2*pi*x), 0.4, 1, opt0), fzero (@(x) 2*x + 2*pi*cos (2*pi*x), [0.4, 1], opt0), sqrt (eps)) -%!assert (fminbnd (@(x) x > 0.3, 0, 1) < 0.3) -%!assert (fminbnd (@(x) sin (x), 0, 0), 0, eps) +%!assert (fminbnd (@(x) x > 0.3, 0, 1) < 0.3) +%!assert (fminbnd (@(x) sin (x), 0, 0), 0, eps) %!error <lower bound cannot be greater> fminbnd (@(x) sin (x), 0, -pi)
--- a/scripts/optimization/sqp.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/optimization/sqp.m Tue Jan 20 10:29:54 2015 -0500 @@ -129,7 +129,7 @@ ## ## @table @asis ## @item 101 -## The algorithm terminated normally. +## The algorithm terminated normally. ## All constraints meet the specified tolerance. ## ## @item 102 @@ -139,7 +139,7 @@ ## The maximum number of iterations was reached. ## ## @item 104 -## The stepsize has become too small, i.e., +## The stepsize has become too small, i.e., ## @tex ## $\Delta x,$ ## @end tex
--- a/scripts/path/private/getsavepath.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/path/private/getsavepath.m Tue Jan 20 10:29:54 2015 -0500 @@ -44,7 +44,7 @@ endif endif - ## Verify the file was correctly formatted. + ## Verify the file was correctly formatted. if (startline > endline || (startline > 0 && endline == 0)) error ("getsavepath: unable to parse file, %s", file); endif
--- a/scripts/path/savepath.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/path/savepath.m Tue Jan 20 10:29:54 2015 -0500 @@ -46,7 +46,7 @@ beginstring = "## Begin savepath auto-created section, do not edit"; endstring = "## End savepath auto-created section"; - ## Use project-specific or user's .octaverc when no file specified + ## Use project-specific or user's .octaverc when no file specified if (nargin == 0) file = fullfile (pwd, ".octaverc"); if (! exist (file, "file")) @@ -197,7 +197,7 @@ %! unlink (".octaverc"); %! endif %! ## Create blank .octaverc file -%! fid = fopen (".octaverc", "wt"); +%! fid = fopen (".octaverc", "wt"); %! assert (fid >= 0); %! fclose (fid); %! ## Save path into local .octaverc file @@ -216,5 +216,5 @@ %! assert (orig_data, new_data); %! unwind_protect_cleanup %! cd (old_dir); -%! end_unwind_protect +%! end_unwind_protect
--- a/scripts/pkg/pkg.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/pkg/pkg.m Tue Jan 20 10:29:54 2015 -0500 @@ -129,7 +129,7 @@ ## ## @noindent ## will produce a short report with the package name, version, and installation -## directory for each installed package. Supply a package name to limit +## directory for each installed package. Supply a package name to limit ## reporting to a particular package. For example: ## ## @example
--- a/scripts/pkg/private/installed_packages.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/pkg/private/installed_packages.m Tue Jan 20 10:29:54 2015 -0500 @@ -108,7 +108,7 @@ h2 = "Version"; h3 = "Installation directory"; max_name_length = max ([length(h1), cellfun(@length, installed_names)]); - version_lengths = cellfun (@(x) length (x.version), installed_pkgs_lst); + version_lengths = cellfun (@(x) length (x.version), installed_pkgs_lst); max_version_length = max ([length(h2), version_lengths]); ncols = terminal_size ()(2); max_dir_length = ncols - max_name_length - max_version_length - 7;
--- a/scripts/plot/draw/plotyy.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/draw/plotyy.m Tue Jan 20 10:29:54 2015 -0500 @@ -85,7 +85,7 @@ [axtmp, h1tmp, h2tmp] = __plotyy__ (hax, varargin{:}); set (gcf, "currentaxes", hax(1)); - + unwind_protect_cleanup if (! isempty (oldfig)) set (0, "currentfigure", oldfig);
--- a/scripts/plot/draw/polar.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/draw/polar.m Tue Jan 20 10:29:54 2015 -0500 @@ -291,9 +291,9 @@ set (hg, "handlevisibility", "on"); kids = get (hax, "children"); if (strcmp (get (hax, "layer"), "bottom")) - set (hax, "children", [kids(kids != hg); hg]); + set (hax, "children", [kids(kids != hg); hg]); else - set (hax, "children", [hg; kids(kids != hg)]); + set (hax, "children", [hg; kids(kids != hg)]); endif set (hg, "handlevisibility", "off");
--- a/scripts/plot/draw/private/__quiver__.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/draw/private/__quiver__.m Tue Jan 20 10:29:54 2015 -0500 @@ -119,7 +119,7 @@ ww = w; len = max (sqrt (u(:).^2 + v(:).^2 + w(:).^2)); else - len = max (sqrt (u(:).^2 + v(:).^2)); + len = max (sqrt (u(:).^2 + v(:).^2)); endif if (len > 0 && autoscale && numel (u) > 1) if (isvector (x))
--- a/scripts/plot/draw/private/__scatter__.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/draw/private/__scatter__.m Tue Jan 20 10:29:54 2015 -0500 @@ -85,9 +85,9 @@ endif ## Validate inputs - if (nd == 2 && ! size_equal (x, y)) + if (nd == 2 && ! size_equal (x, y)) error ([fcn ": X and Y must have the same size"]); - elseif (nd == 3 && ! size_equal (x, y, z)) + elseif (nd == 3 && ! size_equal (x, y, z)) error ([fcn ": X, Y, and Z must have the same size"]); endif
--- a/scripts/plot/draw/private/__stem__.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/draw/private/__stem__.m Tue Jan 20 10:29:54 2015 -0500 @@ -49,7 +49,7 @@ h = []; nx = rows (x); h_baseline = []; - + for i = 1 : columns (x) if (have_z) xt = x(:)'; @@ -96,7 +96,7 @@ __line__ (hax, xt, yt, "color", lc, "linestyle", ls, "parent", hg); __line__ (hax, x(:,i), y(:, i), "color", mc, "linestyle", "none", "marker", ms, "markerfacecolor", fc, "parent", hg); - + x_axis_range = get (hax, "xlim"); if (isempty (h_baseline)) h_baseline = line (hax, x_axis_range, [0, 0], "color", [0, 0, 0]); @@ -159,7 +159,7 @@ addlistener (hg, "visible", {@show_baseline, h}); addlistener (hg, "basevalue", @move_baseline); endfor - + addlistener (h_baseline, "basevalue", {@update_baseline, 0}); addlistener (h_baseline, "ydata", {@update_baseline, 1}); addlistener (h_baseline, "visible", {@update_baseline, 2});
--- a/scripts/plot/draw/surface.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/draw/surface.m Tue Jan 20 10:29:54 2015 -0500 @@ -175,7 +175,7 @@ otherwise bad_usage = true; return; - + endswitch if (firststring < nargin)
--- a/scripts/plot/draw/surfnorm.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/draw/surfnorm.m Tue Jan 20 10:29:54 2015 -0500 @@ -35,7 +35,7 @@ ## vectors to the surface is plotted. ## ## Any property/value input pairs are assigned to the surface object. -## +## ## If the first argument @var{hax} is an axes handle, then plot into this axis, ## rather than the current axes returned by @code{gca}. ## @@ -143,8 +143,8 @@ ##daspect ("manual"); ##len = norm (daratio); ## This assumes an even meshgrid which isn't a great assumption - ##dx = x(1,2) - x(1,1); - ##dy = y(2,1) - y(1,1); + ##dx = x(1,2) - x(1,1); + ##dy = y(2,1) - y(1,1); ##nx *= daratio(1); ##ny *= daratio(2); ##nz *= daratio(3);
--- a/scripts/plot/util/copyobj.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/util/copyobj.m Tue Jan 20 10:29:54 2015 -0500 @@ -47,7 +47,7 @@ ## current figure and axes cf = gcf (); ca = get (cf, "currentaxes"); - + ## compatibility of input handles kididx = find (strcmp (alltypes, get (horig).type)); paridx = find (strcmp (alltypes, get (hparent).type)); @@ -168,7 +168,7 @@ %! graphics_toolkit (toolkit); %! end_unwind_protect -%!test +%!test %! unwind_protect %! tag = "foo"; %! hf = figure ("visible", "off");
--- a/scripts/plot/util/hgload.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/util/hgload.m Tue Jan 20 10:29:54 2015 -0500 @@ -47,7 +47,7 @@ error ("hgload: unable to locate file %s", filename); endif endif - + ## Load the handle try stmp = load (filename, "s_oct40"); @@ -56,7 +56,7 @@ end_try_catch h = struct2hdl (stmp.s_oct40); - + endfunction
--- a/scripts/plot/util/hgsave.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/util/hgsave.m Tue Jan 20 10:29:54 2015 -0500 @@ -23,9 +23,9 @@ ## Save the graphics handle @var{h} to the file @var{filename} in the format ## @var{fmt}. ## -## If unspecified, @var{h} is the current figure as returned by @code{gcf}. +## If unspecified, @var{h} is the current figure as returned by @code{gcf}. ## When @var{filename} does not have an extension the default filename -## extension @file{.ofig} will be appended. If present, @var{fmt} should +## extension @file{.ofig} will be appended. If present, @var{fmt} should ## should be one of the following: ## ## @itemize @bullet
--- a/scripts/plot/util/isprop.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/util/isprop.m Tue Jan 20 10:29:54 2015 -0500 @@ -22,7 +22,7 @@ ## ## @var{obj} may also be an array of objects in which case @var{res} will be a ## logical array indicating whether each handle has the property @var{prop}. -## +## ## For plotting, @var{obj} is a handle to a graphics object. Otherwise, ## @var{obj} should be an instance of a class. ## @seealso{get, set, ismethod, isobject}
--- a/scripts/plot/util/linkprop.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/util/linkprop.m Tue Jan 20 10:29:54 2015 -0500 @@ -73,9 +73,9 @@ endif h = h(:)'; # set() prefers column vectors - ## Match all objects to the first one in the list before linking + ## Match all objects to the first one in the list before linking for j = 1 : numel (prop) - set (h(2:end), prop{j}, get (h(1), prop{j})); + set (h(2:end), prop{j}, get (h(1), prop{j})); endfor ## Add listeners to all objects
--- a/scripts/plot/util/private/__go_draw_axes__.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/plot/util/private/__go_draw_axes__.m Tue Jan 20 10:29:54 2015 -0500 @@ -775,7 +775,7 @@ ccdat = (rows (cmap) + rows (addedcmap) + 1) * ones(3, 1); addedcmap = [addedcmap; reshape(color, 1, 3)]; elseif (numel (ccdat) <= 1) - ccdat = zcol; + ccdat = zcol; endif data{data_3d_idx} = [data{data_3d_idx}, ... [[xcol; xcol(end)], [ycol; ycol(end)], ...
--- a/scripts/set/setdiff.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/set/setdiff.m Tue Jan 20 10:29:54 2015 -0500 @@ -28,7 +28,7 @@ ## Otherwise, return a row vector. The inputs may also be cell arrays of ## strings. ## -## If the optional input @qcode{"rows"} is given then return the rows in +## If the optional input @qcode{"rows"} is given then return the rows in ## @var{a} that are not in @var{b}. The inputs must be 2-D matrices to use ## this option. ##
--- a/scripts/set/union.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/set/union.m Tue Jan 20 10:29:54 2015 -0500 @@ -32,7 +32,7 @@ ## If the optional input @qcode{"rows"} is given then return rows that are in ## either @var{a} or @var{b}. The inputs must be 2-D matrices to use this ## option. -## +## ## The optional outputs @var{ia} and @var{ib} are index vectors such that ## @code{@var{a}(@var{ia})} and @code{@var{b}(@var{ib})} are disjoint sets ## whose union is @var{c}. @@ -88,7 +88,7 @@ %! assert (union (a, b), sort ([a(1:end), 2])); %!test -%! a = [3, 1, 4, 1, 5]; +%! a = [3, 1, 4, 1, 5]; %! b = [1, 2, 3, 4]; %! [y, ia, ib] = union (a, b.'); %! assert (y, [1, 2, 3, 4, 5]);
--- a/scripts/signal/periodogram.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/signal/periodogram.m Tue Jan 20 10:29:54 2015 -0500 @@ -44,7 +44,7 @@ ## data must be a vector of the same length as @var{x}. ## ## @item nfft -## number of frequency bins. The default is 256 or the next higher power of +## number of frequency bins. The default is 256 or the next higher power of ## 2 greater than the length of @var{x} ## (@code{max (256, 2.^nextpow2 (length (x)))}). If @var{nfft} is greater ## than the length of the input then @var{x} will be zero-padded to the length @@ -69,7 +69,7 @@ ## @var{f} will be in the range [0, @var{Fs}/2] or [0, @var{Fs}/2) for ## one-sided calculations. For two-sided calculations the range will be ## [0, @var{Fs}). -## +## ## When called with no outputs the periodogram is immediately plotted in the ## current figure window. ## @seealso{fft} @@ -107,7 +107,7 @@ error ("periodogram: X must be a real or complex vector"); endif x = x(:); # Use column vectors from now on - + n = rows (x); if (! isempty (window))
--- a/scripts/sparse/eigs.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/sparse/eigs.m Tue Jan 20 10:29:54 2015 -0500 @@ -182,7 +182,7 @@ ## Given a third return argument @var{flag}, @code{eigs} returns the status ## of the convergence. If @var{flag} is 0 then all eigenvalues have converged. ## Any other value indicates a failure to converge. -## +## ## This function is based on the @sc{arpack} package, written by ## @nospell{R. Lehoucq, K. Maschhoff, D. Sorensen, and C. Yang}. For more ## information see @url{http://www.caam.rice.edu/software/ARPACK/}.
--- a/scripts/sparse/ilu.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/sparse/ilu.m Tue Jan 20 10:29:54 2015 -0500 @@ -1,6 +1,6 @@ ## Copyright (C) 2014 Eduardo Ramos Fernández <eduradical951@gmail.com> ## Copyright (C) 2013 Kai T. Ohlhus <k.ohlhus@gmail.com> -## +## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ ## ## @code{ilu} returns a unit lower triangular matrix @var{L}, an upper ## triangular matrix @var{U}, and optionally a permutation matrix @var{P}, such -## that @code{@var{L}*@var{U}} approximates @code{@var{P}*@var{A}}. +## that @code{@var{L}*@var{U}} approximates @code{@var{P}*@var{A}}. ## ## The factors given by this routine may be useful as preconditioners for a ## system of linear equations being solved by iterative methods such as BICG @@ -76,12 +76,12 @@ ## ## @table @asis ## @item @qcode{"row"} -## Row-sum modified incomplete LU factorization. +## Row-sum modified incomplete LU factorization. ## The factorization preserves row sums: ## @code{@var{A} * e = @var{L} * @var{U} * e}, where e is a vector of ones. ## ## @item @qcode{"col"} -## Column-sum modified incomplete LU factorization. +## Column-sum modified incomplete LU factorization. ## The factorization preserves column sums: ## @code{e' * @var{A} = e' * @var{L} * @var{U}}. ## @@ -100,7 +100,7 @@ ## is chosen to be the pivot. ## @end table ## -## If @code{ilu} is called with just one output, the returned matrix is +## If @code{ilu} is called with just one output, the returned matrix is ## @code{@var{L} + @var{U} - speye (size (@var{A}))}, where @var{L} is unit ## lower triangular and @var{U} is upper triangular. ## @@ -142,8 +142,8 @@ ## @example ## @group ## A = gallery ("wathen", 10, 10); -## b = sum (A, 2); -## tol = 1e-8; +## b = sum (A, 2); +## tol = 1e-8; ## maxit = 50; ## opts.type = "crout"; ## opts.droptol = 1e-4; @@ -174,7 +174,7 @@ endif ## If A is empty then return empty L, U and P for Matlab compatibility - if (isempty (A)) + if (isempty (A)) L = U = P = A; return; endif @@ -323,59 +323,59 @@ %! A_medium = sprand (n_medium, n_medium, 1/n_medium) + speye (n_medium); %! A_large = sprand (n_large, n_large, 1/n_large/10) + speye (n_large); %! -%!test +%!test %! opts.type = "nofill"; %! [L, U] = ilu (A_tiny); %! assert (norm (A_tiny - L*U, "fro") / norm (A_tiny, "fro"), 0, n_tiny * eps); -%!test +%!test %! opts.type = "nofill"; %! [L, U] = ilu (A_small); %! assert (norm (A_small - L*U, "fro") / norm (A_small, "fro"), 0, 1); -%!test +%!test %! opts.type = "nofill"; %! [L, U] = ilu (A_medium); %! assert (norm (A_medium - L*U, "fro") / norm (A_medium, "fro"), 0, 1); -%!test +%!test %! opts.type = "nofill"; %! [L, U] = ilu (A_large); %! assert (norm (A_large - L*U, "fro") / norm (A_large, "fro"), 0, 1); %! -%!test +%!test %! opts.type = "crout"; %! [L, U] = ilu (A_tiny, opts); %! assert (norm (A_tiny - L*U, "fro") / norm (A_tiny, "fro"), eps, eps); -%!test +%!test %! opts.type = "crout"; %! [L, U] = ilu (A_small, opts); %! assert (norm (A_small - L*U, "fro") / norm (A_small, "fro"), eps, eps); -%!test +%!test %! opts.type = "crout"; %! [L, U] = ilu (A_medium, opts); %! assert (norm (A_medium - L*U, "fro") / norm (A_medium, "fro"), eps, eps); -%!test +%!test %! opts.type = "crout"; %! [L, U] = ilu (A_large, opts); %! assert (norm (A_large - L*U, "fro") / norm (A_large, "fro"), eps, eps); %! -%!test +%!test %! opts.type = "ilutp"; %! opts.droptol = 0; %! opts.thresh = 0; %! [L, U] = ilu (A_tiny, opts); %! assert (norm (A_tiny - L*U, "fro") / norm (A_tiny, "fro"), eps, eps); -%!test +%!test %! opts.type = "ilutp"; %! opts.droptol = 0; %! opts.thresh = 0; %! [L, U] = ilu (A_small, opts); %! assert (norm (A_small - L*U, "fro") / norm (A_small, "fro"), eps, eps); -%!test +%!test %! opts.type = "ilutp"; %! opts.droptol = 0; %! opts.thresh = 0; %! [L, U] = ilu (A_medium, opts); %! assert (norm (A_medium - L*U, "fro") / norm (A_medium, "fro"), eps, eps); -%!test +%!test %! opts.type = "ilutp"; %! opts.droptol = 0; %! opts.thresh = 0; @@ -397,59 +397,59 @@ %! A_large = sprand (n_large, n_large, 1/n_large/10) + ... %! i * sprand (n_large, n_large, 1/n_large/10) + speye (n_large); %! -%!test +%!test %! opts.type = "nofill"; %! [L, U] = ilu (A_tiny); %! assert (norm (A_tiny - L*U, "fro") / norm (A_tiny, "fro"), 0, n_tiny * eps); -%!test +%!test %! opts.type = "nofill"; %! [L, U] = ilu (A_small); %! assert (norm (A_small - L*U, "fro") / norm (A_small, "fro"), 0, 1); -%!test +%!test %! opts.type = "nofill"; %! [L, U] = ilu (A_medium); %! assert (norm (A_medium - L*U, "fro") / norm (A_medium, "fro"), 0, 1); -%!test +%!test %! opts.type = "nofill"; %! [L, U] = ilu (A_large); %! assert (norm (A_large - L*U, "fro") / norm (A_large, "fro"), 0, 1); %! -%!test +%!test %! opts.type = "crout"; %! [L, U] = ilu (A_tiny, opts); %! assert (norm (A_tiny - L*U, "fro") / norm (A_tiny, "fro"), eps, eps); -%!test +%!test %! opts.type = "crout"; %! [L, U] = ilu (A_small, opts); %! assert (norm (A_small - L*U, "fro") / norm (A_small, "fro"), eps, eps); -%!test +%!test %! opts.type = "crout"; %! [L, U] = ilu (A_medium, opts); %! assert (norm (A_medium - L*U, "fro") / norm (A_medium, "fro"), eps, eps); -%!test +%!test %! opts.type = "crout"; %! [L, U] = ilu (A_large, opts); %! assert (norm (A_large - L*U, "fro") / norm (A_large, "fro"), eps, eps); %! -%!test +%!test %! opts.type = "ilutp"; %! opts.droptol = 0; %! opts.thresh = 0; %! [L, U] = ilu (A_tiny, opts); %! assert (norm (A_tiny - L*U, "fro") / norm (A_tiny, "fro"), eps, eps); -%!test +%!test %! opts.type = "ilutp"; %! opts.droptol = 0; %! opts.thresh = 0; %! [L, U] = ilu (A_small, opts); %! assert (norm (A_small - L*U, "fro") / norm (A_small, "fro"), eps, eps); -%!test +%!test %! opts.type = "ilutp"; %! opts.droptol = 0; %! opts.thresh = 0; %! [L, U] = ilu (A_medium, opts); %! assert (norm (A_medium - L*U, "fro") / norm (A_medium, "fro"), eps, eps); -%!test +%!test %! opts.type = "ilutp"; %! opts.droptol = 0; %! opts.thresh = 0;
--- a/scripts/sparse/qmr.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/sparse/qmr.m Tue Jan 20 10:29:54 2015 -0500 @@ -158,7 +158,7 @@ endif r = b - Ax (x); - + bnorm = norm (b); res0 = norm (r); if (nargout > 4) @@ -226,7 +226,7 @@ if (nargout > 4) resvec(iter + 1, 1) = norm (r); end - + if (res1 < tol) ## Convergence achieved. flag = 0;
--- a/scripts/sparse/sprand.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/sparse/sprand.m Tue Jan 20 10:29:54 2015 -0500 @@ -78,10 +78,10 @@ %! rc = [5, 4, 3, 2, 1, 0.1]; %! s2 = sprand (100, 100, d, rc); %! s3 = sprand (6, 4, d, rc); -%! assert (svd (s2)'(1:length (rc)), rc, sqrt (eps)); +%! assert (svd (s2)'(1:length (rc)), rc, sqrt (eps)); %! assert (1/cond (s1), 0.4, sqrt (eps)); %! assert (nnz (s1) / (100*100), d, 0.02); -%! assert (nnz (s2) / (100*100), d, 0.02); +%! assert (nnz (s2) / (100*100), d, 0.02); %! assert (svd (s3)', [5 4 3 2], sqrt (eps)); %% Test 1-input calling form
--- a/scripts/sparse/sprandn.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/sparse/sprandn.m Tue Jan 20 10:29:54 2015 -0500 @@ -36,7 +36,7 @@ ## with reciprocal condition number @var{rc} is generated. If @var{rc} is ## a vector, then it specifies the first singular values of the generated ## matrix (@code{length (@var{rc}) <= min (@var{m}, @var{n})}). -## +## ## @seealso{sprand, sprandsym, randn} ## @end deftypefn @@ -70,10 +70,10 @@ %! rc = [5, 4, 3, 2, 1, 0.1]; %! s2 = sprandn (100, 100, d, rc); %! s3 = sprandn (6, 4, d, rc); -%! assert (svd (s2)'(1:length (rc)), rc, sqrt (eps)); +%! assert (svd (s2)'(1:length (rc)), rc, sqrt (eps)); %! assert (1/cond (s1), 0.4, sqrt (eps)); -%! assert (nnz (s1) / (100*100), d, 0.02); -%! assert (nnz (s2) / (100*100), d, 0.02); +%! assert (nnz (s1) / (100*100), d, 0.02); +%! assert (nnz (s2) / (100*100), d, 0.02); %! assert (svd (s3)', [5 4 3 2], sqrt (eps)); %% Test 1-input calling form
--- a/scripts/specfun/beta.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/specfun/beta.m Tue Jan 20 10:29:54 2015 -0500 @@ -18,7 +18,7 @@ ## -*- texinfo -*- ## @deftypefn {Mapping Function} {} beta (@var{a}, @var{b}) -## Compute the Beta function for real inputs @var{a} and @var{b}. +## Compute the Beta function for real inputs @var{a} and @var{b}. ## ## The Beta function definition is ## @tex
--- a/scripts/specfun/ellipke.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/specfun/ellipke.m Tue Jan 20 10:29:54 2015 -0500 @@ -100,7 +100,7 @@ elseif (any (m > 1)) error ("ellipke: M must be <= 1"); endif - + if (isempty (tol)) tol = eps (class (m)); elseif (! (isreal (tol) && isscalar (tol) && tol > 0))
--- a/scripts/specfun/isprime.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/specfun/isprime.m Tue Jan 20 10:29:54 2015 -0500 @@ -27,7 +27,7 @@ ## extends this definition to include both negative integers and complex ## values. A negative integer is prime if its positive counterpart is prime. ## This is equivalent to @code{isprime (abs (x))}. -## +## ## If @code{class (@var{x})} is complex, then primality is tested in the domain ## of Gaussian integers (@url{http://en.wikipedia.org/wiki/Gaussian_integer}). ## Some non-complex integers are prime in the ordinary sense, but not in the
--- a/scripts/statistics/base/lscov.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/statistics/base/lscov.m Tue Jan 20 10:29:54 2015 -0500 @@ -20,8 +20,8 @@ ## @deftypefnx {Function File} {[@var{x}, @var{stdx}, @var{mse}, @var{S}] =} lscov (@dots{}) ## ## Compute a generalized linear least squares fit. -## Estimate @var{x} under the model @var{b} = @var{A}@var{x} + @var{w}, -## where the noise @var{w} is assumed to follow a normal distribution +## Estimate @var{x} under the model @var{b} = @var{A}@var{x} + @var{w}, +## where the noise @var{w} is assumed to follow a normal distribution ## with covariance matrix @math{{\sigma^2} V}. ## ## If the size of the coefficient matrix @var{A} is n-by-p, the @@ -55,16 +55,16 @@ if (nargin < 2 || (rows (A) != rows (b))) print_usage (); endif - + n = rows (A); p = columns (A); k = columns (b); - + if (! isempty (V)) if (rows (V) != n || ! any (columns (V) == [1 n])) error ("lscov: V should be a square matrix or a vector with the same number of rows as A"); endif - + if (isvector (V)) ## n-by-1 vector of inverse variances v = diag (sqrt (V)); @@ -81,26 +81,26 @@ [B, lambda] = eig (V); image_dims = (diag (lambda) > 0); B = B(:, image_dims) * sqrt (lambda(image_dims, image_dims)); - end_try_catch + end_try_catch A = B \ A; b = B \ b; endif endif - + pinv_A = pinv (A); #pseudoinverse x = pinv_A * b; - + if (isargout (3)) dof = n - p; #degrees of freedom remaining after fit SSE = sumsq (b - A * x); mse = SSE / dof; endif - + s = pinv_A * pinv_A'; stdx = sqrt (diag (s) * mse); - + if (isargout (4)) if (k == 1) S = mse * s; @@ -150,16 +150,16 @@ %!test %! ## Adapted from example in Matlab documentation -%! x1 = [.2 .5 .6 .8 1.0 1.1]'; -%! x2 = [.1 .3 .4 .9 1.1 1.4]'; -%! X = [ones(size(x1)) x1 x2]; +%! x1 = [.2 .5 .6 .8 1.0 1.1]'; +%! x2 = [.1 .3 .4 .9 1.1 1.4]'; +%! X = [ones(size(x1)) x1 x2]; %! y = [.17 .26 .28 .23 .27 .34]'; %! [b, se_b, mse, S] = lscov(X, y); %! assert(b, [0.1203 0.3284 -0.1312]', 1E-4); %! assert(se_b, [0.0643 0.2267 0.1488]', 1E-4); %! assert(mse, 0.0015, 1E-4); %! assert(S, [0.0041 -0.0130 0.0075; -0.0130 0.0514 -0.0328; 0.0075 -0.0328 0.0221], 1E-4); -%! w = [1 1 1 1 1 .1]'; +%! w = [1 1 1 1 1 .1]'; %! [bw, sew_b, msew] = lscov (X, y, w); %! assert(bw, [0.1046 0.4614 -0.2621]', 1E-4); %! assert(sew_b, [0.0309 0.1152 0.0814]', 1E-4);
--- a/scripts/testfun/__run_test_suite__.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/testfun/__run_test_suite__.m Tue Jan 20 10:29:54 2015 -0500 @@ -130,7 +130,7 @@ nfail = n - p - xf; if (nfail > 0) printf ("\n%71s %3d", "FAIL ", nfail); - endif + endif if (sk > 0) printf ("\n%71s %3d", "SKIP ", sk); endif
--- a/scripts/testfun/test.m Tue Jan 20 10:24:46 2015 -0500 +++ b/scripts/testfun/test.m Tue Jan 20 10:29:54 2015 -0500 @@ -48,7 +48,7 @@ ## such as @var{success}, @var{n}, etc. ## ## The optional second argument determines the amount of output to generate and -## which types of tests to run. The default value is @qcode{"normal"}. +## which types of tests to run. The default value is @qcode{"normal"}. ## Requesting an output argument will suppress printing the final summary ## message and any intermediate warnings, unless verbose reporting is ## enabled. @@ -98,7 +98,7 @@ ## nmax = 5 ## @end group ## @end example -## +## ## Additional Calling Syntaxes ## ## If the second argument is the string @qcode{"grabdemo"}, the contents of @@ -529,7 +529,7 @@ elseif (strcmp (__type, "testif")) __e = regexp (__code, '.$', 'lineanchors', 'once'); ## Strip any comment from testif line before looking for features - __feat_line = strtok (__code(1:__e), '#%'); + __feat_line = strtok (__code(1:__e), '#%'); __feat = regexp (__feat_line, '\w+', 'match'); __feat = strrep (__feat, "HAVE_", ""); __have_feat = __have_feature__ (__feat); @@ -644,7 +644,7 @@ end_unwind_protect endfor - ## Clear any functions created during test run + ## Clear any functions created during test run eval (__clearfcn, ""); if (nargout == 0) @@ -804,14 +804,14 @@ %!fail ('test ("test", "bogus")', "unknown flag") # incorrect args %!fail ('garbage','garbage.*undefined') # usage on nonexistent function should be -## Test 'error' keyword +## Test 'error' keyword %!error test # no args, generates usage() %!error test (1,2,3,4) # too many args, generates usage() %!error <unknown flag> test ("test", "bogus"); # incorrect args %!error test ("test", "bogus"); # test without pattern %!error <'garbage' undefined> garbage; # usage on nonexistent function is error -## Test 'warning' keyword +## Test 'warning' keyword %!warning warning ("warning message"); # no pattern %!warning <warning message> warning ("warning message"); # with pattern @@ -834,7 +834,7 @@ %! a=1; b=2; c=4; %!shared # clear all shared variables for remainder of tests -## Test 'function' keyword +## Test 'function' keyword %!function x = __test_a (y) %! x = 2*y; %!endfunction @@ -850,16 +850,16 @@ %! x = 2*y; %! z = 3*y; %!endfunction -%!test +%!test %! [x,z] = __test_a (3); # Test a test function with multiple returns %! assert (x,6); %! assert (z,9); -## Test 'assert' keyword +## Test 'assert' keyword %!assert (isempty ([])) # support for test assert shorthand %!assert (size (ones (1,2,3)), [1 2 3]) -## Test 'demo' keyword +## Test 'demo' keyword %!demo # multiline demo block %! t = [0:0.01:2*pi]; x = sin (t); %! plot (t,x); @@ -873,11 +873,11 @@ %! assert (code(idx(3):end), %! " a=3 # single line demo blocks work too"); -## Test 'testif' keyword +## Test 'testif' keyword %!testif HAVE_BOGUS_FEATURE %! error ("testif executed code despite not having feature"); -## Test 'xtest' keyword +## Test 'xtest' keyword %!xtest %! assert (1, 1); # Test passes %!xtest