Mercurial > octave-nkf
diff scripts/io/strread.m @ 19628:fe689210525c gui-release
maint: Periodic merge of stable to gui-release.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 20 Jan 2015 10:05:42 -0500 |
parents | 589354cf668f 446c46af4b42 |
children | 0e1f5a750d00 |
line wrap: on
line diff
--- a/scripts/io/strread.m Mon Jan 19 07:04:12 2015 +0100 +++ b/scripts/io/strread.m Tue Jan 20 10:05:42 2015 -0500 @@ -161,7 +161,7 @@ ## @table @asis ## @item last character = @qcode{"\n"} ## Data columns are padded with empty fields or Nan so that all columns -## have equal length +## have equal length ## ## @item last character is not @qcode{"\n"} ## Data columns are not padded; strread returns columns of unequal length @@ -177,7 +177,7 @@ if (nargin < 1) print_usage (); endif - + if (isempty (str)) ## Return empty args (no match), rather than raising an error varargout = cell (1, nargout); @@ -302,7 +302,7 @@ ## like %f<literal>) (w/o delimiter in between) are fixed further on format = strrep (format, "%", " %"); fmt_words = regexp (format, '[^ ]+', "match"); - + ## Find position of conversion specifiers (they start with %) idy2 = find (! cellfun ("isempty", regexp (fmt_words, '^%')));