Merge branch 'translation' into staging

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index cc814c074b456256eeb8f089781957c178091a46..629986d3463a479d0694bde8bfbb49288bef35f7 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -211,20 +211,10 @@ transpose_mutable (SCM alist, Pitch delta)
       if (Pitch *p = unsmob_pitch (val))
         {
           Pitch transposed = p->transposed (delta);
-          if (transposed.get_alteration ().abs () > Rational (1, 1))
-            {
-              string delta_str;
-              if (delta.get_alteration ().abs () > Rational (1, 1))
-                delta_str = (delta.normalized ().to_string ()
-                             + " " + _ ("(normalized pitch)"));
-              else
-                delta_str = delta.to_string ();
-
-              warning (_f ("Transposing %s by %s makes alteration larger than double",
-                           p->to_string (),
-                           delta_str));
-              transposed = transposed.normalized ();
-            }
+
+          if (prop == ly_symbol2scm ("tonic"))
+            transposed = Pitch (-1, transposed.get_notename (),
+                                transposed.get_alteration ());
 
           new_val = transposed.smobbed_copy ();
         }
@@ -234,7 +224,7 @@ transpose_mutable (SCM alist, Pitch delta)
             m->transpose (delta);
         }
       else if (prop == ly_symbol2scm ("elements")
-              || prop == ly_symbol2scm ("articulations"))
+               || prop == ly_symbol2scm ("articulations"))
         transpose_music_list (val, delta);
       else if (prop == ly_symbol2scm ("pitch-alist")
                && scm_is_pair (val))
@@ -271,7 +261,7 @@ Music::origin () const
   ES TODO: This method should probably be reworked or junked.
 */
 Stream_event *
-Music::to_event (Context *c) const
+Music::to_event () const
 {
   SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name"));
 
@@ -279,8 +269,9 @@ Music::to_event (Context *c) const
   if (!internal_is_music_type (class_name))
     programming_error ("Not a music type");
 
-  Stream_event *e = new Stream_event (c->make_event_class (class_name),
-                                     mutable_property_alist_);
+  Stream_event *e = new Stream_event
+    (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), class_name),
+     mutable_property_alist_);
   Moment length = get_length ();
   if (length.to_bool ())
     e->set_property ("length", length.smobbed_copy ());
@@ -293,7 +284,7 @@ Music::to_event (Context *c) const
       for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus))
         {
           Music *m = unsmob_music (scm_car (art_mus));
-          art_ev = scm_cons (m->to_event (c)->unprotect (), art_ev);
+          art_ev = scm_cons (m->to_event ()->unprotect (), art_ev);
         }
       e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL));
     }
@@ -310,7 +301,7 @@ Music::to_event (Context *c) const
 void
 Music::send_to_context (Context *c)
 {
-  Stream_event *ev = to_event (c);
+  Stream_event *ev = to_event ();
   c->event_source ()->broadcast (ev);
   ev->unprotect ();
 }