* lily/include/ly-module.hh: define MODULE_GC_KLUDGE globally.

* input/proportional.ly: new file.

diff --git a/ChangeLog b/ChangeLog
index 9a576890745f8383e72d984d263ade13b0638ece..6683bde0a2b696ced99a91be4ba9247c68f8a96c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/include/ly-module.hh: define MODULE_GC_KLUDGE globally.
+
        * input/proportional.ly: new file.
 
        * lily/tuplet-bracket.cc (after_line_breaking): don't suicide if

diff --git a/input/proportional.ly b/input/proportional.ly
index 3ae12a81d9ceba7862d27d9a89dbd9313e539d9a..beaedbcf072ff04865119aaeeb1e15bcfd5d8bc8 100644 (file)
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -81,7 +81,9 @@ staffKind = "RhythmicStaff"
     >>
   \new \staffKind {
     \times 9/5 {
-      r8. c16[ c c  c c c
+      r8. c16[ c c
+              \grace { c32[ c32] }
+              c16 c c
       c 
     }
     \times 4/7 {

diff --git a/lily/include/ly-module.hh b/lily/include/ly-module.hh
index bc1ba2125a6efb7d61f99444a81ba8582d321244..c7c16ee7c5116491569d8fc88cdf8a1dd4d2f1bb 100644 (file)
--- a/lily/include/ly-module.hh
+++ b/lily/include/ly-module.hh
@@ -19,10 +19,13 @@ SCM ly_module_symbols (SCM mod);
 void ly_reexport_module (SCM mod);
 inline bool ly_is_module (SCM x) { return SCM_MODULEP (x); }
 SCM ly_clear_anonymous_modules ();
+void clear_anonymous_modules ();
 SCM ly_use_module (SCM mod, SCM used);
 
 /* Ugh signature of scm_internal_hash_fold () is inaccurate.  */
 typedef SCM (*Hash_closure_function) ();
 
+#define MODULE_GC_KLUDGE
+
 #endif /* LY_MODULE_HH */
 

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 2dcdb0ffa2e93f1b8bd8c8c1cc86d9f42b8e53bd..b2d04f4185157bdfc3d8137501d15b48dd8f6b90 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -12,8 +12,6 @@
 #include "string.hh"
 #include "protected-scm.hh"
 
-#define MODULE_GC_KLUDGE
-
 #ifdef MODULE_GC_KLUDGE
 Protected_scm anonymous_modules = SCM_EOL;
 #endif

diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc
index 0e3d98c6123494fff3eb05b2b076b46ca0a9c107..46e846e14ba9474c91c0789686862036d4ef2a86 100644 (file)
--- a/lily/module-scheme.cc
+++ b/lily/module-scheme.cc
@@ -12,6 +12,8 @@
 #include "main.hh"
 #include "string.hh"
 
+#include "ly-module.hh"
+
 /*
   If a variable in changed in SRC, we DEST doesn't see the
   definitions.