\transpose: leave triple-sharps intact; issue 1009

diff --git a/lily/accidental.cc b/lily/accidental.cc
index ce05dfff722f6ed9d7847714415000babf2538cb..3d2906ee85c5e4394455337ebd10b41ce8707bf4 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -163,15 +163,17 @@ Accidental_interface::get_stencil (Grob *me)
   SCM alist = me->get_property ("glyph-name-alist");
   SCM alt = me->get_property ("alteration");
   SCM glyph_name = ly_assoc_get (alt, alist, SCM_BOOL_F);
+  Stencil mol;
 
   if (!scm_is_string (glyph_name))
     {
       me->warning (_f ("Could not find glyph-name for alteration %s",
                        ly_scm_write_string (alt).c_str ()));
-      return SCM_EOL;
+      mol = fm->find_by_name ("noteheads.s1cross");
     }
+  else
+    mol = fm->find_by_name (ly_scm2string (glyph_name));
 
-  Stencil mol (fm->find_by_name (ly_scm2string (glyph_name)));
   if (to_boolean (me->get_property ("restore-first")))
     {
       /*

diff --git a/lily/music.cc b/lily/music.cc
index eea6a9ca818a58552a5d4cdda7a159754696d186..629986d3463a479d0694bde8bfbb49288bef35f7 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -211,20 +211,6 @@ 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 (),