/*
- text-spanner.cc -- implement Text_spanner
+text-spanner.cc -- implement Text_spanner
- source file of the GNU LilyPond music typesetter
+source file of the GNU LilyPond music typesetter
- (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+(c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "molecule.hh"
/*
TODO:
- - vertical start / vertical end (fixme-name) |
- - contination types (vert. star, vert. end) |-> eat volta-spanner
- - more styles
- - more texts/positions
- */
+ - vertical start / vertical end (fixme-name) |
+ - contination types (vert. star, vert. end) |-> eat volta-bracket
+ - more styles
+ - more texts/positions
+*/
MAKE_SCHEME_CALLBACK (Text_spanner, brew_molecule, 1);
+/*
+ TODO: this function is too long, too hairy.
+
+ TODO: document this. What the heck is happening here?
+*/
SCM
Text_spanner::brew_molecule (SCM smob)
{
Grob *me= unsmob_grob (smob);
Spanner *spanner = dynamic_cast<Spanner*> (me);
- if (spanner->has_interface (ly_symbol2scm ("piano-pedal-interface")) )
+ if (spanner->internal_has_interface (ly_symbol2scm ("piano-pedal-interface")) )
{
setup_pedal_bracket(spanner);
}
if (!e.empty_b ())
r = e[-d] + padding;
/* Text spanners such as ottava, should span from outer limits of
- noteheads, iso (de)cresc. spanners that span the inner space */
+ noteheads, iso (de)cresc. spanners that span the inner space */
if (me->get_grob_property ("outer") != SCM_EOL)
// r *= -1; // huh?
{
width += gh_scm2double (me->get_grob_property ("width-correct"));
/* /Ugh */
+ // who is ecs? --hwn
SCM properties = Font_interface::font_alist_chain (me);
}
/* ugh */
- Real thick = me->paper_l ()->get_var ("stafflinethickness");
- Molecule line = Line_spanner::line_molecule (me, width, 0);
+ Real thick = me->paper_l ()->get_var ("linethickness");
+ SCM st = me->get_grob_property ("thickness");
+ if (gh_number_p (st))
+ {
+ thick *= gh_scm2double (st);
+
+ }
+ Molecule line = Line_spanner::line_molecule (me, thick, width, 0);
Drul_array<Molecule> edge_line;
s = me->get_grob_property ("edge-height");
Real dy = gh_scm2double (index_cell (s, d)) * - dir;
if (dy)
{
- SCM list = Line_spanner::line_atom (me, dx, dy);
- Box b (Interval (-thick, 0),
- dy > 0
- ? Interval (0, dy)
- : Interval (dy, 0));
- edge_line[d] = Molecule (b, list);
+ edge_line[d] = Line_spanner::line_molecule (me, thick, dx, dy);
}
}
while (flip (&d) != LEFT);
if (!edge_line[LEFT].empty_b ())
m.add_at_edge (X_AXIS, RIGHT, edge_line[LEFT], 0);
if (!line.empty_b ())
- m.add_at_edge (X_AXIS, RIGHT, line, 0);
+ m.add_at_edge (X_AXIS, RIGHT, line,
+ edge_line[LEFT].empty_b () ? 0 : -thick/2);
if (!edge_line[RIGHT].empty_b ())
- m.add_at_edge (X_AXIS, RIGHT, edge_line[RIGHT], 0);
+ m.add_at_edge (X_AXIS, RIGHT, edge_line[RIGHT], -thick/2);
if (!edge[RIGHT].empty_b ())
m.add_at_edge (X_AXIS, RIGHT, edge[RIGHT], 0);
m.translate_axis (broken_left + extra_off[LEFT] + shorten[LEFT], X_AXIS);
Pedal up-down (restart) indicated by the angled right and left edges
of consecutive pedals touching exactly to form an __/\__
Chris Jackson <chris@fluffhouse.org.uk>
-
- TODO: Pedal line extending to the end of the note
*/
void
-Text_spanner::setup_pedal_bracket(Spanner *s)
+Text_spanner::setup_pedal_bracket(Spanner *me)
{
- Real thick = s->paper_l ()->get_var ("stafflinethickness");
- Real ss = Staff_symbol_referencer::staff_space (s);
+ Real thick = me->paper_l ()->get_var ("linethickness");
+ SCM st = me->get_grob_property ("thickness");
+ if (gh_number_p (st))
+ {
+ thick *= gh_scm2double (st);
+ }
- Drul_array<bool> a, broken;
+ Drul_array<bool> broken;
Drul_array<Real> height, width, shorten, r;
- // Pedal has an angled left edge \__ or an angled right edge __/
- a[LEFT] = a[RIGHT] = false;
- SCM al = s->get_grob_property ("angle-left");
- SCM ar = s->get_grob_property ("angle-right");
- if (gh_boolean_p (al) )
- a[LEFT] = to_boolean (al);
- if (gh_boolean_p (ar) )
- a[RIGHT] = to_boolean (ar);
-
- height[LEFT] = ( to_boolean (s->get_grob_property ("text-start")) ?
- 0 :
- ss );
- height[RIGHT] = ss;
+ SCM pa = me->get_grob_property ("if-text-padding");
+ SCM ew = me->get_grob_property ("edge-width");
+ SCM eh = me->get_grob_property ("edge-height");
+ SCM sp = me->get_grob_property ("shorten-pair");
Direction d = LEFT;
Interval e;
Real padding = 0;
- SCM pa = (s->get_grob_property ("if-text-padding"));
+
if (gh_number_p (pa) )
padding = gh_scm2double (pa);
+
do {
- Item *b = s->get_bound (d);
+ Item *b = me->get_bound (d);
e = b->extent (b, X_AXIS);
if (!e.empty_b ())
r[d] = d * (e[-d] + padding);
broken[d] = b->break_status_dir () != CENTER;
- width[d] = (a[d] ? ss*d/2 : 0);
- if (broken[d])
- height[d] = 0;
+ width[d] = 0;
+ height[d] = 0;
+ shorten[d] = 0;
+ if ( gh_pair_p (ew) )
+ width[d] += gh_scm2double (index_cell (ew, d)) * d;
+ if ( !broken[d] && (gh_pair_p (eh) ) )
+ height[d] += gh_scm2double (index_cell (eh, d));
+ if ( gh_pair_p (sp) )
+ shorten[d] += gh_scm2double (index_cell (sp, d));
}
while (flip (&d) != LEFT);
- shorten[RIGHT] = shorten[LEFT] = 0;
Real extra_short = 0;
// For 'Mixed' style pedals, i.e. a bracket preceded by text: Ped._____|
// need to shorten by the extent of the text grob
- if ( to_boolean (s->get_grob_property ("text-start")) )
+ if ( to_boolean (me->get_grob_property ("text-start")) )
{
- Grob * textbit = s->get_parent(Y_AXIS);
+ height[LEFT] = 0;
+ Grob * textbit = me->get_parent(Y_AXIS);
extra_short = padding;
- if (textbit->has_interface(ly_symbol2scm("piano-pedal-interface")))
- // for pretty Ped. scripts.
- {
- e = textbit->extent(textbit, Y_AXIS);
- extra_short += e.length();
- }
- if (textbit->has_interface(ly_symbol2scm("text-interface")))
+ if (textbit->internal_has_interface(ly_symbol2scm("text-interface")))
// for plain text, e.g., Sost. Ped.
{
SCM text = textbit->get_grob_property("text");
if (gh_string_p (text)) {
- SCM properties = Font_interface::font_alist_chain (s);
- Molecule mol = Text_item::text2molecule (s, text, properties);
+ SCM properties = Font_interface::font_alist_chain (me);
+ Molecule mol = Text_item::text2molecule (me, text, properties);
extra_short += mol.extent(X_AXIS).length() / 2;
}
}
shorten[RIGHT] -= thick;
}
- // Shorten a \____ on the left so that it will touch an adjoining ___/
- shorten[LEFT] += abs(width[LEFT]) * 2 + extra_short ;
+ shorten[LEFT] += extra_short ;
if (broken[LEFT]) {
- shorten[LEFT] -= s->get_broken_left_end_align () ;
- shorten[RIGHT] -= r[RIGHT];
+ shorten[LEFT] -= me->get_broken_left_end_align () ;
+ shorten[RIGHT] += abs(width[RIGHT]) + thick - r[RIGHT];
+ }
+
+ else {
+ // Shorten a ____/ on the right so that it will touch an adjoining \___
+ shorten[RIGHT] += abs(width[LEFT]) + abs(width[RIGHT]) + thick;
+ // Also shorten so that it ends just before the spanned note.
+ shorten[RIGHT] -= (r[LEFT] + r[RIGHT]);
}
- else
- // Shorten bracket on the right so it ends just before the spanned note.
- shorten[RIGHT] += thick - (r[LEFT] + r[RIGHT]);
-
- // Hmm. TODO: This should be set in grob-description.scm, but side-positioning
- // of consecutive brackets only seems to work if direction is +1 within the engraver.
- s->set_grob_property ("direction", gh_int2scm(-1));
-
- s->set_grob_property ("edge-height", gh_cons ( gh_double2scm ( height[LEFT] ) ,
- gh_double2scm ( height[RIGHT]) ) );
- s->set_grob_property ("edge-width", gh_cons ( gh_double2scm ( width[LEFT] ),
- gh_double2scm ( width[RIGHT] ) ));
- s->set_grob_property ("shorten-pair", gh_cons ( gh_double2scm ( shorten[LEFT] ),
- gh_double2scm ( shorten[RIGHT] ) ));
+
+ me->set_grob_property ("edge-height", gh_cons ( gh_double2scm ( height[LEFT] ) ,
+ gh_double2scm ( height[RIGHT]) ) );
+ me->set_grob_property ("edge-width", gh_cons ( gh_double2scm ( width[LEFT] ),
+ gh_double2scm ( width[RIGHT] ) ));
+ me->set_grob_property ("shorten-pair", gh_cons ( gh_double2scm ( shorten[LEFT] ),
+ gh_double2scm ( shorten[RIGHT] ) ));
}
+
+
+struct Pianopedal
+{
+ static bool has_interface (Grob*);
+};
+ADD_INTERFACE (Pianopedal,"piano-pedal-interface",
+ "",
+ "pedal-type edge-width edge-height shorten-pair text-start left-widen right-widen");
+
+ADD_INTERFACE (Text_spanner,"text-spanner-interface",
+ "generic text spanner",
+ "dash-period if-text-padding dash-length edge-height edge-width edge-text shorten-pair type");
+
projects / lilypond.git / blobdiff