Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index a82f358560b4055d4fb984391f4f5a6bb3034ac4..17329521a071743fdd1e2031788d7ed1ebc81dda 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,13 +1,14 @@
-\version "2.3.16"
+\version "2.10.0"
 
 %% < 1.8 compatibility switch
 #(ly:set-option 'old-relative)
 
 %% named durations
 breve = #(ly:make-duration -1 0)
-longa = #(ly:make-duration -2 0 )
+longa = #(ly:make-duration -2 0)
 maxima = #(ly:make-duration -3 0)
 
+\include "markup-init.ly"
 \include "music-functions-init.ly"
 
 %% default note names are dutch
@@ -18,15 +19,15 @@ maxima = #(ly:make-duration -3 0)
 \include "script-init.ly"
 
 % declarations for standard directions
-left = -1
-right = 1
-up = 1
-down = -1
-start = -1
-stop = 1
-smaller = -1
-bigger = 1
-center = 0
+left = #-1
+right = #1
+up = #1
+down = #-1
+start = #-1
+stop = #1
+smaller = #-1
+bigger = #1
+center = #0
 
 %% FIXME
 %% should also set allowBeamBreak, but how to do it "portably"? (ie. also
@@ -35,10 +36,21 @@ center = 0
 %% try \once \set Score.allowBeamBreak = ##t
 
 %% rather name \newline, \pageBreak ?
-break = #(make-event-chord (list (make-penalty-music -10001 0)))
-noBreak = #(make-event-chord (list (make-penalty-music 10001 0)))
-pageBreak = #(make-event-chord (list (make-penalty-music -10001 -10001)))
-noPageBreak = #(make-event-chord (list (make-penalty-music 0 10001)))
+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)))
+
+stopStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent STOP)))
+startStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent START)))
 
 
 %
@@ -59,20 +71,21 @@ escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START)
 
 
 
-foo = { \pageBreak }
-
 \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)
+                 
 \include "grace-init.ly"
 \include "midi-init.ly"
-\include "book-paper-defaults.ly"
+\include "paper-defaults.ly"
 
-\paper {
-    mm = #(ly:output-def-lookup $defaultbookpaper 'mm)
-    unit = #(ly:output-def-lookup $defaultbookpaper 'unit)
+\layout {
+    mm = #(ly:output-def-lookup $defaultpaper 'mm)
+    unit = #(ly:output-def-lookup $defaultpaper 'unit)
 
     in = #(* 25.4 mm)
     pt = #(/  in 72.27)
@@ -81,29 +94,19 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
     \include "engraver-init.ly"
 
     #(set-paper-dimension-variables (current-module))
-    
 }
 
+#(set-default-paper-size (ly:get-option 'paper-size))
 
-#(set-default-paper-size "a4")
-
-
-partCombineListener = \paper {
-    \context {
-       \Voice
-       \consists Note_heads_engraver
-       \consists Rest_engraver
-       \type "Recording_group_engraver"
-       recordEventSequence = #notice-the-events-for-pc
-    }
+partCombineListener = \layout {
     \context {
        \Score
        skipTypesetting = ##t
+       ignoreBarChecks = ##t
+       \alias "Timing"
     }
 }
 
-#(set-part-combine-listener partCombineListener)
-
 \include "dynamic-scripts-init.ly"
 \include "spanners-init.ly"
 \include "property-init.ly"
@@ -113,6 +116,8 @@ setDefaultDurationToQuarter = { c4 }
 %% MAKE-HASH-TABLE in GUILE 1.6 takes mandatory size parameter.
 #(define musicQuotes (make-hash-table 29))
 
-#(define toplevel-book-handler ly:parser-print-book)
+#(define toplevel-book-handler print-book-with-defaults)
 #(define toplevel-music-handler collect-music-for-book)
 #(define toplevel-score-handler collect-scores-for-book)
+#(define toplevel-text-handler collect-scores-for-book)
+