void
Context::clear_key_disambiguations ()
{
+ if (!use_object_keys)
+ return;
+
grob_counts_.clear ();
context_counts_.clear ();
for (SCM s = context_list_; scm_is_pair (s); s = scm_cdr (s))
+++ /dev/null
-/*
- music-constructor.hh -- declare Music_constructor
-
- source file of the GNU LilyPond music typesetter
-
- (c) 2001--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#ifndef MUSIC_CONSTRUCTOR_HH
-#define MUSIC_CONSTRUCTOR_HH
-
-#include "lily-guile.hh"
-#include "lily-proto.hh"
-#include "string.hh"
-#include "global-ctor.hh"
-
-#define ADD_MUSIC(type) \
- Music *_ ## type ## _ctor (SCM init) \
- { \
- return new type (init); \
- } \
- static void _ ## type ## _adder () \
- { \
- add_music_ctor (#type, &_ ## type ## _ctor); \
- } \
- ADD_SCM_INIT_FUNC (_ ## type ## _adder_prefix, _ ## type ## _adder);
-
-typedef Music *(*Music_ctor) (SCM);
-void add_music_ctor (String, Music_ctor);
-Music *make_music (String, SCM);
-
-#endif /* MUSIC_CONSTRUCTOR_HH */
-
}
else if (var == ly_symbol2scm ("object-keys"))
{
- use_object_keys = scm_from_bool (to_boolean (val));
+ use_object_keys = to_boolean (val);
+ val = scm_from_bool (to_boolean (val));
}
}