patch::: 1.3.96.jcn9

[lilypond.git] / ly / declarations.ly

diff --git a/ly/declarations.ly b/ly/declarations.ly
index d6c0930ea81da399539977bae2f7bbd00056c65d..b2781c3dd2db7275916f474b7fefcb83ecec7b29 100644 (file)
--- a/ly/declarations.ly
+++ b/ly/declarations.ly
@@ -1,16 +1,11 @@
-
-  
-breve = \duration { -1 0 }
-longa = \duration { -2 0 }
-maxima = \duration { -3 0 }
-
-#(eval-string (ly-gulp-file "generic-property.scm"))
+breve = \duration #'( -1 0)
+longa = \duration #'( -2 0 )
+maxima = \duration #'( -3 0 )
 
 \include "nederlands.ly"               % dutch
 \include "chord-modifiers.ly"
 \include "script.ly"
 
-
 % declarations for standard directions
 left = -1
 right = 1
@@ -20,42 +15,29 @@ start = -1
 stop = 1
 smaller = -1
 bigger = 1
-
 center=0
 
 break =  \penalty  -1000000; 
 nobreak =  \penalty 1000000; 
-
-major = 0
-minor = 3
-
-ionian = 0
-locrian = 1
-aeolian = 3
-mixolydian = 5
-lydian = 7
-phrygian = 8
-dorian = 10
+\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"
 
 % ugh
 \include "midi.ly"
 
-\include "textscripts.ly"
+\include "dynamic-scripts.ly"
 \include "spanners.ly"
 
 \include "property.ly"
 
 
-
 unusedEntry = \notes { c4 }            % reset default duration
 
 % music = "\melodic\relative c"