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 5fb7d198e1f1a0d7b62faed93099a1693631a358..ba80e75bb6ac6052cecd38c0e3b465ba4e47e51a 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;
@@ -36,15 +34,14 @@ Score_engraver::derived_mark () const
   if (pscore_)
     scm_gc_mark (pscore_->self_scm ());
   Score_translator::derived_mark ();
-  Engraver_group_engraver::derived_mark ();
+  Engraver_group::derived_mark ();
 }
 
-
 void
 Score_engraver::prepare (Moment m)
 {
   (void) m;
-  
+
   precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, DOWN);
 }
 
@@ -71,22 +68,23 @@ 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"));
     }
 
   pscore_ = new Paper_score (dynamic_cast<Output_def *> (context ()->get_output_def ()));
-  pscore_->unprotect (); 
+  pscore_->unprotect ();
 
   SCM props = updated_grob_properties (context (), ly_symbol2scm ("System"));
 
   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 ());
   
-  Engraver_group_engraver::initialize ();
+  system_ = pscore_->root_system ();
+  context ()->set_property ("rootSystem", system_->self_scm ());
+
+  Engraver_group::initialize ();
 }
 
 void
@@ -103,7 +101,7 @@ Score_engraver::one_time_step ()
   if (!to_boolean (context ()->get_property ("skipTypesetting")))
     {
       precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP);
-      Engraver_group_engraver::do_announces ();
+      Engraver_group::do_announces ();
     }
 
   precomputed_recurse_over_translators (context (), STOP_TRANSLATION_TIMESTEP, UP);
@@ -113,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];
 
@@ -138,42 +139,34 @@ 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)
 {
-  if (Engraver_group_engraver::try_music (m))
+  if (Engraver_group::try_music (m))
     return true;
 
   return false;
 }
 
 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 "
-               "means that you can make a breakpoint by creating a barline (assuming "
-               "that there are no beams or notes that prevent a breakpoint.) ",
-               /* create */ "System PaperColumn NonMusicalPaperColumn",
-               /* accept */ "break-event",
-               /* read */ "currentMusicalColumn currentCommandColumn verticallySpacedContexts",
-               /* write */ "");
+                     /* 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, 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 */
+                     "System ",
+
+                     /* accept */
+                     "break-event",
+                     
+                     /* read */
+                     "currentMusicalColumn "
+                     "currentCommandColumn "
+                     "verticallySpacedContexts",
+
+                     /* write */
+                     "");