Merge commit 'origin' into beamlets2

[lilypond.git] / input / lsr / center-text-below-hairpin-dynamics.ly

diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly
index f488e85bfd7590ff7b37edf981a91a3fce3a875b..a88f2aa24b7d111283bd7af1347b059def1582d0 100644 (file)
--- a/input/lsr/center-text-below-hairpin-dynamics.ly
+++ b/input/lsr/center-text-below-hairpin-dynamics.ly
@@ -1,10 +1,8 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.61"
+\version "2.12.0"
 
 \header {
-  lsrtags = "expressive-marks, text"
-
   texidoces = "
 Este ejemplo proporciona una función para tipografiar un regulador
 con texto por debajo, como \"molto\" o \"poco\". El ejemplo
@@ -14,25 +12,28 @@ normalmente un objeto, utilizando código de Scheme.
 "
   doctitlees = "Centrar texto debajo de un regulador"
 
+  lsrtags = "expressive-marks, text"
+
   texidoc = "
 This example provides a function to typeset a hairpin (de)crescendo
 with some additional text below it, such as \"molto\" or \"poco\". The
 example also illustrates how to modify the way an object is normally
-printed, using some Scheme code.  
-
+printed, using some Scheme code.
 "
   doctitle = "Center text below hairpin dynamics"
 } % begin verbatim
-hairpinWithCenteredText = #(define-music-function (parser location text) (markup?)
+
+
+hairpinWithCenteredText =
+#(define-music-function (parser location text) (markup?)
 #{
   \override Voice.Hairpin #'stencil = #(lambda (grob)
-  (ly:stencil-aligned-to
-   (ly:stencil-combine-at-edge
-    (ly:stencil-aligned-to (ly:hairpin::print grob) X CENTER)
-    Y DOWN
-    (ly:stencil-aligned-to (ly:text-interface::print grob) X CENTER))
-   X LEFT))
-  \override Voice.Hairpin #'text = $text
+    (ly:stencil-aligned-to
+     (ly:stencil-combine-at-edge
+      (ly:stencil-aligned-to (ly:hairpin::print grob) X CENTER)
+      Y DOWN
+      (ly:stencil-aligned-to (grob-interpret-markup grob $text) X CENTER))
+     X LEFT))
 #})
 
 hairpinMolto = \hairpinWithCenteredText \markup { \italic molto }