X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob.cc;h=37d715bf0743f4c2cb31b27970656d0ff40a2a51;hb=e9a308e9c6002900fc336733950a0175bcbcc333;hp=72b46376c61d5405d8648c34b7b677db2b8327f1;hpb=d9f0a129bd864743b639c499366bbccf79d27323;p=lilypond.git

diff --git a/lily/grob.cc b/lily/grob.cc
index 72b46376c6..37d715bf07 100644
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
@@ -27,15 +27,13 @@
 #include "ly-smobs.icc"
 
 Grob *
-Grob::clone (int count) const
+Grob::clone () const
 {
-  return new Grob (*this, count);
+  return new Grob (*this);
 }
 
-Grob::Grob (SCM basicprops,
-	    Object_key const *key)
+Grob::Grob (SCM basicprops)	    
 {
-  key_ = key;
   
   /* FIXME: default should be no callback.  */
   self_scm_ = SCM_EOL;
@@ -51,26 +49,28 @@ Grob::Grob (SCM basicprops,
      GC. After smobify_self (), they are.  */
   smobify_self ();
 
-  /*
-    We always get a new key object for a new grob.
-  */
-  if (key_)
-    ((Object_key *)key_)->unprotect ();
-
   SCM meta = get_property ("meta");
   if (scm_is_pair (meta))
-    interfaces_ = scm_cdr (scm_assq (ly_symbol2scm ("interfaces"), meta));
+    {
+      interfaces_ = scm_cdr (scm_assq (ly_symbol2scm ("interfaces"), meta));
+
+      SCM object_cbs = scm_assq (ly_symbol2scm ("object-callbacks"), meta);
+      if (scm_is_pair (object_cbs))
+	{
+	  for (SCM s = scm_cdr (object_cbs); scm_is_pair (s); s = scm_cdr (s))
+	    set_object (scm_caar (s), scm_cdar (s)); 
+	}
+    }
   
-  if (get_property_data (ly_symbol2scm ("X-extent")) == SCM_EOL)
+  if (get_property_data ("X-extent") == SCM_EOL)
     set_property ("X-extent", Grob::stencil_width_proc);
-  if (get_property_data (ly_symbol2scm ("Y-extent")) == SCM_EOL)
+  if (get_property_data ("Y-extent") == SCM_EOL)
     set_property ("Y-extent", Grob::stencil_height_proc);
 }
 
-Grob::Grob (Grob const &s, int copy_index)
+Grob::Grob (Grob const &s)
   : dim_cache_ (s.dim_cache_)
 {
-  key_ = (use_object_keys) ? new Copied_key (s.key_, copy_index) : 0;
   original_ = (Grob *) & s;
   self_scm_ = SCM_EOL;
 
@@ -82,8 +82,6 @@ Grob::Grob (Grob const &s, int copy_index)
   layout_ = 0;
 
   smobify_self ();
-  if (key_)
-    ((Object_key *)key_)->unprotect ();
 }
 
 Grob::~Grob ()
@@ -130,12 +128,12 @@ Grob::get_print_stencil () const
 	  Real x = scm_to_double (scm_cadr (rot));
 	  Real y = scm_to_double (scm_caddr (rot));
 
-	  retval.rotate (angle, Offset (x, y));
+	  retval.rotate_degrees (angle, Offset (x, y));
 	}
 
       /* color support... see interpret_stencil_expression () for more... */
       SCM color = get_property ("color");
