From b705d8ad76b32423530c091af75aa6fcd6bd7575 Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Wed, 6 Nov 2013 21:39:15 -0800 Subject: [PATCH] \transpose: leave triple-sharps intact; issue 1009 --- lily/accidental.cc | 6 ++++-- lily/music.cc | 14 -------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/lily/accidental.cc b/lily/accidental.cc index ce05dfff72..3d2906ee85 100644 --- 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 eea6a9ca81..629986d346 100644 --- 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 (), -- 2.39.5