From: Rune Zedeler <rune@lilypond.org>
Date: Tue, 17 Sep 2002 16:30:39 +0000 (+0000)
Subject: 	* lily/accidental-engraver.cc: Also work with partial measures.
X-Git-Tag: release/1.6.4~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1d93e7afbea2cb2e302060ec024f6eb4908fc3f4;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index bc379584e5..fd4ba62172 100644
--- 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-17  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* lily/text-spanner-engraver.cc: whoops. Set bound in the correct
diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 0c00497d09..3a610ce30c 100644
--- 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++) 
 	{