#include "font-interface.hh"
#include "dimensions.hh"
#include "paper-def.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "paper-column.hh"
#include "staff-symbol-referencer.hh"
/* Don't repeat edge text for broken end */
if (!broken[d])
{
- SCM text = index_cell (edge_text, d);
+ SCM text = index_get_cell (edge_text, d);
edge[d] = Text_item::text2molecule (me, text, properties);
if (!edge[d].empty_b ())
edge[d].align_to (Y_AXIS, CENTER);
/* ugh */
- Real thick = me->paper_l ()->get_var ("linethickness");
+ Real thick = me->get_paper ()->get_var ("linethickness");
SCM st = me->get_grob_property ("thickness");
if (gh_number_p (st))
{
do
{
Real dx = ( gh_pair_p (ew) ?
- gh_scm2double (index_cell (ew, d)) * d :
+ gh_scm2double (index_get_cell (ew, d)) * d :
0 );
- Real dy = gh_scm2double (index_cell (s, d)) * - dir;
+ Real dy = gh_scm2double (index_get_cell (s, d)) * - dir;
if (dy)
{
edge_line[d] = Line_spanner::line_molecule (me, thick, dx, dy);
Text_spanner::setup_pedal_bracket(Spanner *me)
{
- Real thick = me->paper_l ()->get_var ("linethickness");
+ Real thick = me->get_paper ()->get_var ("linethickness");
SCM st = me->get_grob_property ("thickness");
if (gh_number_p (st))
{
height[d] = 0;
shorten[d] = 0;
if ( ly_number_pair_p (ew) )
- width[d] += gh_scm2double (index_cell (ew, d));
+ width[d] += gh_scm2double (index_get_cell (ew, d));
if ( !broken[d] && (ly_number_pair_p (eh) ) )
- height[d] += gh_scm2double (index_cell (eh, d));
+ height[d] += gh_scm2double (index_get_cell (eh, d));
if ( ly_number_pair_p (sp) )
- shorten[d] += gh_scm2double (index_cell (sp, d));
+ shorten[d] += gh_scm2double (index_get_cell (sp, d));
}
while (flip (&d) != LEFT);
if ( to_boolean (me->get_grob_property ("text-start")) )
{
height[LEFT] = 0;
- Grob * textbit = me->get_parent(Y_AXIS);
extra_short = padding;
- if (textbit->internal_has_interface(ly_symbol2scm("text-interface")))
- // for plain text, e.g., Sost. Ped.
+ if (Grob *textbit = unsmob_grob (me->get_grob_property("pedal-text")))
{
- SCM text = textbit->get_grob_property("text");
- if (gh_string_p (text)) {
- SCM properties = Font_interface::font_alist_chain (me);
- Molecule mol = Text_item::text2molecule (me, text, properties);
- extra_short += mol.extent(X_AXIS).length() / 2;
- }
+ 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 (me);
+ Molecule mol = Text_item::text2molecule (me, text, properties);
+ extra_short += mol.extent(X_AXIS).length() / 2;
+ }
+ }
}
shorten[RIGHT] -= thick;
}
};
ADD_INTERFACE (Pianopedal,"piano-pedal-interface",
"",
- "pedal-type edge-widen edge-height shorten-pair text-start left-widen right-widen");
+ "pedal-type edge-widen edge-height shorten-pair text-start left-widen right-widen pedal-text");
ADD_INTERFACE (Text_spanner,"text-spanner-interface",
"generic text spanner",
- "dash-period if-text-padding dash-length edge-height edge-widen edge-text shorten-pair type");
+ "dash-period if-text-padding dash-length edge-height edge-widen edge-text shorten-pair type thickness outer width-correct");