Prepare introduction of Waf build system

[lilypond.git] / ly / engraver-init.ly

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index ed7698ef0914c29ff3778a98574a753a5d517263..df6fb25e883ec8004b31996567fa0b8acf63d23a 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -10,8 +10,6 @@
   \grobdescriptions #all-grob-descriptions
 }
 
-% FIXME: replace minimum-Y-extents with proper spacing commands.
-
 \context {
   \type "Engraver_group"
   \name "FretBoards"
@@ -66,7 +64,6 @@
   localKeySignature = #'()
   createSpacing = ##t
   ignoreFiguredBassRest = ##t
-  \override VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 4)
 
   %% explicitly set instrument, so we don't get
   %% weird effects when doing instrument names for
@@ -136,7 +133,6 @@ contained staves are not connected vertically."
 \context{
   \type "Engraver_group"
 
-  \override VerticalAxisGroup #'minimum-Y-extent = ##f
   localKeySignature = #'()
   createSpacing = ##t
 
@@ -252,7 +248,7 @@ multiple voices on the same staff."
   fontSize = #-4
   \override Stem #'length-fraction = #(magstep -4)
   \override Beam #'length-fraction = #(magstep -4)
-  \override Beam #'thickness = #0.35
+  \override Beam #'beam-thickness = #0.35
 }
 
 \context {
@@ -375,7 +371,6 @@ centered between the staves surrounding this context."
 
 \context{
   \type "Engraver_group"
-  \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.75 . 2.0)
 
   \description "Corresponds to a voice with lyrics.  Handles the
 printing of a single line of lyrics."
@@ -397,7 +392,7 @@ printing of a single line of lyrics."
   \override VerticalAxisGroup #'remove-empty = ##t
   \override VerticalAxisGroup #'staff-affinity = #UP
   \override VerticalAxisGroup #'inter-staff-spacing = #'((space . 5.5) (stretchability . 1) (padding . 0.5))
-  \override VerticalAxisGroup #'inter-loose-line-spacing = #'((space . 2) (stretchability . 0.5) (padding . 0.2))
+  \override VerticalAxisGroup #'inter-loose-line-spacing = #'((space . 0) (stretchability . 0) (padding . 0.2))
   \override SeparationItem #'padding = #0.2
   \override InstrumentName #'self-alignment-Y = ##f
 
@@ -416,7 +411,6 @@ printing of a single line of lyrics."
   \description "A context for printing the names of notes."
   \consists "Axis_group_engraver"
 
-  \override VerticalAxisGroup #'minimum-Y-extent = ##f
   % FIXME: not sure what the default should be here.
   \override VerticalAxisGroup #'staff-affinity = #DOWN
 
@@ -440,10 +434,11 @@ printing of a single line of lyrics."
   \consists "Skip_event_swallow_translator"
   \consists "Hara_kiri_engraver"
 %  \consists "Note_spacing_engraver"
-  \override VerticalAxisGroup #'minimum-Y-extent = #'(0 . 2)
   \override VerticalAxisGroup #'remove-first = ##t
   \override VerticalAxisGroup #'remove-empty = ##t
   \override VerticalAxisGroup #'staff-affinity = #DOWN
+  \override VerticalAxisGroup #'inter-staff-spacing #'padding = #0.5
+  \override VerticalAxisGroup #'inter-loose-line-spacing #'padding = #0.5
 }
 
 
@@ -632,7 +627,7 @@ automatically when an output definition (a @code{\score} or
     (Voice Dots font-size -3)
     (Voice Stem length-fraction 0.8)
     (Voice Stem no-stem-extend #t)
-    (Voice Beam thickness 0.384)
+    (Voice Beam beam-thickness 0.384)
     (Voice Beam length-fraction 0.8)
     (Voice Accidental font-size -4)
     (Voice AccidentalCautionary font-size -4)
@@ -682,7 +677,8 @@ automatically when an output definition (a @code{\score} or
   \override VerticalAxisGroup #'remove-empty = ##t
   \override VerticalAxisGroup #'remove-first = ##t
   \override VerticalAxisGroup #'staff-affinity = #UP
-  \override VerticalAxisGroup #'minimum-Y-extent = #'(0 . 2)
+  \override VerticalAxisGroup #'inter-staff-spacing #'padding = #0.5
+  \override VerticalAxisGroup #'inter-loose-line-spacing #'padding = #0.5
 }
 
 \context {
@@ -713,7 +709,7 @@ context."
   %% TabStaff increase the staff-space, which in turn
   %% increases beam thickness and spacing; beams are
   %% too big. We have to adjust the beam settings:
-  \override Beam #'thickness = #0.32
+  \override Beam #'beam-thickness = #0.32
   \override Beam #'length-fraction = #0.62
 
   %% No accidental in tablature !
@@ -788,16 +784,6 @@ context."
   clefPosition = #0
 }
 
-%% TODO: Gregorian Chant contexts should be moved to gregorian.ly,
-%% but this does not work (is this a bug or intended behaviour?):
-%%
-%% If I try to do so, I get "error: unknown escaped string:
-%% `\VaticanaStaff'" in params-init.ly.  If I also move
-%% "\context { \Vaticana*Context }" from params-init.ly to the end
-%% of gregorian.ly, then I get "error: parse error, unexpected
-%% TRANSLATOR: \context { \VaticanaStaff }" in
-%% gregorian.ly. --jr
-
 \context {
   \Voice
   \name "VaticanaVoice"