Fix 1385.

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

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index f822e0f3dea4ba7ca32ae47a53674b3feb3d728f..403bb0d01d8b24bddbfc9386f78153d728ea7547 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,3 +1,21 @@
+%%%% This file is part of LilyPond, the GNU music typesetter.
+%%%%
+%%%% Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
+%%%%
+%%%% LilyPond is free software: you can redistribute it and/or modify
+%%%% it under the terms of the GNU General Public License as published by
+%%%% the Free Software Foundation, either version 3 of the License, or
+%%%% (at your option) any later version.
+%%%%
+%%%% LilyPond is distributed in the hope that it will be useful,
+%%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%%% GNU General Public License for more details.
+%%%%
+%%%% You should have received a copy of the GNU General Public License
+%%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+
 \version "2.12.0"
 
 %% < 1.8 compatibility switch
@@ -8,17 +26,22 @@ breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0)
 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"
+\include "language-init.ly"
+pitchnames = #default-language
+#(ly:parser-set-note-names parser pitchnames)
 
-\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
@@ -49,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)
@@ -63,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)
@@ -73,7 +93,7 @@ melismaEnd = #(context-spec-music (make-property-unset 'melismaBusy) 'Bottom)
 
 laissezVibrer = #(make-music 'LaissezVibrerEvent)
 repeatTie = #(make-music 'RepeatTieEvent)
-                 
+
 \include "grace-init.ly"
 \include "midi-init.ly"
 \include "paper-defaults-init.ly"
@@ -85,7 +105,7 @@ 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))