* lily/modified-font-metric.cc (text_dimension): try

[lilypond.git] / lily / simultaneous-music.cc

diff --git a/lily/simultaneous-music.cc b/lily/simultaneous-music.cc
index 011734b9661e677ae13d12180b1782828dff6eab..ccf3287ab511202b73d61e397522acc1e7909834 100644 (file)
--- a/lily/simultaneous-music.cc
+++ b/lily/simultaneous-music.cc
@@ -8,7 +8,6 @@
 */
 
 #include "input.hh"
-#include "moment.hh"
 #include "pitch.hh"
 #include "music-list.hh"
 #include "scm-option.hh"
@@ -16,16 +15,16 @@
 Moment
 Simultaneous_music::get_length () const
 {
-  return Music_sequence::maximum_length (get_mus_property ("elements"));
+  return Music_sequence::maximum_length (get_property ("elements"));
 }
 
 Moment
 Simultaneous_music::start_mom () const
 {
-  return Music_sequence::minimum_start (get_mus_property ("elements"));
+  return Music_sequence::minimum_start (get_property ("elements"));
 }
 
-Simultaneous_music::Simultaneous_music()
+Simultaneous_music::Simultaneous_music ()
 {
 
 }
@@ -33,10 +32,17 @@ Simultaneous_music::Simultaneous_music()
 Pitch
 Simultaneous_music::to_relative_octave (Pitch p)
 {
+  Pitch retval = music_list_to_relative (music_list (), p, false);
   if (lily_1_8_relative)
-    lily_1_8_compatibility_used = true;
-  
-  return music_list_to_relative (music_list(), p, lily_1_8_relative);
+    {
+      Pitch retval_1_8 = music_list_to_relative (music_list (), p, true);
+      if (retval_1_8 != retval)
+       lily_1_8_compatibility_used = true;
+
+      retval = retval_1_8;
+    }
+
+  return retval;
 }
 
 ADD_MUSIC (Simultaneous_music);
@@ -47,4 +53,4 @@ Event_chord::to_relative_octave (Pitch p)
   return music_list_to_relative (music_list (), p, true);
 }
 
-ADD_MUSIC(Event_chord);
+ADD_MUSIC (Event_chord);