Several fixes for annotate-spacing.

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

diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index 89c810a5679df344d5ab41ee8f4f70c2b9dbfd81..34545fa911d33da5293c4c656e2342da1d4ad329 100644 (file)
--- a/lily/music-scheme.cc
+++ b/lily/music-scheme.cc
@@ -20,6 +20,7 @@
 #include "music.hh"
 
 #include "duration.hh"
+#include "program-option.hh"
 #include "warn.hh"
 
 LY_DEFINE (ly_music_length, "ly:music-length",
@@ -158,6 +159,24 @@ LY_DEFINE (ly_music_compress, "ly:music-compress",
   return sc->self_scm ();
 }
 
+LY_DEFINE (ly_make_music_relative_x, "ly:make-music-relative!",
+          2, 0, 0, (SCM music, SCM pitch),
+          "Make @var{music} relative to @var{pitch},"
+          " return final pitch.")
+{
+  LY_ASSERT_TYPE (unsmob_music, music, 1);
+  LY_ASSERT_TYPE (unsmob_pitch, pitch, 2);
+
+       Pitch start = *unsmob_pitch (pitch);
+       Music *m = unsmob_music (music);
+       Pitch last = m->to_relative_octave (start);
+       if (lily_1_8_relative)
+               m->set_property ("last-pitch", last.smobbed_copy ());
+
+       return last.smobbed_copy ();
+}
+
+
 LY_DEFINE (ly_music_duration_length, "ly:music-duration-length", 1, 0, 0,
            (SCM mus),
            "Extract the duration field from @var{mus} and return the"