Mercurial > hg > octave-nkf

changeset 3568:58549b931ad5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-02-03 10:21:54 by jwe]
author jwe
date Thu, 03 Feb 2000 10:21:56 +0000
parents dd8998699aa8
children 3796444c54a3
files src/ChangeLog src/DLD-FUNCTIONS/besselj.cc src/DLD-FUNCTIONS/dassl.cc src/DLD-FUNCTIONS/fsolve.cc src/DLD-FUNCTIONS/lsode.cc src/DLD-FUNCTIONS/quad.cc src/pr-output.cc
diffstat 7 files changed, 34 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2000-02-03  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* DLD-FUNCTIONS/dassl.cc (print_dassl_option_list): Use stream
+	manipulators instead of GNU iostream-specific form function.
+	* DLD-FUNCTIONS/fsolve.cc (print_fsolve_option_list): Ditto.
+	* DLD-FUNCTIONS/lsode.cc (print_lsode_option_list): Ditto.
+	* DLD-FUNCTIONS/quad.cc (print_quad_option_list): Ditto.
+	* pr-output.cc (pr_scale_header): Ditto.
+
 	* sighandlers.h: Include signal.h here.
 	* sighandlers.cc: Not here.
 
--- a/src/DLD-FUNCTIONS/besselj.cc
+++ b/src/DLD-FUNCTIONS/besselj.cc
@@ -257,7 +257,7 @@
  = 2) kind.\n\
 @end table\n\
 \n\
-If thet argumemt @var{opt} is supplied, the result is scaled by the\n\
+If the argument @var{opt} is supplied, the result is scaled by the\n\
 @code{exp (-I*@var{x})} for @var{k} = 1 or @code{exp (I*@var{x})} for\n\
  @var{k} = 2.\n\
 \n\
--- a/src/DLD-FUNCTIONS/dassl.cc
+++ b/src/DLD-FUNCTIONS/dassl.cc
@@ -315,11 +315,11 @@
   const char *keyword;
   while ((keyword = list->keyword) != 0)
     {
-      os << std::setw (40)
-	 << std::setfill (' ')
-	 << std::setiosflags (std::ios::left)
-	 << "  " << keyword << " "
-	 << std::resetiosflags (std::ios::left);
+      os << "  "
+	 << std::setiosflags (std::ios::left) << std::setw (40)
+	 << keyword
+	 << std::resetiosflags (std::ios::left)
+	 << " ";
 
       double val = (dassl_opts.*list->d_get_fcn) ();
       if (val < 0.0)
--- a/src/DLD-FUNCTIONS/fsolve.cc
+++ b/src/DLD-FUNCTIONS/fsolve.cc
@@ -255,11 +255,11 @@
   const char *keyword;
   while ((keyword = list->keyword) != 0)
     {
-      os << std::setw (40)
-	 << std::setfill (' ')
-	 << std::setiosflags (std::ios::left)
-	 << "  " << keyword << " "
-	 << std::resetiosflags (std::ios::left);
+      os << "  "
+	 << std::setiosflags (std::ios::left) << std::setw (40)
+	 << keyword
+	 << std::resetiosflags (std::ios::left)
+	 << " ";
 
       double val = (fsolve_opts.*list->d_get_fcn) ();
       if (val < 0.0)
--- a/src/DLD-FUNCTIONS/lsode.cc
+++ b/src/DLD-FUNCTIONS/lsode.cc
@@ -375,11 +375,11 @@
   const char *keyword;
   while ((keyword = list->keyword) != 0)
     {
-      os << std::setw (40)
-	 << std::setfill (' ')
-	 << std::setiosflags (std::ios::left)
-	 << "  " << keyword << " "
-	 << std::resetiosflags (std::ios::left);
+      os << "  "
+	 << std::setiosflags (std::ios::left) << std::setw (40)
+	 << keyword
+	 << std::resetiosflags (std::ios::left)
+	 << " ";
 
       if (list->d_get_fcn)
 	{
--- a/src/DLD-FUNCTIONS/quad.cc
+++ b/src/DLD-FUNCTIONS/quad.cc
@@ -335,11 +335,11 @@
   const char *keyword;
   while ((keyword = list->keyword) != 0)
     {
-      os << std::setw (40)
-	 << std::setfill (' ')
-	 << std::setiosflags (std::ios::left)
-	 << "  " << keyword << " "
-	 << std::resetiosflags (std::ios::left);
+      os << "  "
+	 << std::setiosflags (std::ios::left) << std::setw (40)
+	 << keyword
+	 << std::resetiosflags (std::ios::left)
+	 << " ";
 
       double val = (quad_opts.*list->d_get_fcn) ();
       if (val < 0.0)
--- a/src/pr-output.cc
+++ b/src/pr-output.cc
@@ -1121,7 +1121,12 @@
 {
   if (Vfixed_point_format && scale != 1.0)
     {
-      os.form ("  %-8.1e *\n", scale);
+      os << "  "
+	 << std::setw (8) << std::setprecision (1)
+	 << std::setiosflags (std::ios::scientific|std::ios::left)
+	 << scale
+	 << std::resetiosflags (std::ios::scientific|std::ios::left)
+	 << " *\n";
 
       if (! compact_format)
 	os << "\n";