new file.

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

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 76ecf79872545323a3d145e54feca3974fe7d0e2..7d44b9495ac0309fa90dfc518c3710b3a294e992 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -8,7 +8,7 @@
 
 #include "debug.hh"
 
-#include "line-of-score.hh"
+#include "system.hh"
 #include "item.hh"
 #include "score-engraver.hh"
 #include "paper-score.hh"
@@ -46,10 +46,10 @@ Score_engraver::make_columns ()
   
       command_column_l_->set_grob_property ("breakable", SCM_BOOL_T);
 
-      Grob_info i1 (command_column_l_, SCM_EOL);
+      Grob_info i1 (command_column_l_);
       i1.origin_trans_l_ = this;
 
-      Grob_info i2 (musical_column_l_, SCM_EOL);
+      Grob_info i2 (musical_column_l_);
       i2.origin_trans_l_ = this;
 
       announce_grob (i1);
@@ -90,9 +90,9 @@ Score_engraver::initialize ()
   pscore_p_ = new Paper_score;
   pscore_p_->paper_l_ = dynamic_cast<Paper_def*> (output_def_l_);
 
-  SCM props = get_property ("LineOfScore");
+  SCM props = get_property ("System");
 
-  pscore_p_->typeset_line (new Line_of_score (props));
+  pscore_p_->typeset_line (new System (props));
   
   make_columns ();
   scoreline_l_ = pscore_p_->line_l_;
@@ -124,7 +124,6 @@ Score_engraver::one_time_step ()
       process_music ();
       announces ();
     }
-
   
   stop_translation_timestep ();
   check_removal ();
@@ -175,7 +174,7 @@ Score_engraver::typeset_all ()
                if (elem_p->immutable_property_alist_ == SCM_EOL)
                  ; // gdb hook
                else
-                 ::warning (_f ("unbound spanner `%s'", s->name ().ch_C ()));
+                 elem_p->warning (_f ("unbound spanner `%s'", s->name ().ch_C ()));
              }
          } while (flip (&d) != LEFT);
        }
@@ -274,7 +273,6 @@ Score_engraver::try_music (Music*r)
 /*
   TODO:  use property Score.breakForbidden = #t
  */
-
 void
 Score_engraver::forbid_breaks ()
 {
@@ -304,7 +302,7 @@ Score_engraver::acknowledge_grob (Grob_info gi)
 
 
 ENTER_DESCRIPTION(Score_engraver,
-/* descr */       "Top level engraver. Takes care of generating columns and the complete  system (ie. LineOfScore)
+/* descr */       "Top level engraver. Takes care of generating columns and the complete  system (ie. System)
 
 
 This engraver decides whether a column is breakable. The default is
@@ -316,7 +314,7 @@ that there are no beams or notes that prevent a breakpoint.)
 
 
 ",
-/* creats*/       "LineOfScore PaperColumn NonMusicalPaperColumn",
+/* creats*/       "System PaperColumn NonMusicalPaperColumn",
 /* acks  */       "note-spacing-interface staff-spacing-interface",
 /* reads */       "currentMusicalColumn currentCommandColumn",
 /* write */       "");