* lily/accidental-engraver.cc: Also work with partial measures.

diff --git a/ChangeLog b/ChangeLog
index 0bf6dbe9af02ac049519441e4e6140ba19bb11ea..0c59df748844e8be1edcf501d1a5f6c37af1843e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-17  Rune Zedeler  <rune@zedeler.dk>
+
+       * lily/accidental-engraver.cc: Also work with partial measures.
+
 2002-09-16  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * VERSION (PACKAGE_NAME): Remove HEAD trap leftover.

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 0c00497d0918ac726b7b753b373d3ca3b489d2e0..3a610ce30c509d4c8d62af5886e7a852305611a2 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -239,7 +239,9 @@ Accidental_engraver::process_acknowledged_grobs ()
       SCM accidentals =  get_property ("autoAccidentals");
       SCM cautionaries =  get_property ("autoCautionaries");
       SCM barnum = get_property ("currentBarNumber");
-
+      SCM smp = get_property("measurePosition");
+      Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+      if(mp<0 && gh_number_p(barnum)) barnum = gh_int2scm(gh_scm2int(barnum)-1);
       bool extra_natural_b = get_property ("extraNatural") == SCM_BOOL_T;
       for (int i = 0; i  < accidentals_.size (); i++) 
        {