#include <cstring>
#include "align-interface.hh"
-#include "input-smob.hh"
+#include "input.hh"
#include "international.hh"
#include "item.hh"
#include "main.hh"
#include "output-def.hh"
#include "pointer-group-interface.hh"
#include "stencil.hh"
+#include "stream-event.hh"
#include "system.hh"
#include "warn.hh"
Object_key const *key)
{
key_ = key;
+
/* FIXME: default should be no callback. */
self_scm_ = SCM_EOL;
layout_ = 0;
if (scm_is_pair (meta))
interfaces_ = scm_cdr (scm_assq (ly_symbol2scm ("interfaces"), meta));
- if (get_property_data (ly_symbol2scm ("X-extent")) == SCM_EOL)
+ if (get_property_data ("X-extent") == SCM_EOL)
set_property ("X-extent", Grob::stencil_width_proc);
- if (get_property_data (ly_symbol2scm ("Y-extent")) == SCM_EOL)
+ if (get_property_data ("Y-extent") == SCM_EOL)
set_property ("Y-extent", Grob::stencil_height_proc);
}
retval = Stencil (m->extent_box (), expr);
}
+
SCM rot = get_property ("rotation");
if (scm_is_pair (rot))
{
/* color support... see interpret_stencil_expression () for more... */
SCM color = get_property ("color");
- if (color != SCM_EOL)
+ if (scm_is_pair (color))
{
- m = unsmob_stencil (stil);
SCM expr = scm_list_3 (ly_symbol2scm ("color"),
color,
- m->expr ());
+ retval.expr ());
- retval = Stencil (m->extent_box (), expr);
+ retval = Stencil (retval.extent_box (), expr);
}
}
if (refp == this)
return 0.0;
- SCM pure_off = ly_lily_module_constant ("pure-Y-offset");
Real off = 0;
if (dim_cache_[Y_AXIS].offset_)
off = *dim_cache_[Y_AXIS].offset_;
- else if (ly_is_procedure (pure_off))
+ else
{
+ SCM proc = get_property_data ("Y-offset");
+
dim_cache_[Y_AXIS].offset_ = new Real (0.0);
- off = scm_to_double (scm_apply_3 (pure_off, self_scm (),
- scm_from_int (start), scm_from_int (end),
- SCM_EOL));
+ off = robust_scm2double (call_pure_function (proc,
+ scm_list_1 (self_scm ()),
+ start, end),
+ 0.0);
delete dim_cache_[Y_AXIS].offset_;
dim_cache_[Y_AXIS].offset_ = 0;
}
- /* we simulate positioning-done if we are the child of a VerticalAlignment */
+ /* we simulate positioning-done if we are the child of a VerticalAlignment,
+ but only if we don't have a cached offset. If we do have a cached offset,
+ it probably means that the Alignment was fixed and it has already been
+ calculated.
+ */
Grob *p = get_parent (Y_AXIS);
Real trans = 0;
- if (Align_interface::has_interface (p))
+ if (Align_interface::has_interface (p) && !dim_cache_[Y_AXIS].offset_)
trans = Align_interface::get_pure_child_y_translation (p, this, start, end);
return off + trans
SCM min_ext = internal_get_property (min_ext_sym);
if (is_number_pair (min_ext))
real_ext.unite (ly_scm2interval (min_ext));
+
((Grob*)this)->dim_cache_[a].extent_ = new Interval (real_ext);
}
Interval
Grob::pure_height (Grob *refp, int start, int end)
{
- SCM pure_height = ly_lily_module_constant ("pure-Y-extent");
- Interval iv (0, 0);
-
- if (ly_is_procedure (pure_height))
- iv = ly_scm2interval (scm_apply_3 (pure_height, self_scm (),
- scm_from_int (start), scm_from_int (end),
- SCM_EOL));
+ SCM proc = get_property_data ( ly_symbol2scm ("Y-extent"));
+ Interval iv = robust_scm2interval (call_pure_function (proc,
+ scm_list_1 (self_scm ()),
+ start, end),
+ Interval (0, 0));
Real offset = pure_relative_y_coordinate (refp, start, end);
+ SCM min_ext = get_property ("minimum-Y-extent");
+
+ /* we don't add minimum-Y-extent if the extent is empty. This solves
+ a problem with Hara-kiri spanners. They would request_suicide and
+ return empty extents, but we would force them here to be large. */
+ if (!iv.is_empty () && is_number_pair (min_ext))
+ iv.unite (ly_scm2interval (min_ext));
+
iv.translate (offset);
return iv;
}
Interval_t<int>
Grob::spanned_rank_iv ()
{
- return Interval_t<int> (INT_MIN, INT_MAX);
+ return Interval_t<int> (-1, 0);
}
/****************************************************************
while (Grob *g = unsmob_grob (cause))
cause = g->get_property ("cause");
+ /* ES TODO: cause can't be Music*/
if (Music *m = unsmob_music (cause))
m->origin ()->warning (s);
+ else if (Stream_event *ev = unsmob_stream_event (cause))
+ ev->origin ()->warning (s);
else
::warning (s);
}
s = _f ("programming error: %s", s);
+ /* ES TODO: cause can't be Music*/
if (Music *m = unsmob_music (cause))
m->origin ()->message (s);
+ else if (Stream_event *ev = unsmob_stream_event (cause))
+ ev->origin ()->warning (s);
else
::message (s);
}
"Y-extent "
"Y-offset "
"after-line-breaking "
+ "avoid-slur "
"axis-group-parent-X "
"axis-group-parent-Y "
"before-line-breaking "