X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglissando-engraver.cc;h=50e0386c62abe69c30dbdf263cf3c358aebcac8c;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=0d4c6a0eeca7d8d3de79298e7280f47127aab113;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 0d4c6a0eec..50e0386c62 100644
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include "engraver.hh"
 
 #include "international.hh"
+#include "pointer-group-interface.hh"
 #include "rhythmic-head.hh"
 #include "spanner.hh"
 #include "stream-event.hh"
@@ -34,25 +35,32 @@ public:
   TRANSLATOR_DECLARATIONS (Glissando_engraver);
 
 protected:
-  DECLARE_TRANSLATOR_LISTENER (glissando);
-  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void listen_glissando (Stream_event *);
+  void acknowledge_note_column (Grob_info);
   virtual void finalize ();
 
   void stop_translation_timestep ();
   void process_music ();
+
 private:
-  Spanner *line_;
-  Spanner *last_line_;
+  vector<Spanner *> lines_;
+  vector<Spanner *> kill_me_;
+  bool start_glissandi_;
+  bool stop_glissandi_;
+
   Stream_event *event_;
+  vector<vsize> note_column_1;
+  vector<vsize> note_column_2;
 };
 
-Glissando_engraver::Glissando_engraver ()
+Glissando_engraver::Glissando_engraver (Context *c)
+  : Engraver (c)
 {
-  last_line_ = line_ = 0;
   event_ = 0;
+  start_glissandi_ = false;
+  stop_glissandi_ = false;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Glissando_engraver, glissando);
 void
 Glissando_engraver::listen_glissando (Stream_event *ev)
 {
@@ -63,68 +71,122 @@ void
 Glissando_engraver::process_music ()
 {
   if (event_)
-    line_ = make_spanner ("Glissando", event_->self_scm ());
+    start_glissandi_ = true;
 }
 
 void
-Glissando_engraver::acknowledge_rhythmic_head (Grob_info info)
+Glissando_engraver::acknowledge_note_column (Grob_info info)
 {
   Grob *g = info.grob ();
-  if (line_)
-    line_->set_bound (LEFT, g);
+  if (to_boolean (g->get_property ("glissando-skip")))
+    return;
 
-  if (last_line_)
+  if (stop_glissandi_)
     {
-      last_line_->set_bound (RIGHT, g);
-      announce_end_grob (last_line_, g->self_scm ());
-    }      
+      extract_grob_set (g, "note-heads", note_heads);
+      int glissando_index = 0;
+      for (vsize i = 0; i < note_column_1.size (); i++)
+        {
+          if (note_column_2[i] >= note_heads.size ())
+            {
+              kill_me_.push_back (lines_[i]);
+              announce_end_grob (lines_[i], SCM_EOL);
+            }
+          else
+            {
+              lines_[i]->set_bound (RIGHT, note_heads[note_column_2[i]]);
+              lines_[i]->set_property ("glissando-index", scm_from_int (glissando_index));
+              glissando_index++;
+              announce_end_grob (lines_[i], note_heads[note_column_2[i]]->self_scm ());
+            }
+        }
+      lines_.clear ();
+      note_column_1.clear ();
+      note_column_2.clear ();
+      stop_glissandi_ = false;
+    }
+
+  if (start_glissandi_)
+    {
+      extract_grob_set (g, "note-heads", note_heads);
+      SCM map = get_property ("glissandoMap");
+      if (scm_is_null (map))
+        for (vsize i = 0; i < note_heads.size (); i++)
+          {
+            note_column_1.push_back (i);
+            note_column_2.push_back (i);
+          }
+      else
+        for (SCM m = map; scm_is_pair (m); m = scm_cdr (m))
+          {
+            SCM candidate = scm_car (m);
+            if (!scm_is_pair (candidate))
+              continue;
+            int n1 = robust_scm2int (scm_car (candidate), -1);
+            int n2 = robust_scm2int (scm_cdr (candidate), -1);
+            if ((n1 < 0) || (n2 < 0) || (size_t (n1) >= note_heads.size ()))
+              continue;
+            note_column_1.push_back (vsize (n1));
+            note_column_2.push_back (vsize (n2));
+          }
+      for (vsize i = 0; i < note_column_1.size (); i++)
+        {
+          lines_.push_back (make_spanner ("Glissando", event_->self_scm ()));
+          lines_.back ()->set_bound (LEFT, note_heads[note_column_1[i]]);
+        }
+    }
 }
 
 void
 Glissando_engraver::stop_translation_timestep ()
 {
-  if (last_line_ && last_line_->get_bound (RIGHT))
+  if (start_glissandi_)
     {
-      last_line_ = 0;
+      if (stop_glissandi_)
+        programming_error ("overwriting glissando");
+      stop_glissandi_ = true;
+      start_glissandi_ = false;
     }
-  if (line_)
-    {
-      if (last_line_)
-	programming_error ("overwriting glissando");
-      last_line_ = line_;
-    }
-  line_ = 0;
   event_ = 0;
 }
 
 void
 Glissando_engraver::finalize ()
 {
-  if (line_)
+  if (!lines_.empty ())
     {
       string msg = _ ("unterminated glissando");
 
       if (event_)
-	event_->origin ()->warning (msg);
+        event_->origin ()->warning (msg);
       else
-	warning (msg);
+        warning (msg);
 
-      line_->suicide ();
-      line_ = 0;
+      for (vsize i = 0; i < lines_.size (); i++)
+        lines_[i]->suicide ();
     }
+
+  for (vsize i = 0; i < kill_me_.size (); i++)
+    kill_me_[i]->suicide ();
+}
+
+void
+Glissando_engraver::boot ()
+{
+  ADD_LISTENER (Glissando_engraver, glissando);
+  ADD_ACKNOWLEDGER (Glissando_engraver, note_column);
 }
 
-ADD_ACKNOWLEDGER (Glissando_engraver, rhythmic_head);
 ADD_TRANSLATOR (Glissando_engraver,
-		/* doc */
-		"Engrave glissandi.",
+                /* doc */
+                "Engrave glissandi.",
 
-		/* create */
-		"Glissando ",
+                /* create */
+                "Glissando ",
 
-		/* read */
-		"",
+                /* read */
+                "glissandoMap ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );