X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=c8e21f2ce86e10ad12e8df144fea7b8a6e54ec6b;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=0bdb8443c10b72d88ec0b222ed4b8580b028b5eb;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 0bdb8443c1..c8e21f2ce8 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -3,13 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys , + (c) 1997--2008 Han-Wen Nienhuys , Mats Bengtsson */ #include +using namespace std; +#include "item.hh" #include "context.hh" #include "bar-line.hh" #include "staff-symbol-referencer.hh" @@ -17,7 +19,9 @@ #include "direction.hh" #include "side-position-interface.hh" -class Clef_engraver : public Engraver +#include "translator.icc" + +class Clef_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Clef_engraver); @@ -25,12 +29,14 @@ public: Direction octave_dir_; protected: - virtual void stop_translation_timestep (); - virtual void process_music (); - virtual void acknowledge_grob (Grob_info); + void stop_translation_timestep (); + void process_music (); + DECLARE_ACKNOWLEDGER (bar_line); + + virtual void derived_mark () const; private: - Item * clef_; - Item * octavate_; + Item *clef_; + Item *octavate_; SCM prev_glyph_; SCM prev_cpos_; @@ -40,6 +46,14 @@ private: void inspect_clef_properties (); }; +void +Clef_engraver::derived_mark () const +{ + scm_gc_mark (prev_octavation_); + scm_gc_mark (prev_cpos_); + scm_gc_mark (prev_glyph_); +} + Clef_engraver::Clef_engraver () { clef_ = 0; @@ -48,36 +62,30 @@ Clef_engraver::Clef_engraver () /* will trigger a clef at the start since #f != ' () - */ - prev_cpos_ = prev_glyph_ = SCM_BOOL_F; + */ + prev_octavation_ = prev_cpos_ = prev_glyph_ = SCM_BOOL_F; } void Clef_engraver::set_glyph () { - SCM glyph_sym = ly_symbol2scm ("glyph-name"); - SCM glyph = get_property ("clefGlyph"); - + SCM glyph_sym = ly_symbol2scm ("glyph"); SCM basic = ly_symbol2scm ("Clef"); - + execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED); - execute_pushpop_property (context (), basic, glyph_sym, glyph); + execute_pushpop_property (context (), basic, glyph_sym, get_property ("clefGlyph")); } -/** - Generate a clef at the start of a measure. (when you see a Bar, - ie. a breakpoint) - */ +/** + Generate a clef at the start of a measure. (when you see a Bar, + ie. a breakpoint) +*/ void -Clef_engraver::acknowledge_grob (Grob_info info) +Clef_engraver::acknowledge_bar_line (Grob_info info) { - Item * item = dynamic_cast (info.grob_); - if (item) - { - if (Bar_line::has_interface (info.grob_) - && scm_is_string (get_property ("clefGlyph"))) - create_clef (); - } + Item *item = dynamic_cast (info.grob ()); + if (item && scm_is_string (get_property ("clefGlyph"))) + create_clef (); } void @@ -86,7 +94,6 @@ Clef_engraver::create_clef () if (!clef_) { Item *c = make_item ("Clef", SCM_EOL); - clef_ = c; SCM cpos = get_property ("clefPosition"); @@ -94,28 +101,27 @@ Clef_engraver::create_clef () if (scm_is_number (cpos)) clef_->set_property ("staff-position", cpos); - SCM oct = get_property ("clefOctavation"); + SCM oct = get_property ("clefOctavation"); if (scm_is_number (oct) && scm_to_int (oct)) { - Item * g = make_item ("OctavateEight", SCM_EOL); + Item *g = make_item ("OctavateEight", SCM_EOL); - int abs_oct = scm_to_int (oct) ; + int abs_oct = scm_to_int (oct); int dir = sign (abs_oct); - abs_oct = abs (abs_oct) + 1; + abs_oct = abs (abs_oct) + 1; - SCM txt = scm_number_to_string (scm_int2num (abs_oct), + SCM txt = scm_number_to_string (scm_from_int (abs_oct), scm_from_int (10)); g->set_property ("text", scm_list_n (ly_lily_module_constant ("vcenter-markup"), - txt, SCM_UNDEFINED)); - Side_position_interface::add_support (g, clef_); + txt, SCM_UNDEFINED)); + Side_position_interface::add_support (g, clef_); g->set_parent (clef_, Y_AXIS); g->set_parent (clef_, X_AXIS); - g->set_property ("direction", scm_int2num (dir)); + g->set_property ("direction", scm_from_int (dir)); octavate_ = g; - } } } @@ -132,17 +138,23 @@ Clef_engraver::inspect_clef_properties () 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 || to_boolean (force_clef)) { + set_context_property_on_children (context (), + ly_symbol2scm ("localKeySignature"), + get_property ("keySignature")); + set_glyph (); - create_clef (); + if (prev_cpos_ != SCM_BOOL_F || to_boolean (get_property ("firstClef"))) + create_clef (); - clef_->set_property ("non-default", SCM_BOOL_T); + if (clef_) + clef_->set_property ("non-default", SCM_BOOL_T); prev_cpos_ = clefpos; prev_glyph_ = glyph; @@ -151,45 +163,50 @@ Clef_engraver::inspect_clef_properties () if (to_boolean (force_clef)) { - Context * w = context ()->where_defined (ly_symbol2scm ("forceClef")); + SCM prev; + Context *w = context ()->where_defined (ly_symbol2scm ("forceClef"), &prev); w->set_property ("forceClef", SCM_EOL); } } - void Clef_engraver::stop_translation_timestep () { if (clef_) { - SCM vis = 0; + SCM vis = 0; if (to_boolean (clef_->get_property ("non-default"))) - { - vis = get_property ("explicitClefVisibility"); - } + vis = get_property ("explicitClefVisibility"); if (vis) { clef_->set_property ("break-visibility", vis); if (octavate_) - { - octavate_->set_property ("break-visibility", vis); - - } + octavate_->set_property ("break-visibility", vis); } - + clef_ = 0; octavate_ = 0; } } - - +ADD_ACKNOWLEDGER (Clef_engraver, bar_line); ADD_TRANSLATOR (Clef_engraver, -/* descr */ "Determine and set reference point for pitches", -/* creats*/ "Clef OctavateEight", -/* accepts */ "", -/* acks */ "bar-line-interface", -/* reads */ "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility forceClef", -/* write */ ""); + /* doc */ + "Determine and set reference point for pitches.", + + /* create */ + "Clef " + "OctavateEight ", + + /* read */ + "clefGlyph " + "clefOctavation " + "clefPosition " + "explicitClefVisibility " + "forceClef ", + + /* write */ + "" + );