Issue 5099 Fix format in input/regression/scheme-engraver.ly

[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 5a57a7a743795a4ff42fd4b41f832d68d0ec270b..b515ee328279c9894bd436a52f41de9208266815 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
@@ -4,10 +4,11 @@
 % and then run scripts/auxiliar/makelsr.py
 %
 % This file is in the public domain.
 % and then run scripts/auxiliar/makelsr.py
 %
 % This file is in the public domain.

-\version "2.17.6"
+%% Note: this file works from version 2.19.56
+\version "2.19.56"

 
 \header {
 
 \header {

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


@@ -22,13 +23,13 @@ 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...
 
 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.
+* 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 = ..}.
+* 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


@@ -43,7 +44,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.
 


@@ -54,11 +55,11 @@ 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
 

+\paper {
+  ragged-right = ##f
+  indent = 2.5\cm
+} % begin verbatim

 
 

-\header { title = "Horizontally aligning custom dynamics" } % begin verbatim
-
-
-\paper { ragged-right = ##f }

 
 % 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


@@ -121,23 +122,27 @@ semppMII =
                   #:italic "sempre"
                   #:dynamic "pp")))
 
                   #:italic "sempre"
                   #:dynamic "pp")))
 

-\context StaffGroup <<
-  \context Staff = "s" <<
-    \set Staff.instrumentName = #"Normal"
+\new StaffGroup <<
+  \new Staff = "s" \with { instrumentName = \markup \column { Normal } }
+  <<

     \relative c'' {
       \key es \major
       c4\pp c\p c c | c\ff c c\pp c
     }
   >>
     \relative c'' {
       \key es \major
       c4\pp c\p c c | c\ff c c\pp c
     }
   >>

-  \context Staff = "sMarkup" <<
-    \set Staff.instrumentName = \markup \column { Normal markup }
+  \new Staff = "sMarkup" \with {
+    instrumentName = \markup \column { Normal markup }
+  }
+  <<

     \relative c'' {
       \key es \major
       c4-\semppMarkup c\p c c | c\ff c c-\semppMarkup c
     }
   >>
     \relative c'' {
       \key es \major
       c4-\semppMarkup c\p c c | c\ff c c-\semppMarkup c
     }
   >>

-  \context Staff = "sK" <<
-    \set Staff.instrumentName = \markup \column { Explicit shifting }
+  \new Staff = "sK" \with {
+    instrumentName = \markup \column { Explicit shifting }
+  }
+  <<

     \relative c'' {
       \key es \major
       \once \override DynamicText.X-offset = #-9.2
     \relative c'' {
       \key es \major
       \once \override DynamicText.X-offset = #-9.2


@@ -147,29 +152,37 @@ semppMII =
       c4\semppK c
     }
   >>
       c4\semppK c
     }
   >>

-  \context Staff = "sT" <<
-    \set Staff.instrumentName = \markup \column { Right padding }
+  \new Staff = "sT" \with {
+    instrumentName = \markup \column { Right padding }
+  }
+  <<

     \relative c'' {
       \key es \major
       c4\semppT c\p c c | c\ff c c\semppT c
     }
   >>
     \relative c'' {
       \key es \major
       c4\semppT c\p c c | c\ff c c\semppT c
     }
   >>

-  \context Staff = "sM" <<
-    \set Staff.instrumentName = \markup \column { Setting dimension "to zero" }
+  \new Staff = "sM" \with {
+    instrumentName = \markup \column { Set dimension "to zero" }
+  }
+  <<

     \relative c'' {
       \key es \major
       c4\semppM c\p c c | c\ff c c\semppM c
     }
   >>
     \relative c'' {
       \key es \major
       c4\semppM c\p c c | c\ff c c\semppM c
     }
   >>

-  \context Staff = "sG" <<
-    \set Staff.instrumentName = \markup \column { Shifting inside dynamics }
+  \new Staff = "sG" \with {
+    instrumentName = \markup \column { Shift inside dynamics}
+  }
+  <<

     \relative c'' {
       \key es \major
       c4\semppG c\p c c | c\ff c c\semppG c
     }
   >>
     \relative c'' {
       \key es \major
       c4\semppG c\p c c | c\ff c c\semppG c
     }
   >>

-  \context Staff = "sMII" <<
-    \set Staff.instrumentName = \markup \column { Alignment inside dynamics }
+  \new Staff = "sMII" \with {
+    instrumentName = \markup \column { Alignment inside dynamics }
+  }
+  <<

     \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


@@ -178,3 +191,5 @@ semppMII =
     }
   >>
 >>
     }
   >>
 >>

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