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 99495e22a92c4c8d35014c93d30b47ec07adcd6d..a88f2aa24b7d111283bd7af1347b059def1582d0 100644 (file)
--- a/input/lsr/center-text-below-hairpin-dynamics.ly
+++ b/input/lsr/center-text-below-hairpin-dynamics.ly
@@ -1,35 +1,47 @@
-%% 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.38"
+\version "2.12.0"
 
 \header {
+  texidoces = "
+Este ejemplo proporciona una función para tipografiar un regulador
+con texto por debajo, como \"molto\" o \"poco\". El ejemplo
+ilustra también cómo modificar la manera en que se imprime
+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" }
-hairpinMore = \hairpinWithCenteredText \markup { \bigger "moltissimo" }
+hairpinMolto = \hairpinWithCenteredText \markup { \italic molto }
+hairpinMore = \hairpinWithCenteredText \markup { \larger moltissimo }
+
+\layout { ragged-right = ##f }
 
 {
-  \hairpinMolto c'2\< c'2\f
-  \hairpinMore  c'2\< c'2\f
+  \hairpinMolto c'2\< c'\f
+  \hairpinMore  c'2\< c'\f
 }