}
-/*
- build a ledger line for small pieces.
- */
-Molecule
-Lookup::ledger_line (Interval xwid) const
-{
- Drul_array<Molecule> endings;
- endings[LEFT] = afm_find ("noteheads-ledgerending");
- Molecule * e = &endings[LEFT];
- endings[RIGHT] = *e;
-
- Real thick = e->dim_[Y_AXIS].length();
- Real len = e->dim_[X_AXIS].length () - thick;
-
- Molecule total;
- Direction d = LEFT;
- do {
- endings[d].translate_axis (xwid[d] - endings[d].dim_[X_AXIS][d], X_AXIS);
- total.add_molecule (endings[d]);
- } while ((flip(&d)) != LEFT);
-
- Real xpos = xwid [LEFT] + len;
-
- while (xpos + len + thick /2 <= xwid[RIGHT])
- {
- e->translate_axis (len, X_AXIS);
- total.add_molecule (*e);
- xpos += len;
- }
-
- return total;
-}
Molecule
return m;
}
- Atom* at = new Atom (gh_list (ly_symbol2scm ("char"),
+ SCM at = (gh_list (ly_symbol2scm ("char"),
gh_int2scm (cm->code),
SCM_UNDEFINED));
- at->fontify (afm_l_);
+ at= fontify_atom (afm_l_,at);
m.dim_ = afm_bbox_to_box (cm->charBBox);
- m.add_atom (at->self_scm_);
+ m.add_atom (at);
return m;
}
}
Molecule
-Lookup::beam (Real slope, Real width, Real thick) const
+Lookup::beam (Real slope, Real width, Real thick)
{
Real height = slope * width;
Real min_y = (0 <? height) - thick/2;
m.dim_[Y_AXIS] = Interval (min_y, max_y);
- Atom *at = new Atom
- (gh_list (ly_symbol2scm ("beam"),
+ SCM at = (gh_list (ly_symbol2scm ("beam"),
gh_double2scm (width),
gh_double2scm (slope),
gh_double2scm (thick),
SCM_UNDEFINED));
- m.add_atom (at->self_scm_);
+ m.add_atom (at);
return m;
}
-/*
- FIXME.
- */
Molecule
-Lookup::dashed_slur (Bezier b, Real thick, Real dash) const
+Lookup::dashed_slur (Bezier b, Real thick, Real dash)
{
SCM l = SCM_EOL;
for (int i= 4; i -- ;)
l = gh_cons (ly_offset2scm (b.control_[i]), l);
}
- Atom *at = new Atom(gh_list (ly_symbol2scm ("dashed-slur"),
+ SCM at = (gh_list (ly_symbol2scm ("dashed-slur"),
gh_double2scm (thick),
gh_double2scm (dash),
ly_quote_scm (l),
SCM_UNDEFINED));
Molecule m;
- m.add_atom (at->self_scm_);
+ m.add_atom (at);
return m;
}
Molecule
-Lookup::fill (Box b) const
+Lookup::fill (Box b)
{
Molecule m;
m.dim_ = b;
Molecule
-Lookup::filledbox (Box b ) const
+Lookup::filledbox (Box b )
{
Molecule m;
- Atom* at = new Atom(gh_list (ly_symbol2scm ("filledbox"),
+ SCM at = (gh_list (ly_symbol2scm ("filledbox"),
gh_double2scm (-b[X_AXIS][LEFT]),
gh_double2scm (b[X_AXIS][RIGHT]),
gh_double2scm (-b[Y_AXIS][DOWN]),
SCM_UNDEFINED));
m.dim_ = b;
- m.add_atom (at->self_scm_);
+ m.add_atom (at);
+ return m;
+}
+
+Molecule
+Lookup::frame (Box b, Real thick)
+{
+ Molecule m;
+ Direction d = LEFT;
+ Axis a = X_AXIS;
+ while (a < NO_AXES)
+ {
+ do
+ {
+ Axis o = Axis ((a+1)%NO_AXES);
+
+ Box edges;
+ edges[a] = b[a][d] + 0.5 * thick * Interval (-1, 1);
+ edges[o][DOWN] = b[o][DOWN] - thick/2;
+ edges[o][UP] = b[o][UP] + thick/2;
+
+
+ m.add_molecule (filledbox (edges));
+ }
+ while (flip (&d) != LEFT);
+ }
return m;
+
}
+
/*
TODO: THIS IS UGLY. Since the user has direct access to TeX
strings, we try some halfbaked attempt to detect TeX trickery.
*/
Molecule
-Lookup::text (String style, String text, Paper_def *paper_l) const
+Lookup::text (String style, String text, Paper_def *paper_l)
{
Molecule m;
if (style.empty_b ())
m.dim_ = metric_l->text_dimension (text);
- Atom *at = new Atom (gh_list (ly_symbol2scm ("text"),
+ SCM at = (gh_list (ly_symbol2scm ("text"),
ly_str02scm (text.ch_C()),
SCM_UNDEFINED));
- at->fontify (metric_l);
+ at = fontify_atom (metric_l,at);
- m.add_atom (at->self_scm_);
+ m.add_atom (at);
return m;
}
Molecule
-Lookup::staff_brace (Real y, int staff_size) const
+Lookup::staff_brace (Real y, int staff_size)
{
Molecule m;
+ // URG
Real step = 1.0;
int minht = 2 * staff_size;
int maxht = 7 * minht;
int idx = int (((maxht - step) <? y - minht) / step);
idx = idx >? 0;
-
- String nm = String ("feta-braces" + to_str (staff_size));
+ SCM l = ly_eval_str ("(style-to-cmr \"brace\")");
+ String nm = "feta-braces";
+ if (l != SCM_BOOL_F)
+ nm = ly_scm2string (gh_cdr (l));
+ nm += to_str (staff_size);
SCM e =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED);
- Atom *at = new Atom (e);
+ SCM at = (e);
- at->fontify (all_fonts_global_p->find_font (nm));
+ at = fontify_atom (all_fonts_global_p->find_font (nm), at);
m.dim_[Y_AXIS] = Interval (-y/2,y/2);
m.dim_[X_AXIS] = Interval (0,0);
- m.add_atom (at->self_scm_);
+ m.add_atom (at);
return m;
}
-
+
/*
Make a smooth curve along the points
*/
Molecule
-Lookup::slur (Bezier curve, Real curvethick, Real linethick) const
+Lookup::slur (Bezier curve, Real curvethick, Real linethick)
{
Real alpha = (curve.control_[3] - curve.control_[0]).arg ();
Bezier back = curve;
}
- Atom *at = new Atom (gh_list (ly_symbol2scm ("bezier-sandwich"),
+ SCM at = (gh_list (ly_symbol2scm ("bezier-sandwich"),
ly_quote_scm (list),
gh_double2scm (linethick),
SCM_UNDEFINED));
Molecule m;
m.dim_[X_AXIS] = curve.extent (X_AXIS);
m.dim_[Y_AXIS] = curve.extent (Y_AXIS);
- m.add_atom (at->self_scm_);
+ m.add_atom (at);
return m;
}
Molecule
-Lookup::staff_bracket (Real height, Paper_def* paper_l) const
+Lookup::staff_bracket (Real height, Paper_def* paper_l)
{
Molecule m;
- Atom *at = new Atom ( gh_list (ly_symbol2scm ("bracket"),
+ SCM at = ( gh_list (ly_symbol2scm ("bracket"),
gh_double2scm (paper_l->get_var("bracket_arch_angle")),
gh_double2scm (paper_l->get_var("bracket_arch_width")),
gh_double2scm (paper_l->get_var("bracket_arch_height")),
gh_double2scm (paper_l->get_var("bracket_thick")),
SCM_UNDEFINED));
- m.add_atom (at->self_scm_);
+ m.add_atom (at);
m.dim_[Y_AXIS] = Interval (-height/2,height/2);
m.dim_[X_AXIS] = Interval (0,4 PT);
return m;
}
-Molecule
-Lookup::volta (Real h, Real w, Real thick, bool vert_start, bool vert_end) const
-{
- Molecule m;
-
- Atom *at = new Atom(gh_list (ly_symbol2scm ("volta"),
- gh_double2scm (h),
- gh_double2scm (w),
- gh_double2scm (thick),
- gh_int2scm (vert_start),
- gh_int2scm (vert_end),
- SCM_UNDEFINED));
-
- m.dim_[Y_AXIS] = Interval (- h/2, h/2);
- m.dim_[X_AXIS] = Interval (0, w);
-
- m.add_atom (at->self_scm_);
- return m;
-}
Molecule
Lookup::accordion (SCM s, Real staff_space) const
projects / lilypond.git / blobdiff