coding style nit.

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

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index e08d3b377186e4daaf4ede19403d89710070ddb9..f4c2abdde378841596059c1fc5a62bb16798fa09 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -9,7 +9,9 @@
 
 #include "accidental-placement.hh"
 #include "arpeggio.hh"
+#include "spanner.hh"
 #include "context.hh"
+#include "item.hh"
 #include "engraver.hh"
 #include "international.hh"
 #include "pitch.hh"
@@ -120,8 +122,7 @@ Accidental_engraver::update_local_key_signature ()
 
   /* Huh. Don't understand what this is good for. --hwn.  */
 
-  SCM val;
-  while (trans && trans->where_defined (ly_symbol2scm ("localKeySignature"), &val))
+  while (trans)
     {
       trans->set_property ("localKeySignature", ly_deep_copy (last_keysig_));
       trans = trans->get_parent_context ();
@@ -192,10 +193,14 @@ number_accidentals_from_sig (bool *different, SCM sig, Pitch *pitch,
       SCM entry = scm_car (s);
       if (scm_is_pair (scm_car (entry))
          && scm_cdar (entry) == scm_from_int (n))
-       from_other_octaves = scm_cdr (entry);
+       {
+         from_other_octaves = scm_cdr (entry);
+         break;
+       }
     }
 
-  if (from_same_octave != SCM_BOOL_F
+  if (!ignore_octave
+      && from_same_octave != SCM_BOOL_F
       && recent_enough (bar_number, from_same_octave, laziness))
     previous_alteration = from_same_octave;
   else if (ignore_octave
@@ -289,7 +294,7 @@ number_accidentals (bool *different,
 int
 Accidental_engraver::get_bar_number ()
 {
-  SCM barnum = get_property ("currentBarNumber");
+  SCM barnum = get_property ("internalBarNumber");
   SCM smp = get_property ("measurePosition");
 
   int bn = robust_scm2int (barnum, 0);
@@ -599,10 +604,9 @@ ADD_TRANSLATOR (Accidental_engraver,
                "so you can @code{\\override} them at @code{Voice}. ",
                "Accidental AccidentalSuggestion",
 
-               "",
-
                "autoAccidentals "
                "autoCautionaries "
+               "internalBarNumber "
                "extraNatural "
                "harmonicAccidentals "
                "localKeySignature",