source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
Mats Bengtsson <matsb@s3.kth.se>
*/
#include "translator-group.hh"
#include "key-item.hh"
-#include "local-key-item.hh"
#include "bar.hh"
-#include "note-head.hh"
#include "staff-symbol-referencer.hh"
#include "debug.hh"
#include "engraver.hh"
#include "direction.hh"
#include "side-position-interface.hh"
#include "item.hh"
-#include "custos.hh"
-/// where is c-0 in the staff?
+
class Clef_engraver : public Engraver
{
public:
Direction octave_dir_;
protected:
- void deprecated_process_music ();
- virtual void do_pre_move_processing ();
+ virtual void stop_translation_timestep ();
+ virtual void start_translation_timestep ();
+ virtual void process_music ();
+ virtual void acknowledge_grob (Grob_info);
virtual void do_creation_processing ();
- virtual void do_post_move_processing ();
- virtual void process_acknowledged ();
- virtual void acknowledge_element (Score_element_info);
-
private:
Item * clef_p_;
Item * octavate_p_;
SCM prev_cpos_;
SCM prev_octavation_;
void create_clef ();
- void set_central_c (SCM, SCM, SCM);
void set_glyph ();
+ void inspect_clef_properties ();
};
Clef_engraver::Clef_engraver ()
octavate_p_ = 0;
/*
- will trigger a clef at the start since #f != '()
+ will trigger a clef at the start since #f != ' ()
*/
prev_cpos_ = prev_glyph_ = SCM_BOOL_F;
}
-void
-Clef_engraver::set_central_c (SCM glyph,SCM clefpos, SCM octavation)
-{
- prev_cpos_ = clefpos;
- prev_glyph_ = glyph;
- prev_octavation_ = octavation;
-
- SCM p = get_property ("clefPitches");
- int c0_position = 0;
- if (gh_list_p (p))
- {
- SCM found = scm_assoc (glyph, p);
- if (found == SCM_BOOL_F)
- {
- c0_position =0;
- }
- else
- {
- c0_position = gh_scm2int (gh_cdr (found));
-
- if (gh_number_p (octavation))
- c0_position -= gh_scm2int (octavation);
-
- if (gh_number_p (clefpos))
- c0_position += gh_scm2int (clefpos);
- }
-
- }
- daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position));
-}
-
void
Clef_engraver::set_glyph ()
{
- SCM glyph_sym = ly_symbol2scm ("glyph");
+ SCM glyph_sym = ly_symbol2scm ("glyph-name");
SCM glyph = get_property ("clefGlyph");
SCM basic = ly_symbol2scm ("Clef");
ie. a breakpoint)
*/
void
-Clef_engraver::acknowledge_element (Score_element_info info)
+Clef_engraver::acknowledge_grob (Grob_info info)
{
- deprecated_process_music ();
Item * item =dynamic_cast <Item *> (info.elem_l_);
if (item)
{
if (Bar::has_interface (info.elem_l_)
&& gh_string_p (get_property ("clefGlyph")))
create_clef ();
-
- if (Note_head::has_interface (item)
- || Local_key_item::has_interface (item)
- || Custos::has_interface (item)
- )
- {
- int p = int (Staff_symbol_referencer::position_f (item))
- + gh_scm2int (get_property ("centralCPosition"));
- Staff_symbol_referencer::set_position (item, p);
- }
- else if (Key_item::has_interface (item))
+ if (Key_item::has_interface (item))
{
/*
Key_item adapts its formatting to make sure that the
accidentals stay in the upper half of the staff. It needs
- to know c0-pos for this. (?)
+ to know c0-pos for this. (?)
*/
- item->set_elt_property ("c0-position", get_property ("centralCPosition"));
+ item->set_grob_property ("c0-position", get_property ("centralCPosition"));
}
}
}
-void
-Clef_engraver::do_creation_processing ()
-{
-}
-
-
-
void
Clef_engraver::create_clef ()
{
if (!clef_p_)
{
Item *c= new Item (get_property ("Clef"));
- announce_element (c, 0);
+ announce_grob (c, 0);
Staff_symbol_referencer::set_interface (c);
Staff_symbol_referencer::set_position (clef_p_,
gh_scm2int (get_property ("clefPosition")));
- SCM oct = get_property("clefOctavation");
+ SCM oct = get_property ("clefOctavation");
if (gh_number_p (oct) && gh_scm2int (oct))
{
Item * g = new Item (get_property ("OctavateEight"));
- Side_position::add_support (g,clef_p_);
+ Side_position_interface::add_support (g,clef_p_);
g->set_parent (clef_p_, Y_AXIS);
g->set_parent (clef_p_, X_AXIS);
- g->set_elt_property ("direction", gh_int2scm (sign (gh_scm2int (oct))));
+ g->set_grob_property ("direction", gh_int2scm (sign (gh_scm2int (oct))));
octavate_p_ = g;
- announce_element (octavate_p_, 0);
+ announce_grob (octavate_p_, 0);
}
}
void
-Clef_engraver::process_acknowledged ()
+Clef_engraver::process_music ()
+{
+ inspect_clef_properties ();
+}
+
+/*
+ this must be done in creation_proc() since grace notes will be
+ processed before Clef_engraver::prcoess_music()
+
+ Grace notes and clef changes are still broken.
+*/
+void
+Clef_engraver::do_creation_processing ()
{
- deprecated_process_music ();
+ inspect_clef_properties ();
}
void
-Clef_engraver::deprecated_process_music ()
+Clef_engraver::inspect_clef_properties ()
{
SCM glyph = get_property ("clefGlyph");
SCM clefpos = get_property ("clefPosition");
SCM octavation = get_property ("clefOctavation");
-
+ SCM force_clef = get_property ("forceClef");
+
if (clefpos == SCM_EOL
|| scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F
|| scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F
- || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F)
+ || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F
+ || to_boolean (force_clef)
+)
{
- set_glyph();
- set_central_c (glyph, clefpos, octavation);
-
+ set_glyph ();
create_clef ();
- clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
+ clef_p_->set_grob_property ("non-default", SCM_BOOL_T);
+
+ prev_cpos_ = clefpos;
+ prev_glyph_ = glyph;
+ prev_octavation_ = octavation;
+ }
+
+ if (to_boolean (force_clef))
+ {
+ Translator_group * w = daddy_trans_l_->where_defined (ly_symbol2scm ("forceClef"));
+ w->set_property ("forceClef", SCM_EOL);
}
}
+
void
-Clef_engraver::do_pre_move_processing ()
+Clef_engraver::stop_translation_timestep ()
{
if (clef_p_)
{
SCM vis = 0;
- if (to_boolean (clef_p_->get_elt_property ("non-default")))
+ if (to_boolean (clef_p_->get_grob_property ("non-default")))
{
vis = get_property ("explicitClefVisibility");
}
if (vis)
{
- clef_p_->set_elt_property ("visibility-lambda", vis);
+ clef_p_->set_grob_property ("visibility-lambda", vis);
if (octavate_p_)
- octavate_p_->set_elt_property ("visibility-lambda", vis);
+ octavate_p_->set_grob_property ("visibility-lambda", vis);
}
- typeset_element (clef_p_);
+ typeset_grob (clef_p_);
clef_p_ =0;
if (octavate_p_)
- typeset_element (octavate_p_);
+ typeset_grob (octavate_p_);
octavate_p_ = 0;
}
}
void
-Clef_engraver::do_post_move_processing ()
+Clef_engraver::start_translation_timestep ()
{
}
projects / lilypond.git / blobdiff