(warning): better robustness fix.

[lilypond.git] / lily / grob.cc

diff --git a/lily/grob.cc b/lily/grob.cc
index 9d4707c97e7473ea5107547826335f6749c6f56e..f11e52a4fc588bbc6e94a0059870508b6907acdf 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -45,7 +45,7 @@ Grob::Grob (SCM basicprops)
   /*
     fixme: default should be no callback.
    */
-
+  self_scm_ = SCM_EOL;
   pscore_=0;
   status_ = 0;
   original_ = 0;
@@ -122,6 +122,8 @@ Grob::Grob (Grob const&s)
    : dim_cache_ (s.dim_cache_)
 {
   original_ = (Grob*) &s;
+  self_scm_ = SCM_EOL;
+
   immutable_property_alist_ = s.immutable_property_alist_;
 
   mutable_property_alist_ = SCM_EOL;
@@ -173,8 +175,8 @@ Grob::preset_extent (SCM element_smob, SCM scm_axis)
   Axis a = (Axis) gh_scm2int (scm_axis);
 
   SCM ext = s->get_grob_property ((a == X_AXIS)
-                                ? "extent-X"
-                                : "extent-Y");
+                                ? "X-extent"
+                                : "Y-extent");
   
   if (gh_pair_p (ext))
     {
@@ -238,11 +240,15 @@ Grob::get_molecule ()  const
 
   mol =  get_uncached_molecule ();
   
-  Grob *me = (Grob*)this;
-  me->set_grob_property ("molecule", mol);
+  if (live ())
+    {
+      Grob *me = (Grob*)this;
+      me->set_grob_property ("molecule", mol);
+    }
   
   return unsmob_molecule (mol);  
 }
