* stepmake/stepmake/generic-vars.make: new function absdir.

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

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 281416068c6bbdb46ee55bebc0b66c33451f51db..7b9c5ef282e546148d9adc078dc4d1ba474006fa 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -3,27 +3,25 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "all-font-metrics.hh"
-#include "afm.hh"
-#include "warn.hh"
-#include "main.hh"
-#include "system.hh"
 #include "score-engraver.hh"
-#include "paper-score.hh"
-#include "paper-column.hh"
-#include "output-def.hh"
+
+#include "all-font-metrics.hh"
 #include "axis-group-interface.hh"
 #include "context-def.hh"
 #include "global-context.hh"
+#include "international.hh"
+#include "main.hh"
 #include "open-type-font.hh"
+#include "output-def.hh"
 #include "paper-column-engraver.hh"
+#include "paper-column.hh"
+#include "paper-score.hh"
+#include "system.hh"
+#include "warn.hh"
 
-/*
-  TODO: the column creation logic is rather hairy. Revise it.
-*/
 Score_engraver::Score_engraver ()
 {
   system_ = 0;
@@ -70,7 +68,7 @@ Score_engraver::initialize ()
             + "\n"
             + _ ("Music font has not been installed properly.")
             + "\n"
-            + _f ("Search path `%s'", global_path.to_string ().to_str0 ())
+            + _f ("Search path `%s'", global_path.to_string ().c_str ())
             + "\n"
             + _ ("Aborting"));
     }
@@ -82,6 +80,7 @@ Score_engraver::initialize ()
 
   Object_key const *sys_key = context ()->get_grob_key ("System");
   pscore_->typeset_system (new System (props, sys_key));
+  
   system_ = pscore_->root_system ();
   context ()->set_property ("rootSystem", system_->self_scm ());
 
@@ -112,15 +111,15 @@ Score_engraver::one_time_step ()
 void
 Score_engraver::announce_grob (Grob_info info)
 {
-  announce_infos_.push (info);
+  announce_infos_.push_back (info);
   pscore_->root_system ()->typeset_grob (info.grob ());
-  elems_.push (info.grob ());
+  elems_.push_back (info.grob ());
 }
 
 void
 Score_engraver::typeset_all ()
 {
-  for (int i = 0; i < elems_.size (); i++)
+  for (vsize i = 0; i < elems_.size (); i++)
     {
       Grob *elem = elems_[i];