ratio_ = 1.0;
}
+static Real
+default_height (Real len)
+{
+ // assume 20pt staff
+ // see fonts.doc
+ Real staff_space = 5.0;
+ Real h_inf = 2.0* staff_space;
+ Real r_0 = 0.33;
+ return h_inf * 2.0 / M_PI * atan ( M_PI * r_0 / (2.0 * h_inf) * len);
+}
+
void
Bezier_bow::blow_fit ()
{
- Real len = curve_.control_[3][X_AXIS] ;
- Real ind = curve_.control_[1][X_AXIS] / len;
+ Real len = curve_.control_[3][X_AXIS];
Real h = curve_.control_[1][Y_AXIS] * fit_factor () / len;
-
- // ugh. Unhardcode this
- if (h > 4 * ind)
- {
- h = 4* ind;
- }
-
- if (h > 0.8 + -2 * ind)
- {
- h = 0.8 - 2 *ind;
- }
-
curve_.control_[1][Y_AXIS] = h * len;
curve_.control_[2][Y_AXIS] = h * len;
+ curve_.check_sanity ();
+}
+
+void
+Bezier_bow::de_uglyfy ()
+{
+ Real len = curve_.control_[3][X_AXIS] ;
+ Real ff = fit_factor ();
+ for (int i = 1; i < 3; i++)
+ {
+ Real ind = abs (curve_.control_[(i-1)*3][X_AXIS]
+ - curve_.control_[i][X_AXIS]) / len;
+ Real h = curve_.control_[i][Y_AXIS] * ff / len;
+
+ // ugh. Unhardcode this
+#if 0
+ // Too crude.
+ if (h > 4 * ind)
+ {
+ h = 4* ind;
+ }
+#else
+ Real f = default_height (len) / len;
+ if (h > 2.0 * f)
+ {
+ h = 2.0 * f;
+ }
+#endif
+
+ if (h > 0.8 + -2 * ind)
+ {
+ h = 0.8 - 2 *ind;
+ }
+
+ curve_.control_[i][Y_AXIS] = h * len;
+ }
curve_.check_sanity ();
}
Interval x;
Interval y;
if (i == 0)
- x = Interval (0, encompass_[1][X_AXIS]/2);
+ {
+ x = Interval (0, encompass_[1][X_AXIS] / 2);
+ y = Interval (0,
+ curve_.get_other_coordinate (X_AXIS,
+ encompass_[1][X_AXIS]
+ / 2));
+ }
else if (i == encompass_.size () - 1)
- x = Interval ((encompass_[i-1][X_AXIS] + encompass_[i][X_AXIS])/2,
- encompass_[i][X_AXIS]);
+ {
+ x = Interval ((encompass_[i-1][X_AXIS] + encompass_[i][X_AXIS])/2,
+ encompass_[i][X_AXIS]);
+ y = Interval (0,
+ (curve_.get_other_coordinate (X_AXIS,
+ (x[MIN] + x[MAX]) / 2)));
+ }
else
- x = Interval ((encompass_[i-1][X_AXIS] + encompass_[i][X_AXIS])/2,
- (encompass_[i][X_AXIS] + encompass_[i+1][X_AXIS])/2);
+ {
+ x = Interval ((encompass_[i-1][X_AXIS] + encompass_[i][X_AXIS]) / 2,
+ (encompass_[i][X_AXIS] + encompass_[i+1][X_AXIS]) / 2);
+ y = Interval (encompass_[i][Y_AXIS],
+ (curve_.get_other_coordinate (X_AXIS, x[MIN])
+ + curve_.get_other_coordinate (X_AXIS,
+ (x[MIN] + x[MAX]) / 2)
+ + curve_.get_other_coordinate (X_AXIS, x[MAX])) / 3);
+ }
- y[MIN] = encompass_[i][Y_AXIS];
- // solve_point (X, 0|Xmax) has no solutions...
- y[MAX] = (x[MIN] ? curve_.get_other_coordinate (X_AXIS, x[MIN]) : 0
- + curve_.get_other_coordinate (X_AXIS, (x[MIN] + x[MAX])/2)
- + x[MAX] != encompass_.top ()[X_AXIS] ? curve_.get_other_coordinate (X_AXIS, x[MAX]) : 0)/3;
Real da = x.length () * y.length ();
- if (da > 0)
- a += da;
+ a += da;
}
return a;
}
-void
-Bezier_bow::minimise_enclosed_area ()
+Array<Offset>
+Bezier_bow::area_gradient_offset_arr ()
{
+ Real len = curve_.control_[3][X_AXIS];
Real area = calc_enclosed_area_f ();
+ Real grow = len / 10.0;
Array<Offset> da (2);
for (int i=1; i < 3; i++)
{
for (Axis a=X_AXIS; a < NO_AXES; incr (a))
{
Real r = curve_.control_[i][a];
- curve_.control_[i][a] += 1;
- da[i-1][a] = (calc_enclosed_area_f () - area) / area;
+ curve_.control_[i][a] += grow;
+ da[i-1][a] = (calc_enclosed_area_f () - area) / grow;
+
curve_.control_[i][a] = r;
}
}
+ return da;
+}
+
+void
+Bezier_bow::minimise_enclosed_area ()
+{
+ Real len = curve_.control_[3][X_AXIS];
+ Real beautiful = len * default_height (len) / 2.0;
+
+ DEBUG_OUT << to_str ("Beautiful: %f\n", beautiful);
+ DEBUG_OUT << to_str ("Length: %f\n", len);
+ int steps=2;
+ for (int i=0; i < steps; i++)
+ {
+ Real ff = fit_factor ();
+ if (!ff)
+ break;
+
+ DEBUG_OUT << to_str ("FitFac: %f\n", ff);
+
+ // slur must be higher at every point
+ if (ff > 1.01)
+ {
+ blow_fit ();
+ DEBUG_OUT << to_str ("Blown area: %f\n", calc_enclosed_area_f ());
+ }
+ else
+ DEBUG_OUT << to_str ("Init area: %f\n", calc_enclosed_area_f ());
+
+ Real area = calc_enclosed_area_f ();
+
+
+ if (area <= beautiful)
+ break;
+
+ Array<Offset> da = area_gradient_offset_arr ();
+
+ /*
+ Urg: empiric cs
+ Small slurs are easily too asymmetric,
+ while big slurs are too symmetric
+
+ This makes short slurs strictly x-bound,
+ long slurs become y-bound.
+ */
+ Real ypct = 0.50;
+ //Real xpct = (0.07 * len * len / 1000.0) <? 0.80;
+ Real xpct = (0.1 * len * len * len / 100000.0) <? 0.80;
+
+ Real yu = (abs (curve_.control_[1][Y_AXIS] / da[0][Y_AXIS])
+ <? abs (curve_.control_[2][Y_AXIS] / da[1][Y_AXIS]))
+ * ypct;
+ Real xu = (abs (curve_.control_[1][X_AXIS] / da[0][X_AXIS])
+ <? abs ((curve_.control_[3][X_AXIS]
+ - curve_.control_[2][X_AXIS]) / da[1][X_AXIS]))
+ * xpct;
+ Real u = yu <? xu;
+ DEBUG_OUT << to_str ("u (xu, yu): %f (%f, %f)\n", u, xu, yu);
+ DEBUG_OUT << to_str ("pct (x, y): (%f, %f)\n", xpct, ypct);
+
+ DEBUG_OUT << to_str ("da1: (%f, %f)\n", da[0][X_AXIS], da[0][Y_AXIS]);
+ DEBUG_OUT << to_str ("da2: (%f, %f)\n", da[1][X_AXIS], da[1][Y_AXIS]);
+
+ curve_.control_[1] -= da[0] * u;
+ curve_.control_[2] -= da[1] * u;
+ }
- for (int i=1; i < 3; i++)
+
+ if (fit_factor () > 1.5)
+ blow_fit ();
+
+ DEBUG_OUT << to_str ("Exarea: %f\n", calc_enclosed_area_f ());
+ Real area = calc_enclosed_area_f ();
+ /*
+ Slurs that fit beautifully are not ugly
+ */
+ if (area > beautiful)
{
- da[i-1] *= da[i-1].length () ? 1.0 / da[i-1].length () : 1.0;
- curve_.control_[i] -= da[i-1] * curve_.control_[i].length ();
+ DEBUG_OUT << "DE-UGLYFY\n";
+ de_uglyfy ();
}
+
}
void
if (fit_factor () > 1.0)
{
// calc_tangent_controls ();
- blow_fit ();
+ // blow_fit ();
minimise_enclosed_area ();
}
}
}
/*
- The maximum amount that the encompass points stick out above the bezier curve.
+ max ( encompass.y / curve.y )
+
*/
Real
Bezier_bow::fit_factor () const
Real x1 = encompass_[0][X_AXIS];
Real x2 = encompass_.top ()[X_AXIS];
- Real factor = 1.0;
+ Real factor = 0.0;
for (int i=1; i < encompass_.size ()-1; i++)
{
if (encompass_[i][X_AXIS] > x1 && encompass_[i][X_AXIS] < x2)
+
projects / lilypond.git / blobdiff