/*
+
clef-engraver.cc -- implement Clef_engraver
source file of the GNU LilyPond music typesetter
#include <ctype.h>
-#include "staff-symbol-referencer.hh"
+#include "key-item.hh"
+#include "local-key-item.hh"
#include "bar.hh"
-#include "clef-item.hh"
+#include "note-head.hh"
+#include "staff-symbol-referencer.hh"
#include "debug.hh"
#include "command-request.hh"
-#include "timing-translator.hh"
-#include "note-head.hh"
-#include "key-item.hh"
-#include "local-key-item.hh"
#include "array.hh"
#include "engraver.hh"
#include "direction.hh"
#include "side-position-interface.hh"
-#include "text-item.hh"
+#include "item.hh"
/// where is c-0 in the staff?
class Clef_engraver : public Engraver {
- Clef_item * clef_p_;
- Text_item * octavate_p_;
+ Item * clef_p_;
+ Item * octavate_p_;
Clef_change_req * clef_req_l_;
void create_clef();
Clef_engraver();
- SCM basic_properties_;
+ bool first_b_;
+
Protected_scm current_settings_;
};
Clef_engraver::Clef_engraver()
{
current_settings_ = SCM_EOL;
- basic_properties_ = SCM_EOL;
-
+
+ first_b_ = true;
clef_glyph_ = SCM_EOL;
clef_p_ = 0;
clef_req_l_ = 0;
c0_position_i_ -= (int) octave_dir_ * 7;
- current_settings_ = gh_cons (gh_cons (ly_symbol2scm ("glyph"), clef_glyph_), basic_properties_);
+ SCM basic = get_property ("basicClefItemProperties");
+ current_settings_ = gh_cons (gh_cons (ly_symbol2scm ("glyph"), clef_glyph_), basic);
current_settings_ =
gh_cons (gh_cons (ly_symbol2scm ("c0-position"),
gh_int2scm (c0_position_i_)),
return true;
}
-
/**
Generate a clef at the start of a measure. (when you see a Bar,
ie. a breakpoint)
void
Clef_engraver::acknowledge_element (Score_element_info info)
{
- if (dynamic_cast<Bar*>(info.elem_l_)
- && gh_string_p (clef_glyph_))
- create_clef();
-
- /* ugh; should make Clef_referenced baseclass */
- Item * it_l =dynamic_cast <Item *> (info.elem_l_);
- if (it_l)
+ Item * item =dynamic_cast <Item *> (info.elem_l_);
+ if (item)
{
- if (dynamic_cast<Note_head*>(it_l)
- || dynamic_cast<Local_key_item*> (it_l)
- )
-
+ if (Bar::has_interface (info.elem_l_)
+ && gh_string_p (clef_glyph_))
+ create_clef();
+
+
+ if (Note_head::has_interface (item)
+ || Local_key_item::has_interface (item))
{
- Staff_symbol_referencer_interface si (it_l);
- si.set_position (int (si.position_f ()) + c0_position_i_);
+ int p = int (Staff_symbol_referencer::position_f (item)) + c0_position_i_;
+ Staff_symbol_referencer::set_position (item,p);
+
}
- else if (Key_item *k = dynamic_cast<Key_item*>(it_l))
+ else if (Key_item::has_interface (item))
{
- k->set_elt_property ("c0-position", gh_int2scm (c0_position_i_));
+ item->set_elt_property ("c0-position", gh_int2scm (c0_position_i_));
}
}
}
void
Clef_engraver::do_creation_processing()
{
- basic_properties_ = get_property ("basicClefItemProperties");
-
SCM def = get_property ("defaultClef");
if (gh_string_p (def))
{
set_type (ly_scm2string (def));
- create_clef ();
- clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
}
}
{
clef_req_l_ = cl;
if (!set_type (cl->clef_str_))
- cl->error (_ ("unknown clef type"));
+ cl->origin ()->warning (_ ("unknown clef type"));
return true;
}
{
if (!clef_p_)
{
- Clef_item *c= new Clef_item ( current_settings_);
- announce_element (Score_element_info (c, clef_req_l_));
+ Item *c= new Item ( current_settings_);
+ announce_element (c, clef_req_l_);
- Staff_symbol_referencer_interface si(c);
- si.set_interface ();
+ Staff_symbol_referencer::set_interface (c);
clef_p_ = c;
}
- Staff_symbol_referencer_interface si(clef_p_);
-
- si.set_position (clef_position_i_);
+ Staff_symbol_referencer::set_position(clef_p_, clef_position_i_);
if (octave_dir_)
{
- Text_item * g = new Text_item (get_property ("basicOctavateEightProperties"));
- Side_position_interface spi (g);
- spi.set_axis (Y_AXIS);
- spi.add_support (clef_p_);
+ Item * g = new Item (get_property ("basicOctavateEightProperties"));
+ Side_position::set_axis (g,Y_AXIS);
+ Side_position::add_support (g,clef_p_);
+
g->set_parent (clef_p_, Y_AXIS);
g->set_parent (clef_p_, X_AXIS);
- g->add_offset_callback (Side_position_interface::aligned_on_self, X_AXIS);
- g->add_offset_callback (Side_position_interface::centered_on_parent, X_AXIS);
+ g->add_offset_callback (Side_position::aligned_on_self, X_AXIS);
+ g->add_offset_callback (Side_position::centered_on_parent, X_AXIS);
g->set_elt_property ("direction", gh_int2scm (octave_dir_));
octavate_p_ = g;
- announce_element (Score_element_info (octavate_p_, clef_req_l_));
+ announce_element (octavate_p_, clef_req_l_);
}
}
void
Clef_engraver::do_process_music()
{
- if (clef_req_l_)
+ if (clef_req_l_ || first_b_)
{
create_clef();
clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
if(to_boolean (clef_p_->get_elt_property("non-default")))
{
vis = ly_symbol2scm ("all-visible");
- vis = scm_eval (vis);
+ vis = scm_eval2 (vis, SCM_EOL);
}
if (vis)
octavate_p_ = 0;
}
+
+ first_b_ = 0;
}
void