release: 1.0.15

[lilypond.git] / lily / score-engraver.cc

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index c5350418efa622c5e552380c47ea23fdae424d07..1b30731fd710d69d6e5f80516fb1e6adf5433d2d 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -16,7 +16,6 @@
 #include "score-column.hh"
 #include "command-request.hh"
 #include "paper-def.hh"
-#include "main.hh"
 
 
 Score_engraver::Score_engraver()
@@ -268,23 +267,8 @@ void
 Score_engraver::do_add_processing ()
 {
   Translator_group::do_add_processing ();
-  //assert (output_def_l_->is_type_b (Paper_def::static_name ()));
-  // urg
-  pscore_p_ = output_def_l_->paper_score_p ();
-  //  assert (pscore_p_);
-  // urg, via parser a Paper_def gets constructed
-  // this should never happen, but can't be prevented (Paper_def can't be
-  // abstract bo virtual_copy_cons etc.
-  if (!pscore_p_)
-    {
-      printf ("\nBRAAK\n");
-      output_def_l_ = global_paper_l->paper_l ()->clone ();
-      //      pscore_p_ = output_def_l_->paper_score_p ();
-      pscore_p_ = global_paper_l->paper_score_p ();
-      pscore_p_->paper_l_ = global_paper_l->paper_l ();
-    }
-  else
-    pscore_p_->paper_l_ = output_def_l_->paper_l ();
-  assert (pscore_p_->paper_l_);
+  assert (output_def_l_->is_type_b (Paper_def::static_name ()));
   assert (!daddy_trans_l_);
+  pscore_p_ = new Paper_score;
+  pscore_p_->paper_l_ = (Paper_def*)output_def_l_;
 }