Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / lily / accidental-engraver.cc

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index f93fcca4657773273bbf2867a2ca34cc3dbf5415..24340ed70f2057e7fae2964d77723c7df260b192 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -1,9 +1,9 @@
 /*
-  accidental-engraver.cc -- implement accidental_engraver
+  accidental-engraver.cc -- implement Accidental_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
 */
 
@@ -258,13 +258,13 @@ check_pitch_against_signature (SCM key_signature, Pitch const &pitch,
 // we can delete this function).
 LY_DEFINE (ly_find_accidentals_simple, "ly:find-accidentals-simple", 5, 0, 0,
           (SCM keysig, SCM pitch_scm, SCM barnum, SCM laziness, SCM octaveness ),
-          "Checks the need for an accidental and a 'restore' accidental against a"
-          " key signature.  The laziness is the number of bars for which reminder"
-          " accidentals are used (ie. if laziness is zero, we only cancel accidentals"
-          " in the same bar; if laziness is three, we cancel accidentals up to three"
-          " bars after they first appear.  Octaveness is either 'same-octave or"
-          " 'any-octave and it specifies whether accidentals should be canceled in"
-          " different octaves.")
+          "Checks the need for an accidental and a @q{restore} accidental against a"
+          " key signature.  The @var{laziness} is the number of bars for which reminder"
+          " accidentals are used (ie. if @var{laziness} is zero, we only cancel accidentals"
+          " in the same bar; if @var{laziness} is three, we cancel accidentals up to three"
+          " bars after they first appear.  @var{octaveness} is either"
+          " @code{'same-octave} or @code{'any-octave} and it specifies whether"
+          " accidentals should be canceled in different octaves.")
 {
   LY_ASSERT_TYPE (unsmob_pitch, pitch_scm, 2);
   LY_ASSERT_TYPE (scm_is_integer, barnum, 3);
@@ -411,13 +411,11 @@ Accidental_engraver::create_accidental (Accidental_entry *entry,
 }
 
 Grob *
-Accidental_engraver::make_standard_accidental (Stream_event *note,
+Accidental_engraver::make_standard_accidental (Stream_event * /* note */,
                                               Grob *note_head,
                                               Engraver *trans,
                                               bool cautionary)
 {
-  (void)note;
-
   /*
     We construct the accidentals at the originating Voice
     level, so that we get the property settings for
@@ -455,12 +453,10 @@ Accidental_engraver::make_standard_accidental (Stream_event *note,
 }
 
 Grob *
-Accidental_engraver::make_suggested_accidental (Stream_event *note,
+Accidental_engraver::make_suggested_accidental (Stream_event * /* note */,
                                                Grob *note_head,
                                                Engraver *trans)
 {
-  (void) note;
-
   Grob *a = trans->make_item ("AccidentalSuggestion", note_head->self_scm ());
 
   Side_position_interface::add_support (a, note_head);
@@ -636,6 +632,7 @@ ADD_TRANSLATOR (Accidental_engraver,
                /* create */
                "Accidental "
                "AccidentalCautionary "
+               "AccidentalPlacement "
                "AccidentalSuggestion ",
 
                /* read */