Change stringTunings from list of semitones to list of pitches

[lilypond.git] / ly / declarations-init.ly

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 5ab0e77ab2168698a0117f9969cddd8ddc909e93..39aeabdb61d8f4bf9c90e5a629443f9dcfd58c04 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -30,14 +30,18 @@ maxima = #(ly:make-duration -3 0)
 \include "toc-init.ly"
 
 %% default note names are dutch
-\include "nederlands.ly"
+#(set! default-language "nederlands")
+#(note-names-language parser default-language)
 
-\include "drumpitch-init.ly"           
+\include "drumpitch-init.ly"
 \include "chord-modifiers-init.ly"
 \include "script-init.ly"
 
 \include "chord-repetition-init.ly"
 
+#(define default-fret-table (make-hash-table 101))
+#(define chord-shape-table (make-hash-table 29))
+
 % declarations for standard directions
 left = #-1
 right = #1
@@ -68,7 +72,7 @@ startStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent START)))
 %
 % Code articulation definitions
 %
-noBeam = #(make-music 'BeamForbidEvent) 
+noBeam = #(make-music 'BeamForbidEvent)
 pipeSymbol = #(make-music 'BarCheck)
 bracketOpenSymbol = #(make-span-event 'BeamEvent START)
 bracketCloseSymbol = #(make-span-event 'BeamEvent STOP)
@@ -82,9 +86,6 @@ escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START)
 escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START)
 
 
-#(define fretboard-table (make-hash-table 100))
-#(define chord-shape-table (make-hash-table 100))
-
 \include "scale-definitions-init.ly"
 
 melisma = #(context-spec-music (make-property-set 'melismaBusy #t) 'Bottom)
@@ -92,7 +93,32 @@ melismaEnd = #(context-spec-music (make-property-unset 'melismaBusy) 'Bottom)
 
 laissezVibrer = #(make-music 'LaissezVibrerEvent)
 repeatTie = #(make-music 'RepeatTieEvent)
-                 
+
+\include "dynamic-scripts-init.ly"
+\include "spanners-init.ly"
+
+%% MAKE-HASH-TABLE in GUILE 1.6 takes mandatory size parameter.
+#(define musicQuotes (make-hash-table 29))
+
+#(define toplevel-book-handler print-book-with-defaults)
+#(define toplevel-bookpart-handler collect-bookpart-for-book)
+#(define toplevel-music-handler collect-music-for-book)
+#(define toplevel-score-handler collect-scores-for-book)
+#(define toplevel-text-handler collect-scores-for-book)
+
+#(define book-bookpart-handler ly:book-add-bookpart!)
+#(define book-music-handler collect-book-music-for-book)
+#(define book-score-handler ly:book-add-score!)
+#(define book-text-handler ly:book-add-score!)
+
+#(define bookpart-score-handler ly:book-add-score!)
+#(define bookpart-text-handler ly:book-add-score!)
+#(define bookpart-music-handler collect-book-music-for-book)
+
+\include "predefined-fretboards-init.ly"
+\include "string-tunings-init.ly"
+\include "property-init.ly"
+
 \include "grace-init.ly"
 \include "midi-init.ly"
 \include "paper-defaults-init.ly"
@@ -104,14 +130,13 @@ repeatTie = #(make-music 'RepeatTieEvent)
     in = #(* 25.4 mm)
     pt = #(/  in 72.27)
     cm = #(* 10 mm)
-    
+
     \include "engraver-init.ly"
 
     #(set-paper-dimension-variables (current-module))
 }
 
 #(set-default-paper-size (ly:get-option 'paper-size))
-
 partCombineListener = \layout {
     \context {
        \Score
@@ -121,28 +146,7 @@ partCombineListener = \layout {
     }
 }
 
-\include "dynamic-scripts-init.ly"
-\include "spanners-init.ly"
-\include "property-init.ly"
-
 setDefaultDurationToQuarter = { c4 }
 
-%% MAKE-HASH-TABLE in GUILE 1.6 takes mandatory size parameter.
-#(define musicQuotes (make-hash-table 29))
 
-#(define toplevel-book-handler print-book-with-defaults)
-#(define toplevel-bookpart-handler collect-bookpart-for-book)
-#(define toplevel-music-handler collect-music-for-book)
-#(define toplevel-score-handler collect-scores-for-book)
-#(define toplevel-text-handler collect-scores-for-book)
-
-#(define book-bookpart-handler ly:book-add-bookpart!)
-#(define book-music-handler collect-book-music-for-book)
-#(define book-score-handler ly:book-add-score!)
-#(define book-text-handler ly:book-add-score!)
-
-#(define bookpart-score-handler ly:book-add-score!)
-#(define bookpart-text-handler ly:book-add-score!)
-#(define bookpart-music-handler collect-book-music-for-book)
 
-\include "predefined-fretboards-init.ly"