Emit not-quite-cross-staff beams in the right context.

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 006bdb4c8792d075499a8e400e972fb4b9182abe..221c1e8881ee950c70da5af60b29f202236d30ef 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2010 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2002--2011 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
 
@@ -178,7 +178,11 @@ Ambitus_engraver::finalize ()
            ? robust_scm2rational (scm_cdr (handle), Rational (0))
            : Rational (0);
 
-         if (sig_alter == p.get_alteration ())
+         const Pitch other = pitch_interval_[-d];
+
+         if (sig_alter == p.get_alteration ()
+             && !((p.steps () == other.steps ())
+                  && (p.get_alteration () != other.get_alteration ())))
            {
              accidentals_[d]->suicide ();
              heads_[d]->set_object ("accidental-grob", SCM_EOL);