From 32b02b2642bd132a548afc163c28667aff074829 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 27 Mar 2005 16:45:56 +0000 Subject: [PATCH] * lily/grob.cc (mark_smob): mark \layout block from Grob::mark_smob(). --- ChangeLog | 4 ++++ lily/grob.cc | 6 +++++- lily/slur-scoring.cc | 3 ++- lily/system.cc | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e237214d3c..7e5d99bbb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-03-27 Han-Wen Nienhuys + + * lily/grob.cc (mark_smob): mark \layout block from Grob::mark_smob(). + 2005-03-27 Jan Nieuwenhuizen * Documentation/topdocs/INSTALL.texi (Top): Updates. diff --git a/lily/grob.cc b/lily/grob.cc index d127c0094d..ce3ab0ceb2 100644 --- 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 aec6fe62da..6ed4e11d95 100644 --- 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 d1066602fe..2e06f7a65c 100644 --- 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. ", -- 2.39.2