release: 1.3.93

[lilypond.git] / lily / scores.cc

diff --git a/lily/scores.cc b/lily/scores.cc
index d29848fcbc76dc71ed4be81d0f76f8b2453e69bc..7d611e494aa3489f1e7d20a5e925cfeab8ac66d6 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <fstream.h>
 #include "main.hh"
@@ -23,7 +23,7 @@ Sources* source_global_l = 0;
 Array<String> inclusion_global_array;
 Array<String> target_str_global_array;
 Link_array<Score> score_global_array;
-Header * header_global_p;
+Scope * header_global_p;
 
 
 void write_dependency_file (String fn, Array<String> targets,
@@ -31,11 +31,11 @@ void write_dependency_file (String fn, Array<String> targets,
 {
   const int WRAPWIDTH = 65;
 
-
-  cout << _f ("Writing dependency file: `%s'...", fn) << '\n';
+  progress_indication (_f ("Writing dependency file: `%s'...", fn.ch_C ()));
+  progress_indication ("\n");
   ofstream f (fn.ch_C ());
   if (!f)
-    warning (_f ("Can't open file: `%s'", fn));
+    warning (_f ("can't open file: `%s'", fn));
 
   f << "# Automatically generated by " << gnu_lilypond_version_str ()  << '\n';
   String out;
@@ -69,7 +69,7 @@ void
 do_scores()
 {
   if (!header_global_p)
-    header_global_p = new Header;
+    header_global_p = new Scope;
   for (int i=0; i < score_global_array.size(); i++)
     {
       Score* is_p = score_global_array[i];
@@ -81,8 +81,6 @@ do_scores()
        }
       else
        {
-         if (!lily_monitor->silent_b ("do_scores"))
-             is_p->print ();
          is_p->process();
        }
     }
@@ -105,13 +103,13 @@ do_one_file (String init_str, String file_str)
 {
   if (init_str.length_i () && global_path.find (init_str).empty_b ())
     {
-      warning (_f ("Can't find file: `%s'", init_str));
+      warning (_f ("can't find file: `%s'", init_str));
       warning (_f ("(search path: `%s')", global_path.str ().ch_C()));
       return;
     }
   if ((file_str != "-") && global_path.find (file_str).empty_b ())
     {
-      warning (_f ("Can't find file: `%s'", file_str));
+      warning (_f ("can't find file: `%s'", file_str));
       return;
     }
 
@@ -120,7 +118,9 @@ do_one_file (String init_str, String file_str)
   source_global_l->set_path (&global_path);
   {
     My_lily_parser parser (source_global_l);
-    parser.set_version_check (version_ignore_global_b);
+    parser.set_version_check (false);
+    progress_indication (_f ("Now processing: `%s'", file_str.ch_C ()));
+    progress_indication ("\n");
     parser.parse_file (init_str, file_str);
 
     if (parser.error_level_i_)