Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond into gonville

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

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 210b81daf3cb00cafbfda40623f0705f6a8e7ba2..5ab0e77ab2168698a0117f9969cddd8ddc909e93 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,4 +1,22 @@
-\version "2.10.0"
+%%%% 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
 #(ly:set-option 'old-relative)
@@ -9,6 +27,7 @@ longa = #(ly:make-duration -2 0)
 maxima = #(ly:make-duration -3 0)
 
 \include "music-functions-init.ly"
+\include "toc-init.ly"
 
 %% default note names are dutch
 \include "nederlands.ly"
@@ -17,6 +36,8 @@ maxima = #(ly:make-duration -3 0)
 \include "chord-modifiers-init.ly"
 \include "script-init.ly"
 
+\include "chord-repetition-init.ly"
+
 % declarations for standard directions
 left = #-1
 right = #1
@@ -29,24 +50,16 @@ bigger = #1
 center = #0
 
 %% FIXME
-%% should also set allowBeamBreak, but how to do it "portably"? (ie. also
+%% should also set \override Beam #'breakable, but how to do it "portably"? (ie. also
 %% working with lyric sections)
 %%
-%% try \once \set Score.allowBeamBreak = ##t
+%% try \once \override Score.Beam #'breakable = ##t
 
 %% rather name \newline, \pageBreak ?
 break = #(make-event-chord (list (make-music 'LineBreakEvent 'break-permission 'force)))
 noBreak = #(make-event-chord (list (make-music 'LineBreakEvent 'break-permission '())))
-pageBreak = #(make-event-chord (list
-                               (make-music 'LineBreakEvent 'break-permission 'force)
-                               (make-music 'PageBreakEvent 'break-permission 'force)))
-noPageBreak = #(make-event-chord (list (make-music 'PageBreakEvent 'break-permission '())))
-pageTurn = #(make-event-chord (list
-                               (make-music 'LineBreakEvent 'break-permission 'force)
-                               (make-music 'PageBreakEvent 'break-permission 'force)
-                               (make-music 'PageTurnEvent 'break-permission 'force)))
-noPageTurn = #(make-event-chord (list (make-music 'PageTurnEvent 'break-permission '())))
-allowPageTurn = #(make-event-chord (list (make-music 'PageTurnEvent 'break-permission 'allow)))
+%% \pageBreak, \noPageBreak, \pageTurn, \noPageTurn, \allowPageTurn are defined
+%% as music functions
 
 stopStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent STOP)))
 startStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent START)))
@@ -69,6 +82,8 @@ 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"
 
@@ -80,7 +95,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,7 +131,18 @@ setDefaultDurationToQuarter = { c4 }
 #(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"