*** empty log message ***

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

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 1e47fb9e657b85ee56f71a8a5dcf32c5f240f682..052bd6edb07c4c65a9683b3ac7d2fbafd6048828 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,12 +1,18 @@
+\version "2.4.0"
+
+%% < 1.8 compatibility switch
 #(ly:set-option 'old-relative)
 
-\version "2.3.2"
+%% 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 "music-functions-init.ly"
-\include "nederlands.ly"               % dutch
+
+%% default note names are dutch
+\include "nederlands.ly"
+
 \include "drumpitch-init.ly"           
 \include "chord-modifiers-init.ly"
 \include "script-init.ly"
@@ -20,23 +26,40 @@ start = -1
 stop = 1
 smaller = -1
 bigger = 1
-center=0
-
-%{
-
-should also set allowBeamBreak, but how to do it "portably"? (ie. also
-working with lyric sections)
+center = 0
 
-%}
+%% FIXME
+%% should also set allowBeamBreak, but how to do it "portably"? (ie. also
+%% working with lyric sections)
+%%
+%% try \once \set Score.allowBeamBreak = ##t
 
-%% rather name \newline, \newpage ?
+%% 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)))
+pageBreak = #(make-event-chord (list (make-penalty-music -10001 -10001)))
+noPageBreak = #(make-event-chord (list (make-penalty-music 0 10001)))
 
+
+%
+% Code articulation definitions
+%
 noBeam = #(make-music 'BeamForbidEvent) 
 pipeSymbol = #(make-music 'BarCheck)
+bracketOpenSymbol = #(make-span-event 'BeamEvent START)
+bracketCloseSymbol = #(make-span-event 'BeamEvent STOP)
+tildeSymbol = #(make-music 'TieEvent)
+parenthesisOpenSymbol =  #(make-span-event 'SlurEvent START)
+parenthesisCloseSymbol = #(make-span-event 'SlurEvent STOP)
+escapedExclamationSymbol = #(make-span-event 'CrescendoEvent STOP)
+escapedParenthesisOpenSymbol = #(make-span-event 'PhrasingSlurEvent START)
+escapedParenthesisCloseSymbol = #(make-span-event 'PhrasingSlurEvent STOP)
+escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START)
+escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START)
+
+
+
+foo = { \pageBreak }
 
 \include "scale-definitions-init.ly"
 
@@ -44,93 +67,52 @@ melisma = #(make-span-event 'ManualMelismaEvent START)
 melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 
 \include "grace-init.ly"
-
-% ugh
 \include "midi-init.ly"
+\include "paper-defaults.ly"
 
-\include "book-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)
     cm = #(* 10 mm)
     
     \include "engraver-init.ly"
-}
-
-
-#(set-default-paper-size "a4")
-
-
-
-%{
 
-%% these would supercede defaults in \bookpaper.
-% let's comment this out for now. 
-
-
-paperEleven = \paper {
-    #(paper-set-staff-size (* 11.0 pt))
-}
-
-paperThirteen = \paper {
-    #(paper-set-staff-size (* 13.0 pt))
-}
-
-paperSixteen = \paper {
-    #(paper-set-staff-size (* 16.0 pt))
-}
-
-paperEightteen = \paper {
-    #(paper-set-staff-size (* 18.0 pt))
-}
-
-paperTwenty = \paper {
-    #(paper-set-staff-size (* 20.0 pt))
-}
-
-paperTwentythree = \paper {
-    #(paper-set-staff-size (* 23.0 pt))
+    #(set-paper-dimension-variables (current-module))
+    
 }
 
-paperTwentysix = \paper {
-    #(paper-set-staff-size (* 26.0 pt))
-}
 
-\paper { \paperTwenty }
+#(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
- }
- \context { \Score skipTypesetting = ##t }
+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
+    }
 }
 
 #(set-part-combine-listener partCombineListener)
 
 \include "dynamic-scripts-init.ly"
 \include "spanners-init.ly"
-
 \include "property-init.ly"
 
-%% reset default duration
-unusedEntry = \notes { c4 }
+setDefaultDurationToQuarter = { c4 }
 
-%% must have size argument for GUILE 1.6 compat.
+%% MAKE-HASH-TABLE in GUILE 1.6 takes mandatory size parameter.
 #(define musicQuotes (make-hash-table 29))
 
-%%#(define-public toplevel-music-handler ly:parser-add-book-and-score)
-#(define toplevel-book-handler default-toplevel-book-handler)
-#(define toplevel-music-handler default-toplevel-music-handler)
-#(define toplevel-score-handler default-toplevel-score-handler)
-
-#(define toplevel-score-handler default-toplevel-score-handler)
+#(define toplevel-book-handler ly:parser-print-book)
+#(define toplevel-music-handler collect-music-for-book)
+#(define toplevel-score-handler collect-scores-for-book)