source file of the GNU LilyPond music typesetter
- (c) 2003 Juergen Reuter <reuter@ipd.uka.de>
+ (c) 2003--2004 Juergen Reuter <reuter@ipd.uka.de>
*/
#include <math.h>
#include "item.hh"
#include "vaticana-ligature.hh"
#include "font-interface.hh"
-#include "molecule.hh"
+#include "stencil.hh"
#include "lookup.hh"
#include "staff-symbol-referencer.hh"
#include "note-head.hh"
#include "bezier.hh"
#include "warn.hh"
-Molecule
+Stencil
vaticana_brew_cauda (Grob *me,
int pos,
int delta_pitch,
/*
* TODO: move this function to class Lookup?
*/
-Molecule
+Stencil
vaticana_brew_flexa (Grob *me,
bool solid,
Real line_thickness)
{
Real staff_space = Staff_symbol_referencer::staff_space (me);
- Molecule molecule = Molecule ();
+ Stencil stencil = Stencil ();
Real right_height = 0.6 * staff_space;
Real interval;
- SCM flexa_height_scm = me->get_grob_property ("flexa-height");
+ SCM flexa_height_scm = me->get_property ("flexa-height");
if (flexa_height_scm != SCM_EOL)
{
interval = gh_scm2int (flexa_height_scm);
me->warning (_ ("ascending vaticana style flexa"));
}
- Real width = robust_scm2double ( me->get_grob_property ("flexa-width"), 2);
+ Real width = robust_scm2double ( me->get_property ("flexa-width"), 2);
/*
* Compensate curve thickness that appears to be smaller in steep
*/
Real left_height =
right_height +
- min (0.12 * abs(interval), 0.3) * staff_space;
+ min (0.12 * abs (interval), 0.3) * staff_space;
/*
* Compensate optical illusion regarding vertical position of left
* and right endings due to curved shape.
*/
- Real ypos_correction = -0.1*staff_space * sign(interval);
- Real interval_correction = 0.2*staff_space * sign(interval);
+ Real ypos_correction = -0.1*staff_space * sign (interval);
+ Real interval_correction = 0.2*staff_space * sign (interval);
Real corrected_interval = interval*staff_space + interval_correction;
/*
if (solid)
{
- Molecule solid_head =
+ Stencil solid_head =
Lookup::bezier_sandwich (top_curve, bottom_curve);
- molecule.add_molecule (solid_head);
+ stencil.add_stencil (solid_head);
}
else // outline
{
Bezier inner_top_curve = top_curve;
inner_top_curve.translate (Offset (0.0, -line_thickness));
- Molecule top_edge =
+ Stencil top_edge =
Lookup::bezier_sandwich (top_curve, inner_top_curve);
- molecule.add_molecule(top_edge);
+ stencil.add_stencil (top_edge);
Bezier inner_bottom_curve = bottom_curve;
inner_bottom_curve.translate (Offset (0.0, +line_thickness));
- Molecule bottom_edge =
+ Stencil bottom_edge =
Lookup::bezier_sandwich (bottom_curve, inner_bottom_curve);
- molecule.add_molecule(bottom_edge);
+ stencil.add_stencil (bottom_edge);
/*
* TODO: Use horizontal slope with proper slope value rather
*/
Box left_edge_box (Interval (0, line_thickness),
Interval (-0.5*left_height, +0.5*left_height));
- Molecule left_edge = Lookup::filled_box (left_edge_box);
- molecule.add_molecule(left_edge);
+ Stencil left_edge = Lookup::filled_box (left_edge_box);
+ stencil.add_stencil (left_edge);
Box right_edge_box (Interval (-line_thickness, 0),
Interval (-0.5*right_height, +0.5*right_height));
- Molecule right_edge = Lookup::filled_box (right_edge_box);
+ Stencil right_edge = Lookup::filled_box (right_edge_box);
right_edge.translate_axis (width, X_AXIS);
right_edge.translate_axis (corrected_interval / 2.0, Y_AXIS);
- molecule.add_molecule(right_edge);
+ stencil.add_stencil (right_edge);
}
- molecule.translate_axis (ypos_correction, Y_AXIS);
- return molecule;
+ stencil.translate_axis (ypos_correction, Y_AXIS);
+ return stencil;
}
-Molecule
+Stencil
vaticana_brew_join (Grob *me, int delta_pitch,
Real join_thickness, Real blotdiameter)
{
{
me->programming_error (_f ("Vaticana_ligature: "
"zero join (delta_pitch == 0)"));
- return Molecule ();
+ return Stencil ();
}
Interval x_extent = Interval (0, join_thickness);
Interval y_extent = (delta_pitch > 0) ?
}
void
-vaticana_add_ledger_lines (Grob *me, Molecule *out, int pos, Real offs,
+vaticana_add_ledger_lines (Grob *me, Stencil *out, int pos, Real offs,
bool ledger_take_space)
{
int interspaces = Staff_symbol_referencer::line_count (me)-1;
Interval l_extents = Interval (hd[LEFT] - left_ledger_protusion,
hd[RIGHT] + right_ledger_protusion);
- Molecule ledger_lines =
+ Stencil ledger_lines =
Note_head::brew_ledger_lines (me, pos, interspaces,
- l_extents,
+ l_extents, 0,
ledger_take_space);
ledger_lines.translate_axis (offs, Y_AXIS);
- out->add_molecule (ledger_lines);
+ out->add_stencil (ledger_lines);
}
}
-Molecule
+Stencil
vaticana_brew_primitive (Grob *me, bool ledger_take_space)
{
- SCM glyph_name_scm = me->get_grob_property ("glyph-name");
+ SCM glyph_name_scm = me->get_property ("glyph-name");
if (glyph_name_scm == SCM_EOL)
{
me->programming_error ("Vaticana_ligature: "
"undefined glyph-name -> ignoring grob");
- return Molecule ();
+ return Stencil ();
}
String glyph_name = ly_scm2string (glyph_name_scm);
- Molecule out;
+ Stencil out;
int flexa_height = 0;
- Real thickness = robust_scm2double ( me->get_grob_property ("thickness"), 1);
+ Real thickness = robust_scm2double ( me->get_property ("thickness"), 1);
Real line_thickness =
thickness * me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
int pos = (int)rint (Staff_symbol_referencer::get_position (me));
- SCM delta_pitch_scm = me->get_grob_property ("delta-pitch");
+ SCM delta_pitch_scm = me->get_property ("delta-pitch");
int delta_pitch;
if (delta_pitch_scm != SCM_EOL)
delta_pitch = gh_scm2int (delta_pitch_scm);
else
delta_pitch = 0;
- Real x_offset = robust_scm2double ( me->get_grob_property ("x-offset"), 0);
+ Real x_offset = robust_scm2double ( me->get_property ("x-offset"), 0);
- bool add_stem = to_boolean (me->get_grob_property ("add-stem"));
- bool add_cauda = to_boolean (me->get_grob_property ("add-cauda"));
- bool add_join = to_boolean (me->get_grob_property ("add-join"));
+ bool add_stem = to_boolean (me->get_property ("add-stem"));
+ bool add_cauda = to_boolean (me->get_property ("add-cauda"));
+ bool add_join = to_boolean (me->get_property ("add-join"));
if (!String::compare (glyph_name, ""))
{
* flexa_width.)
*/
Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real flexa_width = robust_scm2double ( me->get_grob_property ("flexa-width"), 2);
+ Real flexa_width = robust_scm2double ( me->get_property ("flexa-width"), 2) *staff_space;
out =
Lookup::blank (Box (Interval (0, 0.5*flexa_width), Interval (0,0)));
}
if (add_cauda)
{
- Molecule cauda =
+ Stencil cauda =
vaticana_brew_cauda (me, pos, delta_pitch,
line_thickness, blotdiameter);
- out.add_molecule (cauda);
+ out.add_stencil (cauda);
}
if (add_stem)
{
- Molecule stem =
+ Stencil stem =
vaticana_brew_cauda (me, pos, -1,
line_thickness, blotdiameter);
stem.translate_axis (head_width - line_thickness, X_AXIS);
- out.add_molecule (stem);
+ out.add_stencil (stem);
}
if (add_join)
{
- Molecule join =
+ Stencil join =
vaticana_brew_join (me, delta_pitch, line_thickness, blotdiameter);
join.translate_axis (head_width - line_thickness, X_AXIS);
- out.add_molecule (join);
+ out.add_stencil (join);
}
- vaticana_add_ledger_lines(me, &out, pos, 0, ledger_take_space);
+ vaticana_add_ledger_lines (me, &out, pos, 0, ledger_take_space);
if (!String::compare (glyph_name, "flexa"))
{
pos += flexa_height;
- vaticana_add_ledger_lines(me, &out, pos, 0.5*flexa_height,
+ vaticana_add_ledger_lines (me, &out, pos, 0.5*flexa_height,
ledger_take_space);
}
return primitive;
}
-MAKE_SCHEME_CALLBACK (Vaticana_ligature, brew_molecule, 1);
+MAKE_SCHEME_CALLBACK (Vaticana_ligature, print, 1);
SCM
-Vaticana_ligature::brew_molecule (SCM)
+Vaticana_ligature::print (SCM)
{
return SCM_EOL;
}
projects / lilypond.git / blobdiff