Mercurial > octave

comparison libinterp/corefcn/pr-output.cc @ 21751:b571fc85953f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use two spaces after period to indicate sentence break.
author Rik <rik@octave.org>
date Thu, 19 May 2016 18:48:52 -0700
parents 176536b15d68
children 2aef506f3fec
comparison
equal deleted inserted replaced
21750:6720e5a220ba 21751:b571fc85953f
1980 if (! Vcompact_format) 1980 if (! Vcompact_format)
1981 os << "\n"; 1981 os << "\n";
1982 1982
1983 pr_scale_header (os, scale); 1983 pr_scale_header (os, scale);
1984 1984
1985 // kluge. Get the true width of a number. 1985 // kluge. Get the true width of a number.
1986 int zero_fw; 1986 int zero_fw;
1987 1987
1988 { 1988 {
1989 std::ostringstream tmp_oss; 1989 std::ostringstream tmp_oss;
1990 pr_float (tmp_oss, 0.0, fw, scale); 1990 pr_float (tmp_oss, 0.0, fw, scale);
2400 if (! Vcompact_format) 2400 if (! Vcompact_format)
2401 os << "\n"; 2401 os << "\n";
2402 2402
2403 pr_scale_header (os, scale); 2403 pr_scale_header (os, scale);
2404 2404
2405 // kluge. Get the true width of a number. 2405 // kluge. Get the true width of a number.
2406 int zero_fw; 2406 int zero_fw;
2407 2407
2408 { 2408 {
2409 std::ostringstream tmp_oss; 2409 std::ostringstream tmp_oss;
2410 pr_complex (tmp_oss, Complex (0.0), r_fw, i_fw, scale); 2410 pr_complex (tmp_oss, Complex (0.0), r_fw, i_fw, scale);
2884 void 2884 void
2885 octave_print_internal (std::ostream& os, const Array<std::string>& nda, 2885 octave_print_internal (std::ostream& os, const Array<std::string>& nda,
2886 bool pr_as_read_syntax, int /* extra_indent */) 2886 bool pr_as_read_syntax, int /* extra_indent */)
2887 { 2887 {
2888 // FIXME: this mostly duplicates the code in the print_nd_array<> 2888 // FIXME: this mostly duplicates the code in the print_nd_array<>
2889 // function. Can fix this with std::is_same from C++11. 2889 // function. Can fix this with std::is_same from C++11.
2890 2890
2891 if (nda.is_empty ()) 2891 if (nda.is_empty ())
2892 print_empty_nd_array (os, nda.dims (), pr_as_read_syntax); 2892 print_empty_nd_array (os, nda.dims (), pr_as_read_syntax);
2893 else if (nda.numel () == 1) 2893 else if (nda.numel () == 1)
2894 { 2894 {
3153 /* static */ inline void 3153 /* static */ inline void
3154 octave_print_internal_template (std::ostream& os, const intNDArray<T>& nda, 3154 octave_print_internal_template (std::ostream& os, const intNDArray<T>& nda,
3155 bool pr_as_read_syntax, int extra_indent) 3155 bool pr_as_read_syntax, int extra_indent)
3156 { 3156 {
3157 // FIXME: this mostly duplicates the code in the print_nd_array<> 3157 // FIXME: this mostly duplicates the code in the print_nd_array<>
3158 // function. Can fix this with std::is_same from C++11. 3158 // function. Can fix this with std::is_same from C++11.
3159 3159
3160 if (nda.is_empty ()) 3160 if (nda.is_empty ())
3161 print_empty_nd_array (os, nda.dims (), pr_as_read_syntax); 3161 print_empty_nd_array (os, nda.dims (), pr_as_read_syntax);
3162 else if (nda.numel () == 1) 3162 else if (nda.numel () == 1)
3163 octave_print_internal_template (os, nda(0), pr_as_read_syntax); 3163 octave_print_internal_template (os, nda(0), pr_as_read_syntax);
3927 @end example\n\ 3927 @end example\n\
3928 \n\ 3928 \n\
3929 @item short eng\n\ 3929 @item short eng\n\
3930 @itemx long eng\n\ 3930 @itemx long eng\n\
3931 Identical to @samp{short e} or @samp{long e} but displays the value\n\ 3931 Identical to @samp{short e} or @samp{long e} but displays the value\n\
3932 using an engineering format, where the exponent is divisible by 3. For\n\ 3932 using an engineering format, where the exponent is divisible by 3. For\n\
3933 example, with the @samp{short eng} format, @code{10 * pi} is displayed as\n\ 3933 example, with the @samp{short eng} format, @code{10 * pi} is displayed as\n\
3934 @code{31.4159e+00}.\n\ 3934 @code{31.4159e+00}.\n\
3935 \n\ 3935 \n\
3936 @item long G\n\ 3936 @item long G\n\
3937 @itemx short G\n\ 3937 @itemx short G\n\