Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 1c626529cae3df8b3444309a31e4f1509c421566..9d671c11e610a0e34420ca703689247d4ba382ef 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -9,14 +9,16 @@
 
 #include "accidental-placement.hh"
 #include "arpeggio.hh"
+#include "spanner.hh"
 #include "context.hh"
+#include "item.hh"
 #include "engraver.hh"
 #include "international.hh"
-#include "music.hh"
 #include "pitch.hh"
 #include "protected-scm.hh"
 #include "rhythmic-head.hh"
 #include "side-position-interface.hh"
+#include "stream-event.hh"
 #include "tie.hh"
 #include "warn.hh"
 
@@ -26,7 +28,7 @@ class Accidental_entry
 {
 public:
   bool done_;
-  Music *melodic_;
+  Stream_event *melodic_;
   Grob *accidental_;
   Context *origin_;
   Engraver *origin_engraver_;
@@ -51,8 +53,8 @@ class Accidental_engraver : public Engraver
   int get_bar_number ();
   void update_local_key_signature ();
   void create_accidental (Accidental_entry *entry, bool, bool);
-  Grob *make_standard_accidental (Music *note, Grob *note_head, Engraver *trans);
-  Grob *make_suggested_accidental (Music *note, Grob *note_head, Engraver *trans);
+  Grob *make_standard_accidental (Stream_event *note, Grob *note_head, Engraver *trans);
+  Grob *make_suggested_accidental (Stream_event *note, Grob *note_head, Engraver *trans);
 
 protected:
   TRANSLATOR_DECLARATIONS (Accidental_engraver);
@@ -77,13 +79,13 @@ public:
     to store all information before we can really create the
     accidentals.
   */
-  std::vector<Grob*> left_objects_;
-  std::vector<Grob*> right_objects_;
+  vector<Grob*> left_objects_;
+  vector<Grob*> right_objects_;
 
   Grob *accidental_placement_;
 
-  std::vector<Accidental_entry> accidentals_;
-  std::vector<Spanner*> ties_;
+  vector<Accidental_entry> accidentals_;
+  vector<Spanner*> ties_;
 };
 
 /*
@@ -289,7 +291,7 @@ number_accidentals (bool *different,
 int
 Accidental_engraver::get_bar_number ()
 {
-  SCM barnum = get_property ("currentBarNumber");
+  SCM barnum = get_property ("internalBarNumber");
   SCM smp = get_property ("measurePosition");
 
   int bn = robust_scm2int (barnum, 0);
@@ -316,7 +318,7 @@ Accidental_engraver::process_acknowledged ()
            continue;
          accidentals_[i].done_ = true;
 
-         Music *note = accidentals_[i].melodic_;
+         Stream_event *note = accidentals_[i].melodic_;
          Context *origin = accidentals_[i].origin_;
 
          Pitch *pitch = unsmob_pitch (note->get_property ("pitch"));
@@ -333,8 +335,8 @@ Accidental_engraver::process_acknowledged ()
                                             pitch, origin,
                                             cautionaries, barnum);
 
-         bool cautionary = to_boolean (note->get_property ("cautionary"));
 
+         bool cautionary = to_boolean (note->get_property ("cautionary"));
          if (num_caut > num)
            {
              num = num_caut;
@@ -342,13 +344,19 @@ Accidental_engraver::process_acknowledged ()
              cautionary = true;
            }
 
-         if (num == 0 && to_boolean (note->get_property ("force-accidental")))
+         bool forced = to_boolean (note->get_property ("force-accidental"));
+         if (num == 0 && forced)
            num = 1;
 
          /* Cannot look for ties: it's not guaranteed that they reach
             us before the notes. */
-         if (num)
+         if (num
+             && !note->in_event_class ("trill-span-event"))
            create_accidental (&accidentals_[i], num > 1, cautionary);
+
+
+         if (forced || cautionary)
+           accidentals_[i].accidental_->set_property ("forced", SCM_BOOL_T);
        }
     }
 }
@@ -358,7 +366,7 @@ Accidental_engraver::create_accidental (Accidental_entry *entry,
                                        bool restore_natural,
                                        bool cautionary)
 {
-  Music *note = entry->melodic_;
+  Stream_event *note = entry->melodic_;
   Grob *support = entry->head_;
   Pitch *pitch = unsmob_pitch (note->get_property ("pitch"));
 
@@ -386,28 +394,32 @@ Accidental_engraver::create_accidental (Accidental_entry *entry,
 }
 
 Grob *
-Accidental_engraver::make_standard_accidental (Music *note,
+Accidental_engraver::make_standard_accidental (Stream_event *note,
                                               Grob *note_head,
                                               Engraver *trans)
 {
 
+  (void)note;
   /*
     We construct the accidentals at the originating Voice
     level, so that we get the property settings for
     Accidental from the respective Voice.
   */
-  Grob *a
-    = make_grob_from_properties (trans,
-                                ly_symbol2scm ("Accidental"),
-                                note_head->self_scm (),
-                                "Accidental");
+  Grob *a = trans->make_item ("Accidental", note_head->self_scm ());
 
   /*
     We add the accidentals to the support of the arpeggio,
     so it is put left of the accidentals.
   */
   for (vsize i = 0; i < left_objects_.size (); i++)
-    Side_position_interface::add_support (left_objects_[i], a);
+    {
+      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]);
 
@@ -424,16 +436,12 @@ Accidental_engraver::make_standard_accidental (Music *note,
 }
 
 Grob *
-Accidental_engraver::make_suggested_accidental (Music *note,
+Accidental_engraver::make_suggested_accidental (Stream_event *note,
                                                Grob *note_head,
                                                Engraver *trans)
 {
-
-  Grob *a
-    = make_grob_from_properties (trans,
-                                ly_symbol2scm ("AccidentalSuggestion"),
-                                note_head->self_scm (),
-                                "AccidentalSuggestion");
+  (void) note;
+  Grob *a = trans->make_item ("AccidentalSuggestion", note_head->self_scm ());
 
   Side_position_interface::add_support (a, note_head);
   if (Grob *stem = unsmob_grob (a->get_object ("stem")))
@@ -472,7 +480,7 @@ Accidental_engraver::stop_translation_timestep ()
     {
       int barnum = get_bar_number ();
 
-      Music *note = accidentals_[i].melodic_;
+      Stream_event *note = accidentals_[i].melodic_;
       Context *origin = accidentals_[i].origin_;
 
       Pitch *pitch = unsmob_pitch (note->get_property ("pitch"));
@@ -528,12 +536,13 @@ Accidental_engraver::stop_translation_timestep ()
 void
 Accidental_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  Music *note = info.music_cause ();
+  Stream_event *note = info.event_cause ();
   if (note
-      && note->is_mus_type ("note-event"))
+      && (note->in_event_class ("note-event")
+         || note->in_event_class ("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"),
@@ -584,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 "
@@ -591,10 +601,9 @@ ADD_TRANSLATOR (Accidental_engraver,
                "so you can @code{\\override} them at @code{Voice}. ",
                "Accidental AccidentalSuggestion",
 
-               "",
-
                "autoAccidentals "
                "autoCautionaries "
+               "internalBarNumber "
                "extraNatural "
                "harmonicAccidentals "
                "localKeySignature",