Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / snippets / marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly

diff --git a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
index 18b52b36a6e13c582eb85d9ba7a431a4b1904766..a836fd38d17f4eccc3637fcd9fcc8ce14b31744a 100644 (file)
--- a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+++ b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.17.6"
 
 \header {
-  lsrtags = "editorial-annotations, vocal-music"
+  lsrtags = "contemporary-notation, editorial-annotations, vocal-music, workaround"
 
   texidoc = "
 This example shows how to put crosses on stems.  Mark the beginning of
@@ -18,8 +18,9 @@ a spoken section with the @code{\\speakOn} keyword, and end it with the
   doctitle = "Marking notes of spoken parts with a cross on the stem"
 } % begin verbatim
 
+
 speakOn = {
-  \override Stem #'stencil =
+  \override Stem.stencil =
     #(lambda (grob)
        (let* ((x-parent (ly:grob-parent grob X))
               (is-rest? (ly:grob? (ly:grob-object x-parent 'rest))))
@@ -30,13 +31,14 @@ speakOn = {
               Y
               (- (ly:grob-property grob 'direction))
               (grob-interpret-markup grob
-                                    (markup #:center-align #:fontsize -4
-                                            #:musicglyph "noteheads.s2cross"))
-              -2.3 0))))
+                                     (markup #:center-align #:fontsize -4
+                                             #:musicglyph "noteheads.s2cross"))
+              -2.3))))
 }
 
 speakOff = {
-  \revert Stem #'stencil
+  \revert Stem.stencil
+  \revert Flag.stencil
 }
 
 \score {
@@ -51,4 +53,3 @@ speakOff = {
     }
   }
 }
-