source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2008 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)
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);
}
/* remove consecutive duplicate points */
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");
}
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);
}
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.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.substr (1);
- }
- int eflag = 0x00;
- if (reg.substr (0, 3) == "EEE")
- {
- eflag = 0x07;
- reg = reg.substr (3);
- }
- else if (reg.substr (0, 2) == "EE")
- {
- eflag = 0x05;
- reg = reg.substr (2);
- }
- else if (reg.substr (0, 2) == "Eh")
- {
- eflag = 0x04;
- reg = reg.substr (2);
- }
- else if (reg.substr (0, 1) == "E")
- {
- eflag = 0x02;
- reg = reg.substr (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.substr (0, 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.substr (2);
- }
- 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.substr (1);
- }
- }
- else if (sym == "Freebase")
- {
- Stencil r = fm->find_by_name ("accordion.accFreebase");
- m.add_stencil (r);
- 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.substr (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.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.substr (1);
- }
- /* include 4' reed just for completeness. You don't want to use this. */
- 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.substr (1);
- }
- if (reg.substr (0, 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.substr (2);
- }
- 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.substr (1);
- }
- }
- else if (sym == "Stdbase")
- {
- Stencil r = fm->find_by_name ("accordion.accStdbase");
- m.add_stencil (r);
- 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.substr (1);
- }
- 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.substr (1);
- }
- 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.substr (1);
- }
- 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.substr (1);
- }
- 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.substr (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)
{
}
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