X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations-init.ly;h=0f55ad98e51ecf738d8aa83656ebdf5782ab76de;hb=59566db06793e38a8805f75d2ee80970ff2cad0f;hp=6021e8d72f469b1fc2a16aecedf8bb0695091626;hpb=54685cedab8c7e6ce9cfc754dc6b6c646e8421ff;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 6021e8d72f..0f55ad98e5 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,10 +1,12 @@
+#(ly:set-option 'old-relative)
 
-\version "1.5.68"
-breve = \duration #(make-duration -1 0)
-longa = \duration #(make-duration -2 0 )
-maxima = \duration #(make-duration -3 0)
+\version "2.1.23"
+breve = #(ly:make-duration -1 0)
+longa = #(ly:make-duration -2 0 )
+maxima = #(ly:make-duration -3 0)
 
 \include "nederlands.ly"		% dutch
+\include "drumpitch-init.ly"		
 \include "chord-modifiers-init.ly"
 \include "script-init.ly"
 
@@ -19,26 +21,108 @@ smaller = -1
 bigger = 1
 center=0
 
-break =  \penalty  #-10000
-noBreak =  \penalty #10000
+%{
+
+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)))
+
 \include "scale-definitions-init.ly"
 
-melisma = \property Staff.melismaBusy = ##t
-melismaEnd = \property Staff.melismaBusy = ##f
+melisma = \set Staff.melismaBusy = ##t
+melismaEnd = \set Staff.melismaBusy = ##f
 
 
-\include "engraver-init.ly"
 \include "grace-init.ly"
 
 % ugh
 \include "midi-init.ly"
 
-papersize = "a4"
-paperfile = \papersize + "-init.ly"
 
-\include "generic-paper-init.ly"
-\include "paper20-init.ly"
+% 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)
+
+    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))
+}
+
+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 {
+ \translator {
+	  \VoiceContext
+	  \consists Note_heads_engraver
+	  \consists Rest_engraver
+	  \type "Recording_group_engraver"
+	  recordEventSequence = #notice-the-events-for-pc
+ }
+ \translator { \ScoreContext skipTypesetting = ##t }
+}
 
+#(set-part-combine-listener partCombineListener)
 
 \include "dynamic-scripts-init.ly"
 \include "spanners-init.ly"
@@ -48,7 +132,7 @@ paperfile = \papersize + "-init.ly"
 
 
 % reset default duration
-unusedEntry = \notes { c4 }	
+unusedEntry = \notes { c4 }
 
 % music = "\melodic\relative c"