Merge master into nested-bookparts

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

diff --git a/input/lsr/customizing-fretboard-fret-diagrams.ly b/input/lsr/customizing-fretboard-fret-diagrams.ly
index c0e80af4a5bdf598b4c142c744687fe524df84c4..8a40eb6517f218ea5648af1048aff90b26f75838 100644 (file)
--- a/input/lsr/customizing-fretboard-fret-diagrams.ly
+++ b/input/lsr/customizing-fretboard-fret-diagrams.ly
@@ -1,13 +1,16 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.62"
 
 \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"
 } % begin verbatim
@@ -17,51 +20,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
+    \override FretBoard #'fret-diagram-details
                                   #'finger-code = #'in-dot
-    \override FretBoards.FretBoard #'fret-diagram-details
+    \override FretBoard #'fret-diagram-details
                                   #'dot-color = #'white
     \chordmode {
       c
-      \once \override FretBoards.FretBoard #'size = #'1.0
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'size = #'1.0
+      \once \override FretBoard #'fret-diagram-details
               #'barre-type = #'straight
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'dot-color = #'black
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'finger-code = #'below-string
       c'
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'barre-type = #'none
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'number-type = #'arabic
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'orientation = #'landscape
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'mute-string = #"M"
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'label-dir = #-1
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'dot-color = #'black
       c'
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'finger-code = #'below-string
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'dot-radius = #0.35
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'dot-position = #0.5
-      \once \override FretBoards.FretBoard #'fret-diagram-details
+      \once \override FretBoard #'fret-diagram-details
               #'fret-count = #3
       d
     }
   }
-  \context Voice {
+  \new Voice {
     c'1 c' c' d'
   }
 >>