Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 7d97b65d269598fb29b51e91616ef9472516c4ef..05990a6853dcd6b38396376996c16be53d16566d 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -77,13 +77,13 @@ public:
     to store all information before we can really create the
     accidentals.
   */
-  Link_array<Grob> left_objects_;
-  Link_array<Grob> right_objects_;
+  vector<Grob*> left_objects_;
+  vector<Grob*> right_objects_;
 
   Grob *accidental_placement_;
 
-  Array<Accidental_entry> accidentals_;
-  Link_array<Spanner> ties_;
+  vector<Accidental_entry> accidentals_;
+  vector<Spanner*> ties_;
 };
 
 /*
@@ -304,13 +304,13 @@ Accidental_engraver::get_bar_number ()
 void
 Accidental_engraver::process_acknowledged ()
 {
-  if (accidentals_.size () && !accidentals_.top ().done_)
+  if (accidentals_.size () && !accidentals_.back ().done_)
     {
       SCM accidentals = get_property ("autoAccidentals");
       SCM cautionaries = get_property ("autoCautionaries");
       int barnum = get_bar_number ();
 
-      for (int i = 0; i < accidentals_.size (); i++)
+      for (vsize i = 0; i < accidentals_.size (); i++)
        {
          if (accidentals_[i].done_)
            continue;
@@ -387,10 +387,11 @@ Accidental_engraver::create_accidental (Accidental_entry *entry,
 
 Grob *
 Accidental_engraver::make_standard_accidental (Music *note,
-                                              Grob *support,
+                                              Grob *note_head,
                                               Engraver *trans)
 {
 
+  (void)note;
   /*
     We construct the accidentals at the originating Voice
     level, so that we get the property settings for
@@ -399,39 +400,47 @@ Accidental_engraver::make_standard_accidental (Music *note,
   Grob *a
     = make_grob_from_properties (trans,
                                 ly_symbol2scm ("Accidental"),
-                                note->self_scm (),
+                                note_head->self_scm (),
                                 "Accidental");
 
   /*
     We add the accidentals to the support of the arpeggio,
     so it is put left of the accidentals.
   */
-  for (int i = 0; i < left_objects_.size (); i++)
-    Side_position_interface::add_support (left_objects_[i], a);
-  for (int i = 0; i < right_objects_.size (); i++)
+  for (vsize i = 0; i < left_objects_.size (); i++)
+    {
+      if (left_objects_[i]->get_property ("side-axis") == scm_from_int (X_AXIS))
+       Side_position_interface::add_support (left_objects_[i], a);
+    }
+
+  /*
+    Hmm. Junkme? 
+   */
+  for (vsize i = 0; i < right_objects_.size (); i++)
     Side_position_interface::add_support (a, right_objects_[i]);
 
-  a->set_parent (support, Y_AXIS);
+  a->set_parent (note_head, Y_AXIS);
 
   if (!accidental_placement_)
     accidental_placement_ = make_item ("AccidentalPlacement",
                                       a->self_scm ());
   Accidental_placement::add_accidental (accidental_placement_, a);
 
-  support->set_object ("accidental-grob", a->self_scm ());
+  note_head->set_object ("accidental-grob", a->self_scm ());
 
   return a;
 }
 
 Grob *
 Accidental_engraver::make_suggested_accidental (Music *note,
-                                               Grob *note_head, Engraver *trans)
+                                               Grob *note_head,
+                                               Engraver *trans)
 {
-
+  (void) note;
   Grob *a
     = make_grob_from_properties (trans,
                                 ly_symbol2scm ("AccidentalSuggestion"),
-                                note->self_scm (),
+                                note_head->self_scm (),
                                 "AccidentalSuggestion");
 
   Side_position_interface::add_support (a, note_head);
@@ -451,10 +460,10 @@ Accidental_engraver::finalize ()
 void
 Accidental_engraver::stop_translation_timestep ()
 {
-  for (int j = ties_.size (); j--;)
+  for (vsize j = ties_.size (); j--;)
     {
       Grob *r = Tie::head (ties_[j], RIGHT);
-      for (int i = accidentals_.size (); i--;)
+      for (vsize i = accidentals_.size (); i--;)
        if (accidentals_[i].head_ == r)
          {
            if (Grob *g = accidentals_[i].accidental_)
@@ -462,12 +471,12 @@ Accidental_engraver::stop_translation_timestep ()
                g->set_object ("tie", ties_[j]->self_scm ());
                accidentals_[i].tied_ = true;
              }
-           ties_.del (j);
+           ties_.erase (ties_.begin () + j);
            break;
          }
     }
 
-  for (int i = accidentals_.size (); i--;)
+  for (vsize i = accidentals_.size (); i--;)
     {
       int barnum = get_bar_number ();
 
@@ -529,10 +538,11 @@ Accidental_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
   Music *note = info.music_cause ();
   if (note
-      && note->is_mus_type ("note-event"))
+      && (note->is_mus_type ("note-event")
+         || note->is_mus_type ("trill-span-event")))
     {
       /*
-       std::string harmonics usually don't have accidentals.
+       string harmonics usually don't have accidentals.
       */
       if (to_boolean (get_property ("harmonicAccidentals"))
          || !ly_is_equal (info.grob ()->get_property ("style"),
@@ -544,7 +554,7 @@ Accidental_engraver::acknowledge_rhythmic_head (Grob_info info)
          entry.origin_ = entry.origin_engraver_->context ();
          entry.melodic_ = note;
 
-         accidentals_.push (entry);
+         accidentals_.push_back (entry);
        }
     }
 }
@@ -552,19 +562,19 @@ Accidental_engraver::acknowledge_rhythmic_head (Grob_info info)
 void
 Accidental_engraver::acknowledge_tie (Grob_info info)
 {
-  ties_.push (dynamic_cast<Spanner *> (info.grob ()));
+  ties_.push_back (dynamic_cast<Spanner *> (info.grob ()));
 }
 
 void
 Accidental_engraver::acknowledge_arpeggio (Grob_info info)
 {
-  left_objects_.push (info.grob ());
+  left_objects_.push_back (info.grob ());
 }
 
 void
 Accidental_engraver::acknowledge_finger (Grob_info info)
 {
-  left_objects_.push (info.grob ());
+  left_objects_.push_back (info.grob ());
 }
 
 void
@@ -583,6 +593,7 @@ ADD_ACKNOWLEDGER (Accidental_engraver, rhythmic_head);
 ADD_ACKNOWLEDGER (Accidental_engraver, tie);
 
 ADD_TRANSLATOR (Accidental_engraver,
+               
                "Make accidentals.  "
                "Catch note heads, ties and notices key-change events.  "
                "This engraver usually lives at Staff level, but "