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

[lilypond.git] / Documentation / snippets / fret-diagrams-explained-and-developed.ly

diff --git a/Documentation/snippets/fret-diagrams-explained-and-developed.ly b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
index 3d8a68e94b78e40837407a22ce10f424eb6fa845..4f6ea0daf255e731e8f0d7b3c86a4c7c178cf907 100644 (file)
--- a/Documentation/snippets/fret-diagrams-explained-and-developed.ly
+++ b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
@@ -1,6 +1,10 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% 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.13.1"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
@@ -20,16 +24,15 @@ diagrams.
       c c c d d
     }
   }
-  
+
   \new Voice = "mel" {
     \textLengthOn
     % Set global properties of fret diagram
-    \override TextScript #'size = #1.2
-    \override TextScript 
-      #'fret-diagram-details #'finger-code = #'below-string
-    \override TextScript #'fret-diagram-details #'dot-color = #'black
-    
-    %% A chord for ukelele
+    \override TextScript.size = #1.2
+    \override TextScript.fret-diagram-details.finger-code = #'below-string
+    \override TextScript.fret-diagram-details.dot-color = #'black
+
+    %% A chord for ukulele
     a'2^\markup {
       \override #'(fret-diagram-details . (
                    (string-count . 4)
@@ -38,8 +41,8 @@ diagrams.
         \fret-diagram #"4-2-2;3-1-1;2-o;1-o;"
       }
     }
-    
-    %% A chord for ukelele, with formatting defined in definition string
+
+    %% A chord for ukulele, with formatting defined in definition string
     %  1.2 * size, 4 strings, 4 frets, fingerings below string
     %  dot radius .35 of fret spacing, dot position 0.55 of fret spacing
     a'2^\markup {
@@ -49,7 +52,7 @@ diagrams.
         \fret-diagram #"s:1.2;w:4;h:3;f:2;d:0.35;p:0.55;4-2-2;3-1-1;2-o;1-o;"
       }
     }
-    
+
       %% These chords will be in normal orientation
 
     %% C major for guitar, barred on third fret
@@ -72,7 +75,7 @@ diagrams.
         }
       }
     }
-    
+
     %% C major for guitar, barred on third fret
     %% Double barre used to test barre function
     %  verbose style
@@ -100,7 +103,7 @@ diagrams.
         }
       }
     }
-    
+
     %% C major for guitar, with capo on third fret
     %  verbose style
     c'2^\markup {
@@ -123,7 +126,7 @@ diagrams.
         }
       }
     }
-    
+
     %% simple D chord
     d'2^\markup {
       \override #'(fret-diagram-details . (
@@ -149,8 +152,7 @@ diagrams.
     }
 
       % These chords will be in landscape orientation
-    \override TextScript 
-       #'fret-diagram-details #'orientation = #'landscape
+    \override TextScript.fret-diagram-details.orientation = #'landscape
 
     %% C major for guitar, barred on third fret
     %  verbose style
@@ -172,7 +174,7 @@ diagrams.
         }
       }
     }
-    
+
     %% C major for guitar, barred on third fret
     %% Double barre used to test barre function
     %  verbose style
@@ -200,7 +202,7 @@ diagrams.
         }
       }
     }
-    
+
     %% C major for guitar, with capo on third fret
     %  verbose style
     c'2^\markup {
@@ -223,7 +225,7 @@ diagrams.
         }
       }
     }
-    
+
     %% simple D chord
     d'2^\markup {
       \override #'(fret-diagram-details . (
@@ -248,8 +250,7 @@ diagrams.
     }
 
       % These chords will be in opposing-landscape orientation
-    \override TextScript #'fret-diagram-details 
-                           #'orientation = #'opposing-landscape
+    \override TextScript.fret-diagram-details.orientation = #'opposing-landscape
 
     %% C major for guitar, barred on third fret
     %  verbose style
@@ -271,7 +272,7 @@ diagrams.
         }
       }
     }
-    
+
     %% C major for guitar, barred on third fret
     %% Double barre used to test barre function
     %  verbose style
@@ -299,7 +300,7 @@ diagrams.
         }
       }
     }
-    
+
     %% C major for guitar, with capo on third fret
     %  verbose style
     c'2^\markup {
@@ -322,7 +323,7 @@ diagrams.
         }
       }
     }
-    
+
     %% simple D chord
     d'2^\markup {
       \override #'(fret-diagram-details . (