release: 1.2.15

[lilypond.git] / ly / declarations.ly

diff --git a/ly/declarations.ly b/ly/declarations.ly
index 4e5d37d75155431270940ad75023383bc1e3ae42..a6e51b93952155554fd109fbc14b1925f14557c7 100644 (file)
--- a/ly/declarations.ly
+++ b/ly/declarations.ly
@@ -8,8 +8,6 @@ longa = \duration { -2 0 }
 \include "script.ly"
 
 
-Gourlay = 1.0
-Wordwrap = 0.0
 % declarations for standard directions
 left = -1
 right = 1
@@ -22,8 +20,8 @@ bigger = 1
 
 center=0
 
-break =  \penalty  10000; 
-nobreak =  \penalty  -10000; 
+break =  \penalty  -1000000; 
+nobreak =  \penalty 1000000; 
 
 major = 0
 minor = 3
@@ -48,7 +46,8 @@ papersize = "a4"
 % ugh
 \include "midi.ly"
 
-\include "dynamic.ly"
+\include "textscripts.ly"
+\include "spanners.ly"
 
 \include "property.ly"