*** empty log message ***

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

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index a18647b0da26dee02f7a4aa486f5c17ce5b45f9f..25cdc4a326db7a5b4fc839cb3845b3ce01aaa0af 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -3,13 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver.hh"
 #include "protected-scm.hh"
 #include "break-align-interface.hh"
-#include "item.hh"
 #include "align-interface.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
@@ -18,7 +17,7 @@
 class Break_align_engraver : public Engraver
 {
   Item *align_;
-SCM column_alist_;
+  SCM column_alist_;
   Item *left_edge_;
 
   void add_to_group (SCM,Item*);
@@ -43,10 +42,10 @@ Break_align_engraver::add_column (SCM smob)
 void
 Break_align_engraver::stop_translation_timestep ()
 {
-  for (SCM p = column_alist_; ly_c_pair_p (p); p = ly_cdr (p))
+  for (SCM p = column_alist_; scm_is_pair (p); p = scm_cdr (p))
     {
-      SCM pair = ly_car (p);
-      add_column (ly_cdr (pair));
+      SCM pair = scm_car (p);
+      add_column (scm_cdr (pair));
     }
   column_alist_ = SCM_EOL;
 
@@ -79,7 +78,7 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
       if (item->get_parent (X_AXIS))
        return;
 
-      SCM bp=item->get_property ("breakable");
+      SCM bp = item->get_property ("breakable");
       bool breakable = (to_boolean (bp));
       if (!breakable)
        return ;
@@ -92,13 +91,11 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
        {
          align_ = make_item ("BreakAlignment", SCM_EOL);
 
-         
-
          Context*origin = inf.origin_contexts (this)[0];
-         left_edge_ =  make_item_from_properties (origin->implementation (),
-                                                  ly_symbol2scm ("LeftEdge"),
-                                                  SCM_EOL
-                                                  );
+         left_edge_ = make_item_from_properties (dynamic_cast<Engraver*> (origin->implementation ()),
+                                                 ly_symbol2scm ("LeftEdge"),
+                                                 SCM_EOL,
+                                                 "LeftEdge");
          add_to_group (left_edge_->get_property ("break-align-symbol"),
                        left_edge_);
        }
@@ -115,7 +112,7 @@ Break_align_engraver::add_to_group (SCM align_name, Item*item)
 
   if (s != SCM_BOOL_F)
     {
-      Grob *e =  unsmob_grob (ly_cdr (s));
+      Grob *e =  unsmob_grob (scm_cdr (s));
       group = dynamic_cast<Item*> (e);
     }
   else
@@ -131,7 +128,7 @@ Break_align_engraver::add_to_group (SCM align_name, Item*item)
   Axis_group_interface::add_element (group, item);
 }
 
-ENTER_DESCRIPTION (Break_align_engraver,
+ADD_TRANSLATOR (Break_align_engraver,
                   "Align grobs with corresponding @code{break-align-symbols} into "
                   "groups, and order the groups according to @code{breakAlignOrder}. "
                   "The left edge of the alignment gets a separate group, with a symbol @code{left-edge}. "