X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-scheme.cc;h=711df4d1a194352790df0dc839e8ce142316408d;hb=9880906860b1ba94a03e1509b2c17a13e9844fa3;hp=27e5db98804752020a1460fb1cff339eac7f1398;hpb=46b687aca821801f779e479ccc601c713ed0917e;p=lilypond.git diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc index 27e5db9880..711df4d1a1 100644 --- a/lily/music-scheme.cc +++ b/lily/music-scheme.cc @@ -3,14 +3,13 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2007 Han-Wen Nienhuys */ -#include "duration.hh" -#include "warn.hh" #include "music.hh" -#include "pitch.hh" +#include "duration.hh" +#include "warn.hh" LY_DEFINE (ly_music_length, "ly:music-length", 1, 0, 0, (SCM mus), @@ -192,23 +191,23 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist", { Pitch orig (scm_to_int (scm_car (key)), scm_to_int (scm_cdr (key)), - scm_to_int (alter)); + ly_scm2rational (alter)); orig = orig.transposed (*p); SCM key = scm_cons (scm_from_int (orig.get_octave ()), scm_from_int (orig.get_notename ())); - newlist = scm_cons (scm_cons (key, scm_from_int (orig.get_alteration ())), + newlist = scm_cons (scm_cons (key, ly_rational2scm (orig.get_alteration ())), newlist); } else if (scm_is_number (key)) { - Pitch orig (0, scm_to_int (key), scm_to_int (alter)); + Pitch orig (0, scm_to_int (key), ly_scm2rational (alter)); orig = orig.transposed (*p); key = scm_from_int (orig.get_notename ()); - alter = scm_from_int (orig.get_alteration ()); + alter = ly_rational2scm (orig.get_alteration ()); newlist = scm_cons (scm_cons (key, alter), newlist); } }