]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/phrasing-slur-engraver.cc
Run grand-replace (issue 3765)
[lilypond.git] / lily / phrasing-slur-engraver.cc
index d9c6e3e03910d7560f2cb008c99b449f734691be..ef11e66ac3516da74c48741a40305fdf37556f11 100644 (file)
@@ -1,9 +1,20 @@
 /*
-  phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
 #include "international.hh"
 #include "note-column.hh"
 #include "slur.hh"
+#include "slur-proto-engraver.hh"
 #include "spanner.hh"
 #include "stream-event.hh"
 #include "warn.hh"
 
 #include "translator.icc"
 
-/*
-  It is possible that a slur starts and ends on the same note.  At
-  least, it is for phrasing slurs: a note can be both beginning and
-  ending of a phrase.
-*/
-
-class Phrasing_slur_engraver : public Engraver
+class Phrasing_slur_engraver : public Slur_proto_engraver
 {
-  Drul_array<Stream_event *> events_;
-  Stream_event *running_slur_start_;
-  vector<Grob*> slurs_;
-  vector<Grob*> end_slurs_;
-
 protected:
-  void acknowledge_extra_object (Grob_info);
-  DECLARE_ACKNOWLEDGER (accidental);
-  DECLARE_ACKNOWLEDGER (dynamic_line_spanner);
-  DECLARE_ACKNOWLEDGER (fingering);
-  DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_ACKNOWLEDGER (script);
-  DECLARE_ACKNOWLEDGER (slur);
-  DECLARE_ACKNOWLEDGER (text_script);
-  DECLARE_ACKNOWLEDGER (tie);
   DECLARE_TRANSLATOR_LISTENER (phrasing_slur);
-
-  void stop_translation_timestep ();
-  virtual void finalize ();
-  void process_music ();
+  DECLARE_ACKNOWLEDGER (slur);
 
 public:
   TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
 };
 
-Phrasing_slur_engraver::Phrasing_slur_engraver ()
+Phrasing_slur_engraver::Phrasing_slur_engraver () :
+  Slur_proto_engraver (0, "PhrasingSlur", "phrasing slur", "phrasing-slur-event")
 {
-  events_[START] = events_[STOP] = 0;
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur);
 void
 Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev)
 {
-  /*
-    Let's not start more than one slur per moment.
-  */
-  Direction d = to_dir (ev->get_property ("span-direction"));
-  if (d == START)
-    events_[START] = ev;
-  else if (d == STOP && !slurs_.empty ())
-    events_[STOP] = ev;
-}
-
-void
-Phrasing_slur_engraver::acknowledge_note_column (Grob_info info)
-{
-  Grob *e = info.grob ();
-  for (vsize i = slurs_.size (); i--;)
-    Slur::add_column (slurs_[i], e);
-  for (vsize i = end_slurs_.size (); i--;)
-    Slur::add_column (end_slurs_[i], e);
-}
-
-void
-Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
-{
-  Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
-}
-
-void
-Phrasing_slur_engraver::acknowledge_accidental (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
-void
-Phrasing_slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
-void
-Phrasing_slur_engraver::acknowledge_fingering (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
-void
-Phrasing_slur_engraver::acknowledge_script (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
-void
-Phrasing_slur_engraver::acknowledge_text_script (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
-void
-Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
-{
-  acknowledge_extra_object (info);
+  internal_listen_slur (ev);
 }
 
 void
@@ -129,54 +59,26 @@ Phrasing_slur_engraver::acknowledge_slur (Grob_info info)
   acknowledge_extra_object (info);
 }
 
-void
-Phrasing_slur_engraver::finalize ()
-{
-  if (slurs_.size ())
-    slurs_[0]->warning (_ ("unterminated phrasing slur"));
-}
-
-void
-Phrasing_slur_engraver::process_music ()
-{
-  if (events_[STOP])
-    {
-      end_slurs_ = slurs_;
-      slurs_.clear ();
-    }
-
-  if (events_[START] && slurs_.empty ())
-    {
-      Stream_event *ev = events_[START];
-
-      Grob *slur = make_spanner ("PhrasingSlur", events_[START]->self_scm ());
-      Direction updown = to_dir (ev->get_property ("direction"));
-      if (updown)
-       set_grob_direction (slur, updown);
-
-      slurs_.push_back (slur);
-    }
-}
-
-void
-Phrasing_slur_engraver::stop_translation_timestep ()
-{
-  end_slurs_.clear ();
-  events_[START] = events_[STOP] = 0;
-}
-
-ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental);
-ADD_ACKNOWLEDGER (Phrasing_slur_engraver, dynamic_line_spanner);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, inline_accidental);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering)
-  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column);
-ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, dots);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script);
-ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
+ADD_END_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number);
 
 ADD_TRANSLATOR (Phrasing_slur_engraver,
-               /* doc */ "Print phrasing slurs. Similar to @ref{Slur_engraver}",
-               /* create */ "PhrasingSlur",
-               /* accept */ "phrasing-slur-event",
-               /* read */ "",
-               /* write */ "");
+                /* doc */
+                "Print phrasing slurs.  Similar to @ref{Slur_engraver}.",
+
+                /* create */
+                "PhrasingSlur ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );