* lily/page-turn-engraver.cc (breakable_column): remove an always-true

[lilypond.git] / lily / new-fingering-engraver.cc

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 02bb58267bc26785e1499f7e45aea9f7e5f5b9cd..2e8c94399ca16d79664a702dfa6bc05507914b43 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -14,7 +14,7 @@
 #include "self-alignment-interface.hh"
 #include "side-position-interface.hh"
 #include "stem.hh"
-#include "stem.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
 #include "translator.icc"
@@ -23,8 +23,8 @@ struct Finger_tuple
 {
   Grob *head_;
   Grob *script_;
-  Music *note_event_;
-  Music *finger_event_;
+  Stream_event *note_event_;
+  Stream_event *finger_event_;
   bool follow_into_staff_;
   int position_;
 
@@ -35,19 +35,21 @@ struct Finger_tuple
     note_event_ = finger_event_ = 0;
     follow_into_staff_ = false;
   }
-  static int compare (Finger_tuple const &c1, Finger_tuple const &c2)
-  {
-    return c1.position_- c2.position_;
-  }
 };
 
+bool
+operator< (Finger_tuple const &a, Finger_tuple const &b)
+{
+  return a.position_ < b.position_;
+}
+
 class New_fingering_engraver : public Engraver
 {
-  std::vector<Finger_tuple> fingerings_;
-  std::vector<Finger_tuple> articulations_;
-  std::vector<Finger_tuple> string_numbers_;
+  vector<Finger_tuple> fingerings_;
+  vector<Finger_tuple> articulations_;
+  vector<Finger_tuple> string_numbers_;
 
-  Link_array<Grob> heads_;
+  vector<Grob*> heads_;
   Grob *stem_;
 
 public:
@@ -56,16 +58,16 @@ protected:
   void stop_translation_timestep ();
   DECLARE_ACKNOWLEDGER (rhythmic_head);
   DECLARE_ACKNOWLEDGER (stem);
-  void add_fingering (Grob *, Music *, Music *);
-  void add_script (Grob *, Music *, Music *);
-  void add_string (Grob *, Music *, Music *);
-  void position_scripts (SCM orientations, std::vector<Finger_tuple> *);
+  void add_fingering (Grob *, Stream_event *, Stream_event *);
+  void add_script (Grob *, Stream_event *, Stream_event *);
+  void add_string (Grob *, Stream_event *, Stream_event *);
+  void position_scripts (SCM orientations, vector<Finger_tuple> *);
 };
 
 void
 New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 {
-  Music *note_ev = inf.music_cause ();
+  Stream_event *note_ev = inf.event_cause ();
   if (!note_ev)
     return;
 
@@ -73,20 +75,20 @@ New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 
   for (SCM s = arts; scm_is_pair (s); s = scm_cdr (s))
     {
-      Music *m = unsmob_music (scm_car (s));
+      Stream_event *ev = unsmob_stream_event (scm_car (s));
 
-      if (!m)
+      if (!ev)
        continue;
 
-      if (m->is_mus_type ("fingering-event"))
-       add_fingering (inf.grob (), m, note_ev);
-      else if (m->is_mus_type ("text-script-event"))
-       m->origin ()->warning (_ ("can't add text scripts to individual note heads"));
-      else if (m->is_mus_type ("script-event"))
-       add_script (inf.grob (), m, note_ev);
-      else if (m->is_mus_type ("string-number-event"))
-       add_string (inf.grob (), m, note_ev);
-      else if (m->is_mus_type ("harmonic-event"))
+      if (ev->in_event_class ("fingering-event"))
+       add_fingering (inf.grob (), ev, note_ev);
+      else if (ev->in_event_class ("text-script-event"))
+       ev->origin ()->warning (_ ("can't add text scripts to individual note heads"));
+      else if (ev->in_event_class ("script-event"))
+       add_script (inf.grob (), ev, note_ev);
+      else if (ev->in_event_class ("string-number-event"))
+       add_string (inf.grob (), ev, note_ev);
+      else if (ev->in_event_class ("harmonic-event"))
        {
          inf.grob ()->set_property ("style", ly_symbol2scm ("harmonic"));
          Grob *d = unsmob_grob (inf.grob ()->get_object ("dot"));
@@ -106,8 +108,8 @@ New_fingering_engraver::acknowledge_stem (Grob_info inf)
 
 void
 New_fingering_engraver::add_script (Grob *head,
-                                   Music *event,
-                                   Music *note)
+                                   Stream_event *event,
+                                   Stream_event *note)
 {
   (void) note;
 
@@ -127,8 +129,8 @@ New_fingering_engraver::add_script (Grob *head,
 
 void
 New_fingering_engraver::add_fingering (Grob *head,
-                                      Music *event,
-                                      Music *hevent)
+                                      Stream_event *event,
+                                      Stream_event *hevent)
 {
   Finger_tuple ft;
 
@@ -164,8 +166,8 @@ New_fingering_engraver::add_fingering (Grob *head,
 
 void
 New_fingering_engraver::add_string (Grob *head,
-                                   Music *event,
-                                   Music *hevent)
+                                   Stream_event *event,
+                                   Stream_event *hevent)
 {
   Finger_tuple ft;
 
@@ -187,11 +189,11 @@ New_fingering_engraver::add_string (Grob *head,
 
 void
 New_fingering_engraver::position_scripts (SCM orientations,
-                                         std::vector<Finger_tuple> *scripts)
+                                         vector<Finger_tuple> *scripts)
 {
   for (vsize i = 0; i < scripts->size (); i++)
-    if (stem_ && to_boolean (scripts->elem (i).script_->get_property ("add-stem-support")))
-      Side_position_interface::add_support (scripts->elem (i).script_, stem_);
+    if (stem_ && to_boolean (scripts->at (i).script_->get_property ("add-stem-support")))
+      Side_position_interface::add_support (scripts->at (i).script_, stem_);
 
   /*
     This is not extremely elegant, but we have to do a little
@@ -209,7 +211,7 @@ New_fingering_engraver::position_scripts (SCM orientations,
     for (vsize j = heads_.size (); j--;)
       Side_position_interface::add_support ((*scripts)[i].script_, heads_[j]);
 
-  std::vector<Finger_tuple> up, down, horiz;
+  vector<Finger_tuple> up, down, horiz;
   for (vsize i = scripts->size (); i--;)
     {
       SCM d = (*scripts)[i].finger_event_->get_property ("direction");
@@ -220,7 +222,7 @@ New_fingering_engraver::position_scripts (SCM orientations,
        }
     }
 
-  scripts->sort (&Finger_tuple::compare);
+  vector_sort (*scripts, less<Finger_tuple> ());
 
   bool up_p = scm_c_memq (ly_symbol2scm ("up"), orientations) != SCM_BOOL_F;
   bool down_p = scm_c_memq (ly_symbol2scm ("down"), orientations) != SCM_BOOL_F;
@@ -241,19 +243,17 @@ New_fingering_engraver::position_scripts (SCM orientations,
          scripts->erase (scripts->begin ());
        }
 
-      horiz.concat (*scripts);
+      horiz.insert (horiz.end (), scripts->begin (), scripts->end ());
     }
   else if (up_p && down_p)
     {
       int center = scripts->size () / 2;
-      down.concat (std::vector<Finger_tuple> (scripts->begin (),
-                                             scripts->begin () + center));
-      up.concat (std::vector<Finger_tuple> (scripts->begin () + center,
-                                           scripts->end ()));
+      down.insert (down.end (), scripts->begin (), scripts->begin () + center);
+      up.insert (up.end (), scripts->begin () + center, scripts->end ());
     }
   else if (up_p)
     {
-      up.concat (*scripts);
+      up.insert (up.end (), scripts->begin (), scripts->end ());
       scripts->clear ();
     }
   else
@@ -263,7 +263,7 @@ New_fingering_engraver::position_scripts (SCM orientations,
          warning (_ ("no placement found for fingerings"));
          warning (_ ("placing below"));
        }
-      down.concat (*scripts);
+      down.insert (down.end (), scripts->begin (), scripts->end ());
       scripts->clear ();
     }
 
@@ -284,7 +284,7 @@ New_fingering_engraver::position_scripts (SCM orientations,
   int finger_prio = 200;
 
   Direction d = DOWN;
-  Drul_array< std::vector<Finger_tuple> > vertical (down, up);
+  Drul_array< vector<Finger_tuple> > vertical (down, up);
   do
     {
       for (vsize i = 0; i < vertical[d].size (); i++)