X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur-configuration.hh;h=be30352676bd072e8690369134340df854def5d2;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=a4d78f99c912b913fe6cf9449869f3ab085d036c;hpb=3c6c00c08ff31f57ec8d88450b4e4e7917bc4f3e;p=lilypond.git diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh index a4d78f99c9..be30352676 100644 --- a/lily/include/slur-configuration.hh +++ b/lily/include/slur-configuration.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2011 Han-Wen Nienhuys + Copyright (C) 2004--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,15 +46,15 @@ public: }; int next_scorer_todo; - + Slur_configuration (); Real score () const { return score_; } - string card () const { return score_card_; } - void add_score (Real, string); - + string card () const { return score_card_; } + void add_score (Real, const string&); + void generate_curve (Slur_score_state const &state, Real r0, Real h_inf, - vector const &); + vector const &); void run_next_scorer (Slur_score_state const &); bool done () const; static Slur_configuration *new_config (Drul_array const &offs, int idx); @@ -72,7 +72,7 @@ protected: class Slur_configuration_less { public: - bool operator () (Slur_configuration* const& l, Slur_configuration* const& r) + bool operator () (Slur_configuration *const &l, Slur_configuration *const &r) { // Invert return l->score_ > r->score_;