X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fpositioning-segno-and-coda-with-line-break.ly;h=80cc874efd026daabd7d4ce07c28a13f61bee72f;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=4906994cce28a5e272f4a6397cb17ef00b9cb8bb;hpb=b27579f3a9b2311232f8eb1f11403f560dcc9b17;p=lilypond.git

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 4906994cce..80cc874efd 100644
--- a/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
+++ b/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
@@ -1,13 +1,13 @@
 %% 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.14.2"
+\version "2.18.0"
 
 \header {
-  lsrtags = "repeats, workaround, breaks, symbols-and-glyphs"
+  lsrtags = "breaks, repeats, symbols-and-glyphs, workaround"
 
   texidoc = "
 If you want to place an exiting segno sign and add text like @qq{D.S.
@@ -20,28 +20,27 @@ line.
   doctitle = "Positioning segno and coda (with line break)"
 } % begin verbatim
 
-
 {
   \clef treble
   \key g \major
   \time 4/4
   \relative c'' {
-    \repeat unfold 2 {
-      | c4 c c c
+    \repeat unfold 4 {
+      c4 c c c
     }
 
     % 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
+      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
+      c4 c c c
     }
 
     % Should Coda be on anew line?
@@ -52,73 +51,82 @@ 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 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
         % ===============================
-        % Move text to the desired position and tweak spacing for optimum text alignment
-        %\once \override TextScript #'extra-offset = #'( 8 . -5.5 )
-        \once \override TextScript #'word-space = #1.5
-        \once \override TextScript #'X-offset = #8
-        \once \override TextScript #'Y-offset = #1.5
-        | s1*0^\markup { \center-column { "D.S. al Coda" \line { \musicglyph #"scripts.coda" \musicglyph #"scripts.tenuto" \musicglyph #"scripts.coda"} } }
+        % Move text to the desired position
+        % and tweak spacing for optimum text alignment
+        \repeat unfold 1 {
+          s1
+          \bar ""
+        }
+        \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
-        \repeat unfold 4 {
-          s4 s4 s4 s4
+        \repeat unfold 3 {
+          s1
           \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 on top of the (treble-)clef
+    % depending 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 = #'( -8.42 . 1.75 )
+    % 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 {
-      | c4 c c c
+    % The coda
+    \repeat unfold 6 {
+      c4 c c c
     }
     \bar"|."
   }
 }
-