diff options
| author | Jean-Charles Malahieude <lilyfan@orange.fr> | 2016-09-17 16:05:08 +0200 |
|---|---|---|
| committer | Jean-Charles Malahieude <lilyfan@orange.fr> | 2016-09-17 16:05:08 +0200 |
| commit | 7738c6fa2759373c05e34b003a7ed521e9382f37 (patch) | |
| tree | 98cdc4f57245b8ebccc10891717b71a9a5e5fbb1 /lily/include | |
| parent | 50ee6ceadc8e270a5cdf43279097ce3f3f56914f (diff) | |
| parent | 39912f861693f1c24b8833e6e9e6ba82eb3e6746 (diff) | |
Merge branch 'master' into translation
Diffstat (limited to 'lily/include')
| -rw-r--r-- | lily/include/bezier.hh | 2 | ||||
| -rw-r--r-- | lily/include/grob.hh | 1 | ||||
| -rw-r--r-- | lily/include/slur-engraver.hh | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh index 959afc5c4e..54acce15fc 100644 --- a/lily/include/bezier.hh +++ b/lily/include/bezier.hh @@ -62,7 +62,7 @@ public: }; void scale (vector<Offset> *array, Real xscale, Real yscale); -void rotate (vector<Offset> *array, Real phi); +void rotate (vector<Offset> *array, Real deg); void translate (vector<Offset> *array, Offset o); Bezier slur_shape (Real width, Real height_limit, diff --git a/lily/include/grob.hh b/lily/include/grob.hh index a9408f09a2..5da4dff74e 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -141,6 +141,7 @@ public: /* offsets */ void translate_axis (Real, Axis); Real relative_coordinate (Grob const *refp, Axis) const; + Real parent_relative (Grob const *refp, Axis) const; Real pure_relative_y_coordinate (Grob const *refp, int start, int end); Real maybe_pure_coordinate (Grob const *refp, Axis a, bool pure, int start, int end); diff --git a/lily/include/slur-engraver.hh b/lily/include/slur-engraver.hh index 572e7ea023..1885625ed9 100644 --- a/lily/include/slur-engraver.hh +++ b/lily/include/slur-engraver.hh @@ -60,8 +60,8 @@ protected: void stop_translation_timestep (); void process_music (); - bool can_create_slur (const string&, vsize, vsize *, Stream_event *); - void create_slur (const string &spanner_id, Event_info evi, Grob *g_cause, Direction dir, bool left_broken); + bool can_create_slur (SCM, vsize, vsize *, Stream_event *); + void create_slur (SCM spanner_id, Event_info evi, Grob *g_cause, Direction dir, bool left_broken); bool try_to_end (Event_info evi); virtual void set_melisma (bool); |