release commit

[lilypond.git] / lily / separation-item.cc

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 3ca590a50044f5ec628b694d09c43cbd38cb99f2..f0e834f193c95099be4ff1a149fc8706be9bdc4e 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -40,7 +40,7 @@ Separation_item::conditional_width (Grob * me, Grob * left)
   Paper_column * pc = item->get_column ();
   
   
-  for (SCM s =  me->get_grob_property ("conditional-elements"); gh_pair_p (s); s = ly_cdr (s))
+  for (SCM s =  me->get_property ("conditional-elements"); scm_is_pair (s); s = ly_cdr (s))
     {
       SCM elt = ly_car (s);
       if (!unsmob_grob (elt))
@@ -54,7 +54,7 @@ Separation_item::conditional_width (Grob * me, Grob * left)
          continue;             /*UGH UGH*/ 
        }
 
-      if (to_boolean (il->get_grob_property ("no-spacing-rods")))
+      if (to_boolean (il->get_property ("no-spacing-rods")))
        {
          continue;
        }
@@ -65,20 +65,16 @@ Separation_item::conditional_width (Grob * me, Grob * left)
        }
     }
 
-  SCM pad = me->get_grob_property ("padding");
+  SCM pad = me->get_property ("padding");
 
-  if (gh_number_p (pad))
-    {
-      w[RIGHT] += gh_scm2double (pad)/2;
-      w[LEFT] -= gh_scm2double (pad)/2;    
-    }
+  w.widen (robust_scm2double (pad, 0.0));
   return w;
 }
 
 Interval
 Separation_item::width (Grob *me)
 {
-  SCM sw = me->get_grob_property ("X-extent");
+  SCM sw = me->get_property ("X-extent");
   if (is_number_pair (sw))
     {
       return ly_scm2interval (sw);
@@ -88,7 +84,7 @@ Separation_item::width (Grob *me)
   Paper_column * pc = item->get_column ();
   Interval w;
   
-  for (SCM s =  me->get_grob_property ("elements"); gh_pair_p (s); s = ly_cdr (s))
+  for (SCM s =  me->get_property ("elements"); scm_is_pair (s); s = ly_cdr (s))
     {
       SCM elt = ly_car (s);
       if (!unsmob_grob (elt))
@@ -102,38 +98,78 @@ Separation_item::width (Grob *me)
          continue;             /*UGH UGH*/ 
        }
 
-      if (to_boolean (il->get_grob_property ("no-spacing-rods")))
+      if (to_boolean (il->get_property ("no-spacing-rods")))
        {
          continue;
        }
 
       Interval iv (il->extent (pc, X_AXIS));
-      if (!iv.empty_b ())
+      if (!iv.is_empty ())
        {
          w.unite (iv);
        }
     }
 
-  SCM pad = me->get_grob_property ("padding");
+  SCM pad = me->get_property ("padding");
 
-  if (gh_number_p (pad))
-  {
-    w[RIGHT] += gh_scm2double (pad)/2;
-    w[LEFT] -= gh_scm2double (pad)/2;    
-  }
+  w.widen (robust_scm2double (pad, 0.0));
 
-  me->set_grob_property ("X-extent", ly_interval2scm (w));
+  me->set_property ("X-extent", ly_interval2scm (w));
   
   return w;
 }
 
+Interval
+Separation_item::relative_width (Grob * me, Grob * common)
+{
+  Interval iv = width (me);
+
+  return dynamic_cast<Item*>(me)->get_column ()->relative_coordinate (common, X_AXIS) + iv ;
+}
+
+
+/*
+  Try to find the break-aligned symbol in SEPARATION_ITEM that is
+  sticking out at direction D. The x size is put in LAST_EXT
+*/
+Grob*
+Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d,
+                                           Interval * last_ext)
+{
+  Grob *col = dynamic_cast<Item*> (separation_item)->get_column ();
+  last_ext->set_empty ();
+  Grob *last_grob = 0;
+  for (SCM s = separation_item->get_property ("elements");
+       scm_is_pair (s); s = ly_cdr (s))
+    {
+      Grob * break_item = unsmob_grob (ly_car (s));
+      
+      if (!scm_is_symbol (break_item->get_property ("break-align-symbol")))
+       continue;
+
+      Interval ext = break_item->extent (col, X_AXIS);
+
+      if (ext.is_empty ())
+       continue;
+      if (!last_grob
+         || (last_grob && d * (ext[d]- (*last_ext)[d]) > 0) )
+       {
+         *last_ext = ext;
+         last_grob = break_item; 
+       }
+    }
+
+  return last_grob;  
+}
+
 
 
 
 
 ADD_INTERFACE (Separation_item,"separation-item-interface",
-  "Item that computes widths to generate spacing rods.\n"
-"\n"
-"Calculate dimensions for the Separating_group_spanner; this has to be "
-"an item to get dependencies correct.  "
-, "padding X-extent conditional-elements elements");
+              "Item that computes widths to generate spacing rods. "
+              "This is done in concert with @ref{separation-spanner-interface}."
+              
+              ,
+
+              "padding X-extent conditional-elements elements");