source file of the GNU LilyPond music typesetter
- (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "span-bar.hh"
void
Span_bar::add_bar (Grob*me, Grob*b)
{
- Pointer_group_interface::add_element (me,"elements", b);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), b);
me->add_dependency (b);
}
* staff context. If bar_engraver is removed, the size of the staff
* lines is evaluated as 0, which results in a solid span bar line
* with faulty y coordinate.
- *
+ */
+
+/*
+ This routine was originally by Juergen Reuter, but it was a on the
+ bulky side. Rewritten by Han-Wen.
*/
SCM
Span_bar::brew_molecule (SCM smobbed_me)
{
Grob *me = unsmob_grob (smobbed_me);
- Span_bar::evaluate_glyph(me);
- SCM glyph = me->get_grob_property (ly_symbol2scm ("glyph"));
- String glyph_str = ly_scm2string (glyph);
SCM first_elt = me->get_grob_property ("elements");
- // first walk: compute axis_group parent via common_refpoint () on all bars
- Grob *refpoint = 0;
- int staff_bar_count = 0;
- for (SCM elts = first_elt;
- elts != SCM_EOL;
- elts = gh_cdr (elts))
- {
- SCM smobbed_staff_bar = gh_car (elts);
- Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
- refpoint = (staff_bar_count > 0) ?
- staff_bar->common_refpoint (refpoint, Y_AXIS) :
- staff_bar;
- staff_bar_count++;
- }
- /* assert: refpoint is an axis-group object */
- Grob *axis_group = refpoint;
-
- // second walk: collect span bar components;
- // compute extent of axis_group
- Real last_staff_bar_length;
- Real *interstaff_bar_length = new Real[staff_bar_count];
- Real *interstaff_bar_yoffs = new Real[staff_bar_count];
- Molecule *interstaff_bar_molecule = new Molecule[staff_bar_count];
- Real axis_group_extent = 0.0;
- staff_bar_count = 0;
- for (SCM elts = first_elt;
- elts != SCM_EOL;
- elts = gh_cdr (elts))
- {
- SCM smobbed_staff_bar = gh_car (elts);
- SCM smobbed_staff_bar_molecule =
- Bar::brew_molecule (smobbed_staff_bar);
- Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
- interstaff_bar_yoffs[staff_bar_count] =
- staff_bar->relative_coordinate (axis_group, (Axis)Y_AXIS);
- if (smobbed_staff_bar_molecule != SCM_EOL)
+ // compute common refpoint of elements
+ Grob *refp = me;
+ for (SCM elts = first_elt; gh_pair_p (elts); elts = ly_cdr (elts))
{
- Real staff_bar_length =
- unsmob_molecule (smobbed_staff_bar_molecule)->
- extent (Y_AXIS).length ();
- if (staff_bar_count > 0)
- {
- // clone bar_molecule and fix y extent
- interstaff_bar_length[staff_bar_count] =
- interstaff_bar_yoffs[staff_bar_count] -
- interstaff_bar_yoffs[staff_bar_count - 1] -
- last_staff_bar_length;
- SCM smobbed_interstaff_bar_molecule =
- Bar::compound_barline (staff_bar, glyph_str,
- interstaff_bar_length[staff_bar_count]).
- smobbed_copy ();
- interstaff_bar_molecule[staff_bar_count] =
- *unsmob_molecule (smobbed_interstaff_bar_molecule);
- }
- else
- {
- interstaff_bar_molecule[staff_bar_count] = Molecule::Molecule ();
- }
- last_staff_bar_length = staff_bar_length;
+ SCM smobbed_staff_bar = ly_car (elts);
+ Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
+ refp = staff_bar->common_refpoint (refp, Y_AXIS);
}
- else
+
+ Span_bar::evaluate_glyph(me);
+ SCM glyph = me->get_grob_property ("glyph");
+
+ /*
+ glyph may not be a string, when ME is killed by Hara Kiri in
+ between.
+ */
+ if (!gh_string_p (glyph))
+ return SCM_EOL;
+
+ String glyph_str = ly_scm2string (glyph);
+
+ // compose span_bar_mol
+ Molecule span_bar_mol;
+
+ Interval prev_extent;
+ for (SCM elts = first_elt; gh_pair_p (elts); elts = ly_cdr (elts))
{
- last_staff_bar_length = 0;
- interstaff_bar_length[staff_bar_count] = 0;
- interstaff_bar_molecule[staff_bar_count] = Molecule::Molecule ();
+ SCM smobbed_staff_bar = ly_car (elts);
+ Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
+ Interval ext = staff_bar->extent (refp, Y_AXIS);
+ if (ext.empty_b ())
+ continue;
+
+ if (!prev_extent.empty_b ())
+ {
+ Interval l(prev_extent [UP],
+ ext[DOWN]);
+
+ Molecule interbar
+ = Bar::compound_barline (staff_bar, glyph_str, l.length());
+ interbar.translate_axis (l.center (), Y_AXIS);
+ span_bar_mol.add_molecule (interbar);
+ }
+ prev_extent = ext;
}
- axis_group_extent += last_staff_bar_length;
- axis_group_extent += interstaff_bar_length[staff_bar_count];
- staff_bar_count++;
- }
- // assert(abs(axis_group_extent -
- // axis_group->extent (axis_group, Y_AXIS).length ()) < EPSILON);
-
- // third walk: correct y axis on all span bar components;
- // put all components into a single span bar molecule
- Molecule span_bar_molecule = Molecule::Molecule ();
- staff_bar_count = 0;
- for (SCM elts = first_elt;
- elts != SCM_EOL;
- elts = gh_cdr (elts))
- {
- interstaff_bar_yoffs[staff_bar_count] +=
- (axis_group_extent - interstaff_bar_length[staff_bar_count]) / 2;
- interstaff_bar_molecule[staff_bar_count].//DEBUG
- translate_axis (-1.0 PT, X_AXIS);//DEBUG
- interstaff_bar_molecule[staff_bar_count].
- translate_axis (interstaff_bar_yoffs[staff_bar_count], Y_AXIS);
- span_bar_molecule.add_molecule (interstaff_bar_molecule[staff_bar_count]);
- staff_bar_count++;
- }
-
- // clean-up & exit
- delete interstaff_bar_length;
- delete interstaff_bar_yoffs;
- delete interstaff_bar_molecule;
- return span_bar_molecule.smobbed_copy ();
+
+ span_bar_mol.translate_axis (- me->relative_coordinate (refp, Y_AXIS), Y_AXIS);
+
+ return span_bar_mol.smobbed_copy ();
}
MAKE_SCHEME_CALLBACK (Span_bar,width_callback,2);
/*
urg.
- */
+ */
Molecule m = Bar::compound_barline (se, gl, 40 PT);
return ly_interval2scm (m.extent (X_AXIS));
/*
no need to call Bar::before_line_breaking (), because the info
in ELEMENTS already has been procced by Bar::before_line_breaking ().
- */
+ */
return SCM_UNSPECIFIED;
}
Span_bar::evaluate_glyph (Grob*me)
{
SCM elts = me->get_grob_property ("elements");
- Grob * b = unsmob_grob (gh_car (elts));
- SCM glsym =ly_symbol2scm ("glyph");
- SCM gl =b ->get_grob_property (glsym);
+ SCM glyph_symbol = ly_symbol2scm ("glyph");
+ SCM gl = SCM_EOL;
+
+ while (gh_pair_p (elts))
+ {
+ gl = unsmob_grob (gh_car (elts))->internal_get_grob_property (glyph_symbol);
+ if (gh_string_p (gl))
+ break;
+ elts =gh_cdr (elts);
+ }
+
if (!gh_string_p (gl))
{
me->suicide ();
- return ;
+ return;
}
-
- String type = ly_scm2string (gl);
+ String type = ly_scm2string (gl);
if (type == "|:")
{
type = ".|";
}
gl = ly_str02scm (type.ch_C ());
- if (scm_equal_p (me->get_grob_property (glsym), gl) != SCM_BOOL_T)
- me->set_grob_property (glsym, gl);
+ if (scm_equal_p (me->internal_get_grob_property (glyph_symbol), gl) != SCM_BOOL_T)
+ me->internal_set_grob_property (glyph_symbol, gl);
}
Interval
{
/*
This happens if the bars are hara-kiried from under us.
- */
+ */
me->suicide ();
return gh_double2scm (-1);
}
projects / lilypond.git / blobdiff