Run grand-replace on all sources. Updates (c) ....--2006 lines.

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index abd2a7c9de1737a6b6d8cbd59b41ba09a63ed6dd..436aa9ebfdfabdf1a550c460c444657cb9f0d013 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in line-thickness (thicknesses) and
@@ -24,6 +24,7 @@
        (alteration . ,accidental-interface::calc-alteration) 
        (stencil . ,ly:accidental-interface::print)
        (Y-extent . ,ly:accidental-interface::height)
+       (X-extent . ,ly:accidental-interface::width)
        (meta . ((class . Item)
                 (interfaces . (accidental-interface
                                font-interface))))))
@@ -216,6 +217,7 @@
        (font-size . -2)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
+       (outside-staff-priority . 100)
        (X-offset . ,(ly:make-simple-closure
                      `(,+
                        ,(ly:make-simple-closure
@@ -603,6 +605,7 @@
        (outside-staff-priority . 250)
        (Y-extent . ,ly:axis-group-interface::height)
        (X-extent . ,ly:axis-group-interface::width)
+       (cross-staff . ,ly:side-position-interface::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
                                dynamic-interface
@@ -825,8 +828,7 @@
        (direction . ,UP)
        (self-alignment-X . ,CENTER)
        (meta . ((class . Item)
-                (interfaces . (system-start-text-interface
-                               side-position-interface
+                (interfaces . (side-position-interface
                                font-interface))))))
     
     (KeyCancellation
@@ -997,6 +999,7 @@
        (word-space . 0.6)
        (font-series . bold-narrow)
        (font-size . 1.0)
+       (extra-spacing-width . (0.0 . 0.0))
        (meta . ((class . Item)
                 (interfaces . (rhythmic-grob-interface
                                lyric-syllable-interface
@@ -1114,6 +1117,7 @@
        (axes . (0))
        (before-line-breaking . ,ly:paper-column::before-line-breaking)
        (X-extent . ,ly:axis-group-interface::width)
+       (horizontal-skylines . ,ly:separation-item::calc-skylines)
        ;;                    (stencil . ,ly:paper-column::print)
        
        (non-musical . #t)
@@ -1126,6 +1130,7 @@
        (meta . ((class . Paper_column)
                 (interfaces . (paper-column-interface
                                axis-group-interface
+                               separation-item-interface
                                spaceable-grob-interface))))))
     
     (NoteCollision
@@ -1229,6 +1234,7 @@
        (axes . (0))
        (allow-loose-spacing . #t)
        (before-line-breaking . ,ly:paper-column::before-line-breaking)
+       (horizontal-skylines . ,ly:separation-item::calc-skylines)
        ;; (stencil . ,ly:paper-column::print)
        (X-extent . ,ly:axis-group-interface::width)
        
@@ -1236,6 +1242,7 @@
        ;;                       (font-size . -6) (font-name . "sans") (Y-extent . #f)
        (meta . ((class . Paper_column)
                 (interfaces . (paper-column-interface
+                               separation-item-interface
                                axis-group-interface
                                spaceable-grob-interface))))))
 
@@ -1331,6 +1338,7 @@
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
 
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (extra-spacing-width . (+inf.0 . -inf.0))
        (self-alignment-X . 0)
        (direction . ,UP)
        (non-musical . #t)
@@ -1712,7 +1720,6 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
        (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
-       (skyline-horizontal-padding . 1.0)
        (meta . ((class . System)
                 (interfaces . (system-interface
                                axis-group-interface))))))
@@ -2091,17 +2098,11 @@
     (VoltaBracket
      . (
        (stencil . ,ly:volta-bracket-interface::print)
-       (direction . ,UP)
-       (padding . 1)
        (font-encoding . fetaNumber)
-       (minimum-Y-extent . (0 . 2))
-       (Y-offset . ,ly:side-position-interface::y-aligned-side)
-       (side-axis . ,Y)
        (thickness . 1.6)  ;;  line-thickness
        (edge-height . (2.0 . 2.0)) ;; staff-space;
-       (minimum-space . 5)
        (font-size . -4)
-       (outside-staff-priority . 100)
+       (direction . ,UP)
        (meta . ((class . Spanner)
                 (interfaces . (volta-bracket-interface
                                horizontal-bracket-interface                            
@@ -2111,6 +2112,21 @@
                                font-interface)))
              )))
 
+    (VoltaBracketSpanner
+     . (       
+       (axes . (1))
+       (side-axis . ,Y)
+       (direction . ,UP)
+       (padding . 1)
+       (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (outside-staff-priority . 100)
+       (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
+       (no-alignment . ,#t)
+       (meta . ((class . Spanner)
+                (interfaces . (side-position-interface
+                               axis-group-interface)))
+             )))
 
     (VoiceFollower
      . (