Merge with master

[lilypond.git] / lily / break-alignment-interface.cc

diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc
index 3ccd2aa1253f79b5851095e75608ba3259dca4a3..c2c335434962a6e7b32d268580c276d7701bc5ea 100644 (file)
--- a/lily/break-alignment-interface.cc
+++ b/lily/break-alignment-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
@@ -21,22 +21,6 @@
 #include "warn.hh"
 
 
-MAKE_SCHEME_CALLBACK (Break_alignment_interface, self_align_callback, 1);
-SCM
-Break_alignment_interface::self_align_callback (SCM smob)
-{
-  Grob *me = unsmob_grob (smob);
-
-  Item *item = dynamic_cast<Item *> (me);
-  Direction bsd = item->break_status_dir ();
-  if (bsd == LEFT)
-    me->set_property ("self-alignment-X", scm_from_int (RIGHT));
-
-  /*
-    Force break alignment itself to be done first, in the case
-  */
-  return Self_alignment_interface::aligned_on_self (me, X_AXIS);
-}
 
 /*
   This is tricky: we cannot modify 'elements, since callers are
@@ -109,6 +93,9 @@ Break_alignment_interface::calc_positioning_done (SCM smob)
   Grob *grob = unsmob_grob (smob);  
   Item *me = dynamic_cast<Item *> (grob);
 
+
+  me->set_property ("positioning-done", SCM_BOOL_T);
+
   vector<Grob*> elems = ordered_elements (me);
   vector<Interval> extents;
 
@@ -233,7 +220,7 @@ Break_alignment_interface::calc_positioning_done (SCM smob)
       else
        {
          extra_right_space = distance;
-         if (idx < offsets.size() - 1)
+         if (idx + 1 < offsets.size ())
            offsets[idx+1] = extents[idx][RIGHT] + distance;
        }
 
@@ -315,7 +302,7 @@ Break_alignable_interface::self_align_callback (SCM grob)
                          - me->relative_coordinate (common, X_AXIS));
 }
 
-ADD_INTERFACE (Break_alignable_interface, "break-alignable-interface",
+ADD_INTERFACE (Break_alignable_interface,
               "Object that is aligned on a break aligment. ",
 
               /* properties */
@@ -324,7 +311,7 @@ ADD_INTERFACE (Break_alignable_interface, "break-alignable-interface",
 
 
 
-ADD_INTERFACE (Break_aligned_interface, "break-aligned-interface",
+ADD_INTERFACE (Break_aligned_interface,
               "Items that are aligned in prefatory matter.\n"
               "\n"
               "The spacing of these items is controlled by the @code{space-alist}\n"
@@ -353,7 +340,7 @@ ADD_INTERFACE (Break_aligned_interface, "break-aligned-interface",
               "space-alist "
               );
 
-ADD_INTERFACE (Break_alignment_interface, "break-alignment-interface",
+ADD_INTERFACE (Break_alignment_interface,
               "The object that performs break aligment. See @ref{break-aligned-interface}.",
 
               /* properties */