* lily/parser.yy (command_element): move clef stuff into Scheme.

[lilypond.git] / lily / bezier.cc

diff --git a/lily/bezier.cc b/lily/bezier.cc
index faf5b899a2662a5c0aaabc347620d1298a97d2e2..ffe48f240d241ab2fa483774141121d2ef950476 100644 (file)
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <math.h>
-#include "config.h"
 
+#include "config.h"
+#include "warn.hh"
 #include "libc-extension.hh"
 #include "bezier.hh"
 #include "polynomial.hh"
@@ -29,35 +30,35 @@ binomial_coefficient (Real over , int under)
 }
 
 void
-scale (Array<Offset>* arr_p, Real x , Real y)
+scale (Array<Offset>* array, Real x , Real y)
 {
-  for (int i = 0; i < arr_p->size (); i++)
+  for (int i = 0; i < array->size (); i++)
     {
-      (*arr_p)[i][X_AXIS] = x* (*arr_p)[i][X_AXIS];
-      (*arr_p)[i][Y_AXIS] = y* (*arr_p)[i][Y_AXIS];
+      (*array)[i][X_AXIS] = x* (*array)[i][X_AXIS];
+      (*array)[i][Y_AXIS] = y* (*array)[i][Y_AXIS];
     }
 }
 
 void
-rotate (Array<Offset>* arr_p, Real phi)
+rotate (Array<Offset>* array, Real phi)
 {
   Offset rot (complex_exp (Offset (0, phi)));
-  for (int i = 0; i < arr_p->size (); i++)
-    (*arr_p)[i] = complex_multiply (rot, (*arr_p)[i]);
+  for (int i = 0; i < array->size (); i++)
+    (*array)[i] = complex_multiply (rot, (*array)[i]);
 }
 
 void
-translate (Array<Offset>* arr_p, Offset o)
+translate (Array<Offset>* array, Offset o)
 {
-  for (int i = 0; i < arr_p->size (); i++)
-    (*arr_p)[i] += o;
+  for (int i = 0; i < array->size (); i++)
+    (*array)[i] += o;
 }
 
 /*
 
   Formula of the bezier 3-spline
 
-  sum_{j=0}^3  (3 over j) z_j (1-t)^(3-j)  t^j
+  sum_{j=0}^3 (3 over j) z_j (1-t)^ (3-j)  t^j
  */
 
 Real
@@ -65,6 +66,12 @@ Bezier::get_other_coordinate (Axis a,  Real x) const
 {
   Axis other = Axis ((a +1)%NO_AXES);
   Array<Real> ts = solve_point (a, x);
+
+  if (ts.size () == 0)
+    {
+      programming_error ("No solution found for Bezier intersection.");
+      return 0.0;
+    }
   
   Offset c = curve_point (ts[0]);
   assert (fabs (c[a] - x) < 1e-8);
@@ -77,7 +84,7 @@ Offset
 Bezier::curve_point (Real t)const
 {
   Real tj = 1;
-  Real one_min_tj =  (1-t)*(1-t)*(1-t);
+  Real one_min_tj = (1-t)* (1-t)* (1-t);
 
   Offset o;
   for (int j=0 ; j < 4; j++)
@@ -105,10 +112,9 @@ Bezier::polynomial (Axis a)const
   Polynomial p (0.0);
   for (int j=0; j <= 3; j++)
     {
-      p += control_[j][a]
+      p += (control_[j][a] *   binomial_coefficient (3, j))
        * Polynomial::power (j , Polynomial (0,1))*
-       Polynomial::power (3 - j, Polynomial (1,-1))*
-       binomial_coefficient(3, j);
+       Polynomial::power (3 - j, Polynomial (1,-1));
     }
 
   return p;
@@ -149,7 +155,7 @@ Bezier::solve_derivative (Offset deriv)const
 Array<Real> 
 Bezier::solve_point (Axis ax, Real coordinate) const
 {
-  Polynomial p(polynomial (ax));
+  Polynomial p (polynomial (ax));
   p.coefs_[0] -= coordinate;
   
   Array<Real> sol (p.solve ());