Merge branch 'master' 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 1794c15d60fa4df817aa83351f1e750c207d65c8..5e43ce53338300b6439c4a5bdf407670af011a28 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,13 +1,13 @@
 %% DO NOT EDIT this file manually; it is automatically
 %% DO NOT EDIT this file manually; it is automatically

-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.
 %% 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.18.0"

 
 \header {
 
 \header {

-  lsrtags = "correction-wanted, version-specific, tweaks-and-overrides, expressive-marks"
+  lsrtags = "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}.


@@ -17,16 +17,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
-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.
+dynamic markup...

 
 

-* Shift the dynamic script @code{\\once\\override ... #'X-offset = ..}.
+* 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.
+
+* 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


@@ -41,7 +43,7 @@ dynamic-script.
 
 * Set an explicit alignment inside the dynamic-script. By default, this
 won't have any effect, only if one sets X-offset! Drawback: One needs
 
 * Set an explicit alignment inside the dynamic-script. By default, this
 won't have any effect, only if one sets X-offset! Drawback: One needs

-to set @code{DynamicText #'X-offset}, which will apply to all dynamic
+to set @code{DynamicText.X-offset}, which will apply to all dynamic

 texts! Also, it is aligned at the right edge of the additional text,
 not at the center of pp.
 
 texts! Also, it is aligned at the right edge of the additional text,
 not at the center of pp.
 


@@ -52,10 +54,10 @@ not at the center of pp.
   doctitle = "Horizontally aligning custom dynamics (e.g. \"sempre pp\" \"piu f\" \"subito p\")"
 } % begin verbatim
 
   doctitle = "Horizontally aligning custom dynamics (e.g. \"sempre pp\" \"piu f\" \"subito p\")"
 } % begin verbatim
 

-
-\header { title = "Horizontally aligning custom dynamics" }
-
-\paper { ragged-right = ##f }
+\paper {
+  ragged-right = ##f
+  indent = 2.5\cm
+}

 
 % Solution 1: Using a simple markup with a particular halign value
 % Drawback: It's a markup, not a dynamic command, so \dynamicDown
 
 % Solution 1: Using a simple markup with a particular halign value
 % Drawback: It's a markup, not a dynamic command, so \dynamicDown


@@ -63,7 +65,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


@@ -108,7 +110,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 =


@@ -122,6 +124,7 @@ semppMII =
   \context Staff = "s" <<
     \set Staff.instrumentName = #"Normal"
     \relative c'' {
   \context Staff = "s" <<
     \set Staff.instrumentName = #"Normal"
     \relative c'' {

+      \override Staff.InstrumentName.self-alignment-X = #LEFT

       \key es \major
       c4\pp c\p c c | c\ff c c\pp c
     }
       \key es \major
       c4\pp c\p c c | c\ff c c\pp c
     }


@@ -129,6 +132,7 @@ semppMII =
   \context Staff = "sMarkup" <<
     \set Staff.instrumentName = \markup \column { Normal markup }
     \relative c'' {
   \context Staff = "sMarkup" <<
     \set Staff.instrumentName = \markup \column { Normal markup }
     \relative c'' {

+      \override Staff.InstrumentName.self-alignment-X = #LEFT

       \key es \major
       c4-\semppMarkup c\p c c | c\ff c c-\semppMarkup c
     }
       \key es \major
       c4-\semppMarkup c\p c c | c\ff c c-\semppMarkup c
     }


@@ -136,17 +140,19 @@ semppMII =
   \context Staff = "sK" <<
     \set Staff.instrumentName = \markup \column { Explicit shifting }
     \relative c'' {
   \context Staff = "sK" <<
     \set Staff.instrumentName = \markup \column { Explicit shifting }
     \relative c'' {

+      \override Staff.InstrumentName.self-alignment-X = #LEFT

       \key es \major
       \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
     }
   >>
   \context Staff = "sT" <<
     \set Staff.instrumentName = \markup \column { Right padding }
     \relative c'' {
       c4\semppK c
     }
   >>
   \context Staff = "sT" <<
     \set Staff.instrumentName = \markup \column { Right padding }
     \relative c'' {

+      \override Staff.InstrumentName.self-alignment-X = #LEFT

       \key es \major
       c4\semppT c\p c c | c\ff c c\semppT c
     }
       \key es \major
       c4\semppT c\p c c | c\ff c c\semppT c
     }


@@ -154,6 +160,7 @@ semppMII =
   \context Staff = "sM" <<
     \set Staff.instrumentName = \markup \column { Setting dimension "to zero" }
     \relative c'' {
   \context Staff = "sM" <<
     \set Staff.instrumentName = \markup \column { Setting dimension "to zero" }
     \relative c'' {

+      \override Staff.InstrumentName.self-alignment-X = #LEFT

       \key es \major
       c4\semppM c\p c c | c\ff c c\semppM c
     }
       \key es \major
       c4\semppM c\p c c | c\ff c c\semppM c
     }


@@ -161,6 +168,7 @@ semppMII =
   \context Staff = "sG" <<
     \set Staff.instrumentName = \markup \column { Shifting inside dynamics }
     \relative c'' {
   \context Staff = "sG" <<
     \set Staff.instrumentName = \markup \column { Shifting inside dynamics }
     \relative c'' {

+      \override Staff.InstrumentName.self-alignment-X = #LEFT

       \key es \major
       c4\semppG c\p c c | c\ff c c\semppG c
     }
       \key es \major
       c4\semppG c\p c c | c\ff c c\semppG c
     }


@@ -168,11 +176,11 @@ semppMII =
   \context Staff = "sMII" <<
     \set Staff.instrumentName = \markup \column { Alignment inside dynamics }
     \relative c'' {
   \context Staff = "sMII" <<
     \set Staff.instrumentName = \markup \column { Alignment inside dynamics }
     \relative c'' {

+      \override Staff.InstrumentName.self-alignment-X = #LEFT

       \key es \major
       % Setting to ##f (false) gives the same result
       \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
     }
   >>
 >>

-