X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=c66abca75c933be3764cd1f349bb13628ed5a0e1;hb=7af4bf1f7440843fa24de456edc04ad31b616cf9;hp=534d209182fb18f6d9ee6ac05fa8eea7c3998827;hpb=af9078fd6d63dea5141e87a1b4d7cb5b0bcba84a;p=lilypond.git

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 534d209182..c66abca75c 100644
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -1,76 +1,175 @@
 /*   
-  single-malt-grouping-item.cc --  implement Separation_item
+     separation-item.cc --  implement Separation_item
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "separation-item.hh"
 #include "paper-column.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "group-interface.hh"
+#include "accidental-placement.hh"
 
 void
-Separation_item::set_interface (Grob*s)
+Separation_item::add_item (Grob*s,Item* i)
 {
-  s->set_extent_callback (SCM_EOL, X_AXIS);
-  s->set_extent_callback (SCM_EOL, Y_AXIS);
+  assert (i);
+  Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"),i);
+  s->add_dependency (i);
 }
 
 void
-Separation_item::add_item (Grob*s,Item* i)
+Separation_item::add_conditional_item (Grob* me , Grob *e)
 {
-  assert (i);
-  Pointer_group_interface::add_element (s, ly_symbol2scm ("elements"),i);
-  s->add_dependency (i);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("conditional-elements"), e);
+}
+
+/*
+  Return the width of ME given that we are considering the object on
+  the LEFT.
+ */
+Interval
+Separation_item::conditional_width (Grob * me, Grob * left)
+{
+  Interval w = width (me);
+  
+  Item *item = dynamic_cast<Item*> (me);
+  Paper_column * pc = item->get_column ();
+  
+  
+  for (SCM s =  me->get_property ("conditional-elements"); gh_pair_p (s); s = ly_cdr (s))
+    {
+      SCM elt = ly_car (s);
+      if (!unsmob_grob (elt))
+	continue;
+      
+      Item *il = unsmob_item (elt);
+      if (pc != il->get_column ())
+	{
+	  /* this shouldn't happen, but let's continue anyway. */
+	  programming_error (_ ("Separation_item:  I've been drinking too much"));
+	  continue;		/*UGH UGH*/ 
+	}
+
+      if (to_boolean (il->get_property ("no-spacing-rods")))
+	{
+	  continue;
+	}
+
+      if (Accidental_placement::has_interface (il))
+	{
+	  w.unite (Accidental_placement::get_relevant_accidental_extent (il, pc, left));
+	}
+    }
+
+  SCM pad = me->get_property ("padding");
+
+  w.widen (robust_scm2double (pad, 0.0));
+  return w;
 }
 
 Interval
-Separation_item::my_width (Grob *me)
+Separation_item::width (Grob *me)
 {
+  SCM sw = me->get_property ("X-extent");
+  if (is_number_pair (sw))
+    {
+      return ly_scm2interval (sw);
+    }
+
   Item *item = dynamic_cast<Item*> (me);
-  Paper_column * pc = item->column_l ();
+  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"); gh_pair_p (s); s = ly_cdr (s))
     {
       SCM elt = ly_car (s);
       if (!unsmob_grob (elt))
 	continue;
 
-      Item *il = dynamic_cast<Item*> (unsmob_grob (elt));
-      if (pc != il->column_l ())
+      Item *il = unsmob_item (elt);
+      if (pc != il->get_column ())
 	{
 	  /* this shouldn't happen, but let's continue anyway. */
 	  programming_error (_ ("Separation_item:  I've been drinking too much"));
 	  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_property ("X-extent", ly_interval2scm (w));
   
   return w;
- // add this->offset_ ? this-> relative_coordinate ()? 
 }
 
+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");
+       gh_pair_p (s); s = gh_cdr (s))
+    {
+      Grob * break_item = unsmob_grob (gh_car (s));
+      
+      if (!gh_symbol_p (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. "
+	       "This is done in concert with @ref{separation-spanner-interface}."
+	       
+	       ,
 
+	       "padding X-extent conditional-elements elements");