LEFT | RIGHT |
(no file at all) | |
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) 2002--2019 Juergen Reuter <reuter@ipd.uka.de> | 4 Copyright (C) 2002--2019 Juergen Reuter <reuter@ipd.uka.de> |
5 | 5 |
6 Han-Wen Nienhuys <hanwen@xs4all.nl | 6 Han-Wen Nienhuys <hanwen@xs4all.nl |
7 | 7 |
8 LilyPond is free software: you can redistribute it and/or modify | 8 LilyPond is free software: you can redistribute it and/or modify |
9 it under the terms of the GNU General Public License as published by | 9 it under the terms of the GNU General Public License as published by |
10 the Free Software Foundation, either version 3 of the License, or | 10 the Free Software Foundation, either version 3 of the License, or |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "axis-group-interface.hh" | 25 #include "axis-group-interface.hh" |
26 #include "item.hh" | 26 #include "item.hh" |
27 #include "note-head.hh" | 27 #include "note-head.hh" |
28 #include "pitch-interval.hh" | 28 #include "pitch-interval.hh" |
29 #include "pointer-group-interface.hh" | 29 #include "pointer-group-interface.hh" |
30 #include "protected-scm.hh" | 30 #include "protected-scm.hh" |
31 #include "side-position-interface.hh" | 31 #include "side-position-interface.hh" |
32 #include "separation-item.hh" | 32 #include "separation-item.hh" |
33 #include "staff-symbol-referencer.hh" | 33 #include "staff-symbol-referencer.hh" |
34 #include "stream-event.hh" | 34 #include "stream-event.hh" |
| 35 #include "text-interface.hh" |
35 | 36 |
36 #include "translator.icc" | 37 #include "translator.icc" |
37 | 38 |
38 class Ambitus_engraver : public Engraver | 39 class Ambitus_engraver : public Engraver |
39 { | 40 { |
40 public: | 41 public: |
41 TRANSLATOR_DECLARATIONS (Ambitus_engraver); | 42 TRANSLATOR_DECLARATIONS (Ambitus_engraver); |
42 protected: | 43 protected: |
43 void acknowledge_note_head (Grob_info); | 44 void acknowledge_note_head (Grob_info); |
44 | 45 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 /* | 122 /* |
122 * \ottava reads middleCClefPosition and overrides | 123 * \ottava reads middleCClefPosition and overrides |
123 * middleCOffset and middleCPosition ignoring previously | 124 * middleCOffset and middleCPosition ignoring previously |
124 * set values. Therefore | 125 * set values. Therefore |
125 * 1. \ottava is incompatible with non-default offset and | 126 * 1. \ottava is incompatible with non-default offset and |
126 * position values (is this a bug? TODO) | 127 * position values (is this a bug? TODO) |
127 * 2. we don’t need to read these values and revert the | 128 * 2. we don’t need to read these values and revert the |
128 * changes \ottava made but we can just read the | 129 * changes \ottava made but we can just read the |
129 * clef position. | 130 * clef position. |
130 */ | 131 */ |
131 if (scm_is_string (ottavation)) | 132 if (Text_interface::is_markup (ottavation)) |
132 start_c0_ = robust_scm2int (get_property ("middleCClefPosition"), 0); | 133 start_c0_ = robust_scm2int (get_property ("middleCClefPosition"), 0); |
133 else if (scm_is_integer (c_pos) && !scm_is_integer (cue_pos)) | 134 else if (scm_is_integer (c_pos) && !scm_is_integer (cue_pos)) |
134 start_c0_ = scm_to_int (c_pos); | 135 start_c0_ = scm_to_int (c_pos); |
135 else | 136 else |
136 { | 137 { |
137 int clef_pos = robust_scm2int (get_property ("middleCClefPosition"), 0
); | 138 int clef_pos = robust_scm2int (get_property ("middleCClefPosition"), 0
); |
138 int offset = robust_scm2int (get_property ("middleCOffset"), 0); | 139 int offset = robust_scm2int (get_property ("middleCOffset"), 0); |
139 start_c0_ = clef_pos + offset; | 140 start_c0_ = clef_pos + offset; |
140 } | 141 } |
141 | 142 |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 "keyAlterations " | 262 "keyAlterations " |
262 "middleCPosition " | 263 "middleCPosition " |
263 "middleCClefPosition " | 264 "middleCClefPosition " |
264 "middleCCuePosition " | 265 "middleCCuePosition " |
265 "middleCOffset " | 266 "middleCOffset " |
266 "staffLineLayoutFunction ", | 267 "staffLineLayoutFunction ", |
267 | 268 |
268 /* write */ | 269 /* write */ |
269 "" | 270 "" |
270 ); | 271 ); |
LEFT | RIGHT |