source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "lookup.hh"
-#include <math.h>
+#include <cmath>
#include <cctype>
+using namespace std;
#include "line-interface.hh"
#include "warn.hh"
Offset p;
- p = Offset (0, thick/2);
+ p = Offset (0, thick / 2);
b.add_point (p);
- p += Offset (1,-1) * (blot/2);
+ p += Offset (1, -1) * (blot / 2);
SCM points = SCM_EOL;
-
+
points = scm_cons (scm_from_double (p[X_AXIS]),
scm_cons (scm_from_double (p[Y_AXIS]),
points));
-
-
- p = Offset (0, -thick/2);
+
+ p = Offset (0, -thick / 2);
b.add_point (p);
- p += Offset (1,1) * (blot/2);
+ p += Offset (1, 1) * (blot / 2);
points = scm_cons (scm_from_double (p[X_AXIS]),
scm_cons (scm_from_double (p[Y_AXIS]),
points));
-
-
- p = Offset (width, width * slope - thick/2);
+
+ p = Offset (width, width * slope - thick / 2);
b.add_point (p);
- p += Offset (-1, 1) * (blot/2);
+ p += Offset (-1, 1) * (blot / 2);
points = scm_cons (scm_from_double (p[X_AXIS]),
scm_cons (scm_from_double (p[Y_AXIS]),
points));
-
-
- p = Offset (width, width * slope + thick/2);
+
+ p = Offset (width, width * slope + thick / 2);
b.add_point (p);
- p += Offset (-1, -1) * (blot/2);
+ p += Offset (-1, -1) * (blot / 2);
points = scm_cons (scm_from_double (p[X_AXIS]),
scm_cons (scm_from_double (p[Y_AXIS]),
points));
-
+
SCM expr = scm_list_n (ly_symbol2scm ("polygon"),
ly_quote_scm (points),
scm_from_double (blot),
SCM_BOOL_T,
SCM_UNDEFINED);
-
+
return Stencil (b, expr);
}
Real off = dash_period - on;
for (int i = 4; i--;)
- {
- l = scm_cons (ly_offset2scm (b.control_[i]), l);
- }
+ l = scm_cons (ly_offset2scm (b.control_[i]), l);
SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"),
scm_from_double (thick),
ly_quote_scm (l),
SCM_UNDEFINED));
- Box box (Interval (0, 0), Interval (0, 0));
+ Box box (b.extent (X_AXIS), b.extent (Y_AXIS));
return Stencil (box, at);
}
+Stencil
+Lookup::rotated_box (Real slope, Real width, Real thick, Real blot)
+{
+ 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
Lookup::horizontal_line (Interval w, Real th)
{
Stencil
Lookup::blank (Box b)
{
- return Stencil (b, scm_makfrom0str (""));
+ return Stencil (b, scm_from_locale_string (""));
}
Stencil
Lookup::round_filled_box (Box b, Real blotdiameter)
{
if (b.x ().length () < blotdiameter)
- {
- blotdiameter = b.x ().length ();
- }
+ blotdiameter = b.x ().length ();
if (b.y ().length () < blotdiameter)
- {
- blotdiameter = b.y ().length ();
- }
+ blotdiameter = b.y ().length ();
SCM at = (scm_list_n (ly_symbol2scm ("round-filled-box"),
scm_from_double (-b[X_AXIS][LEFT]),
* 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");
}
#endif
-
+
/* special cases: degenerated polygons */
if (points.size () == 0)
return Stencil ();
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]);
SCM scontrols[8];
- for (int i = 4; i--;)
- scontrols[ i ] = ly_offset2scm (back.control_[i]);
- for (int i = 4; i--;)
+ 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]);
/*
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);
- }
+ list = scm_cons (scontrols[indices[i]], list);
SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"),
ly_quote_scm (list),
b[X_AXIS].unite (back.extent (X_AXIS));
b[Y_AXIS].unite (back.extent (Y_AXIS));
+ b.widen (0.5 * linethick, 0.5 * linethick);
return Stencil (b, at);
}
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)));
+ 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")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
int eflag = 0x00;
- if (reg.left_string (3) == "EEE")
+ if (reg.substr (0, 3) == "EEE")
{
eflag = 0x07;
- reg = reg.right_string (reg.length () - 3);
+ reg = reg.substr (3);
}
- else if (reg.left_string (2) == "EE")
+ else if (reg.substr (0, 2) == "EE")
{
eflag = 0x05;
- reg = reg.right_string (reg.length () - 2);
+ reg = reg.substr (2);
}
- else if (reg.left_string (2) == "Eh")
+ else if (reg.substr (0, 2) == "Eh")
{
eflag = 0x04;
- reg = reg.right_string (reg.length () - 2);
+ reg = reg.substr (2);
}
- else if (reg.left_string (1) == "E")
+ else if (reg.substr (0, 1) == "E")
{
eflag = 0x02;
- reg = reg.right_string (reg.length () - 1);
+ reg = reg.substr (1);
}
if (eflag & 0x02)
{
d.translate_axis (-0.8 * staff_space PT, X_AXIS);
m.add_stencil (d);
}
- if (reg.left_string (2) == "SS")
+ if (reg.substr (0, 2) == "SS")
{
Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (0.5 * staff_space PT, Y_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);
+ reg = reg.substr (2);
}
- if (reg.left_string (1) == "S")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
}
else if (sym == "Freebase")
{
Stencil r = fm->find_by_name ("accordion.accFreebase");
m.add_stencil (r);
- if (reg.left_string (1) == "F")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
if (reg == "E")
{
{
Stencil r = fm->find_by_name ("accordion.accBayanbase");
m.add_stencil (r);
- if (reg.left_string (1) == "T")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
/* include 4' reed just for completeness. You don't want to use this. */
- if (reg.left_string (1) == "F")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
- if (reg.left_string (2) == "EE")
+ if (reg.substr (0, 2) == "EE")
{
Stencil d = fm->find_by_name ("accordion.accDot");
d.translate_axis (staff_space * 0.5 PT, Y_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);
+ reg = reg.substr (2);
}
- if (reg.left_string (1) == "E")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
}
else if (sym == "Stdbase")
{
Stencil r = fm->find_by_name ("accordion.accStdbase");
m.add_stencil (r);
- if (reg.left_string (1) == "T")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
- if (reg.left_string (1) == "F")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
- if (reg.left_string (1) == "M")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
- if (reg.left_string (1) == "E")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
- if (reg.left_string (1) == "S")
+ if (reg.substr (0, 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);
+ reg = reg.substr (1);
}
}
/* ugh maybe try to use regular font for S.B. and B.B and only use one font
Stencil
Lookup::repeat_slash (Real w, Real s, Real t)
{
-#if 0
- // TODO
- Array<Offset> points ;
+#if 0 /* TODO */
+ vector<Offset> points;
Real blotdiameter = 0.0;
- Offset p1(0, 0);
- Offset p2(w, w*s);
-
-
-
+ Offset p1 (0, 0);
+ Offset p2 (w, w * s);
+
return Lookup::round_filled_polygon (points, blotdiameter);
#endif
-
+
SCM wid = scm_from_double (w);
SCM sl = scm_from_double (s);
SCM thick = scm_from_double (t);
}
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;
+}
projects / lilypond.git / blobdiff