* Documentation/user/examples.itely (Piano templates): change

Engraver_group_engraver -> Engraver_group

* lily/ly-module.cc (make_stand_in_procs_weak): only kludge if
scm_stand_in_procs is not weak_any.

diff --git a/ChangeLog b/ChangeLog
index b5e17bbc693adea7c151f8f0868f1babcbbdeb1a..7c96099a1067783ce52109fc6899bb055cc16319 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/user/examples.itely (Piano templates): change
+       Engraver_group_engraver -> Engraver_group
+
        * lily/ly-module.cc (make_stand_in_procs_weak): only kludge if
        scm_stand_in_procs is not weak_any.
 

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 526b8490ff11e63339bbe77e6ed258745c9d396d..aac59057eacaa3c5fc4e329f74bb5de02c28b0ce 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -661,7 +661,7 @@ to indicate improvisation in Jazz pieces,
 @lilypond[quote,raggedright]
 \layout { \context {
   \name ImproVoice
-  \type "Engraver_group_engraver"
+  \type "Engraver_group"
   \consists "Note_heads_engraver"
   \consists "Text_engraver"
   \consists Pitch_squash_engraver
@@ -740,10 +740,10 @@ The notes look like a slash, without a stem,
 
 All these plug-ins have to cooperate, and this is achieved with a
 special plug-in, which must be marked with the keyword @code{\type}.
-This should always be @internalsref{Engraver_group_engraver},
+This should always be @internalsref{Engraver_group},
 
 @example
-\type "Engraver_group_engraver"
+\type "Engraver_group"
 @end example
 
 Put together, we get
@@ -751,7 +751,7 @@ Put together, we get
 @example
 \context @{
   \name ImproVoice
-  \type "Engraver_group_engraver"
+  \type "Engraver_group"
   \consists "Note_heads_engraver"
   \consists "Text_engraver"
   \consists Pitch_squash_engraver

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index bb1a37749d2a7b942206615548cdd1b39d484270..09ce4a82ed49ae3c5b9e75a741d7a0c5e2ff4412 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -334,7 +334,7 @@ pedal = {
   >>
   \layout {
     \context {
-      \type "Engraver_group_engraver"
+      \type "Engraver_group"
       \name Dynamics
       \alias Voice % So that \cresc works, for example.
       \consists "Output_property_engraver"

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 9bc5f329862e43b0034cab38dd100b0fb768c958..9ce3b380877864b9ead3cbf5fe42d3cea1f1253c 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -14,11 +14,13 @@
 
 #ifdef MODULE_GC_KLUDGE
 Protected_scm anonymous_modules = SCM_EOL;
+bool perform_gc_kludge;
 #endif
 
 void
 clear_anonymous_modules ()
 {
+#ifdef MODULE_GC_KLUDGE
   for (SCM s = anonymous_modules;
        scm_is_pair (s);
        s = scm_cdr (s))
@@ -35,6 +37,7 @@ clear_anonymous_modules ()
     }
 
   anonymous_modules = SCM_EOL;
+#endif
 }
 
 SCM
@@ -61,7 +64,8 @@ ly_make_anonymous_module (bool safe)
     }
 
 #ifdef MODULE_GC_KLUDGE
-  anonymous_modules = scm_cons (mod, anonymous_modules);
+  if (perform_gc_kludge)
+    anonymous_modules = scm_cons (mod, anonymous_modules);
 #endif
 
   return mod;
@@ -153,7 +157,15 @@ void
 make_stand_in_procs_weak ()
 {
   if (SCM_IS_WHVEC_ANY(scm_stand_in_procs))
-    return; 
+    {
+#if (SCM_MINOR_VERSION == 7) 
+      perform_gc_kludge = false;
+#endif
+      return; 
+    }
+  
+  perform_gc_kludge = true;
+  
   
   SCM old_tab = scm_stand_in_procs;
   SCM new_tab = scm_make_weak_key_hash_table (scm_from_int (257));