* scm/framework-ps.scm (dump-stencil-as-EPS): fix thinkos.

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

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 3c73227be1faed97b3104d34f4d8275be0aa85bd..d62be483706593b0f17fb7925ecf1a0cc39be56d 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.39"
 
 %% < 1.8 compatibility switch
 #(ly:set-option 'old-relative)
@@ -18,15 +18,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 +35,19 @@ 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)))
 
@@ -61,13 +70,14 @@ 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 "paper-defaults.ly"
@@ -83,11 +93,9 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
     \include "engraver-init.ly"
 
     #(set-paper-dimension-variables (current-module))
-    
 }
 
-
-#(set-default-paper-size "a4")
+#(set-default-paper-size (ly:get-option 'paper-size))
 
 
 partCombineListener = \layout {
@@ -101,7 +109,8 @@ partCombineListener = \layout {
     \context {
        \Score
        skipTypesetting = ##t
-       ignoreBarChecks = ##t 
+       ignoreBarChecks = ##t
+       \alias "Timing"
     }
 }
 
@@ -116,7 +125,7 @@ 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)