patch::: 1.3.96.jcn9

[lilypond.git] / ly / declarations.ly

diff --git a/ly/declarations.ly b/ly/declarations.ly
index bb2f3d39d0264da0fcade9d5b8eb93daf4567c46..b2781c3dd2db7275916f474b7fefcb83ecec7b29 100644 (file)
--- a/ly/declarations.ly
+++ b/ly/declarations.ly
@@ -1,27 +1,11 @@
-
-  
-breve = \duration { -1 0 }
-longa = \duration { -2 0 }
+breve = \duration #'( -1 0)
+longa = \duration #'( -2 0 )
+maxima = \duration #'( -3 0 )
 
 \include "nederlands.ly"               % dutch
 \include "chord-modifiers.ly"
 \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
@@ -31,18 +15,27 @@ start = -1
 stop = 1
 smaller = -1
 bigger = 1
-
 center=0
 
-break = { \penalty = 10000; }
-nobreak = { \penalty = -10000; }
+break =  \penalty  -1000000; 
+nobreak =  \penalty 1000000; 
+\include "scale-definitions.ly"
 
-major = 0
-minor = 3
-\include "dynamic.ly"
+melisma = \property Staff.melismaBusy = ##t
+melismaEnd = \property Staff.melismaBusy = ##f
+papersize = "a4"
 
-\include "property.ly"
+\include "engraver.ly"
+\include "generic-paper.ly"
+\include "paper20.ly"
 
+% ugh
+\include "midi.ly"
+
+\include "dynamic-scripts.ly"
+\include "spanners.ly"
+
+\include "property.ly"
 
 
 unusedEntry = \notes { c4 }            % reset default duration