X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-engraver.cc;h=8059200849770fcccc83500b5a00b35be19d9232;hb=9a14a394dfa23b38ab78c3eb09a2d7b5f504fa35;hp=7309342dd690a96f59f52c67079010728d1bf671;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 7309342dd6..8059200849 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include "engraver.hh"
 #include "protected-scm.hh"
@@ -12,6 +12,9 @@
 #include "axis-group-interface.hh"
 #include "context.hh"
 #include "translator-group.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 class Break_align_engraver : public Engraver
 {
@@ -20,32 +23,19 @@ class Break_align_engraver : public Engraver
   Item *left_edge_;
 
   void add_to_group (SCM, Item *);
+  void create_alignment (Grob_info);
 protected:
-  virtual void acknowledge_grob (Grob_info i);
-  virtual void stop_translation_timestep ();
+  void stop_translation_timestep ();
   virtual void derived_mark () const;
-  void add_column (SCM);
-
 public:
   TRANSLATOR_DECLARATIONS (Break_align_engraver);
+  DECLARE_ACKNOWLEDGER (break_aligned);
+  DECLARE_ACKNOWLEDGER (break_alignable);
 };
 
-void
-Break_align_engraver::add_column (SCM smob)
-{
-  Grob *e = unsmob_grob (smob);
-  Break_align_interface::add_element (align_, e);
-
-}
-
 void
 Break_align_engraver::stop_translation_timestep ()
 {
-  for (SCM p = column_alist_; scm_is_pair (p); p = scm_cdr (p))
-    {
-      SCM pair = scm_car (p);
-      add_column (scm_cdr (pair));
-    }
   column_alist_ = SCM_EOL;
 
   align_ = 0;
@@ -66,9 +56,21 @@ Break_align_engraver::derived_mark () const
 }
 
 void
-Break_align_engraver::acknowledge_grob (Grob_info inf)
+Break_align_engraver::acknowledge_break_alignable (Grob_info inf)
+{
+  if (!align_)
+    create_alignment (inf);
+
+  Grob *g = inf.grob ();
+
+  if (!g->get_parent (X_AXIS))
+    g->set_parent (align_, X_AXIS);
+}
+
+void
+Break_align_engraver::acknowledge_break_aligned (Grob_info inf)
 {
-  if (Item *item = dynamic_cast<Item *> (inf.grob_))
+  if (Item *item = dynamic_cast<Item *> (inf.grob ()))
     {
       /*
 	Removed check for item->empty (X_AXIS). --hwn 20/1/04
@@ -76,32 +78,40 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
       if (item->get_parent (X_AXIS))
 	return;
 
-      SCM bp = item->get_property ("breakable");
-      bool breakable = (to_boolean (bp));
-      if (!breakable)
+      if (!Item::is_non_musical (item))
 	return;
 
       SCM align_name = item->get_property ("break-align-symbol");
       if (!scm_is_symbol (align_name))
 	return;
-
+	  
       if (!align_)
-	{
-	  align_ = make_item ("BreakAlignment", SCM_EOL);
-
-	  Context *origin = inf.origin_contexts (this)[0];
-	  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_);
-	}
+	create_alignment (inf);
 
       add_to_group (align_name, item);
     }
 }
 
+void
+Break_align_engraver::create_alignment (Grob_info inf)
+{
+  align_ = make_item ("BreakAlignment", SCM_EOL);
+
+  Context *origin = inf.origin_contexts (this)[0];
+
+  Translator_group *tg = origin->implementation ();
+  Engraver *random_source = dynamic_cast<Engraver *> (unsmob_translator (scm_car (tg->get_simple_trans_list ())));
+  if (!random_source)
+    random_source = this;
+
+  /*
+    Make left edge appear to come from same context as clef/bar-line etc.
+  */
+  left_edge_ = random_source->make_item ("LeftEdge", SCM_EOL);
+  add_to_group (left_edge_->get_property ("break-align-symbol"),
+		left_edge_);
+}
+
 void
 Break_align_engraver::add_to_group (SCM align_name, Item *item)
 {
@@ -122,16 +132,18 @@ Break_align_engraver::add_to_group (SCM align_name, Item *item)
 
       column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
 
+      Break_alignment_interface::add_element (align_, group);
     }
   Axis_group_interface::add_element (group, item);
 }
-
+ADD_ACKNOWLEDGER (Break_align_engraver, break_aligned);
+ADD_ACKNOWLEDGER (Break_align_engraver, break_alignable);
 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}. ",
-		/* creats*/ "BreakAlignment BreakAlignGroup LeftEdge",
-		/* accepts */ "",
-		/* acks  */ "break-aligned-interface",
-		/* reads */ "",
+		/* create */ "BreakAlignment "
+		"BreakAlignGroup "
+		"LeftEdge ",
+		/* read */ "",
 		/* write */ "");