lilypond-1.1.1

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 71757314a7c75e82dd1a8bfd2687dad2f060a5ba..2ec7736a40af93be12411c6e86a9671b6d25e5e5 100644 (file)
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -80,6 +80,7 @@ Audio_time_signature::midi_item_p()
 {
   return new Midi_time_signature (this);
 }
+
 IMPLEMENT_IS_TYPE_B1(Audio_time_signature, Audio_item);
 
 Audio_text::Audio_text (Audio_text::Type type, String text_str)
@@ -96,7 +97,6 @@ Audio_text::midi_item_p()
 }
 
 IMPLEMENT_IS_TYPE_B1(Audio_text, Audio_item);
-
 IMPLEMENT_IS_TYPE_B1(Audio_item, Audio_element);
 
 void

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 5f8923c284e48a70f38547b1aa1d1f0942c6b0c3..d63b433a4fe7b0fdf8cccbd2c328104f5caf042c 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -24,27 +24,26 @@ Note_performer::do_print () const
 {
 #ifndef NPRINT
   if (note_req_l_) 
-      note_req_l_->print ();
+    note_req_l_->print ();
 #endif
 }
 
 void 
 Note_performer::do_process_requests () 
 {
-  // this is _really_ braindead, but it generates some output
-  if (!note_req_l_ || !dynamic_cast <Melodic_req *> (note_req_l_)  || !dynamic_cast <Rhythmic_req *> (note_req_l_))
-    return;
-
-  int transposing_i = 0;
-  //urg
-  Scalar prop = get_property ("transposing");
-  if (!prop.empty_b () && prop.isnum_b ()) 
-    transposing_i = prop;
+  if (note_req_l_)
+    {
+      int transposing_i = 0;
+      //urg
+      Scalar prop = get_property ("transposing");
+      if (!prop.empty_b () && prop.isnum_b ()) 
+       transposing_i = prop;
 
 
-  play (new Audio_note (note_req_l_, transposing_i));
+      play (new Audio_note (note_req_l_, transposing_i));
 
-  note_req_l_ = 0;
+      note_req_l_ = 0;
+    }
 }
 
 bool 

diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make
index fb32b06344fb8d676c2af8af94a494c7c78f5690..1c1209d3a544a3d8cb430db4ccaa04dbb94d0d62 100644 (file)
--- a/stepmake/stepmake/executable-vars.make
+++ b/stepmake/stepmake/executable-vars.make
@@ -1,5 +1,5 @@
 # empty
 LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) $($(PACKAGE)_LDFLAGS)
 
-MODULE_LIBES=$(addsuffix /$(outdir)/library.a, $(MODULE_LIBS))
-LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES) $(BLA_LIBES)#u8gh
+MODULE_LIBES := $(addsuffix /$(outdir)/library.a, $(MODULE_LIBS)) $(MODULE_LIBES)
+LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES)