lilypond-1.3.75

diff --git a/ly/declarations-as.ly b/ly/declarations-as.ly
index fe4d71c55241303b1395a66fabbd79c0e5d52305..ceae9b08aa8fd78a82fb62e9d8721422baa3ec14 100644 (file)
--- a/ly/declarations-as.ly
+++ b/ly/declarations-as.ly
@@ -2,13 +2,15 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% UGH UGH UGH UGHUGH FIXME
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -> duplication!
 
-
-breve = \duration { -1 0 }
-longa = \duration { -2 0 }
-maxima = \duration { -3 0 }
+breve = \duration #'( -1 0)
+longa = \duration #'( -2 0 )
+maxima = \duration #'( -3 0 )
 
 #(eval-string (ly-gulp-file "generic-property.scm"))
 
+% urg, move to basic property?
+#(eval-string (ly-gulp-file "slur.scm"))
+
 \include "nederlands.ly"               % dutch
 \include "chord-modifiers.ly"
 \include "script.ly"
@@ -28,7 +30,7 @@ center=0
 
 break =  \penalty  -1000000; 
 nobreak =  \penalty 1000000; 
-\include "scales.ly"
+\include "scale-definitions.ly"
 
 
 melisma = \property Staff.melismaBusy = ##t

diff --git a/ly/init-as.fly b/ly/init-as.fly
index e076e4467b85c189980fb37c5fec360a377874a8..4697e96c22a016d7c6b9c67455a6360ed9ace539 100644 (file)
--- a/ly/init-as.fly
+++ b/ly/init-as.fly
@@ -33,7 +33,7 @@
     \paper_as_nine
     %linewidth=-1.0;
     %indent = 0.0;
-    \translator { \StaffContext barSize = #'staff-height }
+    \translator { \StaffContext barSize = \staffheight; }
 
     % no beam-slope
     %\translator { \VoiceContext beamHeight = #0; }

diff --git a/ly/init-as.ly b/ly/init-as.ly
index ce7099b426b440297cd12ee67145fc3b041d2f61..c24c19d2570ea7d4c9dd5027770ed1c16b9e21c2 100644 (file)
--- a/ly/init-as.ly
+++ b/ly/init-as.ly
@@ -27,7 +27,7 @@
 
 \paper {
     \paper_as_nine
-    \translator { \StaffContext barSize = #'staff-height }
+    \translator { \StaffContext barSize = \staffheight; }
 
     % no beam-slope
     %\translator { \VoiceContext beamHeight = #0; }