release: 1.3.59

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

diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc
index 0d67818da9448c8cbbde633ed2f58a4093e9fc0b..6e5722ca1282658e9bf4bb6c39ae18758fd02c5a 100644 (file)
--- a/lily/break-align-item.cc
+++ b/lily/break-align-item.cc
@@ -6,6 +6,7 @@
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>
+#include <libc-extension.hh>
 
 #include "side-position-interface.hh"
 #include "warn.hh"
@@ -16,28 +17,32 @@
 #include "paper-score.hh"
 #include "paper-def.hh"
 #include "paper-column.hh"
-
-/*
-  Handle spacing for prefatory matter. 
-
-  TODO: rewrite this.  It is kludgy
-*/
+#include "group-interface.hh"
+#include "align-interface.hh"
 
 void
 Break_align_item::before_line_breaking ()
 {
-  Direction ad = (break_status_dir() == LEFT) ? RIGHT : LEFT;
-  Real interline= paper_l ()->get_var ("interline");   
-
-  set_elt_property ("self-alignment-X", gh_int2scm (ad));
+  if (break_status_dir() == LEFT)
+    {
+      set_elt_property ("self-alignment-X", gh_int2scm (RIGHT));
+    }
+  else
+    {
+      add_offset_callback (Align_interface::center_on_element, X_AXIS);
+    }
+  
 
 
+  Real interline= paper_l ()->get_var ("interline");   
   Link_array<Score_element> elems;
-  Link_array<Score_element> all_elems (elem_l_arr ());
+  Link_array<Score_element> all_elems
+    = Pointer_group_interface__extract_elements (this, (Score_element*)0,
+                                        "elements");
   
   for (int i=0; i < all_elems.size(); i++) 
     {
-      Interval y = all_elems[i]->extent(axis ());
+      Interval y = all_elems[i]->extent(X_AXIS);
       if (!y.empty_b())
        elems.push (dynamic_cast<Score_element*> (all_elems[i]));
     }
@@ -47,7 +52,7 @@ Break_align_item::before_line_breaking ()
 
   SCM symbol_list = SCM_EOL;
   Array<Real> dists;
-  SCM current_origin = ly_str02scm ("");
+  SCM current_origin = ly_symbol2scm ("none");
   for (int i=0; i <= elems.size (); i++)
     {
       Score_element *next_elt  = i < elems.size ()
@@ -58,20 +63,35 @@ Break_align_item::before_line_breaking ()
 
       if (next_elt)
        {
-         next_origin = next_elt->get_elt_property ("origin");
+         next_origin = next_elt->get_elt_property ("break-align-symbol");
          next_origin =
            (next_origin == SCM_UNDEFINED)
-           ? ly_str02scm ("")
+           ? ly_symbol2scm ("none")
            : next_origin;
        }
       else
-       next_origin = ly_str02scm ("begin-of-note");
+       next_origin = ly_symbol2scm ("begin-of-note");
+      
+      SCM e = scm_assoc (scm_listify (current_origin,
+                                     next_origin,
+                                     SCM_UNDEFINED),
+                        scm_eval (ly_symbol2scm ("space-alist")));
       
-      SCM extra_space
-       = scm_eval (scm_listify (ly_symbol2scm ("break-align-spacer"),
-                                current_origin, next_origin, SCM_UNDEFINED)); 
+      SCM extra_space;
+      if (e != SCM_BOOL_F)
+       {
+         extra_space = gh_cdr (e);
+       }
+      else
+       {
+         warning (_f ("unknown spacing pair `%s', `%s'",
+                      ly_symbol2string (current_origin),
+                      ly_symbol2string (next_origin)));
+         extra_space = scm_listify (ly_symbol2scm ("minimum-space"), gh_double2scm (0.0), SCM_UNDEFINED);
+       }
+
       SCM symbol = gh_car  (extra_space);
-      Real spc = gh_scm2double (SCM_CADR(extra_space));
+      Real spc = gh_scm2double (gh_cadr(extra_space));
       spc *= interline;
 
       dists.push(spc);
@@ -102,10 +122,12 @@ Break_align_item::before_line_breaking ()
   
   scm_set_car_x (first_pair, gh_double2scm (-dists[0]));
   elems[0]->set_elt_property ("minimum-space", first_pair);
-  
-  Axis_align_item::before_line_breaking ();
 
 
+  /*
+    Force callbacks for alignment to be called   
+   */
+  Real unused =  elems[0]->relative_coordinate (this, X_AXIS);
   Real pre_space = elems[0]->relative_coordinate (column_l (), X_AXIS);
 
   Real xl = elems[0]->extent (X_AXIS)[LEFT];
@@ -137,7 +159,6 @@ Break_align_item::before_line_breaking ()
   /*
     Hint the spacing engine how much space to put in.
 
-
     The pairs are in the format of an interval (ie. CAR <  CDR).
   */
   column_l ()->set_elt_property ("extra-space",
@@ -150,10 +171,13 @@ Break_align_item::before_line_breaking ()
                                 
 }
 
-Break_align_item::Break_align_item ()
+Break_align_item::Break_align_item (SCM s)
+  : Item (s)
 {
   set_elt_property ("stacking-dir" , gh_int2scm (RIGHT));
-  set_axis (X_AXIS);
+
+  Align_interface (this).set_interface (); 
+  Align_interface (this).set_axis (X_AXIS);
 
   add_offset_callback (Side_position_interface::aligned_on_self, X_AXIS);
 }