* 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.

diff --git a/lily/context.cc b/lily/context.cc
index e57593e2878d99c46f729362b290f83cfb3c19a9..52b0b4332cc50698f093c0d4c1a750859139fb69 100644 (file)
--- 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 (file)
index aad0123..0000000
--- 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 <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 */
-

diff --git a/lily/program-option.cc b/lily/program-option.cc
index 19d18acf518a460a7e7878644ff7a582ccd6372f..7233a6957eb7b9f5f8253c8efdca4f9dddb46803 100644 (file)
--- 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));
     }
 }