Imported Upstream version 2.14.2

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 2585bd8bc1c0fe00f9f55a85232e97ecb82cc7c1..221c1e8881ee950c70da5af60b29f202236d30ef 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -1,11 +1,22 @@
 /*
-  ambitus-engraver.cc -- implement Ambitus_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2002--2011 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -82,8 +93,8 @@ Ambitus_engraver::create_ambitus ()
 Ambitus_engraver::Ambitus_engraver ()
 {
   ambitus_ = 0;
-  heads_[LEFT] = heads_[RIGHT] = 0;
-  accidentals_[LEFT] = accidentals_[RIGHT] = 0;
+  heads_.set (0, 0);
+  accidentals_.set (0, 0);
   group_ = 0;
   is_typeset_ = false;
   start_key_sig_ = SCM_EOL;
@@ -145,8 +156,7 @@ Ambitus_engraver::finalize ()
   if (ambitus_ && !pitch_interval_.is_empty ())
     {
       Grob *accidental_placement =
-       make_item ("AccidentalPlacement",
-                  accidentals_[DOWN]->self_scm ());
+       make_item ("AccidentalPlacement", accidentals_[DOWN]->self_scm ());
 
       Direction d = DOWN;
       do
@@ -154,8 +164,7 @@ Ambitus_engraver::finalize ()
          Pitch p = pitch_interval_[d];
          heads_[d]->set_property ("cause", causes_[d]->self_scm());
          heads_[d]->set_property ("staff-position",
-                                  scm_from_int (start_c0_
-                                                + p.steps ()));
+                                  scm_from_int (start_c0_ + p.steps ()));
 
          SCM handle = scm_assoc (scm_cons (scm_from_int (p.get_octave ()),
                                            scm_from_int (p.get_notename ())),
@@ -166,25 +175,32 @@ Ambitus_engraver::finalize ()
                                start_key_sig_);
 
          Rational sig_alter = (handle != SCM_BOOL_F)
-           ? robust_scm2rational (scm_cdr (handle), Rational (0)) : Rational (0);
+           ? robust_scm2rational (scm_cdr (handle), Rational (0))
+           : Rational (0);
+
+         const Pitch other = pitch_interval_[-d];
 
-         if (sig_alter == p.get_alteration ())
+         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);
            }
          else
-           {
-             accidentals_[d]->set_property ("alteration", ly_rational2scm (p.get_alteration ()));
-           }
-         Separation_item::add_conditional_item (heads_[d], accidental_placement);
-         Accidental_placement::add_accidental (accidental_placement, accidentals_[d]);
+           accidentals_[d]->
+             set_property ("alteration",
+                           ly_rational2scm (p.get_alteration ()));
+         Separation_item::add_conditional_item (heads_[d],
+                                                accidental_placement);
+         Accidental_placement::add_accidental (accidental_placement,
+                                               accidentals_[d]);
+         Pointer_group_interface::add_grob (ambitus_,
+                                            ly_symbol2scm ("note-heads"),
+                                            heads_[d]);
        }
       while (flip (&d) != DOWN);
 
-
-      Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[DOWN]);
-      Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[UP]);
       Axis_group_interface::add_element (group_, accidental_placement);
     }
   else
@@ -194,7 +210,7 @@ Ambitus_engraver::finalize ()
        {
          accidentals_[d]->suicide ();
          heads_[d]->suicide ();
-       }
+       }
       while (flip (&d) != DOWN);
 
       ambitus_->suicide ();
@@ -204,7 +220,7 @@ Ambitus_engraver::finalize ()
 ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
 ADD_TRANSLATOR (Ambitus_engraver,
                /* doc */
-               "",
+               "Create an ambitus.",
 
                /* create */
                "AccidentalPlacement "
@@ -214,7 +230,8 @@ ADD_TRANSLATOR (Ambitus_engraver,
                "AmbitusNoteHead ",
 
                /* read */
-               "",
+               "keySignature "
+               "middleCPosition ",
 
                /* write */
                ""