Bugfix: Also print forced accidentals when autoAccidentals = \turnOff

diff --git a/ChangeLog b/ChangeLog
index bee0fd1b7003c3422662e4bd638731033330100d..6f4381a337d787fa39afe3add50065ef81f580ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-07  Rune Zedeler  <rz@daimi.au.dk>
+
+       * lily/accidental-engraver.cc:
+       Bugfix: Also print forced accidentals when autoAccidentals = \turnOff
+
 2002-12-06  Heikki Junes <hjunes@cc.hut.fi>
 
        * lilypond.vim:

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index b2ff103ff3a4a6027c8da5da7c5c0d4f5256e728..b7c9289eab27db460c0e2057bca1b3e87428d775 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -158,9 +158,7 @@ number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazy
   int p = gh_number_p (prev_acc) ? gh_scm2int (prev_acc) : 0;
 
   int num;
-  if (a == p
-      && !to_boolean (note->get_mus_property ("force-accidental"))
-      && gh_number_p (prev_acc))
+  if (a == p && gh_number_p (prev_acc))
     num = 0;
   else if ( (abs (a)<abs (p) || p*a<0) && a != 0 )
     num = 2;
@@ -262,6 +260,9 @@ Accidental_engraver::process_acknowledged_grobs ()
              num = num_caut;
              cautionary = true;
            }
+
+         if(num==0 && to_boolean (note->get_mus_property ("force-accidental")))
+            num=1;
          
          bool different = num < 0;
          num = abs (num);