From: Neil Puttock <n.puttock@gmail.com>
Date: Mon, 1 Sep 2008 21:59:33 +0000 (+0100)
Subject: Phrasing_slur_engraver: acknowledge tuplet numbers.
X-Git-Tag: release/2.11.58-1~32^2~6^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a9ee43182d40d81de2bedc996eb925d795834858;p=lilypond.git

Phrasing_slur_engraver: acknowledge tuplet numbers.
---

diff --git a/input/regression/phrasing-slur-tuplet.ly b/input/regression/phrasing-slur-tuplet.ly
new file mode 100644
index 0000000000..8d017f4c5f
--- /dev/null
+++ b/input/regression/phrasing-slur-tuplet.ly
@@ -0,0 +1,13 @@
+\version "2.11.58"
+
+\header {
+  texidoc = "Phrasing slurs do not collide with tuplet numbers."
+}
+
+\relative c'' {
+  \voiceOne
+  \times 2/3 {
+    c8\( b c
+  }
+  a2.\)
+}
diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index b0ef2b2d74..b0e5b1d210 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -50,6 +50,7 @@ protected:
   DECLARE_ACKNOWLEDGER (script);
   DECLARE_ACKNOWLEDGER (text_script);
   DECLARE_ACKNOWLEDGER (tie);
+  DECLARE_ACKNOWLEDGER (tuplet_number);
   DECLARE_TRANSLATOR_LISTENER (phrasing_slur);
 
   void stop_translation_timestep ();
@@ -126,6 +127,12 @@ Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
   acknowledge_extra_object (info);
 }
 
+void
+Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
 void
 Phrasing_slur_engraver::acknowledge_slur (Grob_info info)
 {
@@ -175,6 +182,7 @@ ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number);
 
 ADD_TRANSLATOR (Phrasing_slur_engraver,
 		/* doc */