release: 1.0.1

[lilypond.git] / mi2mu / mudela-stream.cc

diff --git a/mi2mu/mudela-stream.cc b/mi2mu/mudela-stream.cc
index 8ec278983e631ccb3c8ba12149c817e10a5e27e6..0f5ab11b8f44c55ccb4b1e47fca5ad2951770baf 100644 (file)
--- a/mi2mu/mudela-stream.cc
+++ b/mi2mu/mudela-stream.cc
@@ -3,7 +3,7 @@
 //
 // source file of the LilyPond music typesetter
 //
-// (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+// (c)  1997--1998, 1998 Jan Nieuwenhuizen <janneke@gnu.org>
 
 #include <assert.h>
 #include <time.h>
@@ -11,6 +11,7 @@
 #include "mi2mu-global.hh"
 #include "mudela-item.hh"
 #include "mudela-stream.hh"
+#include "string-convert.hh"
 
 extern String filename_str_g;
 
@@ -33,21 +34,21 @@ Mudela_stream::~Mudela_stream()
 {
   delete os_p_;
   if  (indent_i_)
-       warning ("lily indent level: " + String (indent_i_));
+    warning (_f ("lily indent level: %d", indent_i_));
 }
 
 Mudela_stream&
-Mudela_stream::operator << (String str)
+Mudela_stream::operator << (Scalar s)
 {
   static String word_sep_str = "{} \t\n";
-  while  (str.length_i()) 
+  while  (s.length_i())
     {
-       int i = str.index_any_i (word_sep_str) + 1;
-       if  (!i)
-           i = str.length_i();
-       String word = str.left_str (i);
-       str = str.mid_str (i, str.length_i());
-       output_wrapped (word);
+      int i = s.index_any_i (word_sep_str) + 1;
+      if  (!i)
+       i = s.length_i();
+      String word = s.left_str (i);
+      s = s.cut_str (i, s.length_i());
+      output_wrapped (word);
     }
   return *this;
 }
@@ -63,7 +64,7 @@ Mudela_stream::operator << (Mudela_item& mudela_item_r)
 void
 Mudela_stream::handle_pending_indent()
 {
-  *os_p_ << String ('\t', pending_indent_i_);
+  *os_p_ << String_convert::char_str ('\t', pending_indent_i_);
   column_i_ += pending_indent_i_ * INDENT_i;
   pending_indent_i_ = 0;
 }
@@ -71,77 +72,87 @@ Mudela_stream::handle_pending_indent()
 void
 Mudela_stream::header()
 {
-  *os_p_ << "% Creator: " << mi2mu_version_str() << "\n";
-  *os_p_ << "% Automatically generated, at ";
-  time_t t (time (0));
-  *os_p_ << ctime (&t);
-  *os_p_ << "% from input file: ";
+  *os_p_ << _ ("% Creator: ");
+  if (no_timestamps_b_g)
+    *os_p_ << "GNU LilyPond\n"; 
+  else
+    *os_p_ << mi2mu_version_str() << '\n';
+  *os_p_ << _ ("% Automatically generated");
+  if (no_timestamps_b_g)
+    *os_p_ << ".\n";
+  else
+    {
+      *os_p_ << _ (", at ");
+      time_t t (time (0));
+      *os_p_ << ctime (&t) << "%\n";
+    }
+  *os_p_ << _ ("% from input file: ");
   //  *os_p_ << midi_parser_l_g->filename_str_;
   // ugh
   *os_p_ << filename_str_g;
-  *os_p_ << "\n\n";    
+  *os_p_ << "\n\n";
   // ugh
-  *os_p_ << "\\version \"0.1.2\";\n";
+  *os_p_ << "\\version \"1.0.0\";\n";
 }
 
 void
 Mudela_stream::open()
 {
-  os_p_ = new ofstream (filename_str_);
+  os_p_ = new ofstream (filename_str_.ch_C ());
   if  (!*os_p_)
-       error  ("can't open: `" + filename_str_ + "\'");
+    error (_f ("can't open file: `%s\'",  filename_str_));
 }
 
 void
 Mudela_stream::output (String str)
 {
-  for  (int i = 0; i < str.length_i(); i++) 
+  for  (int i = 0; i < str.length_i(); i++)
     {
-       char c = str[ i ];
-       switch  (c) 
-         {
-           case '{' :
-           case '<' :
-               handle_pending_indent();
-               if  (column_i_ == indent_i_ * INDENT_i)
-                   output ("\t");
-               indent_i_++;
-               *os_p_ << c;
-               column_i_++;
-               break;
-           case '}' :
-           case '>' :
-               assert (indent_i_);
-               indent_i_--;
-               if  (pending_indent_i_)
-                   pending_indent_i_--;
-               handle_pending_indent();
-               *os_p_ << c;
-               column_i_++;
-               break;
-           case '%' :
-               handle_pending_indent();
-               comment_mode_b_ = true;
-               *os_p_ << c;
-               column_i_++;
-               break;
-           case '\t' :
-               handle_pending_indent();
-               *os_p_ << c;
-               column_i_ += INDENT_i;
-               break;
-           case '\n' :
-               *os_p_ << endl;
-               pending_indent_i_ = indent_i_;
-               column_i_ = 0;
-               comment_mode_b_ = false;
-               break;
-           default :
-               handle_pending_indent();
-               *os_p_ << c;
-               column_i_++;
-               break;
-       }       
+      char c = str[ i ];
+      switch  (c)
+       {
+       case '{' :
+       case '<' :
+         handle_pending_indent();
+         if  (column_i_ == indent_i_ * INDENT_i)
+           output ("\t");
+         indent_i_++;
+         *os_p_ << c;
+         column_i_++;
+         break;
+       case '}' :
+       case '>' :
+         assert (indent_i_);
+         indent_i_--;
+         if  (pending_indent_i_)
+           pending_indent_i_--;
+         handle_pending_indent();
+         *os_p_ << c;
+         column_i_++;
+         break;
+       case '%' :
+         handle_pending_indent();
+         comment_mode_b_ = true;
+         *os_p_ << c;
+         column_i_++;
+         break;
+       case '\t' :
+         handle_pending_indent();
+         *os_p_ << c;
+         column_i_ += INDENT_i;
+         break;
+       case '\n' :
+         *os_p_ << endl;
+         pending_indent_i_ = indent_i_;
+         column_i_ = 0;
+         comment_mode_b_ = false;
+         break;
+       default :
+         handle_pending_indent();
+         *os_p_ << c;
+         column_i_++;
+         break;
+       }
     }
 }
 
@@ -149,27 +160,25 @@ void
 Mudela_stream::output_wrapped (String str)
 {
   // enough room left -> doit
-  if  (column_i_ + str.length_i() <= wrap_column_i_) 
+  if  (column_i_ + str.length_i() <= wrap_column_i_)
     {
-       output (str);
-       return;
+      output (str);
+      return;
     }
 
   // we're at BOL already; this will never fit -> doit
-  if  (column_i_ == indent_i_ * INDENT_i) 
+  if  (column_i_ == indent_i_ * INDENT_i)
     {
-       output (str);
-       return;
+      output (str);
+      return;
     }
-  
+
   // ok, let's wrap
   // preserve comment mode
   if  (comment_mode_b_)
-       output (String ("\n%"));
-  else 
-       output (String ("\n"));
-  
+    output (String ("\n%"));
+  else
+    output (String ("\n"));
+
   output (str);
 }
-
-