Mercurial > octave
diff libinterp/corefcn/file-io.cc @ 29117:10a35049bad7
doc: Cleanup Texinfo macros use in documentation.
* macros.texi: Delete @xbackslashchar macro which was needed for Texinfo
versions < 5.1 (2013 release date). Alphabetize macros. Document macros
more clearly.
* func.txi, data.cc, error.cc, file-io.cc, regexp.cc, strfns.cc, utils.cc,
pt-eval.cc, beep.m, dlmwrite.m, strread.m, textread.m, asctime.m, ctime.m:
Replace "@xbackslashchar" with just "@backslashchar".
* graphics.cc (Fwaitfor): Replace '\' in @qcode macro with @backslashchar.
* input.cc (FPS1): Replace '\' in @qcode macro with @backslashchar.
Use single quotes in @example block to avoid "\\" construct.
* jsonencode.cc (Fjsonencode): Replace '\' in @qcode macro with @backslashchar.
* sysdep.cc (Fwinqueryreg): Replace '\' in @qcode macro with @backslashchar.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 27 Nov 2020 17:01:47 -0800 |
parents | e5a1087f15d5 |
children | 8f67ad8b3103 |
line wrap: on
line diff
--- a/libinterp/corefcn/file-io.cc Fri Nov 27 13:49:11 2020 -0500 +++ b/libinterp/corefcn/file-io.cc Fri Nov 27 17:01:47 2020 -0800 @@ -834,7 +834,7 @@ The optional output returns the number of bytes written to the file. Implementation Note: For compatibility with @sc{matlab}, escape sequences in -the template string (e.g., @qcode{"@xbackslashchar{}n"} => newline) are +the template string (e.g., @qcode{"@backslashchar{}n"} => newline) are expanded even when the template string is defined with single quotes. @seealso{fputs, fdisp, fwrite, fscanf, printf, sprintf, fopen} @end deftypefn */) @@ -857,7 +857,7 @@ @end ifclear Implementation Note: For compatibility with @sc{matlab}, escape sequences in -the template string (e.g., @qcode{"@xbackslashchar{}n"} => newline) are +the template string (e.g., @qcode{"@backslashchar{}n"} => newline) are expanded even when the template string is defined with single quotes. @seealso{fprintf, sprintf, scanf} @end deftypefn */) @@ -934,7 +934,7 @@ string, automatically sized to hold all of the items converted. Implementation Note: For compatibility with @sc{matlab}, escape sequences in -the template string (e.g., @qcode{"@xbackslashchar{}n"} => newline) are +the template string (e.g., @qcode{"@backslashchar{}n"} => newline) are expanded even when the template string is defined with single quotes. @seealso{printf, fprintf, sscanf} @end deftypefn */) @@ -1446,12 +1446,12 @@ @item @qcode{"EndOfLine"} @var{value} can be either an empty or one character specifying the end-of-line character, or the pair -@qcode{"@xbackslashchar{}r@xbackslashchar{}n"} (CRLF). +@qcode{"@backslashchar{}r@backslashchar{}n"} (CRLF). In the latter case, any of -@qcode{"@xbackslashchar{}r"}, @qcode{"@xbackslashchar{}n"} or -@qcode{"@xbackslashchar{}r@xbackslashchar{}n"} is counted as a (single) +@qcode{"@backslashchar{}r"}, @qcode{"@backslashchar{}n"} or +@qcode{"@backslashchar{}r@backslashchar{}n"} is counted as a (single) newline. If no value is given, -@qcode{"@xbackslashchar{}r@xbackslashchar{}n"} is used. +@qcode{"@backslashchar{}r@backslashchar{}n"} is used. @c If set to "" (empty string) EOLs are ignored as delimiters and added @c to whitespace. @@ -1489,7 +1489,7 @@ @c Note: the next line specifically has a newline which generates a space @c in the output of qcode, but keeps the next line < 80 characters. @qcode{" -@xbackslashchar{}b@xbackslashchar{}r@xbackslashchar{}n@xbackslashchar{}t"} +@backslashchar{}b@backslashchar{}r@backslashchar{}n@backslashchar{}t"} (note the space). Unless whitespace is set to @qcode{""} (empty) AND at least one @qcode{"%s"} format conversion specifier is supplied, a space is always part of whitespace.