Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / input / new / defining-predefined-fretboards-for-other-instruments.ly

diff --git a/input/new/defining-predefined-fretboards-for-other-instruments.ly b/input/new/defining-predefined-fretboards-for-other-instruments.ly
index 29c5fa9237fc2a0a65f0f2394e36568709d7b069..f38d4a2fbe0db04ddc883c76bf65e20d9984048e 100644 (file)
--- a/input/new/defining-predefined-fretboards-for-other-instruments.ly
+++ b/input/new/defining-predefined-fretboards-for-other-instruments.ly
@@ -1,15 +1,14 @@
-\version "2.11.62"
+\version "2.12.0"
 \header {
   lsrtags = "fretted-strings"
   texidoc = "Predefined fret diagrams can be added for new instruments
 in addition to the standards used for guitar.  This file shows how
 this is done by defining a new string-tuning and a few predefined
-fretboards for the Venezuelan cuatro.  Thanks to Jesus Guillermo
-Andrade for the string-tuning and fretboard information.
+fretboards for the Venezuelan cuatro.
 
 This file also shows how fingerings can be included in the chords
 used as reference points for the chord lookup, and displayed in 
-the fret diagram and the TabStaff, but not the music.
+the fret diagram and the @code{TabStaff}, but not the music.
 
 These fretboards are not transposable because they contain string
 information.  This is planned to be corrected in the future.
@@ -18,18 +17,21 @@ information.  This is planned to be corrected in the future.
   doctitle = "Defining predefined fretboards for other instruments"
 }
 
+%LSR: Thanks to Jesus Guillermo Andrade for the string-tuning
+%LSR: and fretboard information.
+
 % add FretBoards for the Cuatro
-%   Note: This section could be put into a separate file 
+%   Note: This section could be put into a separate file
 %      predefined-cuatro-fretboards.ly
 %      and \included into each of your compositions
 
 cuatroTuning = #'(11 18 14 9)
 
-dSix = {<a\4 b\1 d\3 fis\2> }
+dSix = { <a\4 b\1 d\3 fis\2> }
 dMajor = { <a\4 d\1 d\3 fis \2> }
-aMajSeven = {<a\4 cis\1 e\3 g\2>}
-dMajSeven = {<a\4 c\1 d\3 fis\2>}
-gMajor = {<b\4 b\1 d\3 g\2>}
+aMajSeven = { <a\4 cis\1 e\3 g\2> }
+dMajSeven = { <a\4 c\1 d\3 fis\2> }
+gMajor = { <b\4 b\1 d\3 g\2> }
 
 \storePredefinedDiagram \dSix
                         #cuatroTuning
@@ -70,20 +72,19 @@ primeros = {
 
     \new Staff {
       \new Voice \with {
-        \remove New_fingering_engraver
+        \remove "New_fingering_engraver"
       } 
       \relative c'' {
         \primeros
       }
     }
-    
 
     \new FretBoards {
       \set stringTunings = #cuatroTuning
-      \override FretBoard #'fret-diagram-details
-        #'string-count = #'4
-      \override FretBoard #'fret-diagram-details
-        #'finger-code = #'in-dot
+      \override FretBoard
+        #'(fret-diagram-details string-count) = #'4
+      \override FretBoard
+        #'(fret-diagram-details finger-code) = #'in-dot
       \primeros
     }
 
@@ -98,10 +99,8 @@ primeros = {
     \context {
       \Score
       \override SpacingSpanner
-      #'base-shortest-duration = #(ly:make-moment 1 16)
+        #'base-shortest-duration = #(ly:make-moment 1 16)
     }
-
   }
   \midi { }
 }
-