Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / Documentation / snippets / horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly

diff --git a/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly b/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
index d55e49707cf8b86c83e048b6ef3530795d41ac9d..b336b35caf5dd57ff28804e2c7bab586698813ed 100644 (file)
--- a/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
+++ b/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
@@ -1,60 +1,20 @@
+% 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.17.6

 %% 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.
 %% 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"
+\version "2.17.6"

 
 \header {
 
 \header {

-  lsrtags = "expressive-marks, tweaks-and-overrides, correction-wanted, version-specific"
-
-%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
-  texidocfr = "
-Certaines indication de nuance requièrent un complément textuel, comme
-« sempre pp ».  Dans la mesure où les nuances sont habituellement
-centrées sous la note, le @emph{pp} se trouvera repoussé loin après la
-note à laquelle il s'applique.
-
-Différentes approches permettent de correctement aligner horizontalement
-ce « sempre pp » :
-
--- Un simple @code{\\once \\override DynamicText #'X-offset = #-9.2}
-   avant la note considérée de telle sorte que la nuance soit décalée
-   manuellement à la bonne place.  Inconvénient : il faut le faire
-   manuellement à chaque fois qu'intervient ce @emph{markup}.
-
--- L'intégration d'un rembourrage (@code{#:hspace 7.1}) à la définition
-   de cette nuance personnalisée afin qu'une fois centrée par lilypond
-   elle soit correctement alignée.  Inconvénient : le rembourrage
-   occupera exactement cet espace et ne permettra à aucun autre
-   @emph{markup} ou nuance d'apparaître à cet endroit.
-
--- L'application d'un décalage au script de nuance
-   @code{\\once \\override @dots{} #'X-offset = @dots{}}.
-   Inconvénient : là aussi il faut le faire à chaque fois.
-
--- L'attribution arbitraire d'une dimension à 0 du texte additionnel à
-   l'aide d'un @code{#:with-dimensions '(0 . 0) '(0 . 0)}.
-   Inconvénient : lilypond considère que « sempre » n'occupe pas
-   d'espace, et donc pourra mettre à cet endroit d'autres éléments, ce
-   qui pourrait générer des collisions qui ne seront pas détectées par
-   les routines @emph{ad hoc}.  D'autre part, il semble persister un
-   espacement, ce qui laisse l'impression d'un alignement différent en
-   l'absence de texte additionnel.
-
--- L'ajout, explicite, du décalage directement dans la fonction Scheme
-   du script de nuance.
-
--- La définition d'un alignement explicite au sein du script de nuance.
-   Ceci ne sera suivi d'effet, par défaut, qu'en jouant sur
-   @code{X-offset}.  Inconvénient : il faut définir
-   @code{DynamicText #'X-offset}, ce qui s'appliquera à toutes les
-   nuances textuelles.  Par ailleurs, l'alignement sera réalisé sur le
-   bord droit du texte additionnel, non sur le milieu de @emph{pp}.
-
-"
-  doctitlefr = "Alignement de nuances personnalisées comme \"sempre pp\" \"più f\" \"subito p\""
+  lsrtags = "correction-wanted, expressive-marks, tweaks-and-overrides, version-specific"

 
   texidoc = "
 Some dynamic expressions involve additional text, like @qq{sempre pp}.
 
   texidoc = "
 Some dynamic expressions involve additional text, like @qq{sempre pp}.


@@ -64,16 +24,18 @@ displayed way after the note it applies to.
 To correctly align the @qq{sempre pp} horizontally, so that it is
 aligned as if it were only the \\pp, there are several approaches:
 
 To correctly align the @qq{sempre pp} horizontally, so that it is
 aligned as if it were only the \\pp, there are several approaches:
 

-* Simply use @code{\\once\\override DynamicText #'X-offset = #-9.2}
+* Simply use @code{\\once\\override DynamicText.X-offset = #-9.2}

 before the note with the dynamics to manually shift it to the correct
 position. Drawback: This has to be done manually each time you use that
 before the note with the dynamics to manually shift it to the correct
 position. Drawback: This has to be done manually each time you use that

-dynamic markup... * Add some padding (@code{#:hspace 7.1}) into the
+dynamic markup...
+
+* Add some padding (@code{#:hspace 7.1}) into the

 definition of your custom dynamic mark, so that after lilypond
 center-aligns it, it is already correctly aligned. Drawback: The
 padding really takes up that space and does not allow any other markup
 or dynamics to be shown in that position.
 
 definition of your custom dynamic mark, so that after lilypond
 center-aligns it, it is already correctly aligned. Drawback: The
 padding really takes up that space and does not allow any other markup
 or dynamics to be shown in that position.
 

-* Shift the dynamic script @code{\\once\\override ... #'X-offset = ..}.
+* Shift the dynamic script @code{\\once\\override ...X-offset = ..}.

 Drawback: @code{\\once\\override} is needed for every invocation!
 
 * Set the dimensions of the additional text to 0 (using
 Drawback: @code{\\once\\override} is needed for every invocation!
 
 * Set the dimensions of the additional text to 0 (using


@@ -100,7 +62,8 @@ not at the center of pp.
 } % begin verbatim
 
 
 } % begin verbatim
 
 

-\header { title = "Horizontally aligning custom dynamics" }
+\header { title = "Horizontally aligning custom dynamics" } % begin verbatim
+

 
 \paper { ragged-right = ##f }
 
 
 \paper { ragged-right = ##f }
 


@@ -110,7 +73,7 @@ not at the center of pp.
 semppMarkup = \markup { \halign #1.4 \italic "sempre" \dynamic "pp" }
 
 % Solution 2: Using a dynamic script & shifting with
 semppMarkup = \markup { \halign #1.4 \italic "sempre" \dynamic "pp" }
 
 % Solution 2: Using a dynamic script & shifting with

-%             \once \override ... #'X-offset = ..
+%             \once \override ...X-offset = ..

 % Drawback: \once \override needed for every invocation
 semppK =
 #(make-dynamic-script
 % Drawback: \once \override needed for every invocation
 semppK =
 #(make-dynamic-script


@@ -155,7 +118,7 @@ semppG =
 
 % Solution 6: Dynamic with explicit alignment. This has only effect
 %             if one sets X-offset!
 
 % Solution 6: Dynamic with explicit alignment. This has only effect
 %             if one sets X-offset!

-% Drawback: One needs to set DynamicText #'X-offset!
+% Drawback: One needs to set DynamicText.X-offset!

 % Drawback: Aligned at the right edge of the additional text,
 %           not at the center of pp
 semppMII =
 % Drawback: Aligned at the right edge of the additional text,
 %           not at the center of pp
 semppMII =


@@ -184,10 +147,10 @@ semppMII =
     \set Staff.instrumentName = \markup \column { Explicit shifting }
     \relative c'' {
       \key es \major
     \set Staff.instrumentName = \markup \column { Explicit shifting }
     \relative c'' {
       \key es \major

-      \once \override DynamicText #'X-offset = #-9.2
+      \once \override DynamicText.X-offset = #-9.2

       c4\semppK c\p c c
       c4\ff c
       c4\semppK c\p c c
       c4\ff c

-      \once \override DynamicText #'X-offset = #-9.2
+      \once \override DynamicText.X-offset = #-9.2

       c4\semppK c
     }
   >>
       c4\semppK c
     }
   >>


@@ -217,9 +180,8 @@ semppMII =
     \relative c'' {
       \key es \major
       % Setting to ##f (false) gives the same result
     \relative c'' {
       \key es \major
       % Setting to ##f (false) gives the same result

-      \override DynamicText #'X-offset = #0
+      \override DynamicText.X-offset = #0

       c4\semppMII c\p c c | c\ff c c\semppMII c
     }
   >>
 >>
       c4\semppMII c\p c c | c\ff c c\semppMII c
     }
   >>
 >>

-