Merge commit '76de7e1'

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 7371cbbf10896ad89dca1b9f40c30aee0e726ce4..ccbf965fcbb184dc9fedd4645c21b6dd7aa353a1 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,8 +24,7 @@
        (alteration . ,accidental-interface::calc-alteration) 
        (stencil . ,ly:accidental-interface::print)
        (Y-extent . ,ly:accidental-interface::height)
-       (after-line-breaking
-        . ,ly:accidental-interface::after-line-breaking)
+       (X-extent . ,ly:accidental-interface::width)
        (meta . ((class . Item)
                 (interfaces . (accidental-interface
                                font-interface))))))
@@ -37,8 +36,6 @@
        (alteration . ,accidental-interface::calc-alteration) 
        (stencil . ,ly:accidental-interface::print)
        (Y-extent . ,ly:accidental-interface::height)
-       (after-line-breaking
-        . ,ly:accidental-interface::after-line-breaking)
        (meta . ((class . Item)
                 (interfaces . (accidental-interface
                                font-interface))))))
@@ -50,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)
@@ -125,7 +124,6 @@
        (stencil . ,ly:accidental-interface::print)
        (Y-extent . ,ly:accidental-interface::height)
        (glyph-name-alist . ,standard-alteration-glyph-name-alist)      
-       (after-line-breaking . ,ly:accidental-interface::after-line-breaking)
        (side-axis . ,X)
        (meta . ((class . Item)
                 (interfaces . (
@@ -154,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)
@@ -185,6 +184,7 @@
        (stencil . ,ly:bar-line::print)
        (glyph-name . ,bar-line::calc-glyph-name)
        (bar-size .  ,ly:bar-line::calc-bar-size)
+       (allow-span-bar . #t)
        
        (space-alist . (
                        (time-signature . (extra-space . 0.75))
@@ -221,6 +221,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
@@ -608,6 +609,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
@@ -1001,6 +1003,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
@@ -1175,6 +1178,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)
@@ -1721,7 +1725,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))))))
@@ -1906,7 +1909,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 . (
@@ -1926,12 +1930,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)))
                          ))
        
@@ -2100,17 +2106,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                            
@@ -2120,6 +2120,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
      . (