/*
+
clef-engraver.cc -- implement Clef_engraver
source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
Mats Bengtsson <matsb@s3.kth.se>
*/
#include <ctype.h>
-#include "staff-symbol-referencer.hh"
+
+#include "translator-group.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 "item.hh"
/// where is c-0 in the staff?
-class Clef_engraver : public Engraver {
- Clef_item * clef_p_;
+class Clef_engraver : public Engraver
+{
+ Item * clef_p_;
+ Item * octavate_p_;
Clef_change_req * clef_req_l_;
+
void create_clef();
bool set_type (String);
protected:
- virtual void do_process_requests();
+ virtual void do_process_music();
virtual void do_pre_move_processing();
virtual void do_creation_processing();
virtual void do_post_move_processing();
SCM clef_glyph_; // no need for protection. Always referenced somewhere else.
Clef_engraver();
-};
+ bool first_b_;
+};
-ADD_THIS_TRANSLATOR (Clef_engraver);
Clef_engraver::Clef_engraver()
{
+ first_b_ = true;
clef_glyph_ = SCM_EOL;
clef_p_ = 0;
clef_req_l_ = 0;
c0_position_i_ = 0;
clef_position_i_ = 0;
octave_dir_ = CENTER;
+ octavate_p_ = 0;
}
bool
else
octave_dir_ = CENTER;
- SCM c = get_property ("supportedClefTypes",0);
- SCM p = get_property ("clefPitches", 0);
+ SCM c = get_property ("supportedClefTypes");
+ SCM p = get_property ("clefPitches");
if (gh_list_p (c))
{
}
c0_position_i_ -= (int) octave_dir_ * 7;
+
+ SCM basic = ly_symbol2scm ("basicClefItemProperties");
+ SCM c0 = ly_symbol2scm ("c0-position");
+ SCM gl = ly_symbol2scm ("glyph");
+ daddy_trans_l_->execute_single_pushpop_property (basic, gl, SCM_UNDEFINED);
+ daddy_trans_l_->execute_single_pushpop_property (basic, c0, SCM_UNDEFINED);
+ daddy_trans_l_->execute_single_pushpop_property (basic, gl, clef_glyph_);
+ daddy_trans_l_->execute_single_pushpop_property (basic, c0, 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_c_position (c0_position_i_);
+ item->set_elt_property ("c0-position", gh_int2scm (c0_position_i_));
}
}
}
void
Clef_engraver::do_creation_processing()
{
- SCM def = get_property ("defaultClef", 0);
+ 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;
- c->set_elt_property ("breakable", SCM_BOOL_T);
- c->set_elt_property ("break-aligned", SCM_BOOL_T);
- announce_element (Score_element_info (c, clef_req_l_));
+ Item *c= new Item (get_property ("basicClefItemProperties"));
+ 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_);
- clef_p_->set_elt_property ("glyph", clef_glyph_);
- si.set_position (clef_position_i_);
+ Staff_symbol_referencer::set_position(clef_p_, clef_position_i_);
if (octave_dir_)
{
- clef_p_->set_elt_property ("octave-dir", gh_int2scm (octave_dir_));
+ 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::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 (octavate_p_, clef_req_l_);
}
}
void
-Clef_engraver::do_process_requests()
+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 (clef_p_)
{
- if(to_boolean (clef_p_->remove_elt_property("non-default")))
- clef_p_->set_elt_property("visibility-lambda",
- ly_eval_str ("all-visibility"));
+ SCM vis = 0;
+ if(to_boolean (clef_p_->get_elt_property("non-default")))
+ {
+ vis = get_property ("explicitClefVisibility");
+ }
+
+ if (vis)
+ {
+ clef_p_->set_elt_property("visibility-lambda", vis);
+ if (octavate_p_)
+ octavate_p_->set_elt_property("visibility-lambda", vis);
+ }
typeset_element (clef_p_);
clef_p_ =0;
+
+ if (octavate_p_)
+ typeset_element(octavate_p_);
+
+ octavate_p_ = 0;
}
+
+ first_b_ = 0;
}
void
clef_req_l_ = 0;
}
+ADD_THIS_TRANSLATOR(Clef_engraver);
+
projects / lilypond.git / blobdiff