Mercurial > octave-nkf
changeset 11147:a81994607ca0
document textscan and textread
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 23 Oct 2010 02:29:35 -0400 |
| parents | 69b2f237060e |
| children | c9ec943ebe65 |
| files | doc/ChangeLog doc/interpreter/io.txi scripts/ChangeLog scripts/io/strread.m |
| diffstat | 4 files changed, 18 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog Sat Oct 23 02:22:56 2010 -0400 +++ b/doc/ChangeLog Sat Oct 23 02:29:35 2010 -0400 @@ -1,3 +1,8 @@ +2010-10-23 John W. Eaton <jwe@octave.org> + + * interpreter/io.txi (Simple File I/O): Document textscan and + textread. + 2010-10-23 Ben Abbott <bpabbott@mac.com> * interpreter/strings.txi: Add @DOCSTRING(strread).
--- a/doc/interpreter/io.txi Sat Oct 23 02:22:56 2010 -0400 +++ b/doc/interpreter/io.txi Sat Oct 23 02:29:35 2010 -0400 @@ -219,6 +219,10 @@ @DOCSTRING(csvread) +@DOCSTRING(textread) + +@DOCSTRING(textscan) + @menu * Saving Data on Unexpected Exits:: @end menu
--- a/scripts/ChangeLog Sat Oct 23 02:22:56 2010 -0400 +++ b/scripts/ChangeLog Sat Oct 23 02:29:35 2010 -0400 @@ -1,3 +1,7 @@ +2010-10-23 John W. Eaton <jwe@octave.org> + + * io/strread.m: Docstring fixes. + 2010-10-23 John W. Eaton <jwe@octave.org> * io/is_valid_file_id.m: Ensure that FID is a scalar before
--- a/scripts/io/strread.m Sat Oct 23 02:22:56 2010 -0400 +++ b/scripts/io/strread.m Sat Oct 23 02:29:35 2010 -0400 @@ -69,9 +69,11 @@ ## [@var{a}, @var{b}, @var{c}] = strread (@var{str}, "%s %s %f"); ## @end example ## -## The behaviour of @code{strread} can be changed via properties @var{prop} -## @itemize @code -## @item "commentstyle": +## The behaviour of @code{strread} can be changed via property-value +## pairs. The following properties are recognized: +## +## @table @code +## @item "commentstyle" ## Parts of @var{str} are considered comments and will be skipped. ## @var{value} is the comment style and can be any of the following. ## @itemize