release: 1.3.88

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index c34e936bcbd19a921848dd6e55b41f1afd470968..0fdd838bea38dc310be20df3c92b87a1653bf8fd 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -64,13 +64,13 @@ StaffContext=\translator {
 
 RhythmicStaffContext=\translator{
        \type "Engraver_group_engraver";
-       numberOfStaffLines  = #1
+       
        \consists "Property_engraver";
        \consists "Output_property_engraver";   
 
        Generic_property_list = #generic-staff-properties
        
-       barSize =   4.0 * \staffspace ; % urg: pt
+       barSize =   4.0 * \staffspace ; % JUNKME
 
        \consists "Pitch_squash_engraver";
        \consists "Separating_line_group_engraver";     
@@ -78,8 +78,7 @@ RhythmicStaffContext=\translator{
 
        basicVoltaSpannerProperties \push #'minimum-space =  #15  % urg, in \pt
        basicVoltaSpannerProperties \push #'padding =  #5  % urg, in \pt
-
-
+       basicStaffSymbolProperties \push #'line-count = #1      
 
        \consists "Repeat_engraver";
        \consists "Bar_engraver";
@@ -171,9 +170,11 @@ GraceContext=\translator {
        basicTextScriptProperties \push #'font-size = #-1
        basicSlurProperties \push #'font-size = #-1
        basicLocalKeyProperties \push #'font-size = #-1
-
-       weAreGraceContext = ##t 
-       graceAccidentalSpace= 1.5 * \staffspace;
+       basicBeamProperties \push #'beam-thickness = #0.3
+       basicBeamProperties \push #'beam-space-function = #(lambda (x) 0.5)
+       
+       weAreGraceContext = ##t   
+       graceAccidentalSpace= 1.5 * \staffspace; % JUNKME
 };
 
 \translator{\GraceContext}
@@ -181,7 +182,6 @@ GraceContext=\translator {
 
 ThreadContext = \translator{
        \type Engraver_group_engraver;
-       %%\consists "A2_devnull_engraver";
        \consists "Thread_devnull_engraver";
        \consists "Note_heads_engraver";
        \consists "Output_property_engraver";   
@@ -208,6 +208,8 @@ PianoStaffContext = \translator{\GrandStaffContext
        alignmentReference = \center;
 
        \consists "Vertical_align_engraver";
+
+       % JUNKME
        minVerticalAlign = 3.0*\staffheight;
        maxVerticalAlign = 3.0*\staffheight;
 
@@ -456,17 +458,7 @@ ScoreContext = \translator {
                (name . "barnumber")
        )
 
-       basicBeamProperties = #`(
-               (molecule-callback . ,Beam::brew_molecule)
-               (beam-thickness . 0.42) ; staff-space
-               (before-line-breaking-callback . ,Beam::before_line_breaking)
-               (after-line-breaking-callback . ,Beam::after_line_breaking)
-               (default-neutral-direction . 1)
-               (interfaces . (beam-interface))
-               (damping . 1)
-               (name . "beam")         
-       )
-
+       basicBeamProperties = #basic-beam-properties
        basicBreakAlignProperties = #`(
                (breakable . #t)
                (interfaces . (break-align-interface))
@@ -505,6 +497,7 @@ ScoreContext = \translator {
        basicCollisionProperties = #`(
                (axes 0 1)
                (interfaces . (collision-interface))
+               (note-width . 1.65)
                (name . "note collision")
        )
        basicCrescendoProperties = #`(
@@ -533,7 +526,7 @@ ScoreContext = \translator {
        )
        
        basicDynamicLineSpannerProperties = #`(
-               (interfaces . (dynamic-interface axis-group-interface))
+               (interfaces . (dynamic-interface axis-group-interface side-position-interface))
                (axes . ( 1))
                (padding . 3)
                (minimum-space . 6)
@@ -546,8 +539,10 @@ ScoreContext = \translator {
                (name . "left edge")
        )
        basicGraceAlignItemProperties = #`(
-               (axes . (0))
                (interfaces . (axis-group-interface align-interface))
+               (axes . (0))
+               (horizontal-space . 1.2)
+               (padding . 1.0)
                (before-line-breaking-callback . ,Grace_align_item::before_line_breaking)
                (name . "grace alignment")
        )
@@ -594,6 +589,7 @@ ScoreContext = \translator {
        basicLyricExtenderProperties = #`(
                (interfaces . (lyric-extender-interface))
                (molecule-callback . ,Lyric_extender::brew_molecule)
+               (height . 0.8) ; stafflinethickness;
                (right-trim-amount . 0.5)
                (name . "extender line")
        )
@@ -606,7 +602,7 @@ ScoreContext = \translator {
                (name . "lyric syllable") 
        )
        basicMarkProperties = #`(
-         (interfaces . (mark-interface))
+         (interfaces . (mark-interface side-position-interface))
          (molecule-callback . ,Text_item::brew_molecule)       
          (breakable . #t)
          (visibility-lambda . ,end-of-line-invisible)
@@ -617,6 +613,10 @@ ScoreContext = \translator {
                (spacing-procedure . ,Multi_measure_rest::set_spacing_rods)             
                (molecule-callback . ,Multi_measure_rest::brew_molecule)
                (staff-position . 0)
+               (expand-limit . 10)
+               (padding . 2.0) ; staffspace
+               (minimum-width . 12.5) ; staffspace
+
                (name . "multi-measure rest")
        )
        basicNoteColumnProperties = #`(
@@ -626,6 +626,7 @@ ScoreContext = \translator {
        )
        basicNoteHeadProperties = #`(
                (interfaces . (note-head-interface rhythmic-head-interface))
+               (style . default)
                (molecule-callback . ,Note_head::brew_molecule)
                (name . "note head")
        )
@@ -661,7 +662,7 @@ ScoreContext = \translator {
        )
        basicScriptProperties = #`(
                (molecule-callback . ,Script::brew_molecule)
-               (interfaces . (script-interface))
+               (interfaces . (script-interface side-position-interface))
                (name . "script")
        )
        basicScriptColumnProperties = #`(
@@ -675,6 +676,8 @@ ScoreContext = \translator {
                (spacing-procedure . ,Slur::set_spacing_rods)           
                (minimum-length . 1.5)
                (after-line-breaking-callback . ,Slur::after_line_breaking)
+
+               (de-uglify-parameters . ( 1.5  0.8  -2.0))
                (name . "slur")
        )
        basicSpacingSpannerProperties =#`(
@@ -734,7 +737,7 @@ ScoreContext = \translator {
        basicTextScriptProperties = #`(
                (molecule-callback . ,Text_item::brew_molecule)
                (no-spacing-rods . #t)
-               (interfaces . (text-script-interface text-item-interface))
+               (interfaces . (text-script-interface text-item-interface side-position-interface))
                (padding .      3.0)
                (name . "text script") 
        )
@@ -779,12 +782,14 @@ ScoreContext = \translator {
                (molecule-callback . ,Stem_tremolo::brew_molecule)
                (beam-width . 2.0) ; staff-space
                (beam-thickness . 0.42) ; staff-space
+               (beam-space-function . ,default-beam-space-function)
                (name . "stem tremolo")
        )
        basicStemProperties = #`(
                (interfaces . (stem-interface))
                (before-line-breaking-callback . ,Stem::before_line_breaking)
                (molecule-callback . ,Stem::brew_molecule)
+               (thickness . 0.8)
 
                ; if stem is on middle line, choose this direction.
                (default-neutral-direction . 1)
@@ -800,7 +805,7 @@ ScoreContext = \translator {
                (name . "separation spanner")
        )
        basicSustainPedalProperties = #`(
-               (interfaces . (sustain-pedal-interface))
+               (interfaces . (sustain-pedal-interface  side-position-interface))
                (no-spacing-rods . #t)
                (molecule-callback . ,Sustain_pedal::brew_molecule)
                (self-alignment-X . 0)
@@ -813,12 +818,14 @@ ScoreContext = \translator {
                (self-alignment-X . 0)
                (name . "una chorda pedal")
        )
-       
+
        basicVoltaSpannerProperties = #`(
                (molecule-callback . ,Volta_spanner::brew_molecule)
                (interfaces . (volta-spanner-interface side-position-interface))
                (direction . 1)
                (padding . 5)
+               (thickness . 1.6)  ;  stafflinethickness
+               (height . 2.0) ; staffspace;
                (minimum-space . 25)
                (name . "volta brace")
        )