release: 1.2.4

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

diff --git a/lily/score-priority-engraver.cc b/lily/score-priority-engraver.cc
index 264ed283a58a2a4c79adecc476deff9ad724e60f..3530c26a255eaaeb17845d3de0ea6fde7cf8e53a 100644 (file)
--- a/lily/score-priority-engraver.cc
+++ b/lily/score-priority-engraver.cc
@@ -3,11 +3,11 @@
 
   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 "horizontal-group-item.hh"
+#include "dimension-cache.hh"
+#include "axis-group-item.hh"
 #include "score-priority-engraver.hh"
 #include "item.hh"
 #include "dictionary-iter.hh"
@@ -16,69 +16,49 @@
 
 Score_priority_engraver::Score_priority_engraver()
 {
+  halign_p_ = 0;
 }
 
 void
 Score_priority_engraver::do_pre_move_processing()
 {
-  for (Hash_table_iter<int, Horizontal_group_item*> i(align_p_tab_);
-       i.ok() ; i++)
+  for (int i=0; i < column_p_arr_.size ();i++)
+    typeset_element (column_p_arr_[i]);
+  column_p_arr_.clear ();
+
+  if (halign_p_)
     {
-      if (i.val ())
-       {
-         typeset_element (i.val ());
-         i.val_ref () = 0;
-       }
+      typeset_element (halign_p_);
+      halign_p_ =0;
     }
-  align_p_tab_.clear ();
 }
 
+/*
+  TODO: move this logic into Break_align_item
+ */
 void
 Score_priority_engraver::acknowledge_element (Score_element_info inf)
 {
-  Item * item_l = dynamic_cast <Item *> (inf.elem_l_);
-  if (item_l && item_l->breakable_b_ && !item_l->empty_b ())
+  if (Item * item_l = dynamic_cast <Item *> (inf.elem_l_))
     {
-      /*
-       Don't try to eat up our (probable) parent.
-      */
-      if (inf.origin_grav_l_arr_.size () <= 1 &&
-         dynamic_cast<Break_align_item *> (item_l))
-       return; 
+      if (item_l->empty_b (X_AXIS) || item_l->parent_l (X_AXIS))
+       return;
 
-      
-      int priority =item_l->break_priority_i_;
-      Horizontal_group_item * hg =0;
-      if (!align_p_tab_.elem_b(priority))
-       {
-         hg = new Horizontal_group_item;
-         announce_element (Score_element_info (hg,0));
-         align_p_tab_[priority] = hg;
-         hg->break_priority_i_ = priority;
-         hg->breakable_b_ = true;
-       }
-      else
-       hg = align_p_tab_[priority];
-      
-      Score_element * unbound_elem = inf.elem_l_;
+      bool breakable
+       = (item_l->remove_elt_property (breakable_scm_sym) != SCM_BOOL_F);
+      if (!breakable)
+       return ;
 
-      /*
-       ugh
-       */
-      while (unbound_elem->parent_l (X_AXIS))
+
+      if (!halign_p_)
        {
-         /* We might have added inf.elem_l_ earlier because we added one
-            of its children.  We don't want to add ourselves to ourself
-         */
-         Graphical_element * e = unbound_elem->parent_l (X_AXIS);
-         if (e == hg)
-           return;
-         unbound_elem = dynamic_cast<Score_element*> (e);
+         halign_p_ = new Break_align_item;
+         halign_p_->set_elt_property (breakable_scm_sym, SCM_BOOL_T);
+         announce_element (Score_element_info (halign_p_,0));
        }
 
-      hg->add_element (unbound_elem);
+      halign_p_->add_breakable_item (item_l);
     }
 }
 
-
 ADD_THIS_TRANSLATOR(Score_priority_engraver);