* lily/grob.cc (mark_smob): mark \layout block from Grob::mark_smob().

diff --git a/ChangeLog b/ChangeLog
index e237214d3c46e7fc1c3c48004984a45eb3ad2b0b..7e5d99bbb720b1d2ab14a4d607bfef672c6120fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/grob.cc (mark_smob): mark \layout block from Grob::mark_smob().
+
 2005-03-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/topdocs/INSTALL.texi (Top): Updates.

diff --git a/lily/grob.cc b/lily/grob.cc
index d127c0094dddf5a80e698095f2044e4d13335cb5..ce3ab0ceb2e19e5d939df3331bd3a500fbd76363 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -25,8 +25,9 @@
 #include "misc.hh"
 #include "music.hh"
 #include "item.hh"
-
+#include "paper-score.hh"
 #include "ly-smobs.icc"
+#include "output-def.hh"
 
 Grob *
 Grob::clone (int count) const
@@ -661,6 +662,9 @@ Grob::mark_smob (SCM ses)
   if (s->original_)
     scm_gc_mark (s->original_->self_scm ());
 
+  if (s->pscore_)
+    scm_gc_mark (s->pscore_->layout_->self_scm());
+
   s->do_derived_mark ();
   return s->mutable_property_alist_;
 }

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index aec6fe62dac30ce5c22b3b696641ffc144622078..6ed4e11d95d6c20a53f7231662c70597722f0245 100644 (file)
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -507,6 +507,7 @@ Slur_score_state::get_base_attachments () const
            fixme: X coord should also be set in this case.
          */
          if (stem
+             && !Stem::is_invisible (stem)
              && extremes_[d].stem_dir_ == dir_
              && Stem::get_beaming (stem, -d)
              && (!spanner_less (slur_, Stem::get_beam (stem))
@@ -572,8 +573,8 @@ Slur_score_state::get_base_attachments () const
 
          if (isinf (b) || isnan (b))
            {
-             b = 0.0;
              programming_error ("Slur attachment is inf/nan");
+             b = 0.0;
            }
            
        }

diff --git a/lily/system.cc b/lily/system.cc
index d1066602fe0ddfe34e52cbe9f1d9824408861629..2e06f7a65c19beac42302840633d865b9b9dd0cf 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -400,6 +400,7 @@ System::columns () const
   return acs;
 }
 
+
 ADD_INTERFACE (System, "system-interface",
               "This is the toplevel object: each object in a score "
               "ultimately has a System object as its X and Y parent. ",