* mf/GNUmakefile: always trace pfa fonts.

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

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index d740483ac8016287c4f8d7fc30c33740d829096b..3ca590a50044f5ec628b694d09c43cbd38cb99f2 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -1,70 +1,139 @@
 /*   
-  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--2003 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 (Score_element*s)
+Separation_item::add_item (Grob*s,Item* i)
 {
-  s->set_elt_property ("elements", SCM_EOL);
-  s->set_extent_callback (0, X_AXIS);
-  s->set_extent_callback (0,  Y_AXIS);
+  assert (i);
+  Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"),i);
+  s->add_dependency (i);
 }
 
 void
-Separation_item::add_item (Score_element*s,Item* i)
+Separation_item::add_conditional_item (Grob* me , Grob *e)
 {
-  assert (i);
-  Pointer_group_interface (s).add_element (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_grob_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_grob_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_grob_property ("padding");
+
+  if (gh_number_p (pad))
+    {
+      w[RIGHT] += gh_scm2double (pad)/2;
+      w[LEFT] -= gh_scm2double (pad)/2;    
+    }
+  return w;
 }
 
 Interval
-Separation_item::my_width (Score_element *me)
+Separation_item::width (Grob *me)
 {
+  SCM sw = me->get_grob_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_elt_property ("elements"); gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s =  me->get_grob_property ("elements"); gh_pair_p (s); s = ly_cdr (s))
     {
-      SCM elt = gh_car (s);
-      if (!unsmob_element (elt))
+      SCM elt = ly_car (s);
+      if (!unsmob_grob (elt))
        continue;
 
-      Item *il = dynamic_cast<Item*> (unsmob_element (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"));
+         programming_error (_ ("Separation_item:  I've been drinking too much"));
          continue;             /*UGH UGH*/ 
        }
 
-      if (to_boolean (il->get_elt_property ("no-spacing-rods")))
+      if (to_boolean (il->get_grob_property ("no-spacing-rods")))
        {
          continue;
        }
 
-      Interval iv (il->extent (X_AXIS));
+      Interval iv (il->extent (pc, X_AXIS));
       if (!iv.empty_b ())
        {
-         Real off = il->relative_coordinate (pc, X_AXIS);
-         w.unite  (iv + off);
+         w.unite (iv);
        }
     }
 
+  SCM pad = me->get_grob_property ("padding");
+
+  if (gh_number_p (pad))
+  {
+    w[RIGHT] += gh_scm2double (pad)/2;
+    w[LEFT] -= gh_scm2double (pad)/2;    
+  }
+
+  me->set_grob_property ("X-extent", ly_interval2scm (w));
+  
   return w;
- // add this->offset_ ? this-> relative_coordinate ()? 
 }
 
 
 
+
+
+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");