Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(2350)

Unified Diff: lily/phrasing-slur-engraver.cc

Issue 302020043: Fold Slur_proto_engraver into Slur_engraver
Patch Set: Rebase on current master Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lily/new-fingering-engraver.cc ('k') | lily/slur-engraver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lily/phrasing-slur-engraver.cc
diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index fa402ef48a05fe1fa0b7930a86c86da539241921..cdb50cd9c4f51a3ad20d3c48c72f00d1d33ba434 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -17,48 +17,64 @@
along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "engraver.hh"
-
-#include "context.hh"
-#include "directional-element-interface.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 "slur-engraver.hh"
#include "translator.icc"
-class Phrasing_slur_engraver : public Slur_proto_engraver
+class Phrasing_slur_engraver : public Slur_engraver
{
+ virtual SCM event_symbol () const;
+ virtual bool double_property () const;
+ virtual SCM grob_symbol () const;
+ virtual const char* object_name () const;
+ virtual void set_melisma (bool);
+
protected:
void listen_phrasing_slur (Stream_event *);
void acknowledge_slur (Grob_info);
public:
- SCM event_symbol ();
TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
- TRANSLATOR_INHERIT (Slur_proto_engraver);
+ TRANSLATOR_INHERIT (Slur_engraver);
};
-Phrasing_slur_engraver::Phrasing_slur_engraver () :
- Slur_proto_engraver (0, "PhrasingSlur", "phrasing slur", "phrasing-slur-event")
+SCM
+Phrasing_slur_engraver::event_symbol () const
{
+ return ly_symbol2scm ("phrasing-slur-event");
+}
+
+bool
+Phrasing_slur_engraver::double_property () const
+{
+ return false;
}
SCM
-Phrasing_slur_engraver::event_symbol ()
+Phrasing_slur_engraver::grob_symbol () const
+{
+ return ly_symbol2scm ("PhrasingSlur");
+}
+
+const char *
+Phrasing_slur_engraver::object_name () const
+{
+ return "phrasing slur";
+}
+
+Phrasing_slur_engraver::Phrasing_slur_engraver ()
+{
+}
+
+void
+Phrasing_slur_engraver::set_melisma (bool)
{
- // Need a string constant for memoization
- return ly_symbol2scm ("phrasing-slur-event");
}
void
Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev)
{
- Slur_proto_engraver::listen_slur (ev);
+ Slur_engraver::listen_slur (ev);
}
void
« no previous file with comments | « lily/new-fingering-engraver.cc ('k') | lily/slur-engraver.cc » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b