release: 1.3.131

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

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index e83e91104192a0d8a6df5a489d0c02d5b4ecc0f5..7e814f043921df7c81c276c64702a2d92dd86efc 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--2000  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2001  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ; distances are given in stafflinethickness (thicknesses) and
@@ -49,7 +49,9 @@
                (direction . 1)
                 (font-family . roman)
                (font-relative-size . -1)
+               (Y-offset-callbacks . (,Side_position::aligned_side))
                (meta . ,(grob-description "BarNumber"
+                                          side-position-interface
                        text-interface  font-interface break-aligned-interface))
        ))
 
@@ -57,6 +59,13 @@
                 ;; todo: clean this up a bit: the list is getting
                 ;; rather long.
                 (molecule-callback . ,Beam::brew_molecule)
+                (y-dy-callbacks . (,Beam::least_squares
+                                   ,Beam::cancel_suspect_slope
+                                   ,Beam::slope_damping
+                                   ,Beam::quantise_dy
+                                   ,Beam::user_override
+                                   ,Beam::do_quantise_y))
+                                                        
                 (thickness . 0.48) ; in staff-space
                 (before-line-breaking-callback . ,Beam::before_line_breaking)
                 (after-line-breaking-callback . ,Beam::after_line_breaking)
@@ -227,6 +236,7 @@
                (molecule-callback . ,Text_item::brew_molecule)         
                (break-align-symbol . Instrument_name)
                (visibility-lambda . ,begin-of-line-visible)
+               (baseline-skip . 2)
                (font-family . roman)
                (meta . ,(grob-description "InstrumentName"  font-interface  text-interface break-aligned-interface))
        ))
@@ -274,6 +284,9 @@
        
        (RehearsalMark . (
                (molecule-callback . ,Text_item::brew_molecule)
+               (X-offset-callbacks . (,Side_position::aligned_on_self))
+               (self-alignment-X . 0)
+
                (direction . 1)
                (breakable . #t)
                (font-family . number)
@@ -363,6 +376,27 @@
                 (before-musical-spacing-factor . 0.4)
                (meta . ,(grob-description "PaperColumn" paper-column-interface axis-group-interface spaceable-element-interface))
        ))
+       (PhrasingSlur . (
+                (molecule-callback . ,Slur::brew_molecule)
+                (thickness . 1.2)              
+                (spacing-procedure . ,Slur::set_spacing_rods)          
+                (minimum-length . 1.5)
+                (after-line-breaking-callback . ,Slur::after_line_breaking)
+                (extremity-rules . ,default-slur-extremity-rules)
+                (extremity-offset-alist . ,default-phrasing-slur-extremity-offset-alist)
+                (de-uglify-parameters . ( 1.5  0.8  -2.0))
+                (Y-extent-callback . ,Slur::height)
+                (details . ((height-limit . 2.0) (ratio . 0.333) (force-blowfit . 0.5)
+                            (bezier-pct-c0 . -0.2) (bezier-pct-c3 . 0.000006)
+                            (bezier-pct-out-max . 0.8) (bezier-pct-in-max . 1.2)
+                            (bezier-area-steps . 1.0)))
+                (beautiful . 0.5)
+                (y-free . 0.75)
+                (attachment . (#f . #f))
+                (attachment-offset . ((0 . 0) . (0 . 0)))
+                (slope-limit . 0.8)
+                (meta . ,(grob-description "PhrasingSlur" slur-interface))
+                ))
        (NonMusicalPaperColumn . (
                 (axes 0)
                 (before-musical-spacing-factor . 1.0)
@@ -534,7 +568,9 @@
        (SystemStartDelimiter . (
                (molecule-callback . ,System_start_delimiter::brew_molecule)
                (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)
-               (collapse-height . 1.0)
+               ;; ugh, in practice, brace has height of 4.1 staff-spaces
+               (brace-collapse-height . 4.1)
+               (bracket-collapse-height . 1)
                (thickness . 1.6)
                (arch-height . 1.5)
                (arch-angle . 50.0)
@@ -556,6 +592,7 @@
                (molecule-callback . ,Text_item::brew_molecule)
                (no-spacing-rods . #t)
                (padding . 0.5)
+               (baseline-skip . 2)
                (font-family . roman)
                (font-shape . italic)
                (meta . ,(grob-description "TextScript" text-script-interface text-interface side-position-interface font-interface ))
@@ -602,8 +639,8 @@
                (number-gap . 2.0)   
                (delta-y . 0)
                (thick . 1.0)
-               (after-line-breaking-callback . ,Tuplet_spanner::after_line_breaking)
-               (molecule-callback . ,Tuplet_spanner::brew_molecule)
+               (after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking)
+               (molecule-callback . ,Tuplet_bracket::brew_molecule)
                (font-family . roman)
                (font-shape . italic)
                (font-relative-size . -1)