patch::: 1.5.11.jcn2

[lilypond.git] / lily / break-align-engraver.cc

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index cbc7db0b0d03488c381dd8984b034e4971f794b6..21551ad5b29db6b28a3c2dc813c8a251767f9e05 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver.hh"
@@ -19,52 +19,52 @@ class Break_align_engraver : public Engraver
   Item *align_l_;
   Protected_scm column_alist_;
 protected:
-  virtual void do_removal_processing ();
-  virtual void acknowledge_element(Score_element_info i);
-  virtual void do_pre_move_processing ();
+  virtual void finalize ();
+  virtual void acknowledge_grob (Grob_info i);
+  virtual void stop_translation_timestep ();
   void add_column (SCM);
   
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  VIRTUAL_COPY_CONS (Translator);
   Break_align_engraver ();
 };
 
 
 
-ADD_THIS_TRANSLATOR(Break_align_engraver);
+ADD_THIS_TRANSLATOR (Break_align_engraver);
 
 void
 Break_align_engraver::add_column (SCM smob)
 {
-  Score_element * e = unsmob_element (smob);
+  Grob * e = unsmob_grob (smob);
   Break_align_interface::add_element (align_l_,e);
-  typeset_element (e);
+  typeset_grob (e);
 }
 
 void
-Break_align_engraver::do_removal_processing ()
+Break_align_engraver::finalize ()
 {
   column_alist_ = SCM_EOL;
 }
 
 void
-Break_align_engraver::do_pre_move_processing ()
+Break_align_engraver::stop_translation_timestep ()
 {
   SCM order = get_property ("breakAlignOrder");
-  for (; gh_pair_p (order); order = gh_cdr (order))
+  for (; gh_pair_p (order); order = ly_cdr (order))
     {
-      SCM p = scm_assoc ( gh_car (order), column_alist_);
+      SCM p = scm_assoc (ly_car (order), column_alist_);
       if (gh_pair_p (p))
        {
-         add_column (gh_cdr (p));
-         column_alist_ = scm_assoc_remove_x (column_alist_, gh_car (order));
+         add_column (ly_cdr (p));
+         column_alist_ = scm_assoc_remove_x (column_alist_, ly_car (order));
        }
     }
 
-  for (SCM p = column_alist_; gh_pair_p (p); p = gh_cdr (p))
+  for (SCM p = column_alist_; gh_pair_p (p); p = ly_cdr (p))
     {
-      SCM pair = gh_car (p);
-      add_column (gh_cdr (pair));
+      SCM pair = ly_car (p);
+      add_column (ly_cdr (pair));
     }
 
   
@@ -72,7 +72,7 @@ Break_align_engraver::do_pre_move_processing ()
 
   if (align_l_)
     {
-      typeset_element (align_l_);
+      typeset_grob (align_l_);
       align_l_ = 0;
     }
 }
@@ -85,19 +85,19 @@ Break_align_engraver::Break_align_engraver ()
 }
 
 void
-Break_align_engraver::acknowledge_element (Score_element_info inf)
+Break_align_engraver::acknowledge_grob (Grob_info inf)
 {
   if (Item * item_l = dynamic_cast <Item *> (inf.elem_l_))
     {
       if (item_l->empty_b (X_AXIS) || item_l->parent_l (X_AXIS))
        return;
 
-      SCM bp=item_l->get_elt_property ("breakable");
+      SCM bp=item_l->get_grob_property ("breakable");
       bool breakable = (to_boolean (bp));
       if (!breakable)
        return ;
 
-      SCM align_name = item_l->get_elt_property ("break-align-symbol");
+      SCM align_name = item_l->get_grob_property ("break-align-symbol");
       if (!gh_symbol_p (align_name))
        return ;
 
@@ -105,17 +105,12 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
        {
          align_l_ = new Item (get_property ("BreakAlignment"));
          Break_align_interface::set_interface (align_l_);
-         announce_element (align_l_,0);
+         announce_grob (align_l_,0);
 
          SCM edge_sym = ly_symbol2scm ("Left_edge_item");
          Item * edge = new Item (get_property ("LeftEdge"));
 
-         /*
-           We must have left-edge in the middle.  Instrument-names
-           are left to left-edge, so they don't enter the staff.
-         */
-         align_l_->set_elt_property ("self-alignment-X", edge->self_scm ());
-         
+        
 
          /*
            If the element is empty, it will be ignored in the break
@@ -123,11 +118,15 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
 
            TODO: switch off ignoring empty stuff?
          */
-         edge->set_extent_callback (Score_element::point_dimension_callback_proc, X_AXIS);
+         edge->set_extent_callback (Grob::point_dimension_callback_proc, X_AXIS);
          
-         align_l_->set_elt_property ("self-alignment-X", edge->self_scm ());
-
-         announce_element (edge, 0);
+         /*
+           We must have left-edge in the middle.  Instrument-names
+           are left to left-edge, so they don't enter the staff.
+         */
+         align_l_->set_grob_property ("self-alignment-X", edge->self_scm ());
+         
+         announce_grob (edge, 0);
          column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm ());
        }
 
@@ -137,7 +136,7 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
 
       if (s != SCM_BOOL_F)
        {
-         Score_element *e =  unsmob_element (gh_cdr(s));
+         Grob *e =  unsmob_grob (ly_cdr (s));
          group = dynamic_cast<Item*> (e);
        }
       else
@@ -147,9 +146,9 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
          Axis_group_interface::set_interface (group);
          Axis_group_interface::set_axes (group, X_AXIS,X_AXIS);
 
-         group->set_elt_property ("break-align-symbol", align_name);
+         group->set_grob_property ("break-align-symbol", align_name);
          group->set_parent (align_l_, Y_AXIS);
-         announce_element (group, 0);
+         announce_grob (group, 0);
          column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
 
        }