Revert "Issue 4550 (2/2) Avoid "using namespace std;" in included files"

[lilypond.git] / lily / include / slur-proto-engraver.hh

diff --git a/lily/include/slur-proto-engraver.hh b/lily/include/slur-proto-engraver.hh
index 3dc62118635727c2eb12f8e991e0af541e164b65..c11926b21a9bc8841b4b6e9ba5cdc115cdbbd412 100644 (file)
--- a/lily/include/slur-proto-engraver.hh
+++ b/lily/include/slur-proto-engraver.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2013--2014 Mike Solomon <mike@mikesolomon.org>
+  Copyright (C) 2013--2015 Mike Solomon <mike@mikesolomon.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
@@ -22,6 +22,7 @@
 
 #include "engraver.hh"
 #include "moment.hh"
+#include <map>
 
 class Slur_proto_engraver : public Engraver
 {
@@ -32,9 +33,18 @@ protected:
       grob_name_ (grob_name), object_name_ (object_name),
       event_name_ (event_name) {}
 
+  struct Event_info {
+    Stream_event *slur_, *note_;
+    Event_info (Stream_event *slur, Stream_event *note)
+      : slur_ (slur), note_ (note)
+    { }
+  };
   // protected so that subclasses can see them
-  vector<Stream_event *> start_events_;
-  vector<Stream_event *> stop_events_;
+  vector<Event_info> start_events_;
+  vector<Event_info> stop_events_;
+
+  typedef std::multimap<Stream_event *, Spanner *> Note_slurs;
+  Drul_array<Note_slurs> note_slurs_;
   vector<Grob *> slurs_;
   vector<Grob *> end_slurs_;
   vector<Grob_info> objects_to_acknowledge_;
@@ -42,6 +52,7 @@ protected:
   const char* grob_name_;
   const char* object_name_;
   const char* event_name_;
+  virtual SCM event_symbol () = 0;
 
   DECLARE_ACKNOWLEDGER (inline_accidental);
   DECLARE_ACKNOWLEDGER (fingering);
@@ -52,14 +63,15 @@ protected:
   DECLARE_END_ACKNOWLEDGER (tie);
   DECLARE_ACKNOWLEDGER (tuplet_number);
 
-  void internal_listen_slur (Stream_event *ev);
+  void listen_note (Stream_event *ev);
+  void listen_slur (Stream_event *ev, Stream_event *note = 0);
   void acknowledge_extra_object (Grob_info);
   void stop_translation_timestep ();
   void process_music ();
 
   bool can_create_slur (const string&, vsize, vsize *, Stream_event *);
-  void create_slur (const string &spanner_id, Stream_event *ev_cause, Grob *g_cause, Direction dir, bool left_broken);
-  bool try_to_end (Stream_event *ev);
+  void create_slur (const string &spanner_id, Event_info evi, Grob *g_cause, Direction dir, bool left_broken);
+  bool try_to_end (Event_info evi);
 
   virtual void set_melisma (bool);
   virtual void finalize ();