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 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl> |
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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 if (scm_is_string (annotation)) | 274 if (scm_is_string (annotation)) |
275 { | 275 { |
276 string str; | 276 string str; |
277 SCM properties = Font_interface::text_font_alist_chain (me); | 277 SCM properties = Font_interface::text_font_alist_chain (me); |
278 | 278 |
279 Stencil tm = *unsmob<Stencil> (Text_interface::interpret_markup | 279 Stencil tm = *unsmob<Stencil> (Text_interface::interpret_markup |
280 (me->layout ()->self_scm (), properties, | 280 (me->layout ()->self_scm (), properties, |
281 annotation)); | 281 annotation)); |
282 tm.translate (Offset (b.control_[3][X_AXIS] + 0.5, | 282 tm.translate (Offset (b.control_[3][X_AXIS] + 0.5, |
283 b.control_[0][Y_AXIS] * 2)); | 283 b.control_[0][Y_AXIS] * 2)); |
284 tm = tm.in_color (1, 0, 0); | 284 tm = tm.in_color (1.0, 0.0, 0.0); |
285 | 285 |
286 /* | 286 /* |
287 It would be nice if we could put this in a different layer, | 287 It would be nice if we could put this in a different layer, |
288 but alas, this must be done with a Tie override. | 288 but alas, this must be done with a Tie override. |
289 */ | 289 */ |
290 a.add_stencil (tm); | 290 a.add_stencil (tm); |
291 } | 291 } |
292 #endif | 292 #endif |
293 | 293 |
294 return a.smobbed_copy (); | 294 return a.smobbed_copy (); |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 "control-points " | 397 "control-points " |
398 "dash-definition " | 398 "dash-definition " |
399 "details " | 399 "details " |
400 "direction " | 400 "direction " |
401 "head-direction " | 401 "head-direction " |
402 "line-thickness " | 402 "line-thickness " |
403 "neutral-direction " | 403 "neutral-direction " |
404 "staff-position " | 404 "staff-position " |
405 "thickness " | 405 "thickness " |
406 ); | 406 ); |
OLD | NEW |