*** empty log message ***

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index b96ee5eadaa75b8cd1d26060d480fa6fb77f88da..79ecb85d407f2a810a0b8ad7b1f2abecd66a3302 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -278,11 +278,8 @@ 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
-  \override VerticalAlignment #'after-line-breaking-callback
-     = #Align_interface::stretch_after_break
 
   \consists "Vertical_align_engraver"
   \consists "Instrument_name_engraver"
@@ -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,31 +546,17 @@ 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 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 Stem font-size -3)
+    (Voice NoteHead font-size -3)
+    (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)
-                                (* 0.8 (Beam::space_function
-                                        beam mult))))
+    (Voice Beam length-fraction 0.8)
     (Voice Accidental font-size -4)
     (Voice Slur direction -1)
   )
@@ -594,14 +575,16 @@ AncientRemoveEmptyStaffContext = \context {
 
 \context {
   \type "Engraver_group"
-  \name FiguredBass 
+  \name "FiguredBass"
 
-  \consists "Figured_bass_engraver"
+%%  \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 {
@@ -635,8 +618,7 @@ AncientRemoveEmptyStaffContext = \context {
   %% increases beam thickness and spacing; beams are
   %% too big. We have to adjust the beam settings:
   \override Beam #'thickness = #0.32
-  \override Beam #'space-function =
-  #(lambda (beam mult) (* 0.62 (Beam::space_function beam mult)))
+  \override Beam #'length-fraction = #0.62
 
   %% No accidental in tablature !
   \remove Accidental_engraver