X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-engraver.cc;h=a18647b0da26dee02f7a4aa486f5c17ce5b45f9f;hb=335ac4c1568d57b71d37d31c0014169899a09a53;hp=414d61db7b94022c15507fa5f1900134b736624a;hpb=9f3df01392cdaf8120bf67c5034e507242be90e7;p=lilypond.git

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 414d61db7b..a18647b0da 100644
--- 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"
@@ -12,23 +12,24 @@
 #include "item.hh"
 #include "align-interface.hh"
 #include "axis-group-interface.hh"
-
+#include "context.hh"
+#include "translator-group.hh"
 
 class Break_align_engraver : public Engraver
 {
   Item *align_;
-  Protected_scm column_alist_;
-  Item *edge_;
+SCM column_alist_;
+  Item *left_edge_;
 
   void add_to_group (SCM,Item*);
 protected:
-  virtual void finalize ();
   virtual void acknowledge_grob (Grob_info i);
   virtual void stop_translation_timestep ();
+  virtual void derived_mark () const;
   void add_column (SCM);
   
 public:
-  TRANSLATOR_DECLARATIONS(Break_align_engraver);
+  TRANSLATOR_DECLARATIONS (Break_align_engraver);
 };
 
 void
@@ -36,84 +37,70 @@ Break_align_engraver::add_column (SCM smob)
 {
   Grob * e = unsmob_grob (smob);
   Break_align_interface::add_element (align_,e);
-  typeset_grob (e);
-}
-
-void
-Break_align_engraver::finalize ()
-{
-  column_alist_ = SCM_EOL;
+  
 }
 
 void
 Break_align_engraver::stop_translation_timestep ()
 {
-  SCM order = get_property ("breakAlignOrder");
-  for (; gh_pair_p (order); order = ly_cdr (order))
-    {
-      SCM p = scm_assoc (ly_car (order), column_alist_);
-      if (gh_pair_p (p))
-	{
-	  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 = ly_cdr (p))
+  for (SCM p = column_alist_; ly_c_pair_p (p); p = ly_cdr (p))
     {
       SCM pair = ly_car (p);
       add_column (ly_cdr (pair));
     }
-
-  
   column_alist_ = SCM_EOL;
 
-  if (align_)
-    {
-      typeset_grob (align_);
-      align_ = 0;
-    }
-  if (edge_)
-    {
-      typeset_grob (edge_);
-      edge_ = 0;
-    }
+  align_ = 0;
+  left_edge_ = 0;
 }
 
 
 Break_align_engraver::Break_align_engraver ()
 {
   column_alist_ = SCM_EOL;
-  edge_ = 0;
+  left_edge_ = 0;
   align_ = 0;
 }
 
+void
+Break_align_engraver::derived_mark () const
+{
+  scm_gc_mark (column_alist_);
+}
+
 void
 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");
+      SCM bp=item->get_property ("breakable");
       bool breakable = (to_boolean (bp));
       if (!breakable)
 	return ;
 
-      SCM align_name = item->get_grob_property ("break-align-symbol");
-      if (!gh_symbol_p (align_name))
+      SCM align_name = item->get_property ("break-align-symbol");
+      if (!scm_is_symbol (align_name))
 	return ;
 
       if (!align_)
 	{
-	  align_ = new Item (get_property ("BreakAlignment"));
+	  align_ = make_item ("BreakAlignment", SCM_EOL);
 
-	  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);
+	  Context*origin = inf.origin_contexts (this)[0];
+	  left_edge_ =  make_item_from_properties (origin->implementation (),
+						   ly_symbol2scm ("LeftEdge"),
+						   SCM_EOL
+						   );
+	  add_to_group (left_edge_->get_property ("break-align-symbol"),
+			left_edge_);
 	}
       
       add_to_group (align_name, item);
@@ -121,7 +108,7 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
 }
 
 void
-Break_align_engraver::add_to_group(SCM align_name, Item*item)
+Break_align_engraver::add_to_group (SCM align_name, Item*item)
 {
   SCM s = scm_assoc (align_name, column_alist_);
   Item * group = 0;
@@ -133,11 +120,10 @@ Break_align_engraver::add_to_group(SCM align_name, Item*item)
     }
   else
     {
-      group = new Item (get_property ("BreakAlignGroup"));
+      group = make_item ("BreakAlignGroup", item->self_scm () );
 
-      group->set_grob_property ("break-align-symbol", align_name);
+      group->set_property ("break-align-symbol", align_name);
       group->set_parent (align_, Y_AXIS);
-      announce_grob(group, item->self_scm());
 	  
       column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
 
@@ -145,9 +131,13 @@ Break_align_engraver::add_to_group(SCM align_name, Item*item)
   Axis_group_interface::add_element (group, 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",
-/* acks  */       "break-aligned-interface"
-,/* reads */       "breakAlignOrder",
-/* write */       "");
+ENTER_DESCRIPTION (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}. "
+		   ,
+		   /* creats*/       "BreakAlignment BreakAlignGroup LeftEdge",
+		   /* accepts */     "",
+		   /* acks  */       "break-aligned-interface",
+		   /* reads */       "",
+		   /* write */       "");