OLD | NEW |
1 /* | 1 /* |
2 This file is part of LilyPond, the GNU music typesetter. | 2 This file is part of LilyPond, the GNU music typesetter. |
3 | 3 |
4 Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org> | 4 Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org> |
5 | 5 |
6 LilyPond is free software: you can redistribute it and/or modify | 6 LilyPond is free software: you can redistribute it and/or modify |
7 it under the terms of the GNU General Public License as published by | 7 it under the terms of the GNU General Public License as published by |
8 the Free Software Foundation, either version 3 of the License, or | 8 the Free Software Foundation, either version 3 of the License, or |
9 (at your option) any later version. | 9 (at your option) any later version. |
10 | 10 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 { | 53 { |
54 } | 54 } |
55 | 55 |
56 void | 56 void |
57 Key_performer::process_music () | 57 Key_performer::process_music () |
58 { | 58 { |
59 if (key_ev_) | 59 if (key_ev_) |
60 { | 60 { |
61 SCM pitchlist = key_ev_->get_property ("pitch-alist"); | 61 SCM pitchlist = key_ev_->get_property ("pitch-alist"); |
62 | 62 |
| 63 SCM tp = get_property ("instrumentTransposition"); |
| 64 |
| 65 if (unsmob<Pitch> (tp)) |
| 66 pitchlist = ly_transpose_key_alist (pitchlist, tp); |
| 67 |
63 SCM acc = Lily::alterations_in_key (pitchlist); | 68 SCM acc = Lily::alterations_in_key (pitchlist); |
64 | 69 |
65 Pitch key_do (0, | 70 Pitch key_do (0, |
66 scm_to_int (scm_caar (pitchlist)), | 71 scm_to_int (scm_caar (pitchlist)), |
67 ly_scm2rational (scm_cdar (pitchlist))); | 72 ly_scm2rational (scm_cdar (pitchlist))); |
68 | 73 |
69 Pitch c_do; | 74 Pitch c_do; |
70 | 75 |
71 SCM c_pitchlist | 76 SCM c_pitchlist |
72 = ly_transpose_key_alist (pitchlist, | 77 = ly_transpose_key_alist (pitchlist, |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 } | 118 } |
114 | 119 |
115 ADD_TRANSLATOR (Key_performer, | 120 ADD_TRANSLATOR (Key_performer, |
116 /* doc */ | 121 /* doc */ |
117 "", | 122 "", |
118 | 123 |
119 /* create */ | 124 /* create */ |
120 "", | 125 "", |
121 | 126 |
122 /* read */ | 127 /* read */ |
123 "", | 128 "instrumentTransposition ", |
124 | 129 |
125 /* write */ | 130 /* write */ |
126 "" | 131 "" |
127 ); | 132 ); |
OLD | NEW |