(derived_mark): change signature, add

const.

diff --git a/ChangeLog b/ChangeLog
index 7aceb0fd27b6f012bcfe48eb0de4a5c382fa3759..cb891d7853aca06d5c0471f08b62dfd3310743e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/grace-engraver.cc (derived_mark): change signature, add
+       const.
+
 2005-03-28  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * SConstruct (symlink): 
@@ -9,6 +14,9 @@
 
 2005-03-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/paper-score.cc (process): don't delete grobs after
+       producing stencils. 
+
        * scm/part-combiner.scm (determine-split-list): switch off
        debugging info.
 

diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index be09cb4fe5d3784a3ba2abc0e28e7ed378b3be12..6df1ca46f17bdec8a1609662ffc0c5c065e87564 100644 (file)
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -14,7 +14,7 @@ class Grace_engraver : public Engraver
 {
 protected:
   virtual void start_translation_timestep ();
-  virtual void derived_mark ();
+  virtual void derived_mark () const;
 
   TRANSLATOR_DECLARATIONS (Grace_engraver);
   Moment last_moment_;
@@ -28,9 +28,10 @@ Grace_engraver::Grace_engraver ()
 }
 
 void
-Grace_engraver::derived_mark ()
+Grace_engraver::derived_mark () const
 {
   scm_gc_mark (grace_settings_);
+  Engraver::derived_mark ();
 }
 
 void

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index db8619f21daf09a8415763f1a2309ddba87531ca..05915e794baad41a1e6edbd98f2a17b1929d7cfe 100644 (file)
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -16,7 +16,10 @@
 class Music_output
 {
 public:
-  virtual SCM process (String) {return SCM_EOL;}
+  virtual SCM process (String)
+  {
+    return SCM_EOL;
+  }
   virtual ~Music_output () {}
 };
 

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index b8bc7d318fd405d91ae1628c3fcc927304514f63..c27a9bfd4910bdfa2eef51cb67cbc02067ef742f 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -82,13 +82,11 @@ Paper_score::process (String)
   Array<Column_x_positions> breaking = calc_breaking ();
   system_->break_into_pieces (breaking);
   SCM lines = system_->get_lines ();
-#if 0
-  /* gourlay:do_solve also prints newline.  */
-  progress_indication ("\n");
-#endif
-
-  /* Only keep result stencils in lines_, *title_; delete all grobs.  */
-  systems_ = SCM_EOL;
 
+  /*
+    retain Grobs, since they are pointed to by the point & click data
+    structures, and are not marked fully, because child -> parent
+    links aren't marked.
+   */
   return lines;
 }

diff --git a/ly/init.ly b/ly/init.ly
index 3e36bd347bd23dca86b78b517c20218be9aaf5b6..481eda893d880a625c284651039c5e1ad3610a47 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -13,6 +13,9 @@
 #(define $globalheader #f)
 #(define version-seen? #f)
 
+#(set-debug-cell-accesses! 2500)
+
+
 \maininput
 %% there is a problem at the end of the input file