X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=ly%2Fdeclarations-init.ly;h=26d8cc733c21eaf82942364a388a89c85b330643;hb=3bd9e8e2eb4edbdfaa0a3ed17e7b6c4372b566f0;hp=69510dbb9d07ab4fedf41fab98400b64c2ba8d5a;hpb=db0fd63fbf16b5824fb0c58164e6e82b05f278a0;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 69510dbb9d..26d8cc733c 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "2.1.23"
+\version "2.1.36"
 breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0 )
 maxima = #(ly:make-duration -3 0)
@@ -30,6 +30,9 @@ working with lyric sections)
 break =#(make-event-chord (list (make-penalty-music -10001)))
 noBreak = #(make-event-chord (list (make-penalty-music 10001)))
 
+noBeam = #(make-music 'BeamForbidEvent) 
+pipeSymbol = #(make-music 'BarCheck)
+
 \include "scale-definitions-init.ly"
 
 melisma = #(make-span-event 'ManualMelismaEvent START)
@@ -43,24 +46,36 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 
 % 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)
 
+    inputencoding = #"TeX"
+    raggedright = ##f
+    raggedlast = ##f 
+    packed = ##f
+    
+    #(define $is-paper #t)
+    
     #(define font-defaults
-      '((font-family . music)
-	(font-shape . upright)
+      '((font-encoding . fetaMusic))
+      )
+
+    #(define text-font-defaults
+      '((font-encoding . latin1)
 	(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"
 }
 
-#(set-paper-size "a4")
+#(set-default-paper-size "a4")
 
 
 %{
@@ -74,7 +89,6 @@ for the format of myfonts, see font.scm
 
 %}
 
-
 paperEleven = \paper {
     #(paper-set-staff-size (* 11.0 pt))
 }
@@ -106,14 +120,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)
@@ -128,5 +142,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))