X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fhorizontally-aligning-custom-dynamics-e.g.-sempre-pp%2C-piu-f%2C-subito-p.ly;h=b515ee328279c9894bd436a52f41de9208266815;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=b336b35caf5dd57ff28804e2c7bab586698813ed;hpb=e797772ef677c797c169b7096a28f6a5959353ef;p=lilypond.git

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 b336b35caf..b515ee3282 100644
--- 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,17 +4,11 @@
 % 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.
-\version "2.17.6"
+%% Note: this file works from version 2.19.56
+\version "2.19.56"
 
 \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}.
@@ -29,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...
 
-* 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
@@ -50,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
-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.
 
@@ -61,11 +55,11 @@ not at the center of pp.
   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
@@ -128,23 +122,27 @@ semppMII =
                   #: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
     }
   >>
-  \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
     }
   >>
-  \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
@@ -154,29 +152,37 @@ semppMII =
       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
     }
   >>
-  \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
     }
   >>
-  \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
     }
   >>
-  \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
@@ -185,3 +191,5 @@ semppMII =
     }
   >>
 >>
+
+\layout { \override Staff.InstrumentName.self-alignment-X = #LEFT }