release: 1.0.15

[lilypond.git] / lily / scores.cc

diff --git a/lily/scores.cc b/lily/scores.cc
index 257ead14c11e30f20e44e4fabec7b3d6a55b1996..f41666b0ad7f8d8d202ac43e193c0890485f1c95 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -10,13 +10,14 @@
 #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"
 
 Sources* source_global_l = 0;
 Array<String> inclusion_global_array;
@@ -124,6 +125,16 @@ 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;