Merge remote-tracking branch 'origin/translation'

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index afb5a52a020ff07b8c8e14037810c71fd7994829..57bf98e73903882c0ed1b651166ecb3c9b519097 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -35,33 +35,6 @@ Repeated_music::alternatives (Music *me)
   return me->get_property ("elements");
 }
 
-MAKE_SCHEME_CALLBACK (Repeated_music, relative_callback, 2);
-SCM
-Repeated_music::relative_callback (SCM music, SCM pitch)
-{
-  Pitch p = *unsmob_pitch (pitch);
-  Music *me = unsmob_music (music);
-  if (lily_1_8_relative)
-    {
-      Music *body = unsmob_music (me->get_property ("element"));
-      if (body)
-       p = body->to_relative_octave (p);
-
-      Pitch last = p;
-      SCM alternatives = me->get_property ("elements");
-
-      for (SCM s = alternatives; scm_is_pair (s); s = scm_cdr (s))
-       {
-         lily_1_8_compatibility_used = true;
-         unsmob_music (scm_car (s))->to_relative_octave (p);
-       }
-
-      return last.smobbed_copy ();
-    }
-  else
-    return me->generic_to_relative_octave (p).smobbed_copy ();
-}
-
 Moment
 Repeated_music::alternatives_get_length (Music *me, bool fold)
 {
@@ -83,7 +56,7 @@ Repeated_music::alternatives_get_length (Music *me, bool fold)
       m = m + unsmob_music (scm_car (p))->get_length ();
       done++;
       if (count - done < len)
-       p = scm_cdr (p);
+        p = scm_cdr (p);
     }
   return m;
 }
@@ -167,7 +140,7 @@ Repeated_music::first_start (SCM m)
   Music *body = unsmob_music (me->get_property ("element"));
 
   Moment rv = (body) ? body->start_mom ()
-    : Music_sequence::first_start (me->get_property ("elements"));
+              : Music_sequence::first_start (me->get_property ("elements"));
 
   return rv.smobbed_copy ();
 }