(warning): better robustness fix.

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

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 5f942e35fa857215db0884b9cff10870d95bd5a8..4e19b91a2251998ef71598b28231a8d0a526be67 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--20.301  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in stafflinethickness (thicknesses) and
@@ -18,7 +18,7 @@
      . (
        (molecule-callback . ,Accidental_interface::brew_molecule)
        (font-family . music)
-       (cautionary-style . smaller)
+       (cautionary-style . parentheses)
        (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)             (meta . ((interfaces . (item-interface accidental-interface font-interface))))
        ))
     (AccidentalPlacement
@@ -78,6 +78,7 @@
                        (custos . (minimum-space . 2.0))
                        (clef .   (minimum-space . 1.0))
                        (first-note . (extra-space . 1.3))
+                       (right-edge . (extra-space . 0.0))
                        ))
 
        ;;
@@ -223,12 +224,23 @@
                        (key-signature . (minimum-space . 4.0))
                        (time-signature . (minimum-space . 4.2))
                        (first-note . (minimum-space . 5.0))
-                       (next-note . (extra-space . 0.5))                       
+                       (next-note . (extra-space . 0.5))
+                       (right-edge . (extra-space . 0.5))
                        ))
        (Y-offset-callbacks  . (,Staff_symbol_referencer::callback)) 
        (meta . ((interfaces . (clef-interface staff-symbol-referencer-interface font-interface break-aligned-interface item-interface ))))
        ))
 
