Merge commit 'ce4b499'

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 9c8e83d3110f0b025c8b38569123bf6c213e2ca1..0800d482d843f581a46f62421edb29f40c2b3727 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))))))
@@ -46,8 +47,10 @@
        (Y-extent . ,ly:accidental-interface::height)
        (X-offset . ,(ly:make-simple-closure
                      `(,+
-                       ,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent))
-                       ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
+                       ,(ly:make-simple-closure
+                         (list ly:self-alignment-interface::centered-on-x-parent))
+                       ,(ly:make-simple-closure
+                         (list ly:self-alignment-interface::x-aligned-on-self)))))
        (self-alignment-X . ,CENTER)
        (font-size . -2)
        (glyph-name-alist . ,standard-alteration-glyph-name-alist)
@@ -85,7 +88,7 @@
     
     (Ambitus
      . (
-       (axes . (0 1))
+       (axes . (,X ,Y))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (space-alist . (
@@ -149,6 +152,7 @@
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (direction . ,LEFT)
+       (positions . ,ly:arpeggio::calc-positions)
        (padding . 0.5)
        (script-priority . 0)
        (side-axis . ,X)
@@ -180,6 +184,8 @@
        (stencil . ,ly:bar-line::print)
        (glyph-name . ,bar-line::calc-glyph-name)
        (bar-size .  ,ly:bar-line::calc-bar-size)
+       (bar-extent . ,ly:bar-line::calc-bar-extent)
+       (allow-span-bar . #t)
        
        (space-alist . (
                        (time-signature . (extra-space . 0.75))
@@ -216,6 +222,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
@@ -403,14 +410,14 @@
                               staff-bar
                               time-signature
                               custos)))
-       (axes . (0))
+       (axes . (,X))
        (meta . ((class . Item)
                 (interfaces . (break-alignment-interface
                                axis-group-interface))))))
 
     (BreakAlignGroup
      . (
-       (axes . (0))
+       (axes . (,X))
        (X-extent . ,ly:axis-group-interface::width)
        (break-align-anchor . ,ly:break-aligned-interface::calc-average-anchor)
        (break-visibility . ,ly:break-aligned-interface::calc-break-visibility)
@@ -479,6 +486,7 @@
        (stencil . ,ly:cluster::print)
        (minimum-length . 0.0)
        (padding . 0.25)
+       (cross-staff . ,ly:cluster::calc-cross-staff)
        (style . ramp)
        (meta . ((class . Spanner)
                 (interfaces . (cluster-interface))))))
@@ -510,6 +518,7 @@
        ;; todo: add X self alignment?
        (baseline-skip . 2)
        (side-axis . ,Y)
+       (avoid-slur . outside )
        (font-series . bold)
        (meta . ((class . Item)
                 (interfaces . (text-script-interface
@@ -538,7 +547,7 @@
 
     (DotColumn
      . (
-       (axes . (0))
+       (axes . (,X))
        (direction . ,RIGHT)
        (positioning-done . ,ly:dot-column::calc-positioning-done) 
        (X-extent . ,ly:axis-group-interface::width)
@@ -592,7 +601,7 @@
                                text-interface))))))
     (DynamicLineSpanner
      . (
-       (axes . (1))
+       (axes . (,Y))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (staff-padding . 0.1)
        (padding . 0.6)
@@ -603,6 +612,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 +835,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 +1006,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
@@ -1040,6 +1050,7 @@
        (direction . ,UP)
        (padding . 0.8)
        (side-axis . ,Y)
+       (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 1000)
        (meta . ((class . Item)
                 (interfaces . (text-interface
@@ -1101,6 +1112,7 @@
        (direction . ,UP)
        (padding . 0.2)
        (staff-padding . 0.25)
+       (outside-staff-priority . 450)
        (meta . ((class . Spanner)
                 (interfaces . (side-position-interface
                                multi-measure-interface
@@ -1111,9 +1123,10 @@
     (NonMusicalPaperColumn
      . (
        (allow-loose-spacing . #t)
-       (axes . (0))
+       (axes . (,X))
        (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,11 +1139,12 @@
        (meta . ((class . Paper_column)
                 (interfaces . (paper-column-interface
                                axis-group-interface
+                               separation-item-interface
                                spaceable-grob-interface))))))
     
     (NoteCollision
      . (
-       (axes . (0 1))
+       (axes . (,X ,Y))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (positioning-done . ,ly:note-collision-interface::calc-positioning-done)
@@ -1140,12 +1154,13 @@
 
     (NoteColumn
      . (
-       (axes . (0 1))
+       (axes . (,X ,Y))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
+       (horizontal-skylines . ,ly:separation-item::calc-skylines)
        (meta . ((class . Item)
                 (interfaces . (axis-group-interface
-                               separation-item-iterface
+                               separation-item-interface
                                note-column-interface))))))
 
     (NoteHead
@@ -1168,6 +1183,7 @@
      . (
        (stem-spacing-correction . 0.5)
        (same-direction-correction . 0.25)
+       (space-to-barline . #t)
        ;; Changed this from 0.75.
        ;; If you ever change this back, please document! --hwn
        (knee-spacing-correction . 1.0)
@@ -1211,6 +1227,7 @@
        (staff-padding . 1.0)
        (padding . 0.5)
        (minimum-length . 1.0)
+       (style . dashed-line)
        (dash-fraction . 0.3)
        (edge-height . (0 . 1.2))
        (direction . ,UP)
@@ -1225,9 +1242,10 @@
 
     (PaperColumn
      . (
-       (axes . (0))
+       (axes . (,X))
        (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)
        
@@ -1235,6 +1253,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))))))
 
@@ -1330,6 +1349,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)
@@ -1447,14 +1467,6 @@
                 (interfaces . (
                                separation-item-interface))))))
 
-    (SeparatingGroupSpanner
-     . (
-       (springs-and-rods . ,ly:separating-group-spanner::set-spacing-rods)
-       (meta . ((class . Spanner)
-                (interfaces . (only-prebreak-interface
-                               
-                               separating-group-spanner-interface))))))
-
     (Slur
      . ((details . ,default-slur-details)
        (control-points . ,ly:slur::calc-control-points)
@@ -1489,8 +1501,9 @@
 
     (SostenutoPedalLineSpanner
      . (
-       (axes . (1))
+       (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
        (staff-padding . 1.0)
@@ -1518,14 +1531,17 @@
     (SpanBar
      . (
        (break-align-symbol . staff-bar)
-       (Y-extent . ())
+       (Y-extent . ,ly:axis-group-interface::height)
+       (cross-staff . #t)
        (layer . 0)
        (non-musical . #t)
        (stencil . ,ly:span-bar::print)
        (bar-size . ,ly:span-bar::calc-bar-size)
+       (bar-extent . ,ly:axis-group-interface::height)
        (X-extent . ,ly:span-bar::width)
        (glyph-name . ,ly:span-bar::calc-glyph-name)
        (before-line-breaking . ,ly:span-bar::before-line-breaking)
+       (allow-span-bar . #t)
 
        ;; ugh duplication!
 
@@ -1699,8 +1715,9 @@
 
     (SustainPedalLineSpanner
      . (
-       (axes . (1))
+       (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
        (padding . 1.2)
@@ -1714,12 +1731,11 @@
 
     (System
      . (
-       (axes . (0 1))
+       (axes . (,X ,Y))
        (X-extent . ,ly:axis-group-interface::width)
        (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))))))
@@ -1776,6 +1792,7 @@
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (direction . ,LEFT)
        (style . bar-line)
+       (collapse-height . 5.0)
        (thickness . 1.6)
        (stencil . ,ly:system-start-delimiter::print)
        (meta . ((class . Spanner)
@@ -1819,6 +1836,7 @@
        (avoid-slur . around)
        (slur-padding . 0.5)
        (script-priority . 200)
+       (cross-staff . ,ly:script-interface::calc-cross-staff)
        ;; todo: add X self alignment?
        (meta . ((class . Item)
                 (interfaces . (text-script-interface
@@ -1904,7 +1922,8 @@
      . (
        (stencil . ,ly:time-signature::print)
        (break-align-symbol . time-signature)
-       (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
+       (break-align-anchor
+        . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-visibility . ,all-visible)
        (avoid-slur . inside)
        (space-alist . (
@@ -1924,12 +1943,14 @@
        (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
 
        (bound-details . ((left . ((text . ,(make-translate-scaled-markup
-                                            '(0.5 . -0.6)
+                                            '(0.0 . -1.0)
                                             (make-musicglyph-markup "scripts.trill")))
                                   (Y . 0)
-                                  (padding . 0.25)
+                                  (stencil-offset . (-0.5 . 0))
+                                  (padding . 1.5)
                                   (attach-dir . ,LEFT)
                                   ))
+                         (left-broken . ((end-on-note . #t)))
                          (right . ((Y . 0)))
                          ))
        
@@ -2041,8 +2062,9 @@
 
     (UnaCordaPedalLineSpanner
      . (
-       (axes . (1))
+       (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
        (padding . 1.2)
@@ -2065,7 +2087,7 @@
 
     (VerticalAlignment
      . (
-       (axes . (1))
+       (axes . (,Y))
        (positioning-done . ,ly:align-interface::calc-positioning-done)
        (after-line-breaking . ,ly:align-interface::stretch-after-break)
        (Y-extent . ,ly:axis-group-interface::height)
@@ -2073,14 +2095,14 @@
        (stacking-dir . -1)
        (padding . 0.5)
        (vertical-skylines . ,ly:axis-group-interface::combine-skylines)
-       (max-stretch . ,ly:align-interface::calc-max-stretch)
+       (max-stretch . 0)
        (meta . ((class . Spanner)
                 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
                 (interfaces . (align-interface
                                axis-group-interface))))))
     (VerticalAxisGroup
      . (
-       (axes . (1))
+       (axes . (,Y))
        (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
        (Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
        (X-extent . ,ly:axis-group-interface::width)
@@ -2098,17 +2120,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                            
@@ -2118,6 +2134,21 @@
                                font-interface)))
              )))
 
+    (VoltaBracketSpanner
+     . (       
+       (axes . (,Y))
+       (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
      . (
@@ -2231,6 +2262,7 @@
 
 (define pure-functions
   (list
+   parenthesize-elements
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))