release: 1.3.42

[lilypond.git] / lily / scores.cc

diff --git a/lily/scores.cc b/lily/scores.cc
index 9b2a80bee33760cfbfdb4cb993dc00d0e3352aac..e0ff3ffc1878202f85bf7d2b5377aaf92d43c730 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -3,27 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <fstream.h>
 #include "main.hh"
 #include "score.hh"
 #include "string.hh"
 #include "paper-def.hh"
-#include "header.hh"
+#include "scope.hh"
 #include "debug.hh"
 #include "parray.hh"
 #include "file-path.hh"
 #include "file-results.hh"
 #include "my-lily-parser.hh"
 #include "source.hh"
-#include "lookup.hh"
+#include "lily-version.hh"
 
 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,12 +32,12 @@ 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 " << get_version_str ()  << '\n';
+  f << "# Automatically generated by " << gnu_lilypond_version_str ()  << '\n';
   String out;
   for (int i=0; i < targets.size (); i ++)
      out += targets[i] + " ";
@@ -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 (!monitor->silent_b ("do_scores"))
+         if (flower_dstream && !flower_dstream->silent_b ("do_scores"))
              is_p->print ();
          is_p->process();
        }
@@ -92,11 +92,8 @@ do_scores()
 void
 clear_scores ()
 {
-  for (int i=0; i < score_global_array.size(); i++)
-    {
-      delete score_global_array[i];
-    }
-  score_global_array.clear();
+  junk_pointer_array (score_global_array);
+
   inclusion_global_array.clear ();
   delete  header_global_p ;
   header_global_p =0; 
@@ -108,12 +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 ("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;
     }
 
@@ -125,16 +123,6 @@ do_one_file (String init_str, String file_str)
     parser.set_version_check (version_ignore_global_b);
     parser.parse_file (init_str, file_str);
 
-    /*
-       urg
-       when calling {Ps,Tex}_lookup::paper_stream_p (),
-       it *appears* (aaargh, latest gdb on ppc is gdb 4.16.97)
-       that (global_lookup_l's) 
-       paper_l_ is invalid but not NULL
-       (deleted without being reset maybe?)
-     */
-    global_lookup_l->paper_l_ = parser.default_paper_p ();
-
     if (parser.error_level_i_)
       {
        exit_status_i_  = 1;