Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index e08d3b377186e4daaf4ede19403d89710070ddb9..9d671c11e610a0e34420ca703689247d4ba382ef 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"
@@ -289,7 +291,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 +601,9 @@ ADD_TRANSLATOR (Accidental_engraver,
                "so you can @code{\\override} them at @code{Voice}. ",
                "Accidental AccidentalSuggestion",
 
-               "",
-
                "autoAccidentals "
                "autoCautionaries "
+               "internalBarNumber "
                "extraNatural "
                "harmonicAccidentals "
                "localKeySignature",