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

[lilypond.git] / Documentation / snippets / flute-slap-notation.ly

diff --git a/Documentation/snippets/flute-slap-notation.ly b/Documentation/snippets/flute-slap-notation.ly
index 9fd9d70d5bca807c24e34162b8224270e94e8437..c9ee89ee72b241e0b1f0c2a7521563c163ef3d67 100644 (file)
--- a/Documentation/snippets/flute-slap-notation.ly
+++ b/Documentation/snippets/flute-slap-notation.ly
@@ -1,10 +1,13 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
-\version "2.13.20"
+\version "2.18.0"
 
 \header {
-  lsrtags = "winds"
+  lsrtags = "contemporary-notation, winds"
 
   texidoc = "
 It is possible to indicate special articulation techniques such as a
@@ -18,20 +21,25 @@ glyph.
 slap =
 #(define-music-function (parser location music) (ly:music?)
 #{
-  \override NoteHead #'stencil =
-    #(lambda (grob)
-       (grob-interpret-markup grob
-        (markup #:musicglyph "scripts.sforzato")))
-  \override NoteHead #'stem-attachment =
-    #(lambda (grob)
-       (let ((thickness (ly:staff-symbol-line-thickness grob)))
-         (cons 1 (/ thickness 2))))
+  \override NoteHead.stencil =
+  #(lambda (grob)
+     (grob-interpret-markup grob
+      (markup #:musicglyph "scripts.sforzato")))
+  \override NoteHead.stem-attachment =
+  #(lambda (grob)
+     (let* ((thickness (ly:staff-symbol-line-thickness grob))
+            (stem (ly:grob-object grob 'stem))
+            (dir (ly:grob-property stem 'direction UP)))
+       (cons 1 (+ (if (= dir DOWN)
+                      0.5
+                      0)
+                  (/ thickness 2)))))
   $music
-  \revert NoteHead #'stencil
-  \revert NoteHead #'stem-attachment
+  \revert NoteHead.stencil
+  \revert NoteHead.stem-attachment
 #})
 
 \relative c' {
-  c4 \slap c d r \slap { g a } b r
+  c4 \slap c d r
+  \slap { g4 a } b r
 }
-