* ly/engraver-init.ly (AncientRemoveEmptyStaffContext): use length-fraction.

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index b46432122f55b8eb432d1f074bcb58e2700ded75..c2576b312c29bb6846a29aaaf4a645d9b48a7511 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -122,18 +122,16 @@ contained staves are not connected vertically."
   localKeySignature = #'()
   createSpacing = ##t
 
-  
   squashedPosition = #0
   \name RhythmicStaff
   \alias "Staff"
   
   \override BarLine #'bar-size = #4
-  \override VoltaBracket #'minimum-space = #15
-  \override VoltaBracket #'padding = #5
+  \override VoltaBracket #'staff-padding = #3
   \override StaffSymbol #'line-count = #1      
 
-  \override Stem  #'neutral-direction = #1
-  \override Beam  #'neutral-direction = #1
+  \override Stem  #'neutral-direction = #UP
+  \override Beam  #'neutral-direction = #UP
   
   \consists "Output_property_engraver"
   \consists "Font_size_engraver"
@@ -182,7 +180,7 @@ contained staves are not connected vertically."
   \consists "Trill_spanner_engraver"
   \consists "Grob_pq_engraver"
   \consists "Forbid_line_break_engraver"
-
+  \consists "Laissez_vibrer_engraver"
   \consists "Note_head_line_engraver"
   \consists "Glissando_engraver"
   \consists "Ligature_bracket_engraver"
@@ -280,7 +278,6 @@ contained staves are not connected vertically."
   "Just like @code{GrandStaff} but with a forced distance between
     the staves, so cross staff beaming and slurring can be used."
   
-  verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback
   \override VerticalAlignment #'forced-distance = #12
   \override VerticalAlignment #'self-alignment-Y = #0
 
@@ -479,7 +476,7 @@ AncientRemoveEmptyStaffContext = \context {
   firstClef = ##t
   
   defaultBarType = #"|"
-  barNumberVisibility = #default-bar-number-visibility
+  barNumberVisibility = #first-bar-number-invisible
   automaticBars = ##t
   
   explicitClefVisibility = #all-visible
@@ -489,8 +486,6 @@ AncientRemoveEmptyStaffContext = \context {
   autoBeamCheck = #default-auto-beam-check
   scriptDefinitions = #default-script-alist
 
-  verticalAlignmentChildCallback = #Align_interface::alignment_callback
-
   pedalSustainStrings = #'("Ped." "*Ped." "*")
   pedalSustainStyle = #'text
   pedalUnaCordaStrings = #'("una corda" "" "tre corde")
@@ -551,25 +546,14 @@ AncientRemoveEmptyStaffContext = \context {
   tablatureFormat = #fret-number-tablature-format
 
 %%
-  bassFigureFormatFunction = #format-bass-figure
+  newFiguredBassFormatter = #format-new-bass-figure
   metronomeMarkFormatter = #format-metronome-markup
   graceSettings = #`(
     (Voice Stem direction 1)
-    ;; TODO: should take from existing definition.
-    ;; c&p from define-grobs.scm
-    
-    (Voice Stem lengths ,(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0)))
-    (Voice Stem stem-shorten (0.4 0.4))
-    (Voice Stem  font-size -3)
+    (Voice Stem font-size -3)
     (Voice NoteHead  font-size -3)
-    (Voice Dots  font-size -3)
-    (Voice Stem beamed-lengths  
-     ,(map (lambda (x) (* 0.8 x)) '(3.3 3.3 4.0)))
-    (Voice Stem beamed-minimum-free-lengths  
-     ,(map (lambda (x) (* 0.8 x)) '(2.5 2.0 1.5)))
-    (Voice Stem beamed-extreme-minimum-free-lengths  
-     ,(map (lambda (x) (* 0.8 x)) '(1.83 1.5)))
-
+    (Voice Dots font-size -3)
+    (Voice Stem length-fraction 0.8)
     (Voice Stem no-stem-extend #t)
     (Voice Beam thickness 0.384)
     (Voice Beam space-function ,(lambda (beam mult)
@@ -593,15 +577,16 @@ AncientRemoveEmptyStaffContext = \context {
 
 \context {
   \type "Engraver_group"
-  \name FiguredBass 
+  \name "FiguredBass"
 
-  \consists "Figured_bass_engraver"
-  \consists "Rest_swallow_translator"
+%%  \consists "Figured_bass_engraver"
+  \consists "New_figured_bass_engraver"
   \consists "Note_swallow_translator"
   \consists "Skip_event_swallow_translator"
   \consists "Separating_line_group_engraver"
   \consists "Hara_kiri_engraver"
   \override RemoveEmptyVerticalGroup #'remove-first = ##t
+  minimumVerticalExtent = #'(-0.5 . 2.5)
 }
 
 \context {
@@ -618,6 +603,7 @@ AncientRemoveEmptyStaffContext = \context {
 \context {
   \Voice
   \name "TabVoice"
+  \alias "Voice"
   \consists "Tab_note_heads_engraver"
   \remove "Note_heads_engraver"
   \remove "Fingering_engraver"
@@ -756,7 +742,7 @@ AncientRemoveEmptyStaffContext = \context {
   \override Accidental #'style = #'vaticana
   \override Custos #'style = #'vaticana
   \override Custos #'neutral-position = #3
-  \override Custos #'neutral-direction = #-1
+  \override Custos #'neutral-direction = #DOWN
 
   %% Score.timing = ##f
   %% Score.barAlways = ##t
@@ -861,7 +847,7 @@ AncientRemoveEmptyStaffContext = \context {
   \override Accidental #'style = #'mensural
   \override Custos #'style = #'mensural
   \override Custos #'neutral-position = #3
-  \override Custos #'neutral-direction = #-1
+  \override Custos #'neutral-direction = #DOWN
 
   %% Score.timing = ##f
   %% Score.barAlways = ##t