X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Flsr%2Fmarking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly;h=800d93b97477b7c07f4385e3462d245f679a2436;hb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;hp=8002e477d626177251d6ab312af6dcd362140545;hpb=8e48439b49807222074336a77e1b9873fd8e767f;p=lilypond.git

diff --git a/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
index 8002e477d6..800d93b974 100644
--- a/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+++ b/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
@@ -1,30 +1,33 @@
-%% Do not edit this file; it is auto-generated from input/new
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.62"
+\version "2.12.3"
 
 \header {
   lsrtags = "editorial-annotations, vocal-music"
 
   texidoc = "
-This example shows how to put crosses on stems. Mark the beginning
-of a spoken section with the @code{\\speakOn} keyword, and end it
-with the @code{\\speakOff} keyword.  Remember to end cross sections
-before entering any rest: this function also adds crosses to the
-invisible stems of rests.
+This example shows how to put crosses on stems.  Mark the beginning of
+a spoken section with the @code{\\speakOn} keyword, and end it with the
+@code{\\speakOff} keyword.
+
 "
   doctitle = "Marking notes of spoken parts with a cross on the stem"
 } % begin verbatim
 
 speakOn = {
   \override Stem #'stencil = #(lambda (grob)
-  (ly:stencil-combine-at-edge
-    (ly:stem::print grob)
-    Y
-    (- (ly:grob-property grob 'direction))
-    (grob-interpret-markup grob
-      (markup #:hspace -1.025 #:fontsize -4
-        #:musicglyph "noteheads.s2cross"))
-    -2.3 0))
+    (let* ((x-parent (ly:grob-parent grob X))
+           (is-rest? (ly:grob? (ly:grob-object x-parent 'rest))))
+      (if is-rest?
+        empty-stencil
+        (ly:stencil-combine-at-edge
+          (ly:stem::print grob)
+          Y
+          (- (ly:grob-property grob 'direction))
+          (grob-interpret-markup grob
+            (markup #:hspace -1.025 #:fontsize -4
+              #:musicglyph "noteheads.s2cross"))
+          -2.3 0))))
 }
 
 speakOff = {
@@ -43,3 +46,4 @@ speakOff = {
     }
   }
 }
+