source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "warn.hh"
#include "dimensions.hh"
#include "bezier.hh"
-#include "string-convert.hh"
#include "file-path.hh"
#include "main.hh"
#include "lily-guile.hh"
-#include "font-metric.hh"
Stencil
Lookup::dot (Offset p, Real radius)
}
Stencil
-Lookup::dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction)
+Lookup::rotated_box (Real slope, Real width, Real thick, Real blot)
{
- SCM l = SCM_EOL;
-
- Real on = dash_fraction * dash_period;
- Real off = dash_period - on;
-
- for (int i = 4; i--;)
- l = scm_cons (ly_offset2scm (b.control_[i]), l);
-
- SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"),
- scm_from_double (thick),
- scm_from_double (on),
- scm_from_double (off),
- ly_quote_scm (l),
- SCM_UNDEFINED));
-
- Box box (Interval (0, 0), Interval (0, 0));
- return Stencil (box, at);
+ vector<Offset> pts;
+ Offset rot (1, slope);
+
+ thick -= 2*blot;
+ width -= 2*blot;
+ rot /= sqrt (1 + slope*slope);
+ pts.push_back (Offset (0, -thick / 2) * rot);
+ pts.push_back (Offset (width, -thick / 2) * rot);
+ pts.push_back (Offset (width, thick / 2) * rot);
+ pts.push_back (Offset (0, thick / 2) * rot);
+ return Lookup::round_filled_polygon (pts, blot);
}
Stencil
Stencil
Lookup::blank (Box b)
{
- return Stencil (b, scm_makfrom0str (""));
+ return Stencil (b, scm_from_locale_string (""));
}
Stencil
* shrinked polygon). --jr
*/
Stencil
-Lookup::round_filled_polygon (Array<Offset> const &points,
+Lookup::round_filled_polygon (vector<Offset> const &points,
Real blotdiameter)
{
/* TODO: Maybe print a warning if one of the above limitations
#ifndef NDEBUG
/* remove consecutive duplicate points */
- for (int i = 0; i < points.size (); i++)
+ for (vsize i = 0; i < points.size (); i++)
{
- int next_i = (i + 1) % points.size ();
- Real d = (points[i] - points[next_i]).length ();
+ int next = (i + 1) % points.size ();
+ Real d = (points[i] - points[next]).length ();
if (d < epsilon)
programming_error ("Polygon should not have duplicate points");
}
return Line_interface::make_line (blotdiameter, points[0], points[1]);
/* shrink polygon in size by 0.5 * blotdiameter */
- Array<Offset> shrunk_points;
- shrunk_points.set_size (points.size ());
+ vector<Offset> shrunk_points;
+ shrunk_points.resize (points.size ());
bool ccw = 1; // true, if three adjacent points are counterclockwise ordered
- for (int i = 0; i < points.size (); i++)
+ for (vsize i = 0; i < points.size (); i++)
{
int i0 = i;
int i1 = (i + 1) % points.size ();
/* build scm expression and bounding box */
SCM shrunk_points_scm = SCM_EOL;
Box box;
- for (int i = 0; i < shrunk_points.size (); i++)
+ for (vsize i = 0; i < shrunk_points.size (); i++)
{
SCM x = scm_from_double (shrunk_points[i][X_AXIS]);
SCM y = scm_from_double (shrunk_points[i][Y_AXIS]);
Make a smooth curve along the points
*/
Stencil
-Lookup::slur (Bezier curve, Real curvethick, Real linethick)
+Lookup::slur (Bezier curve, Real curvethick, Real linethick,
+ SCM dash_details)
{
+ Stencil return_value;
+
+ /*
+ calculate the offset for the two beziers that make the sandwich
+ for the slur
+ */
Real alpha = (curve.control_[3] - curve.control_[0]).arg ();
Bezier back = curve;
Offset perp = curvethick * complex_exp (Offset (0, alpha + M_PI / 2)) * 0.5;
- back.reverse ();
back.control_[1] += perp;
back.control_[2] += perp;
curve.control_[1] -= perp;
curve.control_[2] -= perp;
-
- SCM scontrols[8];
-
- for (int i = 0; i < 4; i++)
- scontrols[i] = ly_offset2scm (back.control_[i]);
- for (int i = 0; i < 4; i++)
- scontrols[i + 4] = ly_offset2scm (curve.control_[i]);
-
- /*
- Need the weird order b.o. the way PS want its arguments
- */
- int indices[] = {5, 6, 7, 4, 1, 2, 3, 0};
- SCM list = SCM_EOL;
- for (int i = 8; i--;)
- list = scm_cons (scontrols[indices[i]], list);
-
- SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"),
- ly_quote_scm (list),
- scm_from_double (linethick),
- SCM_UNDEFINED));
- Box b (curve.extent (X_AXIS),
- curve.extent (Y_AXIS));
-
- b[X_AXIS].unite (back.extent (X_AXIS));
- b[Y_AXIS].unite (back.extent (Y_AXIS));
-
- return Stencil (b, at);
+
+ if (!scm_is_pair (dash_details))
+ {
+ /* solid slur */
+ return_value = bezier_sandwich (back, curve, linethick);
+ }
+ else
+ {
+ /* dashed or combination slur */
+ int num_segments = scm_to_int (scm_length (dash_details));
+ for (int i=0; i<num_segments; i++)
+ {
+ SCM dash_pattern = scm_list_ref (dash_details, scm_from_int (i));
+ Real t_min = robust_scm2double (scm_car (dash_pattern), 0);
+ Real t_max = robust_scm2double (scm_cadr (dash_pattern), 1.0);
+ Real dash_fraction =
+ robust_scm2double (scm_caddr (dash_pattern), 1.0);
+ Real dash_period =
+ robust_scm2double (scm_cadddr (dash_pattern), 0.75);
+ Bezier back_segment = back.extract (t_min, t_max);
+ Bezier curve_segment = curve.extract (t_min, t_max);
+ if (dash_fraction == 1.0)
+ return_value.add_stencil (bezier_sandwich (back_segment,
+ curve_segment,
+ linethick));
+ else
+ {
+ Bezier back_dash, curve_dash;
+ Real seg_length = (back_segment.control_[3] -
+ back_segment.control_[0]).length ();
+ int pattern_count = seg_length / dash_period;
+ Real pattern_length = 1.0 / (pattern_count + dash_fraction);
+ Real start_t, end_t;
+ for (int p = 0; p <= pattern_count; p++)
+ {
+ start_t = p * pattern_length;
+ end_t = (p + dash_fraction) * pattern_length;
+ back_dash =
+ back_segment.extract (start_t, end_t);
+ curve_dash =
+ curve_segment.extract (start_t, end_t);
+ return_value.add_stencil (bezier_sandwich (back_dash,
+ curve_dash,
+ linethick));
+ }
+ }
+ }
+ }
+ return return_value;
}
+
/*
* Bezier Sandwich:
*
*
*/
Stencil
-Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve)
+Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve, Real thickness)
{
/*
Need the weird order b.o. the way PS want its arguments
SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"),
ly_quote_scm (list),
- scm_from_double (0.0),
+ scm_from_double (thickness),
SCM_UNDEFINED);
Interval x_extent = top_curve.extent (X_AXIS);
y_extent.unite (bottom_curve.extent (Y_AXIS));
Box b (x_extent, y_extent);
+ b.widen (0.5 * thickness, 0.5 * thickness);
return Stencil (b, horizontal_bend);
}
-/*
- TODO: junk me.
-*/
-Stencil
-Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
-{
- Stencil m;
- String sym = ly_scm2string (scm_car (s));
- String reg = ly_scm2string (scm_car (scm_cdr (s)));
-
- if (sym == "Discant")
- {
- Stencil r = fm->find_by_name ("accordion.accDiscant");
- m.add_stencil (r);
- if (reg.left_string (1) == "F")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- int eflag = 0x00;
- if (reg.left_string (3) == "EEE")
- {
- eflag = 0x07;
- reg = reg.right_string (reg.length () - 3);
- }
- else if (reg.left_string (2) == "EE")
- {
- eflag = 0x05;
- reg = reg.right_string (reg.length () - 2);
- }
- else if (reg.left_string (2) == "Eh")
- {
- eflag = 0x04;
- reg = reg.right_string (reg.length () - 2);
- }
- else if (reg.left_string (1) == "E")
- {
- eflag = 0x02;
- reg = reg.right_string (reg.length () - 1);
- }
- if (eflag & 0x02)
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- m.add_stencil (d);
- }
- if (eflag & 0x04)
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- d.translate_axis (0.8 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- }
- if (eflag & 0x01)
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- d.translate_axis (-0.8 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- }
- if (reg.left_string (2) == "SS")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (0.5 * staff_space PT, Y_AXIS);
- d.translate_axis (0.4 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- d.translate_axis (-0.8 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 2);
- }
- if (reg.left_string (1) == "S")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (0.5 * staff_space PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- }
- else if (sym == "Freebase")
- {
- Stencil r = fm->find_by_name ("accordion.accFreebase");
- m.add_stencil (r);
- if (reg.left_string (1) == "F")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- if (reg == "E")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
- m.add_stencil (d);
- }
- }
- else if (sym == "Bayanbase")
- {
- Stencil r = fm->find_by_name ("accordion.accBayanbase");
- m.add_stencil (r);
- if (reg.left_string (1) == "T")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- /* include 4' reed just for completeness. You don't want to use this. */
- if (reg.left_string (1) == "F")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- if (reg.left_string (2) == "EE")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
- d.translate_axis (0.4 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- d.translate_axis (-0.8 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 2);
- }
- if (reg.left_string (1) == "E")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- }
- else if (sym == "Stdbase")
- {
- Stencil r = fm->find_by_name ("accordion.accStdbase");
- m.add_stencil (r);
- if (reg.left_string (1) == "T")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 3.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- if (reg.left_string (1) == "F")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- if (reg.left_string (1) == "M")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 2 PT, Y_AXIS);
- d.translate_axis (staff_space PT, X_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- if (reg.left_string (1) == "E")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- if (reg.left_string (1) == "S")
- {
- Stencil d = fm->find_by_name ("accordion.accDot");
- d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length () - 1);
- }
- }
- /* ugh maybe try to use regular font for S.B. and B.B and only use one font
- for the rectangle */
- else if (sym == "SB")
- {
- Stencil r = fm->find_by_name ("accordion.accSB");
- m.add_stencil (r);
- }
- else if (sym == "BB")
- {
- Stencil r = fm->find_by_name ("accordion.accBB");
- m.add_stencil (r);
- }
- else if (sym == "OldEE")
- {
- Stencil r = fm->find_by_name ("accordion.accOldEE");
- m.add_stencil (r);
- }
- else if (sym == "OldEES")
- {
- Stencil r = fm->find_by_name ("accordion.accOldEES");
- m.add_stencil (r);
- }
- return m;
-}
-
Stencil
Lookup::repeat_slash (Real w, Real s, Real t)
{
#if 0 /* TODO */
- Array<Offset> points;
+ vector<Offset> points;
Real blotdiameter = 0.0;
Offset p1 (0, 0);
}
Stencil
-Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot)
+Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot)
{
Box b;
Axis other = Axis ((a + 1)%2);
Stencil m = round_filled_box (b, blot);
b[a] = Interval (iv[UP] - thick, iv[UP]);
- Interval oi = Interval (-thick / 2, thick / 2 + fabs (protude));
- oi *= sign (protude);
+ Interval oi = Interval (-thick / 2, thick / 2 + fabs (protrude));
+ oi *= sign (protrude);
b[other] = oi;
m.add_stencil (round_filled_box (b, blot));
b[a] = Interval (iv[DOWN], iv[DOWN] + thick);
}
Stencil
-Lookup::triangle (Interval iv, Real thick, Real protude)
+Lookup::triangle (Interval iv, Real thick, Real protrude)
{
Box b;
b[X_AXIS] = Interval (0, iv.length ());
- b[Y_AXIS] = Interval (min (0., protude), max (0.0, protude));
+ b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude));
- Offset z1 (iv[LEFT], 0);
- Offset z2 (iv[RIGHT], 0);
- Offset z3 ((z1 + z2)[X_AXIS] / 2, protude);
+ vector<Offset> points;
+ points.push_back (Offset (iv[LEFT], 0));
+ points.push_back (Offset (iv[RIGHT], 0));
+ points.push_back (Offset (iv.center (), protrude));
- /*
- TODO: move Triangle to Line_interface ?
- */
- Stencil tri = Line_interface::make_line (thick, z1, z2);
- tri.add_stencil (Line_interface::make_line (thick, z2, z3));
- tri.add_stencil (Line_interface::make_line (thick, z3, z1));
+ return points_to_line_stencil (thick, points);
- return tri;
}
+
+
+Stencil
+Lookup::points_to_line_stencil (Real thick, vector<Offset> const &points)
+{
+ Stencil ret;
+ for (vsize i = 1; i < points.size (); i++)
+ {
+ if (points[i-1].is_sane () && points[i].is_sane ())
+ {
+ Stencil line
+ = Line_interface::make_line (thick, points[i-1], points[i]);
+ ret.add_stencil (line);
+ }
+ }
+ return ret;
+}