+
 SCM
 Grob::get_uncached_molecule ()const
 {
@@ -251,7 +257,6 @@ Grob::get_uncached_molecule ()const
   SCM  mol = SCM_EOL;
   if (gh_procedure_p (proc)) 
     mol = gh_apply (proc, scm_list_n (this->self_scm (), SCM_UNDEFINED));
-
   
   Molecule *m = unsmob_molecule (mol);
   
@@ -259,14 +264,15 @@ Grob::get_uncached_molecule ()const
     {
       SCM origin = ly_symbol2scm ("no-origin");
       
-      if (store_locations_global_b){
-       SCM cause = get_grob_property ("cause");
-       if (Music*m = unsmob_music (cause))
-         {
-           SCM music_origin = m->get_mus_property ("origin");
-           if (unsmob_input (music_origin))
-             origin = music_origin;
-         }
+      if (store_locations_global_b)
+       {
+         SCM cause = get_grob_property ("cause");
+         if (Music*m = unsmob_music (cause))
+           {
+             SCM music_origin = m->get_mus_property ("origin");
+             if (unsmob_input (music_origin))
+               origin = music_origin;
+           }
       }
 
       // ugr.
@@ -297,45 +303,12 @@ Grob::do_break_processing ()
 {
 }
 
-
-
-
-
-
 System *
 Grob::get_system () const
 {
   return 0;
 }
 
-LY_DEFINE (get_system,
-          "get-system",
-          1, 0, 0, (SCM grob),
-          "
-Return the System Grob of @var{grob}.
-")
-{
-  Grob *me = unsmob_grob (grob);
-  SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "grob");
-  
-  if (Grob *g = me->get_system ())
-    return g->self_scm ();
-    
-  return SCM_EOL;
-}
-
-LY_DEFINE (get_original,
-          "get-original",
-          1, 0, 0, (SCM grob),
-          "
-Return the original Grob of @var{grob}
-")
-{
-  Grob *me = unsmob_grob (grob);
-  SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "grob");
-  return me->original_ ? me->original_->self_scm () : me->self_scm ();
-}
-
 void
 Grob::add_dependency (Grob*e)
 {
@@ -348,34 +321,31 @@ Grob::add_dependency (Grob*e)
 }
 
 
-
 void
 Grob::handle_broken_dependencies ()
 {
-  Spanner * s= dynamic_cast<Spanner*> (this);
-  if (original_ && s)
+  Spanner * sp = dynamic_cast<Spanner*> (this);
+  if (original_ && sp)
     return;
 
-  if (s)
+  if (sp)
     {
-      for (int i = 0;  i< s->broken_intos_ .size (); i++)
+      for (SCM s = mutable_property_alist_; gh_pair_p(s);
+          s = gh_cdr(s))
        {
-         Grob * sc = s->broken_intos_[i];
-         System * l = sc->get_system ();
-
-         sc->substitute_mutable_properties (l ? l->self_scm () : SCM_UNDEFINED,
-                                  mutable_property_alist_);
+         sp->substitute_one_mutable_property (gh_caar (s),
+                                             gh_cdar (s));
+         
        }
     }
 
-
   System *system = get_system ();
 
   if (live ()
       && system && common_refpoint (system, X_AXIS) && common_refpoint (system, Y_AXIS))
     {
       substitute_mutable_properties (system ? system->self_scm () : SCM_UNDEFINED,
-                              mutable_property_alist_);
+                                    mutable_property_alist_);
     }
   else if (dynamic_cast <System*> (this))
     {
@@ -404,6 +374,13 @@ Grob::handle_broken_dependencies ()
 void
 Grob::suicide ()
 {
+  if (!live ())
+    return; 
+
+#if 0 // see below. 
+   String nm = name();
+#endif
+  
   mutable_property_alist_ = SCM_EOL;
   immutable_property_alist_ = SCM_EOL;
 
@@ -415,6 +392,19 @@ Grob::suicide ()
       dim_cache_[a].offset_callbacks_ = SCM_EOL;
       dim_cache_[a].offsets_left_ = 0;
     }
+
+#if 0
+  /*
+    This can make debugging a little easier: we can still know what
+    the object used to be. However, since all its links have been
+    broken, it's usually more convenient to set a conditional
+    breakpoint in GDB before the property lists are wiped.
+   */
+  mutable_property_alist_ = scm_acons (ly_symbol2scm ("name"),
+                                      scm_makfrom0str (nm.to_str0()),
+                                      mutable_property_alist_
+                                      );
+#endif
 }
 
 void
@@ -543,8 +533,8 @@ Grob::extent (Grob * refp, Axis a) const
   ext = ly_scm2interval (d->dimension_);
 
   SCM extra = get_grob_property (a == X_AXIS
-                               ? "extra-extent-X"
-                               : "extra-extent-Y");
+                               ? "extra-X-extent"
+                               : "extra-Y-extent");
 
   /*
     signs ?
@@ -556,8 +546,8 @@ Grob::extent (Grob * refp, Axis a) const
     }
   
   extra = get_grob_property (a == X_AXIS
-                               ? "minimum-extent-X"
-                               : "minimum-extent-Y");
+                               ? "minimum-X-extent"
+                               : "minimum-Y-extent");
   if (gh_pair_p (extra))
     {
       ext.unite (Interval (gh_scm2double (ly_car (extra)),
@@ -710,9 +700,8 @@ void
 Grob::warning (String s)const
 {
   SCM cause = self_scm();
-  while (cause != SCM_EOL && !unsmob_music (cause))
+  while (Grob * g = unsmob_grob (cause))
     {
-      Grob * g = unsmob_grob (cause);
       cause = g->get_grob_property ("cause");
     }
 
@@ -785,7 +774,7 @@ Grob::print_smob (SCM s, SCM port, scm_print_state *)
 }
 
 SCM
-Grob::do_derived_mark ()
+Grob::do_derived_mark () const
 {
   return SCM_EOL;
 }
@@ -834,7 +823,7 @@ ly_grobs2scm (Link_array<Grob> a)
 }
 
 
-IMPLEMENT_TYPE_P (Grob, "ly-grob?");
+IMPLEMENT_TYPE_P (Grob, "ly:grob?");
 
 ADD_INTERFACE (Grob, "grob-interface",
   "In music notation, lots of symbols are related in some way.  You can
@@ -865,9 +854,9 @@ anything.
 ",
   "X-offset-callbacks Y-offset-callbacks X-extent-callback molecule cause
 Y-extent-callback molecule-callback extra-offset spacing-procedure
-staff-symbol interfaces dependencies extent-X extent-Y extra-extent-X
+staff-symbol interfaces dependencies X-extent Y-extent extra-X-extent
 causes meta layer before-line-breaking-callback
-after-line-breaking-callback extra-extent-Y minimum-extent-X
-minimum-extent-Y transparent");
+after-line-breaking-callback extra-Y-extent minimum-X-extent
+minimum-Y-extent transparent");