Merge branch 'master' into dev/texi2html

[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 e427bfcfa97a51efe091945fe200bf7e98550621..b4ad8130331e542959829935d80fd1026fe28d42 100644 (file)
--- a/input/lsr/center-text-below-hairpin-dynamics.ly
+++ b/input/lsr/center-text-below-hairpin-dynamics.ly
@@ -1,37 +1,37 @@
 %% 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.38"
+\version "2.11.51"
 
 \header {
   lsrtags = "expressive-marks, text"
- texidoc = "
-This example provides a function to typeset hairpin (de)crescendo with
-some additional text below it, such as \"molto\" or \"poco\". 
 
-The example also illustrates how to use modify the way an object
-normally is printed, using some Scheme code.  
-" }
-% begin verbatim
-hairpinWithCenteredText = #(define-music-function
-                          (parser location text) (markup?)
+  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.  
+
+"
+  doctitle = "Center text below hairpin dynamics"
+} % begin verbatim
+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
+  \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
 #})
 
+hairpinMolto = \hairpinWithCenteredText \markup { \italic molto }
+hairpinMore = \hairpinWithCenteredText \markup { \bigger moltissimo }
 
-hairpinMolto = \hairpinWithCenteredText \markup {\italic "molto"}
-hairpinMore  = \hairpinWithCenteredText \markup {\bigger "moltissimo"}
+\layout { ragged-right = ##f }
 
-\new Staff {
-   \hairpinMolto c'2\< c'2\f
-   \hairpinMore  c'2\< c'2\f
+{
+  \hairpinMolto c'2\< c'\f
+  \hairpinMore  c'2\< c'\f
 }
-