release commit

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 23a1e1045ed1b388d32ef8860b7ffa9b314478a2..6e3a51c62be935ecae6a621671a65ac45b0377b6 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "1.9.1"
+\version "1.9.8"
 
 
 %
@@ -16,7 +16,7 @@ StaffContext=\translator {
        \consists "Output_property_engraver"    
        
        \consists "Bar_engraver"
- % Bar_engraver must be first so default bars aren't overwritten
+% Bar_engraver must be first so default bars aren't overwritten
 % with empty ones.
        \consists "Font_size_engraver"
 
@@ -40,6 +40,7 @@ StaffContext=\translator {
        \consists "Instrument_name_engraver"
        \consists "Grob_pq_engraver"
        \consists "Forbid_line_break_engraver"
+       \consists "String_number_engraver"
        \consistsend "Axis_group_engraver"
 
        minimumVerticalExtent = #'(-6 . 6)
@@ -335,7 +336,7 @@ LyricsContext = \translator {
        %% To get folded repeats right.
        \consists Vertical_align_engraver 
 
-       \consistsend "Hara_kiri_engraver"
+%      \consistsend "Hara_kiri_engraver"
        minimumVerticalExtent = ##f
        extraVerticalExtent = ##f
        verticalExtent = ##f 
@@ -347,7 +348,7 @@ LyricsContext = \translator {
 ChordNamesContext = \translator {
        \type "Engraver_group_engraver"
        \name ChordNames
-\description "    Typesets chord names."
+       \description "Typesets chord names."
        
        \consists "Rest_swallow_translator" 
        \consists "Output_property_engraver"    
@@ -355,6 +356,7 @@ ChordNamesContext = \translator {
        \consists "Chord_name_engraver"
        \consists "Skip_event_swallow_translator"
        \consistsend "Hara_kiri_engraver"
+       
        minimumVerticalExtent = #'(0 . 2.5)
        extraVerticalExtent = ##f
        verticalExtent = ##f 
@@ -436,7 +438,8 @@ ScoreContext = \translator {
        changeMoment = #`(,(ly:make-moment 0 0) . ,(ly:make-moment 1 512))
        systemStartDelimiter =#'SystemStartBar
 
-
+       melismaBusyProperties = #'(melismaBusy slurMelismaBusy tieMelismaBusy beamMelismaBusy)
+       
        clefGlyph = #"clefs-G"
        clefPosition = #-2
        centralCPosition = #-6
@@ -468,7 +471,7 @@ ScoreContext = \translator {
        pedalSostenutoStrings = #'("Sost. Ped." "*Sost. Ped." "*") 
        pedalSostenutoStyle = #'mixed
 
-       
+       fingeringOrientations = #'(up down)
        tupletNumberFormatFunction = #denominator-tuplet-formatter
        
        subdivideBeams = ##f
@@ -495,7 +498,7 @@ ScoreContext = \translator {
          custos
        )
        barCheckSynchronize = ##t
-
+       
        %% chord names:
        chordNameFunction = #ignatzek-chord-names
        majorSevenSymbol = #whiteTriangleMarkup
@@ -520,6 +523,37 @@ ScoreContext = \translator {
        bassFigureFormatFunction = #make-bass-figure-markup
        metronomeMarkFormatter = #make-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))
+                (Voice Stem font-relative-size -1)
+                (Voice NoteHead font-relative-size -1)
+                (Voice Dots font-relative-size -1)
+                (Voice Stem beamed-lengths  
+                 ,(map (lambda (x) (* 0.8 x)) '(3.26)))
+                (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 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 position-callbacks (,Beam::least_squares
+                                                   ,Beam::check_concave
+                                                   ,Beam::slope_damping))
+                (Staff Accidental font-relative-size -2)
+                (Voice Slur direction -1)
+       )
+       
        \grobdescriptions #all-grob-descriptions
 }
 
@@ -573,6 +607,13 @@ TabStaffContext = \translator {
       \denies "Voice"
 
       \description "Context for generating tablature. [DOCME]"
+
+%{
+      TODO: this context should use a special staff_symbol engraver that
+      takes the line count out of the stringTunings property.
+
+%}
+      
       
       \accepts "TabVoice"
       
@@ -584,9 +625,9 @@ TabStaffContext = \translator {
       Stem \override #'avoid-note-head = ##t
       
       % No accidental in tablature !
-      \remove Accidental_engraver
-      \remove Key_engraver
-
+      \remove "Accidental_engraver"
+      \remove "Key_engraver"
+      \remove "String_number_engraver"
       % Special "TAB" clef
       clefGlyph = #"clefs-tab"
       clefPosition = #0
@@ -666,6 +707,7 @@ VaticanaStaffContext = \translator {
   BarLine \set #'transparent = ##t
 
   StaffSymbol \set #'line-count = #4
+  StaffSymbol \set #'thickness = #0.6
 
   % FIXME: unit on StaffSymbol's width should be \linewidth.
   % StaffSymbol \set #'width = #60.0