X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbreak-align-engraver.cc;h=dcce285bdfa0492fe61b2081c9c26d0b0fe8000f;hb=ae99aa08986aad83845b2dee6fa6cddeb2526433;hp=01193851b3f4853f3a5153a38dca0f46e483d59e;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 01193851b3..dcce285bdf 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@xs4all.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include "engraver.hh"
 #include "protected-scm.hh"
@@ -12,6 +12,7 @@
 #include "axis-group-interface.hh"
 #include "context.hh"
 #include "translator-group.hh"
+#include "item.hh"
 
 #include "translator.icc"
 
@@ -63,9 +64,7 @@ Break_align_engraver::acknowledge_break_aligned (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");
@@ -84,10 +83,7 @@ Break_align_engraver::acknowledge_break_aligned (Grob_info inf)
 	  /*
 	    Make left edge appear to come from same context as clef/bar-line etc.
 	  */
-	  left_edge_ = make_item_from_properties (random_source,
-						  ly_symbol2scm ("LeftEdge"),
-						  SCM_EOL,
-						  "LeftEdge");
+	  left_edge_ = random_source->make_item ("LeftEdge", SCM_EOL);
 	  add_to_group (left_edge_->get_property ("break-align-symbol"),
 			left_edge_);
 	}
@@ -116,7 +112,7 @@ 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_align_interface::add_element (align_, group);
+      Break_alignment_interface::add_element (align_, group);
     }
   Axis_group_interface::add_element (group, item);
 }
@@ -125,7 +121,8 @@ 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}. ",
-		/* create */ "BreakAlignment BreakAlignGroup LeftEdge",
-		/* accept */ "",
+		/* create */ "BreakAlignment "
+		"BreakAlignGroup "
+		"LeftEdge ",
 		/* read */ "",
 		/* write */ "");