Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 364068c043c0f8cd60bb9abc48139c53860c37ed..661c7f88546afd9f19af5c584bee11998adeeab3 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -10,6 +10,7 @@ maxima = #(ly:make-duration -3 0)
 
 \include "markup-init.ly"
 \include "music-functions-init.ly"
+\include "toc-init.ly"
 
 %% default note names are dutch
 \include "nederlands.ly"
@@ -62,6 +63,7 @@ escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START)
 escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START)
 
 
+#(define fretboard-table (make-hash-table 100))
 
 \include "scale-definitions-init.ly"
 
@@ -73,7 +75,7 @@ repeatTie = #(make-music 'RepeatTieEvent)
                  
 \include "grace-init.ly"
 \include "midi-init.ly"
-\include "paper-defaults.ly"
+\include "paper-defaults-init.ly"
 
 \layout {
     mm = #(ly:output-def-lookup $defaultpaper 'mm)
@@ -116,3 +118,6 @@ setDefaultDurationToQuarter = { c4 }
 #(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!)
+
+
+\include "predefined-fretboards-init.ly"