+    (Cluster
+     . (
+       (molecule-callback . ,Cluster::brew_molecule)
+       (spacing-procedure . ,Spanner::set_spacing_rods)                
+       (minimum-length . 0.0)
+       (padding . 0.25)
+       (shape . leftsided-stairs)
+       (meta . ((interfaces . (cluster-interface spanner-interface))))
+       ))
+
     (ChordName
      . (
        (molecule-callback . ,Chord_name::brew_molecule)
@@ -252,6 +264,7 @@
        (font-family . ancient)
        (space-alist . (
                        (first-note . (minimum-space . 0.0))
+                       (right-edge . (extra-space . 0.1))
                        ))
        (meta . ((interfaces
                  . (custos-interface staff-symbol-referencer-interface
@@ -332,6 +345,7 @@
                        (breathing-sign . (minimum-space  . 0.0))
                        (clef . (extra-space . 1.0))
                        (first-note . (extra-space . 1.0))
+                       (right-edge . (extra-space . 0.0))
                        (key-signature . (extra-space . 0.0))
                        ))
        (meta . ((interfaces . (break-aligned-interface item-interface ))))
@@ -340,8 +354,6 @@
     (Fingering
      . (
        (molecule-callback . ,Text_item::brew_molecule)
-       (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent
-                              ,Self_alignment_interface::aligned_on_self))
        (padding . 0.6)
        ;;              (direction . -1)
        (self-alignment-X . 0)
@@ -379,6 +391,15 @@
        (meta . ((interfaces . (hairpin-interface self-alignment-interface dynamic-interface spanner-interface))))
        ))
 
+    (HorizontalBracket
+     . (
+       (thickness . 1.0)
+       (molecule-callback . ,Horizontal_bracket::brew_molecule)
+       (Y-offset-callbacks . (,Side_position_interface::aligned_side))
+       (padding . 0.2)
+       (direction . -1)
+       (meta . ((interfaces . (horizontal-bracket-interface side-position-interface spanner-interface))))
+       ))
     (InstrumentName
      . (
        (breakable . #t)
@@ -405,6 +426,7 @@
        (space-alist . (
                        (time-signature . (extra-space . 1.25))
                        (staff-bar .  (extra-space . 1.1))
+                       (right-edge . (extra-space . 0.5))
                        (first-note . (extra-space . 2.5))
                        ))
        (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
@@ -422,11 +444,18 @@
 
     (LigatureBracket
      . (
-       (width . 0.75)
-       (height . 0.5)
        (ligature-primitive-callback . ,Note_head::brew_molecule)
-       (molecule-callback . ,Ligature_bracket::brew_molecule)
-       (meta . ((interfaces . (ligature-bracket-interface spanner-interface))))
+       (direction . 1)
+       (gap . 0.0)
+       (padding . 2.0)
+       (thickness . 1.6)
+       (edge-widen . (0.0 . 0.0))
+       (edge-height . (0.7 . 0.7))
+       (shorten-pair . (-0.2 . -0.2))
+       (before-line-breaking-callback . ,Tuplet_bracket::before_line_breaking)
+       (after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking)
+       (molecule-callback . ,Tuplet_bracket::brew_molecule)
+       (meta .  ((interfaces . (tuplet-bracket-interface spanner-interface))))
        ))
 
     (LigatureHead
@@ -436,7 +465,8 @@
        (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
        (stem-attachment-function . ,note-head-style->attachment-coordinates)
        (font-family . ancient)
-       (style . mensural)
+       (style . default)
+       (glyph-name-procedure . ,find-notehead-symbol)
        (meta . ((interfaces . (ligature-head-interface rhythmic-head-interface
                                                        font-interface
                                                        note-head-interface staff-symbol-referencer-interface))))
@@ -517,7 +547,19 @@
        (padding . 0.8)
        (meta . ((interfaces . (text-interface side-position-interface font-interface mark-interface self-alignment-interface item-interface ))))
        ))
-
+    
+    (MeasureGrouping
+     . (
+       (Y-offset-callbacks . (,Side_position_interface::out_of_staff 
+                              ,Side_position_interface::aligned_side))
+       (molecule-callback . ,Measure_grouping::brew_molecule)
+       (padding . 2)
+       (direction . 1)
+       (thickness . 1)
+       (height . 2.0)
+       (staff-padding . 3)
+       (meta . ((interfaces . (spanner-interface side-position-interface measure-grouping-interface))))
+       ))
     (MultiMeasureRest
      . (
        (spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
@@ -525,13 +567,25 @@
        (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
        (staff-position . 0)
        (expand-limit . 10)
-       (number-threshold . 1)
-       (padding . 1)
-       (thickness . 6.6)
-       (font-family . number)
+       (thick-thickness . 6.6)
+       (hair-thickness . 2.0)
        (padding . 1)
        (meta . ((interfaces . (multi-measure-rest-interface rest-interface font-interface staff-symbol-referencer-interface spanner-interface))))
        ))
+    
+    (MultiMeasureRestNumber
+     . (
+       (molecule-callback . ,Text_item::brew_molecule)
+       (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
+                              ,Self_alignment_interface::centered_on_other_axis_parent))
+       (Y-offset-callbacks . (,Side_position_interface::aligned_side))
+       (self-alignment-X . 0)
+       (direction . 1)
+       (padding . 2)
+       (font-family . number)
+       (meta . ((interfaces . (side-position-interface self-alignment-interface font-interface spanner-interface text-interface))))
+       ))
+
 
     (NoteCollision
      . (
@@ -565,6 +619,7 @@
      . (
        (type . line)
        (gap . 0.5)
+       (zigzag-width . 0.75)
        (breakable . #t)
        (X-extent-callback . #f)
        (Y-extent-callback . #f)                         
@@ -693,7 +748,7 @@
        (Y-extent-callback . ,Rest::extent_callback)            
        (molecule-callback . ,Rest::brew_molecule)
        (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) 
-       (minimum-beam-collision-distance . 1.5)
+       (minimum-beam-collision-distance . 0.75)
        (meta . (
                 (interfaces . (font-interface
                                rhythmic-head-interface
@@ -759,7 +814,7 @@
        (grace-space-factor . 0.6)
        (shortest-duration-space . 2.0)
        (spacing-increment . 1.2)
-       (base-shortest-duration . ,(make-moment 1 8))
+       (base-shortest-duration . ,(ly:make-moment 1 8))
        (meta . ((interfaces . (spacing-interface spacing-spanner-interface spanner-interface))))
        ))
 
@@ -1065,6 +1120,7 @@
        (break-visibility . ,all-visible)
        (space-alist . (
                        (first-note . (extra-space . 2.0))
+                       (right-edge . (extra-space . 0.5))
                        (staff-bar .  (minimum-space . 2.0))
                        ))
        (breakable . #t)