#include <ctype.h>
-#include "translator-group.hh"
+#include "context.hh"
#include "bar-line.hh"
#include "staff-symbol-referencer.hh"
#include "engraver.hh"
class Clef_engraver : public Engraver
{
public:
- TRANSLATOR_DECLARATIONS(Clef_engraver);
+ TRANSLATOR_DECLARATIONS (Clef_engraver);
Direction octave_dir_;
SCM basic = ly_symbol2scm ("Clef");
- daddy_trans_->execute_pushpop_property (basic, glyph_sym, SCM_UNDEFINED);
- daddy_trans_->execute_pushpop_property (basic, glyph_sym, glyph);
+ execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED);
+ execute_pushpop_property (context (), basic, glyph_sym, glyph);
}
/**
if (item)
{
if (Bar_line::has_interface (info.grob_)
- && gh_string_p (get_property ("clefGlyph")))
+ && ly_c_string_p (get_property ("clefGlyph")))
create_clef ();
}
}
{
if (!clef_)
{
- Item *c= make_item ("Clef");
- announce_grob(c, SCM_EOL);
+ Item *c = make_item ("Clef", SCM_EOL);
+
clef_ = c;
SCM cpos = get_property ("clefPosition");
- if (gh_number_p (cpos))
- Staff_symbol_referencer::set_position (clef_, gh_scm2int (cpos));
+ if (ly_c_number_p (cpos))
+ clef_->set_property ("staff-position", cpos);
SCM oct = get_property ("clefOctavation");
- if (gh_number_p (oct) && gh_scm2int (oct))
+ if (ly_c_number_p (oct) && ly_scm2int (oct))
{
- Item * g = make_item ("OctavateEight");
+ Item * g = make_item ("OctavateEight", SCM_EOL);
- int abs_oct = gh_scm2int (oct) ;
+ int abs_oct = ly_scm2int (oct) ;
int dir = sign (abs_oct);
abs_oct = abs (abs_oct) + 1;
-
- g->set_grob_property ("text",
- scm_number_to_string (gh_int2scm (abs_oct),
- SCM_MAKINUM (10)));
+
+ SCM txt = scm_number_to_string (scm_int2num (abs_oct),
+ SCM_MAKINUM (10));
+
+ g->set_property ("text",
+ scm_list_n (ly_scheme_function ("vcenter-markup"),
+ txt, SCM_UNDEFINED));
Side_position_interface::add_support (g,clef_);
g->set_parent (clef_, Y_AXIS);
g->set_parent (clef_, X_AXIS);
- g->set_grob_property ("direction", scm_int2num (dir));
+ g->set_property ("direction", scm_int2num (dir));
octavate_ = g;
- announce_grob(octavate_, SCM_EOL);
+
}
}
}
set_glyph ();
create_clef ();
- clef_->set_grob_property ("non-default", SCM_BOOL_T);
+ clef_->set_property ("non-default", SCM_BOOL_T);
prev_cpos_ = clefpos;
prev_glyph_ = glyph;
if (to_boolean (force_clef))
{
- Translator_group * w = daddy_trans_->where_defined (ly_symbol2scm ("forceClef"));
+ Context * w = context ()->where_defined (ly_symbol2scm ("forceClef"));
w->set_property ("forceClef", SCM_EOL);
}
}
if (clef_)
{
SCM vis = 0;
- if (to_boolean (clef_->get_grob_property ("non-default")))
+ if (to_boolean (clef_->get_property ("non-default")))
{
vis = get_property ("explicitClefVisibility");
}
if (vis)
{
- clef_->set_grob_property ("break-visibility", vis);
+ clef_->set_property ("break-visibility", vis);
if (octavate_)
{
- octavate_->set_grob_property ("break-visibility", vis);
+ octavate_->set_property ("break-visibility", vis);
}
}
- typeset_grob (clef_);
clef_ =0;
- if (octavate_)
- {
- typeset_grob (octavate_);
- }
-
octavate_ = 0;
}
}
-ENTER_DESCRIPTION(Clef_engraver,
+ENTER_DESCRIPTION (Clef_engraver,
/* descr */ "Determine and set reference point for pitches",
/* creats*/ "Clef OctavateEight",
/* accepts */ "",
/* acks */ "bar-line-interface",
-/* reads */ "clefPosition clefGlyph centralCPosition clefOctavation explicitClefVisibility",
+/* reads */ "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility",
/* write */ "");