release: 1.2.15

[lilypond.git] / ly / declarations.ly

diff --git a/ly/declarations.ly b/ly/declarations.ly
index bb2f3d39d0264da0fcade9d5b8eb93daf4567c46..a6e51b93952155554fd109fbc14b1925f14557c7 100644 (file)
--- a/ly/declarations.ly
+++ b/ly/declarations.ly
@@ -8,20 +8,6 @@ longa = \duration { -2 0 }
 \include "script.ly"
 
 
-Gourlay = 1.0
-Wordwrap = 0.0
-
-papersize = "a4"
-
-\include "paper20.ly"
-
-\paper{
-       \paper_twenty
-}
-
-% ugh
-\include "midi.ly"
-
 % declarations for standard directions
 left = -1
 right = 1
@@ -34,12 +20,34 @@ bigger = 1
 
 center=0
 
-break = { \penalty = 10000; }
-nobreak = { \penalty = -10000; }
+break =  \penalty  -1000000; 
+nobreak =  \penalty 1000000; 
 
 major = 0
 minor = 3
-\include "dynamic.ly"
+
+ionian = 0
+locrian = 1
+aeolian = 3
+mixolydian = 5
+lydian = 7
+phrygian = 8
+dorian = 10
+
+melisma = \property Staff.melismaBusy = "1"
+melismaEnd = \property Staff.melismaBusy = "0"
+
+
+
+papersize = "a4"
+\include "generic-paper.ly"
+\include "paper20.ly"
+
+% ugh
+\include "midi.ly"
+
+\include "textscripts.ly"
+\include "spanners.ly"
 
 \include "property.ly"