X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations-init.ly;h=88fdfe1c0308061213294bec0cf0384177a3e384;hb=d03883358e67bb40a80a49dfc703db69dd362f25;hp=5a322c2af7ac54496015b5da27c8dd9eb40b2278;hpb=e03b2923c10e1c33238a4f2ecf78714bf829e758;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 5a322c2af7..88fdfe1c03 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.10.0"
 
 %% < 1.8 compatibility switch
 #(ly:set-option 'old-relative)
@@ -8,7 +8,9 @@ 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"
@@ -37,15 +39,8 @@ center = #0
 %% 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 '())))
+%% \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)))
@@ -68,11 +63,13 @@ escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START)
 escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START)
 
 
+#(define fretboard-table (make-hash-table 100))
 
 \include "scale-definitions-init.ly"
 
-melisma = #(make-span-event 'ManualMelismaEvent START)
-melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
+melisma = #(context-spec-music (make-property-set 'melismaBusy #t) 'Bottom)
+melismaEnd = #(context-spec-music (make-property-unset 'melismaBusy) 'Bottom)
+
 laissezVibrer = #(make-music 'LaissezVibrerEvent)
 repeatTie = #(make-music 'RepeatTieEvent)
 		  
@@ -95,24 +92,15 @@ repeatTie = #(make-music 'RepeatTieEvent)
 
 #(set-default-paper-size (ly:get-option 'paper-size))
 
-
 partCombineListener = \layout {
-    \context {
-	\Voice
-	\consists Note_heads_engraver
-	\consists Rest_engraver
-	\type "Recording_group_engraver"
-	recordEventSequence = #notice-the-events-for-pc
-    }
     \context {
 	\Score
 	skipTypesetting = ##t
-	ignoreBarChecks = ##t 
+	ignoreBarChecks = ##t
+	\alias "Timing"
     }
 }
 
-#(set-part-combine-listener partCombineListener)
-
 \include "dynamic-scripts-init.ly"
 \include "spanners-init.ly"
 \include "property-init.ly"
@@ -127,3 +115,9 @@ setDefaultDurationToQuarter = { c4 }
 #(define toplevel-score-handler collect-scores-for-book)
 #(define toplevel-text-handler collect-scores-for-book)
 
+#(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"