Mercurial > octave-nkf
changeset 14402:cbcaf5602469
doc: Make spacing nicer for Strings chapter of manual.
* numbers.txi, strings.txi, int2str.m, bin2dec.m, blanks.m, cstrcat.m,
hex2dec.m, index.m pt-mat.cc(string_fill_char):
Make spacing nicer for Strings chapter of manual.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Thu, 23 Feb 2012 22:13:06 -0800 |
| parents | 2bce551c85b6 |
| children | 61cc4c715962 |
| files | doc/interpreter/numbers.txi doc/interpreter/strings.txi scripts/general/int2str.m scripts/strings/bin2dec.m scripts/strings/blanks.m scripts/strings/cstrcat.m scripts/strings/hex2dec.m scripts/strings/index.m src/pt-mat.cc |
| diffstat | 9 files changed, 47 insertions(+), 55 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/numbers.txi Thu Feb 23 21:23:49 2012 -0800 +++ b/doc/interpreter/numbers.txi Thu Feb 23 22:13:06 2012 -0800 @@ -773,9 +773,9 @@ @example @group x = ones (2, 2); -x (1, 1) = single (2) - @result{} x = 2 1 - 1 1 +x(1, 1) = single (2) + @result{} x = 2 1 + 1 1 @end group @end example
--- a/doc/interpreter/strings.txi Thu Feb 23 21:23:49 2012 -0800 +++ b/doc/interpreter/strings.txi Thu Feb 23 22:13:06 2012 -0800 @@ -187,14 +187,14 @@ @example @group -ischar(collection) - @result{} ans = 1 +ischar (collection) + @result{} 1 -ischar(collection) && isvector(collection) - @result{} ans = 0 +ischar (collection) && isvector (collection) + @result{} 0 -ischar("my string") && isvector("my string") - @result{} ans = 1 +ischar ("my string") && isvector ("my string") + @result{} 1 @end group @end example @@ -243,9 +243,8 @@ @example @group -char([98, 97, 110, 97, 110, 97]) - @result{} ans = - banana +char ([98, 97, 110, 97, 110, 97]) + @result{} banana @end group @end example @@ -256,16 +255,14 @@ @example @group -char("an apple", "two pears") - @result{} ans = - an apple +char ("an apple", "two pears") + @result{} an apple two pears @end group @group -strcat("oc", "tave", " is", " good", " for you") - @result{} ans = - octave is good for you +strcat ("oc", "tave", " is", " good", " for you") + @result{} octave is good for you @end group @end example @@ -275,18 +272,16 @@ @example @group -char("orange", "green", "", "red") - @result{} ans = - orange +char ("orange", "green", "", "red") + @result{} orange green red @end group @group -strvcat("orange", "green", "", "red") - @result{} ans = - orange +strvcat ("orange", "green", "", "red") + @result{} orange green red @end group @@ -299,21 +294,20 @@ @example @group -char(@{"red", "green", "", "blue"@}) - @result{} ans = - red - green +char (@{"red", "green", "", "blue"@}) + @result{} red + green - blue + blue @end group @group -strcat(@{"abc"; "ghi"@}, @{"def"; "jkl"@}) - @result{} ans = - @{ - [1,1] = abcdef - [2,1] = ghijkl - @} +strcat (@{"abc"; "ghi"@}, @{"def"; "jkl"@}) + @result{} + @{ + [1,1] = abcdef + [2,1] = ghijkl + @} @end group @end example @@ -323,17 +317,15 @@ @example @group -strcat(["dir1";"directory2"], ["/";"/"], ["file1";"file2"]) - @result{} ans = - dir1/file1 - directory2/file2 +strcat (["dir1";"directory2"], ["/";"/"], ["file1";"file2"]) + @result{} dir1/file1 + directory2/file2 @end group @group -cstrcat(["thirteen apples"; "a banana"], [" 5$";" 1$"]) - @result{} ans = - thirteen apples 5$ - a banana 1$ +cstrcat (["thirteen apples"; "a banana"], [" 5$";" 1$"]) + @result{} thirteen apples 5$ + a banana 1$ @end group @end example @@ -467,7 +459,7 @@ @example @group hex2dec ("FF") - @result{} ans = 255 + @result{} 255 @end group @end example
--- a/scripts/general/int2str.m Thu Feb 23 21:23:49 2012 -0800 +++ b/scripts/general/int2str.m Thu Feb 23 22:13:06 2012 -0800 @@ -32,7 +32,7 @@ ## 4 5 6 ## ## whos s -## @result{} s = +## @result{} ## Attr Name Size Bytes Class ## ==== ==== ==== ===== ===== ## s 2x7 14 char
--- a/scripts/strings/bin2dec.m Thu Feb 23 21:23:49 2012 -0800 +++ b/scripts/strings/bin2dec.m Thu Feb 23 22:13:06 2012 -0800 @@ -24,7 +24,7 @@ ## @example ## @group ## bin2dec ("1110") -## @result{} 14 +## @result{} 14 ## @end group ## @end example ##
--- a/scripts/strings/blanks.m Thu Feb 23 21:23:49 2012 -0800 +++ b/scripts/strings/blanks.m Thu Feb 23 22:13:06 2012 -0800 @@ -23,7 +23,7 @@ ## @example ## @group ## blanks (10); -## whos ans; +## whos ans ## @result{} ## Attr Name Size Bytes Class ## ==== ==== ==== ===== =====
--- a/scripts/strings/cstrcat.m Thu Feb 23 21:23:49 2012 -0800 +++ b/scripts/strings/cstrcat.m Thu Feb 23 22:13:06 2012 -0800 @@ -32,8 +32,8 @@ ## @group ## s = [ "ab"; "cde" ]; ## cstrcat (s, s, s) -## @result{} "ab ab ab " -## "cdecdecde" +## @result{} "ab ab ab " +## "cdecdecde" ## @end group ## @end example ## @seealso{strcat, char, strvcat}
--- a/scripts/strings/hex2dec.m Thu Feb 23 21:23:49 2012 -0800 +++ b/scripts/strings/hex2dec.m Thu Feb 23 22:13:06 2012 -0800 @@ -24,9 +24,9 @@ ## @example ## @group ## hex2dec ("12B") -## @result{} 299 +## @result{} 299 ## hex2dec ("12b") -## @result{} 299 +## @result{} 299 ## @end group ## @end example ##
--- a/scripts/strings/index.m Thu Feb 23 21:23:49 2012 -0800 +++ b/scripts/strings/index.m Thu Feb 23 22:13:06 2012 -0800 @@ -28,7 +28,7 @@ ## @example ## @group ## index ("Teststring", "t") -## @result{} 4 +## @result{} 4 ## @end group ## @end example ##
--- a/src/pt-mat.cc Thu Feb 23 21:23:49 2012 -0800 +++ b/src/pt-mat.cc Thu Feb 23 22:13:06 2012 -0800 @@ -1400,9 +1400,9 @@ @group\n\ string_fill_char (\"X\");\n\ [ \"these\"; \"are\"; \"strings\" ]\n\ - @result{} \"theseXX\"\n\ - \"areXXXX\"\n\ - \"strings\"\n\ + @result{} \"theseXX\"\n\ + \"areXXXX\"\n\ + \"strings\"\n\ @end group\n\ @end example\n\ \n\