Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 4fe8c7e3637a75415e3e364e18eb50a06f8a527a..899fee3c61cbb566bc4de0796d979f4e83c32801 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--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,7 @@
 #include "axis-group-interface.hh"
 #include "context.hh"
 #include "translator-group.hh"
+#include "item.hh"
 
 #include "translator.icc"
 
@@ -28,7 +29,6 @@ protected:
 public:
   TRANSLATOR_DECLARATIONS (Break_align_engraver);
   DECLARE_ACKNOWLEDGER (break_aligned);
-
 };
 
 void
@@ -64,31 +64,26 @@ 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");
       if (!scm_is_symbol (align_name))
        return;
-
+         
       if (!align_)
        {
          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 ())));
+         Translator_group *tg = origin->implementation ();
+         Engraver *random_source = dynamic_cast<Engraver *> (unsmob_translator (scm_car (tg->get_simple_trans_list ())));
 
          /*
            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_);
        }
@@ -117,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);
 }
@@ -126,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 */ "");