X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations-init.ly;h=f0fc60ee7bfe31284767e96bbd89e022847aa08b;hb=853303f6ec72641e842d58e68bc304c5afffcd13;hp=cec3097a7f7dc24eb1ff211ed1b1eeb430ad3096;hpb=f67039a8cc4182dba8d6a04a62acba939409e784;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index cec3097a7f..f0fc60ee7b 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,10 +1,13 @@
+#(ly:set-option 'old-relative)
 
-\version "1.7.3"
-breve = \duration #(ly:make-duration -1 0)
-longa = \duration #(ly:make-duration -2 0 )
-maxima = \duration #(ly:make-duration -3 0)
+\version "2.2.0"
+breve = #(ly:make-duration -1 0)
+longa = #(ly:make-duration -2 0 )
+maxima = #(ly:make-duration -3 0)
 
+\include "music-functions-init.ly"
 \include "nederlands.ly"		% dutch
+\include "drumpitch-init.ly"		
 \include "chord-modifiers-init.ly"
 \include "script-init.ly"
 
@@ -18,17 +21,28 @@ stop = 1
 smaller = -1
 bigger = 1
 center=0
-	
-break = #(make-event-chord (list (make-penalty-music -10001)))
-noBreak =  #(make-event-chord (list (make-penalty-music 10001)))
 
-\include "scale-definitions-init.ly"
+%{
+
+should also set allowBeamBreak, but how to do it "portably"? (ie. also
+working with lyric sections)
+
+%}
+
+%% rather name \newline, \newpage ?
+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)))
 
-melisma = \property Staff.melismaBusy = ##t
-melismaEnd = \property Staff.melismaBusy = ##f
+noBeam = #(make-music 'BeamForbidEvent) 
+pipeSymbol = #(make-music 'BarCheck)
 
+\include "scale-definitions-init.ly"
+
+melisma = #(make-span-event 'ManualMelismaEvent START)
+melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 
-\include "engraver-init.ly"
 \include "grace-init.ly"
 
 % ugh
@@ -37,29 +51,120 @@ melismaEnd = \property Staff.melismaBusy = ##f
 
 % Do units first; must be done before any units are specified.
 \paper {
-	unit = "mm"
-	mm = 1.0
-	in = 25.4
-	pt = #(/  in 72.27)
-	cm = #(* 10 mm)
+    unit = #(ly:unit)
+    mm = 1.0
+    in = 25.4
+    pt = #(/  in 72.27)
+    cm = #(* 10 mm)
+
+    inputencoding = #"TeX"
+    raggedright = ##f
+    raggedlast = ##f 
+    packed = ##f
+    
+    #(define $is-paper #t)
+    
+    #(define font-defaults
+      '((font-encoding . fetaMusic)))
+
+    #(define text-font-defaults
+      '((font-encoding . latin1)
+	(baseline-skip . 2)
+	(word-space . 0.6)))
+
+    #(define page-breaking ly:ragged-page-breaks)
+    %%#(define page-breaking ly:optimal-page-breaks)
+
+    #(define page-to-stencil ly:page-header-lines-footer-stencil)
+
+    #(define make-header plain-header)
+    #(define make-footer plain-footer)
+    %%#(define make-footer empty-markup)
+    #(define make-tagline TAGLINE-or-tagline-from-header)
+    #(define make-copyright copyright-from-header)
+
+    \include "engraver-init.ly"
 }
 
-papersize = "a4"
-paperfile = \papersize + "-init.ly"
+%
+% 20pt staff, 5 pt = 1.75 mm
+%
+
+#(define-public $defaultbookpaper (ly:make-bookpaper 1.7573))
+  
+
 
-\include "generic-paper-init.ly"
-\include "paper20-init.ly"
+#(set-default-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))
+}
+
+paperTwenty = \paper {
+    #(paper-set-staff-size (* 20.0 pt))
+}
+
+paperTwentythree = \paper {
+    #(paper-set-staff-size (* 23.0 pt))
+}
+
+paperTwentysix = \paper {
+    #(paper-set-staff-size (* 26.0 pt))
+}
+
+\paper { \paperTwenty }
+
+partCombineListener = \paper {
+ \context {
+	  \VoiceContext
+	  \consists Note_heads_engraver
+	  \consists Rest_engraver
+	  \type "Recording_group_engraver"
+	  recordEventSequence = #notice-the-events-for-pc
+ }
+ \context { \ScoreContext 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 }
 
+%% must have size argument for GUILE 1.6 compat.
+#(define musicQuotes (make-hash-table 29))
 
-% reset default duration
-unusedEntry = \notes { c4 }	
-
-% music = "\melodic\relative c"
+%%#(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)