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

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 5805fdb7de..428c78d248 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "2.1.22"
+\version "2.1.30"
 breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0 )
 maxima = #(ly:make-duration -3 0)
@@ -28,13 +28,14 @@ working with lyric sections)
 
 %}
 break =#(make-event-chord (list (make-penalty-music -10001)))
-noBreak =  #(make-event-chord (list (make-penalty-music 10001)))
+noBreak = #(make-event-chord (list (make-penalty-music 10001)))
 
-\include "scale-definitions-init.ly"
+noBeam = #(make-music 'BeamForbidEvent) 
 
-melisma = \set Staff.melismaBusy =  ##t
-melismaEnd = \set Staff.melismaBusy =  ##f
+\include "scale-definitions-init.ly"
 
+melisma = #(make-span-event 'ManualMelismaEvent START)
+melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 
 \include "grace-init.ly"
 
@@ -44,24 +45,24 @@ melismaEnd = \set Staff.melismaBusy =  ##f
 
 % Do units first; must be done before any units are specified.
 \paper {
-    unit = "mm"
+    unit = #(ly:unit)
     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)
+      '((font-encoding . music))
+      )
+
+    #(define text-font-defaults
+      '((font-encoding . text)
 	(baseline-skip . 2)
 	(word-space . 0.6)
-	(font-series . medium)
-    ))
+	))
+
+    #(define page-breaking ly:ragged-page-breaks)
+    %#(define page-breaking ly:optimal-page-breaks)
     
     \include "engraver-init.ly"
 }
@@ -112,14 +113,14 @@ paperTwentysix = \paper {
 \paper { \paperTwenty }
 
 partCombineListener = \paper {
- \translator {
+ \context {
 	  \VoiceContext
 	  \consists Note_heads_engraver
 	  \consists Rest_engraver
 	  \type "Recording_group_engraver"
 	  recordEventSequence = #notice-the-events-for-pc
  }
- \translator { \ScoreContext skipTypesetting = ##t }
+ \context { \ScoreContext skipTypesetting = ##t }
 }
 
 #(set-part-combine-listener partCombineListener)
@@ -134,5 +135,6 @@ partCombineListener = \paper {
 % reset default duration
 unusedEntry = \notes { c4 }
 
-% music = "\melodic\relative c"
 
+% must have size argument for GUILE 1.6 compat.
+#(define musicQuotes (make-hash-table 29))