From: fred <fred>
Date: Sun, 24 Mar 2002 20:06:15 +0000 (+0000)
Subject: lilypond-0.1.47
X-Git-Tag: release/1.5.59~3409
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b2f9673dac12d0bac6b1c3d132c5bb39c475537d;p=lilypond.git

lilypond-0.1.47
---

diff --git a/lily/clef-grav.cc b/lily/clef-grav.cc
index 6bb055c2fa..589dbf3282 100644
--- a/lily/clef-grav.cc
+++ b/lily/clef-grav.cc
@@ -30,6 +30,10 @@ Clef_engraver::set_type (String s)
     {
       c0_position_i_= -6;
     }
+  else if (clef_type_str_ == "soprano")
+    {
+      c0_position_i_= -4;
+    }
   else if (clef_type_str_ == "alto")
     {
       c0_position_i_= 0;
diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 927d3f2335..a63d8b72bd 100644
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -38,17 +38,25 @@ void
 Clef_item::read (String t)
 {
   symbol_= t;
-  if (t == "violin")
+  if (t == "violin") {
     y_position_i_ = -2;
-  if (t == "alto")
+  }
+  else if (t == "soprano") {
+    symbol_="alto";
+    y_position_i_ = -4;
+  }
+  else if (t == "alto") {
     y_position_i_ = 0;
-  if (t == "tenor") {
+  }
+  else if (t == "tenor") {
     symbol_="alto";
     y_position_i_ = 2;
   }
-  if (t == "bass")
+  else if (t == "bass") {
     y_position_i_ = 2;
+  }
 }
+
 void
 Clef_item::read (Clef_engraver const &k)
 {
diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 24f297942d..f688baf6d5 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -119,7 +119,7 @@ Midi_header::Midi_header (int format_i, int tracks_i, int clocks_per_4_i)
 char const* const instrument_name_sz_a_[ ] = {
 
   /* default is usually piano */
-  /* 0 */ "piano",
+  /* 0 "piano", */
 
 	  /* (1-8 piano) */
 	  /* 1 */ "acoustic grand",
@@ -535,7 +535,8 @@ Midi_track::Midi_track ()
 void 
 Midi_track::add (Moment delta_time_mom, Midi_item* mitem_p)
 {
-  assert (delta_time_mom >= 0);
+  assert (delta_time_mom >= Moment (0));
+
   event_p_list_.bottom ().add (new Midi_event (delta_time_mom, mitem_p));
 }