patch::: 1.1.52.mb2

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

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index c94779bc3a7cbb67424afa6a109780f9807fa992..3d73c012c4a9ce5bc2d890ffd12f9e880eafd103 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "super-element.hh"
@@ -49,21 +49,26 @@ Score_engraver::finish()
   removal_processing();
 }
 
+/*
+  use start/finish?
+ */
 void
-Score_engraver::do_creation_processing()
+Score_engraver::do_creation_processing ()
 {
   scoreline_l_ = pscore_p_->line_l_;
-  scoreline_l_->set_bounds(LEFT,get_staff_info().command_pcol_l ());
-  command_column_l_->breakable_b_ = true;
+  scoreline_l_->set_bounds(LEFT,command_column_l_);
+  command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T);
+
   Engraver_group_engraver::do_creation_processing();
 }
 
+
 void
 Score_engraver::do_removal_processing()
 {
   Engraver_group_engraver::do_removal_processing();
-  scoreline_l_->set_bounds(RIGHT,get_staff_info().command_pcol_l ());
-  command_column_l_->breakable_b_ = true;
+  scoreline_l_->set_bounds(RIGHT,command_column_l_);
+  command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T);
 
   typeset_all ();
   set_columns (0,0);
@@ -82,35 +87,27 @@ void
 Score_engraver::announce_element (Score_element_info info)
 {
   announce_info_arr_.push (info);
-  info.origin_grav_l_arr_.push (this);
+  info.origin_trans_l_arr_.push (this);
+
+  if (Spanner *s = dynamic_cast <Spanner *> (info.elem_l_))
+    pscore_p_->typeset_unbroken_spanner (s);
+  else if (Item *i = dynamic_cast<Item*> (info.elem_l_))
+    pscore_p_->typeset_element (i);
 }
 
+/* All elements are propagated to the top upon announcement. If
+   something was created during one run of
+   Engraver_group_engraver::do_announces, then
+   announce_info_arr_.size() will be nonzero again
+*/
+/* junkme? Done by Engraver_group_engraver::do_announces ()?
+ */
+   
 void
 Score_engraver::do_announces()
 {
-  /* All elements are propagated to the top upon announcement. If
-     something was created during one run of
-     Engraver_group_engraver::do_announces, then
-     announce_info_arr_.size() will be nonzero again
-
-     */
   while (announce_info_arr_.size()) 
-    {
-      for (int i=0; i < announce_info_arr_.size(); i++)
-       /*
-         TODO
-
-         More subtle spacing
-         */
-       if (announce_info_arr_[i].req_l_) 
-         {
-           if (Rhythmic_req *rq = dynamic_cast <Rhythmic_req *> (announce_info_arr_[i].req_l_))
-             {
-               musical_column_l_->add_duration (rq->length_mom ());
-             }
-         }
-      Engraver_group_engraver::do_announces();
-    }
+    Engraver_group_engraver::do_announces();
 }
 
 
@@ -127,10 +124,9 @@ Score_engraver::typeset_all()
   for  (int i =0; i < elem_p_arr_.size(); i++) 
     {
       Score_element * elem_p = elem_p_arr_[i];
+      elem_p->add_processing ();
       if (Spanner *s = dynamic_cast <Spanner *> (elem_p))
        {
-         pscore_p_->typeset_unbroken_spanner (s);
-
            /*
            do something sensible if spanner not 
            spanned on 2 items.
@@ -147,16 +143,18 @@ Score_engraver::typeset_all()
       else 
        {
          Item *item_p = dynamic_cast <Item *> (elem_p);
-         pscore_p_->typeset_element (item_p);
+
          if (!item_p->parent_l (X_AXIS))
            {
-             if (item_p->breakable_b_) 
+             bool br = (item_p->remove_elt_property (breakable_scm_sym) != SCM_BOOL_F);
+             if (br)
                command_column_l_->add_element(item_p);
              else
                musical_column_l_->add_element(item_p);
            }
        }
-      scoreline_l_->add_element (elem_p);
+      if (!elem_p->dim_cache_[Y_AXIS]->parent_l_)
+       scoreline_l_->add_element (elem_p);
     }
   elem_p_arr_.clear();
 }
@@ -166,7 +164,7 @@ Score_engraver::do_pre_move_processing()
 {
   if (break_penalty_i_ > Break_req::DISALLOW)
     {
-      get_staff_info().command_pcol_l ()-> breakable_b_ = true;
+      command_column_l_->set_elt_property (breakable_scm_sym, SCM_BOOL_T);
       breaks_i_ ++;
       if (! (breaks_i_%8))
        *mlog << "[" << breaks_i_ << "]" << flush;
@@ -184,7 +182,7 @@ Score_engraver::set_columns (Score_column *new_command_l,
   if (command_column_l_ && command_column_l_->linked_b()) 
     {
       pscore_p_->add_column (command_column_l_);
-      scoreline_l_->add_element (command_column_l_);
+      scoreline_l_->add_column (command_column_l_);
     }
   else 
     {
@@ -192,14 +190,12 @@ Score_engraver::set_columns (Score_column *new_command_l,
       command_column_l_ =0;
     }
   if (new_command_l) 
-    {
-      command_column_l_ = new_command_l;
-      command_column_l_->musical_b_ = false;
-    }
+    command_column_l_ = new_command_l;
+
   if (musical_column_l_ && musical_column_l_->linked_b()) 
     {
       pscore_p_->add_column (musical_column_l_);
-      scoreline_l_->add_element (musical_column_l_);
+      scoreline_l_->add_column (musical_column_l_);      
     }
   else 
     {
@@ -210,7 +206,6 @@ Score_engraver::set_columns (Score_column *new_command_l,
   if (new_musical_l) 
     {
       musical_column_l_ = new_musical_l;
-      musical_column_l_->musical_b_ = true;
     }
 }
 
@@ -244,13 +239,11 @@ Score_engraver::do_try_music (Music*r)
     {
       if (Break_req* b = dynamic_cast<Break_req *> (r))
        {
+         gotcha = true;
          if (b->penalty_i_ <= Break_req::DISALLOW)
            break_penalty_i_ = b->penalty_i_;
          else if (b->penalty_i_ >= Break_req::FORCE)
-           {
-             command_column_l_->break_penalty_i_ = b->penalty_i_;
-             gotcha = true;
-           }
+           command_column_l_->break_penalty_i_ = b->penalty_i_;
        }
     }
    return gotcha;
@@ -267,5 +260,5 @@ Score_engraver::do_add_processing ()
   assert (dynamic_cast<Paper_def *> (output_def_l_));
   assert (!daddy_trans_l_);
   pscore_p_ = new Paper_score;
-  pscore_p_->paper_l_ = (Paper_def*)output_def_l_;
+  pscore_p_->paper_l_ = dynamic_cast<Paper_def*>(output_def_l_);
 }