patch::: 1.3.59.uu1

diff --git a/VERSION b/VERSION
index 484be829b250fb9a030bbd6b492e38b7e07987b3..1810523f6724d69da94badddaf0ce085814724aa 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=59
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=uu1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index f8454664ed05c401a3b75f7506ba50efcdce7b8a..d496d25bc91c0d421cf972d1b2bf30dec3d65a35 100644 (file)
--- a/lily/include/ly-smobs.icc
+++ b/lily/include/ly-smobs.icc
@@ -38,15 +38,12 @@ return s;\
  */
 #define IMPLEMENT_SMOBS(CL)\
 long CL::smob_tag_;\
-static scm_smobfuns CL ## _funs = {                                    \
-  CL::mark_smob, CL::free_smob,                                                \
-  CL::print_smob, 0,                                                   \
-};                                                                     \
 void                                                                   \
 CL::init_smobs ()                                                      \
 {                                                                      \
-  smob_tag_ = scm_newsmob (&CL ## _funs);                                      \
-}                                                                      \
+  smob_tag_ = scm_make_smob_type_mfpe ( \
+     #CL, 0, CL::mark_smob, CL::free_smob, CL::print_smob, 0);\
+}\
                                                                        \
                                                                         \
 void                                                                    \

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 9f5b91fa931ae3ccb105eebdc67e2fc9b61aaff4..6f9657731094bcf7ad2efce17ddfdcd8ee9ef5de 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -373,7 +373,7 @@ ly_number2string (SCM s)
   return gh_str02scm (str);
 }
 
-// #define TEST_GC
+#define TEST_GC
 
 #ifdef TEST_GC
 #include <libguile/gc.h>

diff --git a/lily/score-element-callback.cc b/lily/score-element-callback.cc
index a155603891e64627cf0a26a0a5c72372d3d33085..7b701b15bd9ee96862b1d3fa4cf060f9bbb324bb 100644 (file)
--- a/lily/score-element-callback.cc
+++ b/lily/score-element-callback.cc
@@ -30,15 +30,12 @@ scm_sizet free_smob (SCM)
   return 0;
 }
 
-static scm_smobfuns callback_funs = {
-  mark_smob, free_smob,
-  print_smob, 0,
-};
-
 static
 void start_callback_smobs()
 {
-  callback_tag = scm_newsmob (&callback_funs);
+  callback_tag = scm_make_smob_type_mfpe ("callback", 0,
+                                         mark_smob, free_smob,
+                                         print_smob, 0);
 }
 
 

diff --git a/scm/lily.scm b/scm/lily.scm
index 42b517f5d05ce5a42b44d8888f32d46bef3334b7..ded3b1ff301edabb4406e3e07b041b2dd2581ab9 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -291,9 +291,11 @@
     (string-append "% " s))
   
   (define (end-output) 
+       (begin
+               (display (gc-stats))
     (string-append "\n\\EndLilyPondOutput"
                   ; Put GC stats here.
-                  ))
+                  )))
   
   (define (experimental-on)
     "")