(c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "dimension-cache.hh"
#include "engraver.hh"
-#include "g-staff-side.hh"
-#include "g-text-item.hh"
+#include "staff-side.hh"
+#include "text-item.hh"
#include "musical-request.hh"
#include "note-head.hh"
#include "stem.hh"
class Text_engraver : public Engraver
{
Link_array<Text_script_req> reqs_;
- Link_array<G_staff_side_item> positionings_;
- Link_array<G_text_item> texts_;
+ Link_array<Staff_side_item> positionings_;
+ Link_array<Text_item> texts_;
public:
Text_engraver();
VIRTUAL_COPY_CONS(Translator);
for (int i=0; i < positionings_.size (); i++)
{
positionings_[i]->add_support (n);
+ if (positionings_[i]->axis_ == X_AXIS
+ && !positionings_[i]->parent_l (Y_AXIS))
+ positionings_[i]->set_parent (n, Y_AXIS);
}
}
if (Stem *n = dynamic_cast<Stem*> (i.elem_l_))
{
Text_script_req * r = reqs_[i];
- G_text_item *text = new G_text_item;
- G_staff_side_item *ss = new G_staff_side_item;
+ Text_item *text = new Text_item;
+ Staff_side_item *ss = new Staff_side_item;
+
+
+ SCM axisprop = get_property ("scriptHorizontal",0);
+ if (gh_boolean_p (axisprop) && gh_scm2bool (axisprop))
+ {
+ ss->axis_ = X_AXIS;
+ text->set_parent (ss, Y_AXIS);
+
+ }
ss->set_victim (text);
ss->set_elt_property (script_priority_scm_sym,
gh_int2scm (200));
if (r->style_str_.empty_b ())
{
- Scalar p (get_property ("textStyle", 0));
- if (p.length_i ())
- text->style_str_ = p;
+ SCM p (get_property ("textStyle", 0));
+ if (gh_string_p (p))
+ text->style_str_ = ly_scm2string(p);
}
else
text->style_str_ = r->style_str_;
- Scalar padding = get_property ("textScriptPadding", 0);
- if (padding.length_i() && padding.isnum_b ())
+ SCM padding = get_property ("textScriptPadding", 0);
+ if (SCM_NUMBERP(padding))
{
- ss->set_elt_property (padding_scm_sym, gh_double2scm(Real(padding)));
+ ss->set_elt_property (padding_scm_sym, padding);
}
- Scalar empty = get_property ("textEmptyDimension", 0);
- if (empty.to_bool ())
+ SCM empty = get_property ("textEmptyDimension", 0);
+ if (gh_boolean_p (empty) && gh_scm2bool (empty))
{
- text->dim_cache_[X_AXIS]->set_empty (true);
+ text->set_empty (true, X_AXIS);
}
-
+
announce_element (Score_element_info (text, r));
announce_element (Score_element_info (ss, r));