-      if (color != SCM_EOL)
+      if (scm_is_pair (color))
 	{
 	  SCM expr = scm_list_3 (ly_symbol2scm ("color"),
 				 color,
@@ -287,17 +285,19 @@ Grob::pure_relative_y_coordinate (Grob const *refp, int start, int end)
   if (refp == this)
     return 0.0;
 
-  SCM pure_off = ly_lily_module_constant ("pure-Y-offset");
   Real off = 0;
 
   if (dim_cache_[Y_AXIS].offset_)
     off = *dim_cache_[Y_AXIS].offset_;
-  else if (ly_is_procedure (pure_off))
+  else
     {
+      SCM proc = get_property_data ("Y-offset");
+
       dim_cache_[Y_AXIS].offset_ = new Real (0.0);
-      off = scm_to_double (scm_apply_3 (pure_off, self_scm (),
-					scm_from_int (start), scm_from_int (end),
-					SCM_EOL));
+      off = robust_scm2double (call_pure_function (proc,
+						   scm_list_1 (self_scm ()),
+						   start, end),
+			       0.0);
       delete dim_cache_[Y_AXIS].offset_;
       dim_cache_[Y_AXIS].offset_ = 0;
     }
@@ -307,13 +307,15 @@ Grob::pure_relative_y_coordinate (Grob const *refp, int start, int end)
      it probably means that the Alignment was fixed and it has already been
      calculated.
   */
-  Grob *p = get_parent (Y_AXIS);
-  Real trans = 0;
-  if (Align_interface::has_interface (p) && !dim_cache_[Y_AXIS].offset_)
-    trans = Align_interface::get_pure_child_y_translation (p, this, start, end);
+  if (Grob *p = get_parent (Y_AXIS))
+    {
+      Real trans = 0;
+      if (Align_interface::has_interface (p) && !dim_cache_[Y_AXIS].offset_)
+	trans = Align_interface::get_pure_child_y_translation (p, this, start, end);
 
-  return off + trans
-    + dim_cache_[Y_AXIS].parent_->pure_relative_y_coordinate (refp, start, end);
+      return off + trans + p->pure_relative_y_coordinate (refp, start, end);
+    }
+  return off;
 }
 
 /* Invoke callbacks to get offset relative to parent.  */
@@ -392,7 +394,7 @@ Grob::extent (Grob *refp, Axis a) const
 	(a == X_AXIS)
 	? ly_symbol2scm ("X-extent")
 	: ly_symbol2scm ("Y-extent");
-
+	
       SCM ext = internal_get_property (ext_sym);
       if (is_number_pair (ext))
 	real_ext.unite (ly_scm2interval (ext));
@@ -404,6 +406,7 @@ Grob::extent (Grob *refp, Axis a) const
       SCM min_ext = internal_get_property (min_ext_sym);
       if (is_number_pair (min_ext))
 	real_ext.unite (ly_scm2interval (min_ext));
+
       ((Grob*)this)->dim_cache_[a].extent_ = new Interval (real_ext);  
     }
   
@@ -415,17 +418,19 @@ Grob::extent (Grob *refp, Axis a) const
 Interval
 Grob::pure_height (Grob *refp, int start, int end)
 {
-  SCM pure_height = ly_lily_module_constant ("pure-Y-extent");
-  Interval iv (0, 0);
-
-  if (ly_is_procedure (pure_height))
-    iv = ly_scm2interval (scm_apply_3 (pure_height, self_scm (),
-				       scm_from_int (start), scm_from_int (end),
-				       SCM_EOL));
+  SCM proc = get_property_data (ly_symbol2scm ("Y-extent"));
+  SCM iv_scm = call_pure_function (proc,
+				   scm_list_1 (self_scm ()),
+				   start, end);
+  Interval iv = robust_scm2interval (iv_scm, Interval (0, 0));
   Real offset = pure_relative_y_coordinate (refp, start, end);
 
   SCM min_ext = get_property ("minimum-Y-extent");
-  if (is_number_pair (min_ext))
+
+  /* we don't add minimum-Y-extent if the extent is empty. This solves
+     a problem with Hara-kiri spanners. They would request_suicide and
+     return empty extents, but we would force them here to be large. */
+  if (!iv.is_empty () && is_number_pair (min_ext))
     iv.unite (ly_scm2interval (min_ext));
 
   iv.translate (offset);
@@ -441,7 +446,7 @@ Grob::maybe_pure_extent (Grob *refp, Axis a, bool pure, int start, int end)
 }
 
 Interval_t<int>
-Grob::spanned_rank_iv ()
+Grob::spanned_rank_iv () const
 {
   return Interval_t<int> (-1, 0);
 }
@@ -561,7 +566,7 @@ Grob::programming_error (string s) const
 }
 
 
-ADD_INTERFACE (Grob, "grob-interface",
+ADD_INTERFACE (Grob,
 	       "A grob represents a piece of music notation\n"
 	       "\n"
 	       "All grobs have an X and Y-position on the page.  These X and Y positions\n"
@@ -602,11 +607,13 @@ ADD_INTERFACE (Grob, "grob-interface",
 	       "Y-extent "
 	       "Y-offset "
 	       "after-line-breaking "
+	       "avoid-slur "
 	       "axis-group-parent-X "
 	       "axis-group-parent-Y "
 	       "before-line-breaking "
 	       "cause "
 	       "color "
+	       "cross-staff "
 	       "extra-X-extent "
 	       "extra-Y-extent "
 	       "extra-offset "
@@ -615,6 +622,9 @@ ADD_INTERFACE (Grob, "grob-interface",
 	       "meta "
 	       "minimum-X-extent "
 	       "minimum-Y-extent "
+	       "outside-staff-horizontal-padding "
+	       "outside-staff-padding "
+	       "outside-staff-priority "
 	       "rotation "
 	       "springs-and-rods "
 	       "staff-symbol "
@@ -622,15 +632,10 @@ ADD_INTERFACE (Grob, "grob-interface",
 	       "transparent "
 	       );
 
-
-
-
-
 /****************************************************************
   CALLBACKS
 ****************************************************************/
 
-
 static SCM
 grob_stencil_extent (Grob *me, Axis a)
 {