X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=6406a3e0fcc12f9f94cba9a760358e90265d5427;hb=6224c5c3bfe0a4c7aef15a060a323c77c99bd3f0;hp=42043f5c14947863ae9f8a6185ffd780abf8ab10;hpb=07a5ed85c189a97d04c550679826dfc5eca2eb18;p=lilypond.git

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 42043f5c14..6406a3e0fc 100644
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -1,68 +1,154 @@
-/*   
-  single-malt-grouping-item.cc --  implement Separation_item
-  
+/*
+  separation-item.cc -- implement Separation_item
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "separation-item.hh"
+
 #include "paper-column.hh"
-#include "debug.hh"
-#include "group-interface.hh"
+#include "warn.hh"
+#include "pointer-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);
 }
 
 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,"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::my_width (Grob *me)
+Separation_item::conditional_width (Grob *me, Grob *left)
 {
-  Item *item = dynamic_cast<Item*> (me);
-  Paper_column * pc = item->column_l ();
-  Interval w;
-  
-  for (SCM s =  me->get_grob_property ("elements"); gh_pair_p (s); s = gh_cdr (s))
-    {
-      SCM elt = gh_car (s);
-      if (!unsmob_grob (elt))
-	continue;
+  Interval w = width (me);
+
+  Item *item = dynamic_cast<Item *> (me);
+  Paper_column *pc = item->get_column ();
 
-      Item *il = dynamic_cast<Item*> (unsmob_grob (elt));
-      if (pc != il->column_l ())
+  extract_grob_set (me, "conditional-elements", elts);
+  for (vsize i = 0; i < elts.size (); i++)
+    {
+      Item *il = dynamic_cast<Item *> (elts[i]);
+      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*/ 
+	  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;
+
+      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::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->get_column ();
+  Interval w;
+
+  extract_grob_set (me, "elements", elts);
+  for (vsize i = 0; i < elts.size (); i++)
+    {
+      Item *il = dynamic_cast<Item *> (elts[i]);
+      if (pc != il->get_column ())
 	{
-	  continue;
+	  /* 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;
+
       Interval iv (il->extent (pc, X_AXIS));
-      if (!iv.empty_b ())
-	{
-	  w.unite  (iv);
-	}
+      if (!iv.is_empty ())
+	w.unite (iv);
     }
 
+  SCM pad = me->get_property ("padding");
+
+  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 *me,
+					      Direction d,
+					      Interval *last_ext)
+{
+  Grob *col = dynamic_cast<Item *> (me)->get_column ();
+  last_ext->set_empty ();
+  Grob *last_grob = 0;
+
+  extract_grob_set (me, "elements", elts);
+  for (vsize i = elts.size (); i--;)
+    {
+      Grob *break_item = elts[i];
+      if (!scm_is_symbol (break_item->get_property ("break-align-symbol")))
+	continue;
+
+      if (!scm_is_pair (break_item->get_property ("space-alist")))
+	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");