trill-pitch-engraver: acknowledge stems and flags; issue 3465

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index ef49b217d14ff2f2dad2fc79afa604c25a9a675f..c2a02e71d9e213a2db91bb409955a5f7e5277bec 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -38,6 +38,8 @@ public:
 protected:
   DECLARE_ACKNOWLEDGER (note_head);
   DECLARE_ACKNOWLEDGER (dots);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (flag);
   DECLARE_ACKNOWLEDGER (trill_spanner);
   void stop_translation_timestep ();
 
@@ -64,6 +66,16 @@ Pitched_trill_engraver::acknowledge_dots (Grob_info info)
   heads_.push_back (info.grob ());
 }
 void
+Pitched_trill_engraver::acknowledge_stem (Grob_info info)
+{
+  heads_.push_back (info.grob ());
+}
+void
+Pitched_trill_engraver::acknowledge_flag (Grob_info info)
+{
+  heads_.push_back (info.grob ());
+}
+void
 Pitched_trill_engraver::acknowledge_note_head (Grob_info info)
 {
   heads_.push_back (info.grob ());
@@ -159,6 +171,8 @@ Pitched_trill_engraver::stop_translation_timestep ()
 
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head);
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots);
+ADD_ACKNOWLEDGER (Pitched_trill_engraver, stem);
+ADD_ACKNOWLEDGER (Pitched_trill_engraver, flag);
 ADD_ACKNOWLEDGER (Pitched_trill_engraver, trill_spanner);
 
 ADD_TRANSLATOR (Pitched_trill_engraver,

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index e2b9e6acd71ae30503899413a3b3c923fd45b478..86bf7c15a931d0b045cf088f3b8b8a015c99dc7f 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2505,7 +2505,9 @@
         (side-axis . ,X)
         (stencil . ,parenthesize-elements)
         (stencils . ,parentheses-item::calc-parenthesis-stencils)
-        (X-offset . ,ly:side-position-interface::x-aligned-side)
+        ;; offset a bit to the right, further if needed to clear the main note
+        (X-offset . ,(lambda (grob)
+                       (ly:side-position-interface::x-aligned-side grob 2.5)))
         (Y-extent . ,grob::always-Y-extent-from-stencil)
         (meta . ((class . Item)
                  (interfaces . (axis-group-interface