From 878e94c966d1eb7104be133611566564e2edeb8b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 5 Aug 2005 15:28:15 +0000 Subject: [PATCH] * lily/include/ly-module.hh: define MODULE_GC_KLUDGE globally. * input/proportional.ly: new file. --- ChangeLog | 2 ++ input/proportional.ly | 4 +++- lily/include/ly-module.hh | 3 +++ lily/ly-module.cc | 2 -- lily/module-scheme.cc | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a57689074..6683bde0a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-08-05 Han-Wen Nienhuys + * 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 3ae12a81d9..beaedbcf07 100644 --- 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 bc1ba2125a..c7c16ee7c5 100644 --- 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 2dcdb0ffa2..b2d04f4185 100644 --- 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 0e3d98c612..46e846e14b 100644 --- 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. -- 2.39.5