X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations-init.ly;h=598985e8d14952341545699463c999c9a6fc3730;hb=397b68b52ef39748339623ab50e2d74a8f5f26e8;hp=5805fdb7de45c14a7eb07f85a7867f7c5132f449;hpb=402045837e7134cdf90d1fcf31768c62227a4936;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 5805fdb7de..598985e8d1 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,11 +1,18 @@
+\version "2.4.0"
+
+%% < 1.8 compatibility switch
 #(ly:set-option 'old-relative)
 
-\version "2.1.22"
+%% 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 "nederlands.ly"		% dutch
+\include "music-functions-init.ly"
+
+%% default note names are dutch
+\include "nederlands.ly"
+
 \include "drumpitch-init.ly"		
 \include "chord-modifiers-init.ly"
 \include "script-init.ly"
@@ -19,120 +26,97 @@ 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)
-
-%}
-break =#(make-event-chord (list (make-penalty-music -10001)))
-noBreak =  #(make-event-chord (list (make-penalty-music 10001)))
+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, \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)))
+stopStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent STOP)))
+startStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent START)))
+
+
+%
+% 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"
 
-melisma = \set Staff.melismaBusy =  ##t
-melismaEnd = \set Staff.melismaBusy =  ##f
-
+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"
 
+\layout {
+    mm = #(ly:output-def-lookup $defaultpaper 'mm)
+    unit = #(ly:output-def-lookup $defaultpaper 'unit)
 
-% Do units first; must be done before any units are specified.
-\paper {
-    unit = "mm"
-    mm = 1.0
-    in = 25.4
+    in = #(* 25.4 mm)
     pt = #(/  in 72.27)
     cm = #(* 10 mm)
-
-    texsetting = ""
-    pssetting = ""
-    scmsetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n"% UGH. 
-
-
-    #(define font-defaults
-      '((font-family . music)
-	(font-shape . upright)
-	(baseline-skip . 2)
-	(word-space . 0.6)
-	(font-series . medium)
-    ))
     
     \include "engraver-init.ly"
-}
-
-#(set-paper-size "a4")
-
-
-%{
-
-; note:
-; you can add fonts manually  in the paper block by issuing
-
-#(set! fonts (append ...myfonts... fonts))
 
-for the format of myfonts, see font.scm
-
-%}
-
-
-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))
+    #(set-paper-dimension-variables (current-module))
+    
 }
 
-paperTwenty = \paper {
-    #(paper-set-staff-size (* 20.0 pt))
-}
 
-paperTwentythree = \paper {
-    #(paper-set-staff-size (* 23.0 pt))
-}
+#(set-default-paper-size "a4")
 
-paperTwentysix = \paper {
-    #(paper-set-staff-size (* 26.0 pt))
-}
 
-\paper { \paperTwenty }
-
-partCombineListener = \paper {
- \translator {
-	  \VoiceContext
-	  \consists Note_heads_engraver
-	  \consists Rest_engraver
-	  \type "Recording_group_engraver"
-	  recordEventSequence = #notice-the-events-for-pc
- }
- \translator { \ScoreContext 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
+	ignoreBarChecks = ##t 
+    }
 }
 
 #(set-part-combine-listener partCombineListener)
 
 \include "dynamic-scripts-init.ly"
 \include "spanners-init.ly"
-
 \include "property-init.ly"
 
+setDefaultDurationToQuarter = { c4 }
 
+%% MAKE-HASH-TABLE in GUILE 1.6 takes mandatory size parameter.
+#(define musicQuotes (make-hash-table 29))
 
-% reset default duration
-unusedEntry = \notes { c4 }
-
-% music = "\melodic\relative c"
-
+#(define toplevel-book-handler ly:parser-print-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)