*** empty log message ***

[lilypond.git] / ly / declarations-init.ly

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 4cbadfea8385c8a1783be64a1e1438035f94dfb4..00ae0f46f619c4239768459c733667501854fac7 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "2.1.29"
+\version "2.1.30"
 breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0 )
 maxima = #(ly:make-duration -3 0)
@@ -45,24 +45,34 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 
 % Do units first; must be done before any units are specified.
 \paper {
-    unit = "mm"  %% ugh: coupled to LilyPond C++ code.
+    unit = #(ly:unit)
     mm = 1.0
     in = 25.4
     pt = #(/  in 72.27)
     cm = #(* 10 mm)
 
+    raggedright = ##f
+    raggedlast = ##f 
+    packed = ##f
+    #(define $is-paper #t)
+    
     #(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"
 }
 
-#(set-paper-size "a4")
+#(set-default-paper-size "a4")
 
 
 %{
@@ -76,7 +86,6 @@ for the format of myfonts, see font.scm
 
 %}
 
-
 paperEleven = \paper {
     #(paper-set-staff-size (* 11.0 pt))
 }