release: 1.1.58

[lilypond.git] / ly / declarations.ly

diff --git a/ly/declarations.ly b/ly/declarations.ly
index 69b33ac2ce1d4d04dc3217a81f933b89e4e4213a..30677bb55ede8d6b6cc6b9881f3ac8316f7b9e50 100644 (file)
--- a/ly/declarations.ly
+++ b/ly/declarations.ly
@@ -3,7 +3,6 @@
 breve = \duration { -1 0 }
 longa = \duration { -2 0 }
 
-\include "dynamic.ly"
 \include "nederlands.ly"               % dutch
 \include "chord-modifiers.ly"
 \include "script.ly"
@@ -11,9 +10,36 @@ longa = \duration { -2 0 }
 
 Gourlay = 1.0
 Wordwrap = 0.0
+% declarations for standard directions
+left = -1
+right = 1
+up = 1
+down = -1
+start = -1
+stop = 1
+smaller = -1
+bigger = 1
+
+center=0
+
+break =  \penalty  10000; 
+nobreak =  \penalty  -10000; 
+
+major = 0
+minor = 3
+
+ionian = 0
+locrian = 1
+aeolian = 3
+mixolydian = 5
+lydian = 7
+phrygian = 8
+dorian = 10
 
-papersize = "a4"
 
+
+papersize = "a4"
+\include "generic-paper.ly"
 \include "paper20.ly"
 
 \paper{
@@ -23,23 +49,13 @@ papersize = "a4"
 % ugh
 \include "midi.ly"
 
-% declarations for standard directions
-left = -1
-right = 1
-up = 1
-down = -1
-% zillie spellink?
-center=0
+\include "dynamic.ly"
 
-break = { \penalty = 10000; }
-nobreak = { \penalty = -10000; }
+\include "property.ly"
 
-major = 0
-minor = 3
 
-\include "property.ly"
 
-\scmfile "lily.scm";
+unusedEntry = \notes { c4 }            % reset default duration
 
 % music = "\melodic\relative c"