Mercurial > octave-nkf
changeset 18466:a3611f3e80eb
maint: Merge away extra head
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 15 Feb 2014 13:36:01 -0800 |
| parents | 917f1af7d2e4 (diff) d6736ea0251a (current diff) |
| children | c5a101de2d88 |
| files | |
| diffstat | 1 files changed, 64 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/pr-output.cc Sat Feb 15 13:21:33 2014 -0800 +++ b/libinterp/corefcn/pr-output.cc Sat Feb 15 13:36:01 2014 -0800 @@ -3668,6 +3668,38 @@ set_output_prec_and_fw (5, 10); } + else if (arg == "shorte") + { + init_format_state (); + print_e = true; + set_output_prec_and_fw (5, 10); + } + else if (arg == "shortE") + { + init_format_state (); + print_e = true; + print_big_e = true; + set_output_prec_and_fw (5, 10); + } + else if (arg == "shortg") + { + init_format_state (); + print_g = true; + set_output_prec_and_fw (5, 10); + } + else if (arg == "shortG") + { + init_format_state (); + print_g = true; + print_big_e = true; + set_output_prec_and_fw (5, 10); + } + else if (arg == "shortEng") + { + init_format_state (); + print_eng = true; + set_output_prec_and_fw (5, 10); + } else if (arg == "long") { if (--argc > 0) @@ -3713,6 +3745,38 @@ set_output_prec_and_fw (15, 20); } + else if (arg == "longe") + { + init_format_state (); + print_e = true; + set_output_prec_and_fw (15, 20); + } + else if (arg == "longE") + { + init_format_state (); + print_e = true; + print_big_e = true; + set_output_prec_and_fw (15, 20); + } + else if (arg == "longg") + { + init_format_state (); + print_g = true; + set_output_prec_and_fw (15, 20); + } + else if (arg == "longG") + { + init_format_state (); + print_g = true; + print_big_e = true; + set_output_prec_and_fw (15, 20); + } + else if (arg == "longEng") + { + init_format_state (); + print_eng = true; + set_output_prec_and_fw (15, 20); + } else if (arg == "hex") { init_format_state ();