Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / snippets / positioning-segno-and-coda-with-line-break.ly

diff --git a/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly b/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
index 047238c2a4d01ba5fe697b80b10784d193d350b3..9444c97a141d60e48c87480bc53fdf2424caac13 100644 (file)
--- a/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
+++ b/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
@@ -1,10 +1,10 @@
 %% 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.
-\version "2.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "breaks, repeats, symbols-and-glyphs, workaround"
@@ -30,14 +30,14 @@ line.
     }
 
     % Set segno sign as rehearsal mark and adjust size if needed
-    % \once \override Score.RehearsalMark #'font-size = #3
+    % \once \override Score.RehearsalMark.font-size = #3
     \mark \markup { \musicglyph #"scripts.segno" }
     \repeat unfold 2 {
       c4 c c c
     }
 
     % Set coda sign as rehearsal mark and adjust size if needed
-    \once \override Score.RehearsalMark #'font-size = #4
+    \once \override Score.RehearsalMark.font-size = #4
     \mark \markup { \musicglyph #"scripts.coda" }
     \repeat unfold 2 {
       c4 c c c
@@ -51,27 +51,27 @@ line.
     \bar "||"
 
     % Set segno sign as rehearsal mark and adjust size if needed
-    \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
-    % \once \override Score.RehearsalMark #'font-size = #3
+    \once \override Score.RehearsalMark.break-visibility = #begin-of-line-invisible
+    % \once \override Score.RehearsalMark.font-size = #3
     \mark \markup { \musicglyph #"scripts.segno" }
 
     % Here begins the trickery!
     % \cadenzaOn will suppress the bar count and \stopStaff removes the staff lines.
     \cadenzaOn
-      \stopStaff
+    \stopStaff
         % Some examples of possible text-displays
 
         % text line-aligned
         % ==================
         % Move text to the desired position
-        % \once \override TextScript #'extra-offset = #'( 2 . -3.5 )
-        % | s1*0^\markup { D.S. al Coda } }
+        % \once \override TextScript.extra-offset = #'( 2 . -3.5 )
+        % | <>^\markup { D.S. al Coda } }
 
         % text center-aligned
         % ====================
         % Move text to the desired position
-        % \once \override TextScript #'extra-offset = #'( 6 . -5.0 )
-        % | s1*0^\markup { \center-column { D.S. "al Coda" } }
+        % \once \override TextScript.extra-offset = #'( 6 . -5.0 )
+        % | <>^\markup { \center-column { D.S. "al Coda" } }
 
         % text and symbols center-aligned
         % ===============================
@@ -80,8 +80,8 @@ line.
           s1
           \bar ""
         }
-        \once \override TextScript #'extra-offset = #'( 0 . -3.0 )
-        \once \override TextScript #'word-space = #1.5
+        \once \override TextScript.extra-offset = #'( 0 . -3.0 )
+        \once \override TextScript.word-space = #1.5
         <>^\markup { \center-column { "D.S. al Coda" \line { \musicglyph #"scripts.coda" \musicglyph #"scripts.tenuto" \musicglyph #"scripts.coda"} } }
 
         % Increasing the unfold counter will expand the staff-free space
@@ -90,33 +90,33 @@ line.
           \bar ""
         }
         % Resume bar count and show staff lines again
-     \startStaff
-   \cadenzaOff
+    \startStaff
+    \cadenzaOff
 
-   % Should Coda be on new line?
-   % Coda NOT on new line: DON'T use \break
-   % Coda on new line: use \break
-   \break
+    % Should Coda be on new line?
+    % Coda NOT on new line: DON'T use \break
+    % Coda on new line: use \break
+    \break
 
-   % Show up, you clef and key!
-   \once \override Staff.KeySignature #'break-visibility = #end-of-line-invisible
-   \once \override Staff.Clef #'break-visibility = #end-of-line-invisible
+    % Show up, you clef and key!
+    \once \override Staff.KeySignature.break-visibility = #end-of-line-invisible
+    \once \override Staff.Clef.break-visibility = #end-of-line-invisible
 
-   % Set coda sign as rehearsal mark and adjust size and position
+    % Set coda sign as rehearsal mark and adjust size and position
 
-   % Put the coda sign ontop of the (treble-)clef dependend on coda's line-position
+    % Put the coda sign ontop of the (treble-)clef dependend on coda's line-position
 
-   % Coda NOT on new line, use this:
-   % \once \override Score.RehearsalMark #'extra-offset = #'( -2 . 1.75 )
+    % Coda NOT on new line, use this:
+    % \once \override Score.RehearsalMark.extra-offset = #'( -2 . 1.75 )
 
-   % Coda on new line, use this:
-   \once \override Score.RehearsalMark #'extra-offset = #'( -4.5 . 0 )
+    % Coda on new line, use this:
+    \once \override Score.RehearsalMark.extra-offset = #'( -5 . .5 )
 
-   \once \override Score.RehearsalMark #'font-size = #5
-   \mark \markup { \musicglyph #"scripts.coda" }
+    \once \override Score.RehearsalMark.font-size = #5
+    \mark \markup { \musicglyph #"scripts.coda" }
 
-   % The coda
-   \repeat unfold 5 {
+    % The coda
+    \repeat unfold 6 {
       c4 c c c
     }
     \bar"|."