source file of the GNU LilyPond music typesetter
- (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "multi-measure-rest.hh"
#include "warn.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "paper-column.hh" // urg
#include "font-interface.hh"
#include "rest.hh"
-#include "molecule.hh"
+#include "stencil.hh"
#include "misc.hh"
#include "spanner.hh"
#include "staff-symbol-referencer.hh"
#include "text-item.hh"
#include "percent-repeat-item.hh"
#include "lookup.hh"
+#include "separation-item.hh"
MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1);
SCM
Grob *me = unsmob_grob (smob);
Spanner *sp = dynamic_cast<Spanner*> (me);
- Molecule r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6);
+ Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6);
// ugh copy & paste.
return r.smobbed_copy ();
}
-MAKE_SCHEME_CALLBACK (Multi_measure_rest,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Multi_measure_rest,print,1);
SCM
-Multi_measure_rest::brew_molecule (SCM smob)
+Multi_measure_rest::print (SCM smob)
{
Grob *me = unsmob_grob (smob);
Spanner * sp = dynamic_cast<Spanner*> (me);
Grob *common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
do
{
- Item * col = sp->get_bound (d)->get_column ();
+ Item * b = sp->get_bound (d);
- Interval coldim = col->extent (common, X_AXIS);
+ Interval coldim = (Separation_item::has_interface (b))
+ ? Separation_item::relative_width (b, common)
+ : b->extent (common, X_AXIS);
- sp_iv[d] = coldim[-d] ;
+ sp_iv[d] = coldim.is_empty () ? b->relative_coordinate (common, X_AXIS) : coldim[-d];
}
while ((flip (&d)) != LEFT);
- Real space = sp_iv.length();
+ Real space = sp_iv.length ();
Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS);
/*
Real x_off = (sp_iv[LEFT] - rx) >? 0;
- Molecule mol;
- mol.add_molecule (symbol_molecule (me, space));
+ Stencil mol;
+ mol.add_stencil (symbol_stencil (me, space));
int measures = 0;
- SCM m (me->get_grob_property ("measure-count"));
- if (gh_number_p (m))
+ SCM m (me->get_property ("measure-count"));
+ if (ly_c_number_p (m))
{
- measures = gh_scm2int (m);
+ measures = ly_scm2int (m);
}
mol.translate_axis (x_off, X_AXIS);
-Molecule
-Multi_measure_rest::symbol_molecule (Grob *me, Real space)
+Stencil
+Multi_measure_rest::symbol_stencil (Grob *me, Real space)
{
int measures = 0;
- SCM m (me->get_grob_property ("measure-count"));
- if (gh_number_p (m))
+ SCM m (me->get_property ("measure-count"));
+ if (ly_c_number_p (m))
{
- measures = gh_scm2int (m);
+ measures = ly_scm2int (m);
}
if (measures <= 0)
- return Molecule();
+ return Stencil ();
- SCM limit = me->get_grob_property ("expand-limit");
- if (measures > gh_scm2int (limit))
+ SCM limit = me->get_property ("expand-limit");
+ if (measures > ly_scm2int (limit))
{
Real padding = 0.15;
- Molecule s = big_rest (me, (1.0 - 2*padding) * space);
+ Stencil s = big_rest (me, (1.0 - 2*padding) * space);
s.translate_axis (padding * space, X_AXIS);
return s;
}
- SCM alist_chain = Font_interface::font_alist_chain (me);
+ SCM alist_chain = Font_interface::music_font_alist_chain (me);
Real staff_space = Staff_symbol_referencer::staff_space (me);
Font_metric *musfont
- = Font_interface::get_font (me,alist_chain);
+ = select_font (me->get_paper (), alist_chain);
- SCM sml = me->get_grob_property ("use-breve-rest");
+ SCM sml = me->get_property ("use-breve-rest");
if (measures == 1)
{
- if (sml == SCM_BOOL_T)
+ if (to_boolean (sml))
{
- Molecule s = musfont->find_by_name (Rest::glyph_name (me, -1, ""));
+ Stencil s = musfont->find_by_name (Rest::glyph_name (me, -1, "", false));
s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS);
}
else
{
- Molecule s = musfont->find_by_name (Rest::glyph_name (me, 0, ""));
+ Stencil s = musfont->find_by_name (Rest::glyph_name (me, 0, "", true));
/*
ugh.
}
-
-Molecule
+/*
+ WIDTH can also be 0 to determine the minimum size of the object.
+ */
+Stencil
Multi_measure_rest::big_rest (Grob *me, Real width)
{
- Real tthick = gh_scm2double (me->get_grob_property ("thick-thickness"));
- Real hair_thick = gh_scm2double (me->get_grob_property ("hair-thickness"));
+ Real thick_thick =robust_scm2double (me->get_property ("thick-thickness"), 1.0);
+ Real hair_thick = robust_scm2double (me->get_property ("hair-thickness"), .1);
Real ss = Staff_symbol_referencer::staff_space (me);
-
- Real slt = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
- Real y = slt * tthick/2 * ss;
+ Real slt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+ Real y = slt * thick_thick/2 * ss;
Real ythick = hair_thick * slt * ss;
- Box b(Interval (0, width - 2 * ythick), Interval (-y, y));
+ Box b (Interval (0, 0 >? (width - 2 * ythick)), Interval (-y, y));
+
+ Real blot = width ? (.8 * (y <? ythick)) : 0.0;
- Molecule m = Lookup::filledbox (b);
- Molecule yb = Lookup::filledbox (Box (Interval (-0.5, 0.5)* ythick, Interval (-ss, ss)));
+ Stencil m = Lookup::round_filled_box (b, blot);
+ Stencil yb = Lookup::round_filled_box (Box (Interval (-0.5, 0.5)* ythick, Interval (-ss, ss)), blot);
m.add_at_edge (X_AXIS, RIGHT, yb, 0, 0);
m.add_at_edge (X_AXIS, LEFT, yb, 0, 0);
/*
Kirchenpause (?)
*/
-Molecule
+Stencil
Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures,
Real space)
{
int count = 0;
Real symbols_width = 0.0;
- SCM sml = me->get_grob_property ("use-breve-rest");
+ SCM sml = me->get_property ("use-breve-rest");
while (l)
{
k = -1;
}
- Molecule r (musfont->find_by_name ("rests-" + to_string (k)));
+ Stencil r (musfont->find_by_name ("rests-" + to_string (k)));
symbols_width += r.extent (X_AXIS).length ();
- mols = gh_cons (r.smobbed_copy (), mols);
+ mols = scm_cons (r.smobbed_copy (), mols);
}
else
{
l --;
}
- Molecule r (musfont->find_by_name ("rests-" + to_string (k)));
+ Stencil r (musfont->find_by_name ("rests-" + to_string (k)));
if (k == 0)
{
Real staff_space = Staff_symbol_referencer::staff_space (me);
r.translate_axis (staff_space, Y_AXIS);
}
symbols_width += r.extent (X_AXIS).length ();
- mols = gh_cons (r.smobbed_copy (), mols);
+ mols = scm_cons (r.smobbed_copy (), mols);
}
count ++;
}
inner_padding = 1.0;
}
- Molecule mol;
- for (SCM s = mols; gh_pair_p (s); s = gh_cdr(s))
+ Stencil mol;
+ for (SCM s = mols; ly_c_pair_p (s); s = ly_cdr (s))
{
- mol.add_at_edge (X_AXIS, LEFT, *unsmob_molecule (gh_car (s)), inner_padding, 0);
+ mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (ly_car (s)), inner_padding, 0);
}
mol.align_to (X_AXIS, LEFT);
mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS);
Item * lb = l->find_prebroken_piece (RIGHT);
Item * rb = r->find_prebroken_piece (LEFT);
- Item* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}};
+ Item* combinations[4][2] = {{l,r},
+ {lb,r},
+ {l,rb},
+ {lb,rb}};
- Real sym_width = symbol_molecule (me, 0.0).extent (X_AXIS).length ();
+ Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length ();
for (int i=0; i < 4; i++)
{
- Item * l = combinations[i][0];
+ Item *l = combinations[i][0];
Item *r = combinations[i][1];
if (!l || !r)
rod.distance_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
+ sym_width + 2.0; // 2.0 = magic!
- Real minlen =0.0;
- SCM ml =me->get_grob_property ("minimum-length");
- if (gh_number_p (ml)) minlen = gh_scm2double (ml);
- rod.distance_ = max(rod.distance_,
+ Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0.0);
+ rod.distance_ = max (rod.distance_,
minlen);
rod.add_to_cols ();
}
projects / lilypond.git / blobdiff