Run grand replace for 2015.

[lilypond.git] / lily / include / bezier.hh

diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index d830898fa33e1f23b96fc4d9dc01ecd940c7a949..681c8c1816450f23bd4b075dbc8551a1ee0b848e 100644 (file)
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -39,13 +39,16 @@ public:
   Bezier extract (Real, Real) const;
 
   Real get_other_coordinate (Axis a, Real x) const;
+  vector<Real> get_other_coordinates (Axis a, Real x) const;
   vector<Real> solve_point (Axis, Real coordinate) const;
+  Real minmax (Axis, Real, Real, Direction) const;
   vector<Real> solve_derivative (Offset) const;
   Interval extent (Axis) const;
   Interval control_point_extent (Axis) const;
-  
+
   Polynomial polynomial (Axis)const;
   Offset curve_point (Real t) const;
+  Real slope_at_point (Real t) const;
   Real curve_coordinate (Real t, Axis) const;
 
   static const int CONTROL_COUNT = 4;
@@ -63,7 +66,7 @@ void rotate (vector<Offset> *array, Real phi);
 void translate (vector<Offset> *array, Offset o);
 
 Bezier slur_shape (Real width, Real height_limit,
-                  Real height_proportion);
+                   Real height_proportion);
 Real slur_height (Real width, Real height_limit, Real height_proportion);
 void get_slur_indent_height (Real *indent, Real *height, Real width, Real h_inf, Real r_0);