patch::: 1.5.7.jcn1

[lilypond.git] / scm / grob-description.scm

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index e2bfae830534ac89a530f4991f0bfe26b9b2402e..dc0fbd7a07376d092adad860f9620478da6a05d0 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2001  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--20.301  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ; distances are given in stafflinethickness (thicknesses) and
@@ -37,7 +37,7 @@
                (break-align-symbol . Staff_bar)
                (glyph . "|")
                (break-glyph-function . ,default-break-barline)
-               (barsize-procedure . ,Bar::get_staff_bar_size)
+               (bar-size-procedure . ,Bar::get_staff_bar_size)
                (molecule-callback . ,Bar::brew_molecule)          
                (visibility-lambda . ,all-visible)
                (breakable . #t)
@@ -80,7 +80,7 @@
                 (thickness . 0.48) ; in staff-space
                 (before-line-breaking-callback . ,Beam::before_line_breaking)
                 (after-line-breaking-callback . ,Beam::after_line_breaking)
-                (default-neutral-direction . 1)
+                (neutral-direction . -1)
                 (dir-function . ,beam-dir-majority)
                 (height-quants .  ,default-beam-dy-quants)
                 (vertical-position-quant-function . ,default-beam-y-quants)
@@ -152,7 +152,11 @@
        
 
        (DotColumn . (
-               (axes 0 )
+               (axes 0)
+               (direction . 1)
+               (X-extent-callback . ,Axis_group_interface::group_extent_callback)
+               
+               (X-offset-callbacks . (,Dot_column::side_position))
                (meta . ,(grob-description "DotColumn" dot-column-interface  axis-group-interface))
        ))
 
@@ -217,13 +221,6 @@
                (meta . ,(grob-description "Fingering" finger-interface  font-interface text-script-interface text-interface side-position-interface))
        ))
 
-       (GraceAlignment . (
-               (axes . (0))
-               (horizontal-space . 1.2)
-               (padding . 1.0)
-               (before-line-breaking-callback . ,Grace_align_item::before_line_breaking)
-               (meta . ,(grob-description "GraceAlignment" axis-group-interface align-interface grace-alignment-interface))
-       ))
        
        (HaraKiriVerticalGroup . (
                (Y-offset-callbacks . (,Hara_kiri_group_spanner::force_hara_kiri_callback))
@@ -275,6 +272,7 @@
                (thickness . 1.0)
                (height . 0.4)
                (minimum-length .  0.5) 
+               (maximum-length .  100)
                (molecule-callback . ,Hyphen_spanner::brew_molecule)
                (Y-extent-callback . ,Grob::point_dimension_callback)
                (meta . ,(grob-description "LyricHyphen" lyric-hyphen-interface ))
@@ -311,7 +309,7 @@
 
                (direction . 1)
                (breakable . #t)
-               (font-family . number)
+               (font-family . roman)
                (font-shape . upright)
                (font-relative-size . 1)
                (visibility-lambda . ,end-of-line-invisible)
@@ -333,7 +331,8 @@
        ))
        (NoteCollision . (
                (axes 0 1)
-               (note-width . 1.65)
+               ;; Ugh, should not be hard-coded. 
+               (note-width . 1.321)
                (meta . ,(grob-description "NoteCollision"
                   note-collision-interface axis-group-interface
                ))
@@ -467,6 +466,7 @@
        (Script . (
                ;; don't set direction here: it breaks staccato.
                (molecule-callback . ,Script::brew_molecule)
+               (padding . 0.29) 
                (X-offset-callbacks . (,Side_position_interface::centered_on_parent))
                (before-line-breaking-callback . ,Script::before_line_breaking)
                (meta . ,(grob-description "Script" script-interface side-position-interface font-interface))
@@ -500,8 +500,11 @@
                 ))
              
        (SpacingSpanner . (
-               (spacing-procedure . ,Spacing_spanner::set_springs)
+               (spacing-procedure . ,New_spacing_spanner::set_springs)
                (stem-spacing-correction . 0.5)
+               (grace-space-factor . 0.8)
+
+               ;; TODO: change naming -- unintuitive
                (arithmetic-basicspace . 2.0)
                (arithmetic-multiplier . ,(* 0.9 1.32))
                ;; assume that notes at least this long are present.
@@ -510,12 +513,10 @@
        ))
        (SpanBar . (
                (break-align-symbol . Staff_bar)
-               (barsize-procedure . ,Span_bar::get_bar_size) 
-               (molecule-callback . ,Bar::brew_molecule)
+               (bar-size-procedure . ,Span_bar::get_bar_size) 
+               (molecule-callback . ,Span_bar::brew_molecule)
                (visibility-lambda . ,begin-of-line-invisible)
                (X-extent-callback . ,Span_bar::width_callback)
-               (Y-offset-callbacks . (,Span_bar::center_on_spanned_callback))
-               
                (breakable . #t)
                (glyph . "|")
                (before-line-breaking-callback . ,Span_bar::before_line_breaking)
@@ -574,7 +575,7 @@
                (lengths . (3.5 3.5 3.5 4.5 5.0))
                (stem-shorten . (0.5))
                ; if stem is on middle line, choose this direction.
-               (default-neutral-direction . 1)
+               (neutral-direction . -1)
                (X-offset-callbacks . (,Stem::off_callback))
                (X-extent-callback . ,Stem::dim_callback)       
                (Y-extent-callback . ,Stem::height)
@@ -613,12 +614,12 @@
                (meta . ,(grob-description "SustainPedal" sustain-pedal-interface side-position-interface font-interface))
        ))
 
-       ; should split in 3
+       ;; TODO: should split in 3
        (SystemStartDelimiter . (
                (molecule-callback . ,System_start_delimiter::brew_molecule)
                (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)
-               ;; ugh, in practice, brace has height of 4.1 staff-spaces
-               (brace-collapse-height . 4.1)
+               ;; really 4.0, but 5 to be on safe side.
+               (brace-collapse-height . 5.0)
                (bracket-collapse-height . 1)
                (thickness . 1.6)
                (arch-height . 1.5)
@@ -666,6 +667,7 @@
                (details . ((ratio . 0.333) (height-limit . 1.0)))
                (thickness . 1.2)
                (x-gap . 0.2)
+               (y-offset . 0.6)
                (minimum-length  . 2.5)
                (meta . ,(grob-description "Tie" tie-interface ))
        ))
@@ -680,6 +682,7 @@
                (break-align-symbol . Time_signature)
                (visibility-lambda . ,all-visible)
                (breakable . #t)
+               (style . C)
                 (font-family . number)
                 (meta . ,(grob-description "TimeSignature" time-signature-interface  font-interface))
        ))
@@ -699,6 +702,7 @@
 
        (UnaCordaPedal . (
                (molecule-callback . ,Text_item::brew_molecule)
+                (font-family . roman)
                 (font-shape . italic)
                (no-spacing-rods . #t)
                (self-alignment-X . 0)
@@ -729,6 +733,7 @@
                (axes 1)
                (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
                (X-extent-callback . #f)
+
                (stacking-dir . -1)
                (meta . ,(grob-description "VerticalAlignment" align-interface axis-group-interface))
        ))