Merge remote-tracking branch 'origin/translation'

[lilypond.git] / Documentation / snippets / broken-crescendo-hairpin.ly

diff --git a/Documentation/snippets/broken-crescendo-hairpin.ly b/Documentation/snippets/broken-crescendo-hairpin.ly
index 0282ffb73153aa63ee1ffc0517ec61ea86b645a5..1515b52fa33484719226a9b74237278c66160d21 100644 (file)
--- a/Documentation/snippets/broken-crescendo-hairpin.ly
+++ b/Documentation/snippets/broken-crescendo-hairpin.ly
@@ -1,70 +1,24 @@
-%% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.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.14.2"
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.19.2
+\version "2.19.2"
 
 \header {
-  lsrtags = "expressive-marks, contemporary-notation, symbols-and-glyphs"
-
-%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
-  texidoces = "
-Para hacer invisibles partes de un regulador de crescendo, se usa
-el método de dibujar un rectángulo blanco encima de la parte
-respectiva del regulador, tapándola.  El rectángulo se define como
-código PostScript dentro de un elemento de marcado de texto.
-
-Para realizar un ajuste fino de la posición y el tamaño del
-elemento de marcado, se puede establecer el número que precede a
-@code{setgray} en la definición de PostScript a un valor menor que
-la unidad, haciendo que sea de color gris.  Los dos números que
-están antes de @code{scale} en el código PostScript son los
-responsables del ancho y la altura del rectángulo, y los dos
-números que están antes de @code{translate} cambian las
-coordenadas X e Y de origen del rectángulo.
-
-Asegúrse de poner el regulador en una capa más baja que el
-elemento de marcado de texto para trazar el rectángulo encima del
-regulador.
-
-"
-  doctitlees = "Regulador interrumpido"
-
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Une portion d'un soufflet de crescendo peut être rendue invisible.
-Il suffit pour cela de dessiner un rectangle par dessus cette partie, ce
-qui aura pour effet de la rendre invisible.  Le rectangle est défini par
-un @emph{markup} contenant du code PostScript.
-
-La taille et le positionnement de ce @emph{markup} sont ajustables grâce
-à certaiins composants du code PostScript@tie{}: le nombre précédant
-@code{setgray} donnera du gris s'il est inérieur à@tie{}1@tie{}; les
-deux nombres précédant @code{scale} définissent la largeur et la hauteur
-du rectangle@tie{}; les deux nombres précédant @code{translate}
-modifient le point d'ancrage (en abscisse et en ordonnée) du rectangle.
-
-Le soufflet doit se trouver à un niveau inférieur à celui du @emph{markup}
-afin que le dessin du rectangle puisse effectivement le recouvrir.
-
-"
-  doctitlefr = "Soufflet de crescendo partiellement interrompu"
+  lsrtags = "contemporary-notation, expressive-marks, symbols-and-glyphs"
 
   texidoc = "
 In order to make parts of a crescendo hairpin invisible, the following
 method is used: A white rectangle is drawn on top of the respective
-part of the crescendo hairpin, making it invisible.  The rectangle is
-defined as postscript code within a text markup.
-
-To fine-tune the position and size of the markup, the number preceding
-@code{setgray} in the postscript definition can be set to a value less
-than one, making it grey.  The two numbers before @code{scale} in the
-postscript code are responsible for the width and height of the
-rectangle, the two numbers before @code{translate} change the x- and
-y-origin of the rectangle.
+part of the crescendo hairpin, making it invisible.
 
+The markup command @code{with-dimensions} tells LilyPond to consider only
+the bottom edge of the rectangle when spacing it against the hairpin.
+The property @code{staff-padding} prevents the rectangle from fitting
+between the hairpin and staff.
 
 Make sure to put the hairpin in a lower layer than the text markup to
 draw the rectangle over the hairpin.
@@ -78,28 +32,19 @@ draw the rectangle over the hairpin.
   <<
     {
       \dynamicUp
-      \override DynamicLineSpanner #'staff-padding = #4
       r2 r16 c'8.\pp r4
     }
     \\
     {
-      \override DynamicLineSpanner #'layer = #0
+      \override DynamicLineSpanner.layer = #0
       des,2\mf\< ~
-      \override TextScript #'layer = #2
-      des16_\markup {
-        \postscript #"
-          1.9 -8 translate
-          5 4 scale
-          1 setgray
-          0 0 moveto
-          0 1 lineto
-          1 1 lineto
-          1 0 lineto
-          0 0 lineto
-          fill"
-      }
-      r8. des4 ~ des16->\sff
+      \override TextScript.layer = #2
+      \once\override TextScript.staff-padding = #6
+      \once\override TextScript.vertical-skylines = #'()
+      des16_\markup \with-dimensions #'(2 . 7) #'(0 . 0)
+                    \with-color #white
+                    \filled-box #'(2 . 7) #'(0 . 2) #0
+      r8. des4 ~ 16->\sff
     }
   >>
 }
-