* lily/auto-beam-engraver.cc (try_music): accept and process

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

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 414d61db7b94022c15507fa5f1900134b736624a..91db57ae33473afe68879fd4700fe704e977428b 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver.hh"
@@ -18,7 +18,7 @@ class Break_align_engraver : public Engraver
 {
   Item *align_;
   Protected_scm column_alist_;
-  Item *edge_;
+  Item *left_edge_;
 
   void add_to_group (SCM,Item*);
 protected:
@@ -73,10 +73,10 @@ Break_align_engraver::stop_translation_timestep ()
       typeset_grob (align_);
       align_ = 0;
     }
-  if (edge_)
+  if (left_edge_)
     {
-      typeset_grob (edge_);
-      edge_ = 0;
+      typeset_grob (left_edge_);
+      left_edge_ = 0;
     }
 }
 
@@ -84,7 +84,7 @@ Break_align_engraver::stop_translation_timestep ()
 Break_align_engraver::Break_align_engraver ()
 {
   column_alist_ = SCM_EOL;
-  edge_ = 0;
+  left_edge_ = 0;
   align_ = 0;
 }
 
@@ -93,7 +93,10 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
 {
   if (Item * item = dynamic_cast <Item *> (inf.grob_))
     {
-      if (item->empty_b (X_AXIS) || item->get_parent (X_AXIS))
+      /*
+       Removed check for item->empty (X_AXIS). --hwn 20/1/04
+       */
+      if (item->get_parent (X_AXIS))
        return;
 
       SCM bp=item->get_grob_property ("breakable");
@@ -107,13 +110,13 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
 
       if (!align_)
        {
-         align_ = new Item (get_property ("BreakAlignment"));
+         align_ = make_item ("BreakAlignment");
 
          announce_grob (align_, SCM_EOL);
 
-         edge_ = new Item (get_property ("LeftEdge"));
-         add_to_group (edge_->get_grob_property ("break-align-symbol"), edge_);
-         announce_grob(edge_, SCM_EOL);
+         left_edge_ = make_item ("LeftEdge");
+         add_to_group (left_edge_->get_grob_property ("break-align-symbol"), left_edge_);
+         announce_grob(left_edge_, SCM_EOL);
        }
       
       add_to_group (align_name, item);
@@ -133,7 +136,7 @@ Break_align_engraver::add_to_group(SCM align_name, Item*item)
     }
   else
     {
-      group = new Item (get_property ("BreakAlignGroup"));
+      group = make_item ("BreakAlignGroup");
 
       group->set_grob_property ("break-align-symbol", align_name);
       group->set_parent (align_, Y_AXIS);
@@ -148,6 +151,7 @@ Break_align_engraver::add_to_group(SCM align_name, Item*item)
 ENTER_DESCRIPTION(Break_align_engraver,
 /* descr */       "Align grobs with corresponding break-align-symbols into groups, and order the groups according to breakAlignOrder",
 /* creats*/       "BreakAlignment BreakAlignGroup LeftEdge",
+/* accepts */     "",
 /* acks  */       "break-aligned-interface"
 ,/* reads */       "breakAlignOrder",
 /* write */       "");