Merge commit 'origin' into beamlets2

[lilypond.git] / input / new / customizing-fretboard-fret-diagrams.ly

diff --git a/input/new/customizing-fretboard-fret-diagrams.ly b/input/new/customizing-fretboard-fret-diagrams.ly
index 1b9ab8f912747feacf3ef8c107030e9031c03ee5..1f4d8cb2b568d886d352e1e0e3dc122e151c2366 100644 (file)
--- a/input/new/customizing-fretboard-fret-diagrams.ly
+++ b/input/new/customizing-fretboard-fret-diagrams.ly
@@ -1,11 +1,14 @@
-\version "2.11.55"
+\version "2.12.0"
 
 \header {
   lsrtags = "fretted-strings,tweaks-and-overrides"
 
   texidoc = "Fret diagram properties can be set through
-@code{fret-diagram-details}.  For FretBoard fret diagrams,
+@code{'fret-diagram-details}.  For FretBoard fret diagrams,
 overrides are applied to the @code{FretBoards.FretBoard} object.
+Like @code{Voice}, @code{FretBoards} is a bottom level context,
+therefore can be omitted in property overrides.
+
 "
   doctitle = "Customizing fretboard fret diagrams"
 }
@@ -15,51 +18,51 @@ overrides are applied to the @code{FretBoards.FretBoard} object.
                         #guitar-tuning
                         #"x;1-1-(;3-2;3-3;3-4;1-1-);"
 <<
-  \context ChordNames {
+  \new ChordNames {
     \chordmode { c1 c c d }
   }
-  \context FretBoards {
+  \new FretBoards {
     % Set global properties of fret diagram
     \override FretBoards.FretBoard #'size = #'1.2
-    \override FretBoards.FretBoard #'fret-diagram-details
-                                  #'finger-code = #'in-dot
-    \override FretBoards.FretBoard #'fret-diagram-details
-                                  #'dot-color = #'white
+    \override FretBoard
+      #'(fret-diagram-details finger-code) = #'in-dot
+    \override FretBoard
+      #'(fret-diagram-details dot-color) = #'white
     \chordmode {
       c
-      \once \override FretBoards.FretBoard #'size = #'1.0
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'barre-type = #'straight
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'dot-color = #'black
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'finger-code = #'below-string
+      \once \override FretBoard #'size = #'1.0
+      \once \override FretBoard
+        #'(fret-diagram-details barre-type) = #'straight
+      \once \override FretBoard
+        #'(fret-diagram-details dot-color) = #'black
+      \once \override FretBoard
+        #'(fret-diagram-details finger-code) = #'below-string
       c'
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'barre-type = #'none
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'number-type = #'arabic
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'orientation = #'landscape
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'mute-string = #"M"
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'label-dir = #-1
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'dot-color = #'black
+      \once \override FretBoard
+        #'(fret-diagram-details barre-type) = #'none
+      \once \override FretBoard
+        #'(fret-diagram-details number-type) = #'arabic
+      \once \override FretBoard
+        #'(fret-diagram-details orientation) = #'landscape
+      \once \override FretBoard
+        #'(fret-diagram-details mute-string) = #"M"
+      \once \override FretBoard
+        #'(fret-diagram-details label-dir) = #LEFT
+      \once \override FretBoard
+        #'(fret-diagram-details dot-color) = #'black
       c'
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'finger-code = #'below-string
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'dot-radius = #0.35
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'dot-position = #0.5
-      \once \override FretBoards.FretBoard #'fret-diagram-details
-              #'fret-count = #3
+      \once \override FretBoard
+        #'(fret-diagram-details finger-code) = #'below-string
+      \once \override FretBoard
+        #'(fret-diagram-details dot-radius) = #0.35
+      \once \override FretBoard
+        #'(fret-diagram-details dot-position) = #0.5
+      \once \override FretBoard
+        #'(fret-diagram-details fret-count) = #3
       d
     }
   }
-  \context Voice {
+  \new Voice {
     c'1 c' c' d'
   }
 >>