X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgregorian-ligature-engraver.cc;h=485b97a184460c2b0b6e8651d1a433f65e3ac39c;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=30ac2728dc088da09f45db7dafcbb67fff96f2c6;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc index 30ac2728dc..485b97a184 100644 --- a/lily/gregorian-ligature-engraver.cc +++ b/lily/gregorian-ligature-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2003--2011 Juergen Reuter + Copyright (C) 2003--2015 Juergen Reuter LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -93,7 +93,7 @@ void fix_prefix_set (int *current_set, int min_set, int max_set, Grob *primitive fix_prefix ("pes_or_flexa", LINEA, current_set, min_set, max_set, primitive); } -void check_and_fix_all_prefixes (vector primitives) +void check_and_fix_all_prefixes (vector const &primitives) { /* Check for invalid head modifier combinations */ for (vsize i = 0; i < primitives.size (); i++) @@ -204,7 +204,7 @@ void check_and_fix_all_prefixes (vector primitives) * Marks those heads that participate in a pes or flexa. */ void -provide_context_info (vector primitives) +provide_context_info (vector const &primitives) { Grob *prev_primitive = 0; int prev_prefix_set = 0; @@ -215,7 +215,7 @@ provide_context_info (vector primitives) Grob *primitive = primitives[i].grob (); Stream_event *event_cause = primitives[i].event_cause (); int context_info = 0; - int pitch = unsmob_pitch (event_cause->get_property ("pitch"))->steps (); + int pitch = Pitch::unsmob (event_cause->get_property ("pitch"))->steps (); int prefix_set = scm_to_int (primitive->get_property ("prefix-set")); if (prefix_set & PES_OR_FLEXA) @@ -253,7 +253,7 @@ provide_context_info (vector primitives) void Gregorian_ligature_engraver::build_ligature (Spanner *ligature, - vector primitives) + vector const &primitives) { // apply style-independent checking and transformation check_and_fix_all_prefixes (primitives);