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 724062ec24ee2f49b59fe4f0bb5d98bad83c642c..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,14 +1,13 @@
-% 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
-\version "2.17.6"
+%% DO NOT EDIT this file manually; it is automatically
+%% 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.
+\version "2.18.0"
 
 \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}.
@@ -23,13 +22,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
@@ -44,17 +43,21 @@ 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.
+
+
+
+
 "
   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
@@ -121,6 +124,7 @@ semppMII =
   \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
     }
@@ -128,6 +132,7 @@ semppMII =
   \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
     }
@@ -135,6 +140,7 @@ semppMII =
   \context Staff = "sK" <<
     \set Staff.instrumentName = \markup \column { Explicit shifting }
     \relative c'' {
+      \override Staff.InstrumentName.self-alignment-X = #LEFT
       \key es \major
       \once \override DynamicText.X-offset = #-9.2
       c4\semppK c\p c c
@@ -146,6 +152,7 @@ semppMII =
   \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
     }
@@ -153,6 +160,7 @@ semppMII =
   \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
     }
@@ -160,6 +168,7 @@ semppMII =
   \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
     }
@@ -167,6 +176,7 @@ semppMII =
   \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
       \override DynamicText.X-offset = #0