release: 1.3.0

[lilypond.git] / lily / scores.cc

diff --git a/lily/scores.cc b/lily/scores.cc
index 23f85ce5bcc3911201030742c15efeeb0920601f..b3899c2d2e3f6a0e3ad0fe56c564ba911dde04b5 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -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,
@@ -32,10 +32,10 @@ void write_dependency_file (String fn, Array<String> targets,
   const int WRAPWIDTH = 65;
 
 
-  cout << _f ("writing dependency file: `%s\'...", fn) << '\n';
+  cout << _f ("Writing dependency file: `%s'...", fn) << '\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,19 +69,19 @@ 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];
 
       if (is_p->errorlevel_i_)
        {
-         is_p->warning (_("score contains errors; will not process it"));
+         is_p->warning (_("Score contains errors; will not process it"));
          exit_status_i_ |= 1;
        }
       else
        {
-         if (!lily_monitor->silent_b ("do_scores"))
+         if (flower_dstream && !flower_dstream->silent_b ("do_scores"))
              is_p->print ();
          is_p->process();
        }
@@ -105,13 +105,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 ("Search path: %s", global_path.str ().ch_C()));
+      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;
     }