X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=95da047a067bd5ced57ba29f53a0a2ee93405bbe;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=0d5c36661c2e85d15dedbfc1e70ba51d75219d09;hpb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;p=lilypond.git diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 0d5c36661c..95da047a06 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2014 Jan Nieuwenhuizen + Copyright (C) 2000--2015 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ MAKE_SCHEME_CALLBACK (Arpeggio, calc_cross_staff, 1); SCM Arpeggio::calc_cross_staff (SCM grob) { - Grob *me = unsmob_grob (grob); + Grob *me = unsmob (grob); extract_grob_set (me, "stems", stems); Grob *vag = 0; @@ -83,7 +83,7 @@ MAKE_SCHEME_CALLBACK (Arpeggio, calc_positions, 1); SCM Arpeggio::calc_positions (SCM grob) { - Grob *me = unsmob_grob (grob); + Grob *me = unsmob (grob); Grob *common = get_common_y (me); /* @@ -116,7 +116,7 @@ MAKE_SCHEME_CALLBACK (Arpeggio, print, 1); SCM Arpeggio::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Interval heads = robust_scm2interval (me->get_property ("positions"), Interval ()) * Staff_symbol_referencer::staff_space (me); @@ -184,7 +184,7 @@ MAKE_SCHEME_CALLBACK (Arpeggio, brew_chord_bracket, 1); SCM Arpeggio::brew_chord_bracket (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Interval heads = robust_scm2interval (me->get_property ("positions"), Interval ()) * Staff_symbol_referencer::staff_space (me); @@ -203,7 +203,7 @@ MAKE_SCHEME_CALLBACK (Arpeggio, brew_chord_slur, 1); SCM Arpeggio::brew_chord_slur (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); SCM dash_definition = me->get_property ("dash-definition"); Interval heads = robust_scm2interval (me->get_property ("positions"), Interval ()) @@ -215,7 +215,7 @@ Arpeggio::brew_chord_slur (SCM smob) Real height_limit = 1.5; Real ratio = .33; Bezier curve = slur_shape (dy, height_limit, ratio); - curve.rotate (M_PI / 2); + curve.rotate (90.0); Stencil mol (Lookup::slur (curve, lt, lt, dash_definition)); mol.translate_axis (heads[LEFT], Y_AXIS); @@ -230,7 +230,7 @@ MAKE_SCHEME_CALLBACK (Arpeggio, width, 1); SCM Arpeggio::width (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); return ly_interval2scm (get_squiggle (me).extent (X_AXIS)); } @@ -238,7 +238,7 @@ MAKE_SCHEME_CALLBACK (Arpeggio, pure_height, 3); SCM Arpeggio::pure_height (SCM smob, SCM, SCM) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); if (to_boolean (me->get_property ("cross-staff"))) return ly_interval2scm (Interval ());