From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 20 Jun 2002 23:42:34 +0000 (+0000)
Subject: foo
X-Git-Tag: release/1.5.63~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1af893a197eed7fa944c8a261d6d758fccc041c7;p=lilypond.git

foo
---

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index c9b0ee0e62..4930b4fec7 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -9,8 +9,6 @@
 #ifndef LILY_GUILE_HH
 #define LILY_GUILE_HH
 
-#define SCM_VOIDP_TEST
-
 
 /*
   TODO: the  GH interface is deprecated as of GUILE 1.6
diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 992dba8d63..db22eaa86e 100644
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -105,25 +105,6 @@ Separating_group_spanner::set_spacing_rods (SCM smob)
 	find_rods (rb, ly_cdr (s));
     }
 
-#if 0
-  /*
-    TODO; restore this.
-   */
-  /*
-    We've done our job, so we get lost. 
-   */
-  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s); s = ly_cdr (s))
-    {
-      Item * it =dynamic_cast<Item*> (unsmob_grob (ly_car (s)));
-      if (it && it->broken_b ())
-	{
-	  it->find_prebroken_piece (LEFT) ->suicide ();
-	  it->find_prebroken_piece (RIGHT)->suicide ();
-	}
-      it->suicide ();
-    }
-  me->suicide ();
-#endif
   return SCM_UNSPECIFIED ;
 }
 
diff --git a/lily/system.cc b/lily/system.cc
index 692b1f11ee..46cd931b02 100644
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -61,7 +61,18 @@ System::output_lines ()
     {
       Grob * g = unsmob_grob (ly_car (s));
       if (Spacing_interface::has_interface (g))
-	g->suicide ();
+	{
+	  /*
+	    Kill no longer needed grobs. 
+	   */
+	  Item * it = dynamic_cast<Item*> (g);
+	  if (it && Item::breakable_b(it))
+	    {
+	      it->find_prebroken_piece (LEFT)->suicide();
+	      it->find_prebroken_piece (RIGHT)->suicide();
+	    }
+	  g->suicide ();
+	}
       else
 	g->do_break_processing ();
     }