Fix 1805: Ignore AmbitusAccidental in slur/phrasing slur engraving

Slurs and Phrasing slurs don't need to listen for ambitus accidentals,
so instead of acklowledging the accidental interface, we are only
acknowleding inline-accidental.

diff --git a/input/regression/ambitus-slur.ly b/input/regression/ambitus-slur.ly
new file mode 100644 (file)
index 0000000..0cc3084
--- /dev/null
+++ b/input/regression/ambitus-slur.ly
@@ -0,0 +1,12 @@
+\version "2.14.1"
+\header {
+  texidoc = "Ambitus accidentals (whether present or not) are ignored by the
+slur engravers.
+" 
+}
+
+\score {
+  \new Voice \with { \consists Ambitus_engraver } {
+    c'4( es')
+  }
+}
\ No newline at end of file

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 8882a64285253be9380eeed6dd1961ddaeab1f44..6a1caedb01b124821534ccae8681049fc68510cd 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -55,7 +55,7 @@ class Phrasing_slur_engraver : public Engraver
 
 protected:
   DECLARE_TRANSLATOR_LISTENER (phrasing_slur);
-  DECLARE_ACKNOWLEDGER (accidental);
+  DECLARE_ACKNOWLEDGER (inline_accidental);
   DECLARE_ACKNOWLEDGER (fingering);
   DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_ACKNOWLEDGER (slur);
@@ -108,7 +108,7 @@ Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
 }
 
 void
-Phrasing_slur_engraver::acknowledge_accidental (Grob_info info)
+Phrasing_slur_engraver::acknowledge_inline_accidental (Grob_info info)
 {
   acknowledge_extra_object (info);
 }
@@ -219,7 +219,7 @@ Phrasing_slur_engraver::stop_translation_timestep ()
   objects_to_acknowledge_.clear ();
 }
 
-ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental);
+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, slur);

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index bd1a90a07b2494507e77505fabcc10f8dceb1898..96d22cd759c001f6eff7acb97c54f1ade52fe5a0 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -57,7 +57,7 @@ class Slur_engraver : public Engraver
 
 protected:
   DECLARE_TRANSLATOR_LISTENER (slur);
-  DECLARE_ACKNOWLEDGER (accidental);
+  DECLARE_ACKNOWLEDGER (inline_accidental);
   DECLARE_ACKNOWLEDGER (fingering);
   DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_ACKNOWLEDGER (script);
@@ -115,7 +115,7 @@ Slur_engraver::acknowledge_extra_object (Grob_info info)
 }
 
 void
-Slur_engraver::acknowledge_accidental (Grob_info info)
+Slur_engraver::acknowledge_inline_accidental (Grob_info info)
 {
   acknowledge_extra_object (info);
 }
@@ -253,7 +253,7 @@ Slur_engraver::stop_translation_timestep ()
   stop_events_.clear ();
 }
 
-ADD_ACKNOWLEDGER (Slur_engraver, accidental);
+ADD_ACKNOWLEDGER (Slur_engraver, inline_accidental);
 ADD_ACKNOWLEDGER (Slur_engraver, fingering);
 ADD_ACKNOWLEDGER (Slur_engraver, note_column);
 ADD_ACKNOWLEDGER (Slur_engraver, script);