X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=6e16d7fde8cf5af036e0880942cb07391493d8ad;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=74992be97612d9373bd81c89063e05bb26503525;hpb=70cc70f3a6183472b93fc4c2b4c60cc0375b6d64;p=lilypond.git diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 74992be976..6e16d7fde8 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -1,11 +1,21 @@ /* - 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--2014 Han-Wen Nienhuys + Mats Bengtsson - (c) 1997--2007 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 @@ -13,7 +23,6 @@ using namespace std; #include "item.hh" #include "context.hh" -#include "bar-line.hh" #include "staff-symbol-referencer.hh" #include "engraver.hh" #include "direction.hh" @@ -26,8 +35,6 @@ class Clef_engraver : public Engraver public: TRANSLATOR_DECLARATIONS (Clef_engraver); - Direction octave_dir_; - protected: void stop_translation_timestep (); void process_music (); @@ -36,11 +43,11 @@ protected: virtual void derived_mark () const; private: Item *clef_; - Item *octavate_; + Item *modifier_; SCM prev_glyph_; SCM prev_cpos_; - SCM prev_octavation_; + SCM prev_transposition_; void create_clef (); void set_glyph (); void inspect_clef_properties (); @@ -49,7 +56,7 @@ private: void Clef_engraver::derived_mark () const { - scm_gc_mark (prev_octavation_); + scm_gc_mark (prev_transposition_); scm_gc_mark (prev_cpos_); scm_gc_mark (prev_glyph_); } @@ -57,13 +64,12 @@ Clef_engraver::derived_mark () const Clef_engraver::Clef_engraver () { clef_ = 0; - octave_dir_ = CENTER; - octavate_ = 0; + modifier_ = 0; /* will trigger a clef at the start since #f != ' () */ - prev_octavation_ = prev_cpos_ = prev_glyph_ = SCM_BOOL_F; + prev_transposition_ = prev_cpos_ = prev_glyph_ = SCM_BOOL_F; } void @@ -83,7 +89,7 @@ Clef_engraver::set_glyph () void Clef_engraver::acknowledge_bar_line (Grob_info info) { - Item *item = dynamic_cast (info.grob ()); + Item *item = info.item (); if (item && scm_is_string (get_property ("clefGlyph"))) create_clef (); } @@ -99,30 +105,33 @@ Clef_engraver::create_clef () SCM cpos = get_property ("clefPosition"); if (scm_is_number (cpos)) - clef_->set_property ("staff-position", cpos); - - SCM oct = get_property ("clefOctavation"); - if (scm_is_number (oct) && scm_to_int (oct)) - { - Item *g = make_item ("OctavateEight", SCM_EOL); - - int abs_oct = scm_to_int (oct); - int dir = sign (abs_oct); - abs_oct = abs (abs_oct) + 1; - - 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_); - - g->set_parent (clef_, Y_AXIS); - g->set_parent (clef_, X_AXIS); - g->set_property ("direction", scm_from_int (dir)); - octavate_ = g; - } + clef_->set_property ("staff-position", cpos); + + SCM transp = get_property ("clefTransposition"); + if (scm_is_number (transp) && scm_to_int (transp)) + { + Item *g = make_item ("ClefModifier", SCM_EOL); + + int abs_transp = scm_to_int (transp); + int dir = sign (abs_transp); + abs_transp = abs (abs_transp) + 1; + + SCM txt = scm_number_to_string (scm_from_int (abs_transp), + scm_from_int (10)); + + SCM style = get_property ("clefTranspositionStyle"); + + SCM formatter = get_property ("clefTranspositionFormatter"); + if (ly_is_procedure (formatter)) + g->set_property ("text", scm_call_2 (formatter, txt, style)); + + Side_position_interface::add_support (g, clef_); + + g->set_parent (clef_, Y_AXIS); + g->set_parent (clef_, X_AXIS); + g->set_property ("direction", scm_from_int (dir)); + modifier_ = g; + } } } void @@ -131,34 +140,41 @@ Clef_engraver::process_music () inspect_clef_properties (); } +static void apply_on_children (Context *context, SCM fun) +{ + scm_call_1 (fun, context->self_scm ()); + for (SCM s = context->children_contexts (); + scm_is_pair (s); s = scm_cdr (s)) + apply_on_children (unsmob_context (scm_car (s)), fun); +} + void Clef_engraver::inspect_clef_properties () { SCM glyph = get_property ("clefGlyph"); SCM clefpos = get_property ("clefPosition"); - SCM octavation = get_property ("clefOctavation"); + SCM transposition = get_property ("clefTransposition"); 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 (transposition, prev_transposition_) == SCM_BOOL_F || to_boolean (force_clef)) { - set_context_property_on_children (context (), - ly_symbol2scm ("localKeySignature"), - get_property ("keySignature")); - + apply_on_children (context (), + ly_lily_module_constant ("invalidate-alterations")); + set_glyph (); if (prev_cpos_ != SCM_BOOL_F || to_boolean (get_property ("firstClef"))) - create_clef (); + create_clef (); if (clef_) - clef_->set_property ("non-default", SCM_BOOL_T); + clef_->set_property ("non-default", SCM_BOOL_T); prev_cpos_ = clefpos; prev_glyph_ = glyph; - prev_octavation_ = octavation; + prev_transposition_ = transposition; } if (to_boolean (force_clef)) @@ -176,31 +192,34 @@ 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; - octavate_ = 0; + modifier_ = 0; } } ADD_ACKNOWLEDGER (Clef_engraver, bar_line); ADD_TRANSLATOR (Clef_engraver, - /* doc */ "Determine and set reference point for pitches", - /* create */ "Clef " - "OctavateEight ", - /* read */ - "clefGlyph " - "clefOctavation " - "clefPosition " - "explicitClefVisibility " - "forceClef " - , - /* write */ ""); + /* doc */ + "Determine and set reference point for pitches.", + + /* create */ + "Clef " + "ClefModifier ", + + /* read */ + "clefGlyph " + "clefTransposition " + "clefTranspositionStyle " + "clefPosition " + "explicitClefVisibility " + "forceClef ", + + /* write */ + "" + );