X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=5551cbc07c6eac64e15f22f47f7060aa96dced9e;hb=0052082fd05c21b95cdd5f20c2a11d14e3ce2d1f;hp=bed486a45e8b0bb12db2dd5bf8802e9d4e507f29;hpb=8a37f4d25a58780a966ac364d580e98b58d7162f;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index bed486a45e..5551cbc07c 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -1,15 +1,27 @@ /* - clef-engraver.cc -- implement Clef_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys + Mats Bengtsson - (c) 1997--2005 Han-Wen Nienhuys , + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Mats Bengtsson + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include +using namespace std; +#include "item.hh" #include "context.hh" #include "bar-line.hh" #include "staff-symbol-referencer.hh" @@ -17,17 +29,19 @@ #include "direction.hh" #include "side-position-interface.hh" +#include "translator.icc" + class Clef_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Clef_engraver); - 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_; @@ -40,28 +54,33 @@ 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; - octave_dir_ = CENTER; octavate_ = 0; /* 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")); } /** @@ -69,15 +88,11 @@ Clef_engraver::set_glyph () 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 = info.item (); + if (item && scm_is_string (get_property ("clefGlyph"))) + create_clef (); } void @@ -102,7 +117,7 @@ Clef_engraver::create_clef () int dir = sign (abs_oct); 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", @@ -112,7 +127,7 @@ Clef_engraver::create_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; } } @@ -131,12 +146,16 @@ Clef_engraver::inspect_clef_properties () 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)) + 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 (); if (prev_cpos_ != SCM_BOOL_F || to_boolean (get_property ("firstClef"))) create_clef (); @@ -151,7 +170,8 @@ 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); } } @@ -163,18 +183,10 @@ Clef_engraver::stop_translation_timestep () { 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); - } - } + clef_->set_property ("break-visibility", vis); clef_ = 0; @@ -182,10 +194,22 @@ Clef_engraver::stop_translation_timestep () } } +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 */ + "" + );