X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=3a52d5d475c5b562b7d5f571d8c8894c31227f09;hb=557c7f26f0c62bca9eb620a782e6a8e5bef9103e;hp=6487921b17ad23d5859ef51e48165745dec3b413;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index 6487921b17..3a52d5d475 100644
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -3,17 +3,33 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-
 #include "relative-music.hh"
 #include "warn.hh"
+#include "scm-option.hh"
+
 
 Pitch
-Relative_octave_music::to_relative_octave (Pitch)
+Relative_octave_music::to_relative_octave (Pitch p)
 {
-  return * unsmob_pitch (get_mus_property ("last-pitch"));
+  if (lily_1_8_relative)
+    {
+      lily_1_8_compatibility_used = true;
+      /*
+	ugh: last-pitch should  be junked.
+
+	Change this for lilypond 2.0. When you do,
+	then B should start where A left off.
+
+	\relative { A \relative { ...} B }
+
+      */
+      return * unsmob_pitch (get_mus_property ("last-pitch"));
+    }
+  else
+    return p;
 }
 
 
@@ -22,3 +38,5 @@ Relative_octave_music::Relative_octave_music ()
 }
 
 ADD_MUSIC (Relative_octave_music);
+
+