patch::: 1.3.96.jcn9

[lilypond.git] / ly / declarations.ly

diff --git a/ly/declarations.ly b/ly/declarations.ly
index 7d01eca86eefd183140f63d73b7599d6b01e1dc8..b2781c3dd2db7275916f474b7fefcb83ecec7b29 100644 (file)
--- a/ly/declarations.ly
+++ b/ly/declarations.ly
@@ -1,15 +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
 % declarations for standard directions
 left = -1
 right = 1
@@ -19,33 +15,29 @@ start = -1
 stop = 1
 smaller = -1
 bigger = 1
-
 center=0
 
-break = { \penalty = 10000; }
-nobreak = { \penalty = -10000; }
-
-major = 0
-minor = 3
-
+break =  \penalty  -1000000; 
+nobreak =  \penalty 1000000; 
+\include "scale-definitions.ly"
 
+melisma = \property Staff.melismaBusy = ##t
+melismaEnd = \property Staff.melismaBusy = ##f
 papersize = "a4"
 
+\include "engraver.ly"
+\include "generic-paper.ly"
 \include "paper20.ly"
 
-\paper{
-       \paper_twenty
-}
-
 % ugh
 \include "midi.ly"
 
-\include "dynamic.ly"
+\include "dynamic-scripts.ly"
+\include "spanners.ly"
 
 \include "property.ly"
 
 
-
 unusedEntry = \notes { c4 }            % reset default duration
 
 % music = "\melodic\relative c"