X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations.ly;h=468fc575290423e17432613a308468a4534b7fb5;hb=8da6cef580cce3365b219f6aca429b434cb60fcf;hp=a6e51b93952155554fd109fbc14b1925f14557c7;hpb=8002fa018c81f70585c25232247c6dcba7f5cba0;p=lilypond.git

diff --git a/ly/declarations.ly b/ly/declarations.ly
index a6e51b9395..468fc57529 100644
--- a/ly/declarations.ly
+++ b/ly/declarations.ly
@@ -1,13 +1,11 @@
-
-  
-breve = \duration { -1 0 }
-longa = \duration { -2 0 }
+breve = \duration #(make-duration -1 0)
+longa = \duration #(make-duration -2 0 )
+maxima = \duration #(make-duration  -3 0)
 
 \include "nederlands.ly"		% dutch
 \include "chord-modifiers.ly"
 \include "script.ly"
 
-
 % declarations for standard directions
 left = -1
 right = 1
@@ -17,42 +15,29 @@ start = -1
 stop = 1
 smaller = -1
 bigger = 1
-
 center=0
 
 break =  \penalty  -1000000; 
 nobreak =  \penalty 1000000; 
+\include "scale-definitions.ly"
 
-major = 0
-minor = 3
-
-ionian = 0
-locrian = 1
-aeolian = 3
-mixolydian = 5
-lydian = 7
-phrygian = 8
-dorian = 10
-
-melisma = \property Staff.melismaBusy = "1"
-melismaEnd = \property Staff.melismaBusy = "0"
-
-
-
+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"