X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=87040e0c41630a2238f5cb68a8b597eeeebf628a;hb=f69bd6761b3b3c077b0b994bd65b5a5bd79b5582;hp=0b0a282064ec3b6bdb1dd03449f6507344b068ee;hpb=c3ff1c6cd20e15e9036ee7120012e05b1d62a46d;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 0b0a282064..87040e0c41 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2007 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ #include "bar-line.hh" @@ -79,8 +79,9 @@ Key_engraver::create_key (bool is_default) SCM new_alter_pair = scm_assoc (scm_caar (s), key); Rational old_alter = robust_scm2rational (scm_cdar (s), 0); if (new_alter_pair == SCM_BOOL_F - || extranatural - && (ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter)*old_alter < Rational (0)) + || (extranatural + && (ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter)*old_alter + < Rational (0))) { *tail = scm_cons (scm_car (s), *tail); tail = SCM_CDRLOC (*tail); @@ -119,18 +120,16 @@ Key_engraver::listen_key_change (Stream_event *ev) } void -Key_engraver::acknowledge_clef (Grob_info info) +Key_engraver::acknowledge_clef (Grob_info /* info */) { - (void)info; SCM c = get_property ("createKeyOnClefChange"); if (to_boolean (c)) create_key (false); } void -Key_engraver::acknowledge_bar_line (Grob_info info) +Key_engraver::acknowledge_bar_line (Grob_info /* info */) { - (void)info; if (scm_is_pair (get_property ("keySignature"))) create_key (true); } @@ -208,8 +207,11 @@ ADD_ACKNOWLEDGER (Key_engraver, clef); ADD_ACKNOWLEDGER (Key_engraver, bar_line); ADD_TRANSLATOR (Key_engraver, - /* doc */ "", - /* create */ "KeySignature", + /* doc */ + "Engrave a key signature.", + + /* create */ + "KeySignature ", /* read */ "createKeyOnClefChange " @@ -218,10 +220,10 @@ ADD_TRANSLATOR (Key_engraver, "keyAlterationOrder " "keySignature " "lastKeySignature " - "printKeyCancellation " - , + "printKeyCancellation ", /* write */ "keySignature " "lastKeySignature " - "tonic ") + "tonic " + );