From d1f6b888056efa964f146531348a7c2f6b667a8c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 13 Jul 2005 18:42:25 +0000 Subject: [PATCH] * lily/include/music-constructor.hh: remove file. * lily/context.cc (get_grob_key): nop if use_object_keys not set. (get_context_key): idem. * ps/music-drawing-routines.ps: remove draw_beam. * lily/lookup.cc (beam): use round_filled_polygon() for beam. --- lily/context.cc | 3 +++ lily/include/music-constructor.hh | 33 ------------------------------- lily/program-option.cc | 3 ++- 3 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 lily/include/music-constructor.hh diff --git a/lily/context.cc b/lily/context.cc index e57593e287..52b0b4332c 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -562,6 +562,9 @@ Context::implementation () const 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)) diff --git a/lily/include/music-constructor.hh b/lily/include/music-constructor.hh deleted file mode 100644 index aad0123ddc..0000000000 --- a/lily/include/music-constructor.hh +++ /dev/null @@ -1,33 +0,0 @@ -/* - music-constructor.hh -- declare Music_constructor - - source file of the GNU LilyPond music typesetter - - (c) 2001--2005 Han-Wen Nienhuys -*/ - -#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 */ - diff --git a/lily/program-option.cc b/lily/program-option.cc index 19d18acf51..7233a6957e 100644 --- a/lily/program-option.cc +++ b/lily/program-option.cc @@ -68,7 +68,8 @@ void internal_set_option (SCM var, SCM val) } 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)); } } -- 2.39.2