Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index b5823267869f2376b1b08f85005e59ef2818ed95..ba80e75bb6ac6052cecd38c0e3b465ba4e47e51a 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -111,15 +111,18 @@ Score_engraver::one_time_step ()
 void
 Score_engraver::announce_grob (Grob_info info)
 {
-  announce_infos_.push (info);
-  pscore_->root_system ()->typeset_grob (info.grob ());
-  elems_.push (info.grob ());
+  Engraver_group::announce_grob (info);
+  if (info.start_end () == START)
+    {
+      pscore_->root_system ()->typeset_grob (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];
 
@@ -136,20 +139,6 @@ Score_engraver::get_output ()
   return o->self_scm ();
 }
 
-/*
-  UGH UGH
-*/
-void
-Score_engraver::forbid_breaks ()
-{
-  for (SCM s = simple_trans_list_; scm_is_pair (s); s = scm_cdr (s))
-    {
-      Translator *tr = unsmob_translator (scm_car (s));
-      if (Paper_column_engraver *pce = dynamic_cast<Paper_column_engraver *> (tr))
-       pce->forbid_breaks ();
-    }
-}
-
 bool
 Score_engraver::try_music (Music *m)
 {
@@ -163,9 +152,9 @@ ADD_TRANSLATOR_GROUP (Score_engraver,
                      /* doc */ "Top level engraver. Takes care of generating columns and the complete  system (ie. System) "
                      "\n\n "
                      "This engraver decides whether a column is breakable. The default is "
-                     "that a column is always breakable. However, when every Bar_engraver "
-                     "that does not have a barline at a certain point will call "
-                     "Score_engraver::forbid_breaks to stop linebreaks.  In practice, this "
+                     "that a column is always breakable. However, every Bar_engraver "
+                     "that does not have a barline at a certain point will set "
+                      "forbidBreaks to stop linebreaks.  In practice, this "
                      "means that you can make a breakpoint by creating a barline (assuming "
                      "that there are no beams or notes that prevent a breakpoint.) ",
                      /* create */
@@ -173,9 +162,11 @@ ADD_TRANSLATOR_GROUP (Score_engraver,
 
                      /* accept */
                      "break-event",
+                     
                      /* read */
                      "currentMusicalColumn "
                      "currentCommandColumn "
                      "verticallySpacedContexts",
+
                      /* write */
                      "");