Finish fixing 97.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 50e984034e0167e8aac74e03e5a6bbe0985d04eb..15d59483a8ffc9ead9c561241c01d4061544fb79 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -153,6 +153,7 @@
        (script-priority . 0)
        (side-axis . ,X)
        (staff-position . 0.0)
+       (Y-extent . ,ly:arpeggio::height)
        (meta . ((class . Item)
                 (interfaces . (arpeggio-interface
                                staff-symbol-referencer-interface
@@ -170,6 +171,7 @@
     (BarLine
      . (
        (break-align-symbol . staff-bar)
+       (break-align-anchor . ,ly:bar-line::calc-anchor)
        (glyph . "|")
        (gap . 0.4)
        (layer . 0)
@@ -214,7 +216,6 @@
        (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
@@ -225,7 +226,7 @@
        (self-alignment-X . 1)
 
        ;; want the bar number before the clef at line start. 
-       (break-align-symbol . left-edge)
+       (break-align-symbols . (left-edge staff-bar))
        (meta .
              ((class . Item)
               (interfaces . (side-position-interface
@@ -290,7 +291,7 @@
      . (
        (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
-       (skylines . ,ly:axis-group-interface::calc-skylines)
+       (vertical-skylines . ,ly:axis-group-interface::calc-skylines)
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
                                ))))))
@@ -319,6 +320,7 @@
        (beaming . ,ly:beam::calc-beaming)
        (stencil . ,ly:beam::print)
        (clip-edges . #t)
+       (cross-staff . ,ly:beam::calc-cross-staff)
 
        (details .  ((hint-direction-penalty . 20)))
        ;; TODO: should be in SLT.
@@ -409,6 +411,8 @@
      . (
        (axes . (0))
        (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)
        (meta . ((class . Item)
                 (interfaces . (break-aligned-interface
                                axis-group-interface))))))
@@ -444,6 +448,7 @@
        (avoid-slur . inside)
        (font-family . music)
        (break-align-symbol . clef)
+       (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-visibility . ,begin-of-line-visible)
        (space-alist . ((ambitus . (extra-space . 2.0))
                        (staff-bar . (extra-space . 0.7))
@@ -536,7 +541,6 @@
        (direction . ,RIGHT)
        (positioning-done . ,ly:dot-column::calc-positioning-done) 
        (X-extent . ,ly:axis-group-interface::width)
-       (X-offset . ,ly:dot-column::side-position)
        (meta . ((class . Item)
                 (interfaces . (dot-column-interface
                                axis-group-interface))))))
@@ -591,7 +595,6 @@
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (staff-padding . 0.1)
        (padding . 0.6)
-       (avoid-slur . outside)
        (slur-padding . 0.3)
        (minimum-space . 1.2)
        (direction . ,DOWN)
@@ -612,6 +615,7 @@
 
        (stencil . ,ly:text-interface::print)
        (direction . ,ly:script-interface::calc-direction)
+       (positioning-done . ,ly:script-interface::calc-positioning-done)
 
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (self-alignment-X . 0)
@@ -620,7 +624,6 @@
        (font-series . bold)
        (font-encoding . fetaDynamic)
        (font-shape . italic)
-       (avoid-slur . around)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 250)
        (meta . ((class . Item)
@@ -637,31 +640,27 @@
        (font-shape . italic)
        (style . dashed-line)
 
+       ;; make sure the spanner doesn't get too close to notes
+       (minimum-Y-extent . (-1 . 1))
        (bound-details . ((right . ((attach-dir .  ,LEFT)
                                    (Y . 0)
                                    (padding . 0.75)
                                    ))
                          (right-broken . ((attach-dir .  ,RIGHT)
-                                   (Y . 0)
                                    (padding . 0.0)
                                    ))
+                         
                          (left . ((attach-dir .  ,LEFT)
                                   (Y . 0)
                                   (stencil-offset . (0 . -0.5))
                                   (padding . 0.5)
                                   ))
                          (left-broken . ((attach-dir .  ,RIGHT)
-                                         (padding . 0.5)
-                                         (Y . 0)
-                                         
-                                         ;; make sure the - - - stays at reasonable
-                                         ;; distance from staff.
-                                         (text . " ")
                                   ))
                          ))
-       (stencil . ,ly:new-line-spanner::print)
-       (left-bound-info . ,ly:new-line-spanner::calc-left-bound-info-and-text)
-       (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
+       (stencil . ,ly:line-spanner::print)
+       (left-bound-info . ,ly:line-spanner::calc-left-bound-info-and-text)
+       (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
 
        ;; need to blend with dynamic texts.
        (font-size . 1)
@@ -670,7 +669,8 @@
        (meta . ((class . Spanner)
                 (interfaces . (font-interface
                                text-interface
-                               new-line-spanner-interface
+                               line-spanner-interface
+                               line-interface
                                dynamic-interface
                                dynamic-text-spanner-interface
                                spanner-interface))))))
@@ -690,6 +690,8 @@
        (script-priority . 100)
        (stencil . ,ly:text-interface::print)
        (direction . ,ly:script-interface::calc-direction)
+       (positioning-done . ,ly:script-interface::calc-positioning-done)
+
        (text . ,fingering::calc-text) 
        (font-encoding . fetaNumber)
        (font-size . -5)                ; don't overlap when next to heads.
@@ -723,13 +725,13 @@
                                   (padding . 1.5)
                                      ))
                          ))
-       (stencil . ,ly:new-line-spanner::print)
-       (left-bound-info . ,ly:new-line-spanner::calc-left-bound-info)
-       (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
+       (stencil . ,ly:line-spanner::print)
+       (left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+       (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
        (meta . ((class . Spanner)
                 (interfaces . (line-interface
                                unbreakable-spanner-interface
-                               new-line-spanner-interface))))))
+                               line-spanner-interface))))))
 
     (GraceSpacing
      . (
@@ -857,6 +859,7 @@
                        (first-note . (fixed-space . 2.5))))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (break-align-symbol . key-signature)
+       (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-visibility . ,begin-of-line-visible)
        (non-musical . #t)
        (meta . ((class . Item)
@@ -905,6 +908,7 @@
     (LeftEdge
      . (
        (break-align-symbol . left-edge)
+       (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (X-extent . (0 . 0))
        (non-musical . #t)
        (break-visibility . ,center-invisible)
@@ -1260,6 +1264,7 @@
        (minimum-length . 1.5)
        (height-limit . 2.0)
        (ratio . 0.333)
+       (cross-staff . ,ly:slur::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1329,7 +1334,7 @@
        (font-size . 2)
        (baseline-skip . 2)
        (break-visibility . ,end-of-line-invisible)
-       (break-align-symbol . clef)
+       (break-align-symbols . (staff-bar clef))
        (padding . 0.8)
        (outside-staff-priority . 1500)
        (meta . ((class . Item)
@@ -1368,7 +1373,7 @@
        (X-extent . #f)
        (Y-extent . #f)
        (direction . ,ly:tie::calc-direction)
-       (head-direction . ,RIGHT)
+       (head-direction . ,ly:semi-tie-column::calc-head-direction)
        
        (positioning-done . ,ly:semi-tie-column::calc-positioning-done)
        (meta . ((class . Item)
@@ -1404,13 +1409,15 @@
 
        ;; padding set in script definitions.
        (staff-padding . 0.25)
-       (X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
+       (X-offset . ,script-interface::calc-x-offset)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
 
        (stencil . ,ly:script-interface::print)
        (direction . ,ly:script-interface::calc-direction)
+       (positioning-done . ,ly:script-interface::calc-positioning-done)
        (font-encoding . fetaMusic)
+       (cross-staff . ,ly:script-interface::calc-cross-staff)
        (meta . ((class . Item)
                 (interfaces . (script-interface
                                side-position-interface
@@ -1432,7 +1439,8 @@
        (avoid-slur . inside)
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
-       (skylines . ,ly:separation-item::calc-skylines)
+       (horizontal-skylines . ,ly:separation-item::calc-skylines)
+       (stencil . ,ly:separation-item::print)
        (meta . ((class . Item)
                 (interfaces . (
                                separation-item-interface))))))
@@ -1458,6 +1466,7 @@
        (height-limit . 2.0)
        (ratio . 0.25)
        (avoid-slur . inside)
+       (cross-staff . ,ly:slur::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1578,6 +1587,7 @@
        (Y-extent . ,ly:stem::height)
        (length . ,ly:stem::calc-length)
        (thickness . 1.3)
+       (cross-staff . ,ly:stem::calc-cross-staff)
        (details
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
@@ -1618,8 +1628,8 @@
     (StemTremolo
      . (
        (Y-extent . ,ly:stem-tremolo::height)
+       (X-extent . ,ly:stem-tremolo::width)
        (stencil . ,ly:stem-tremolo::print)
-       (X-extent . #f)
        (slope . ,ly:stem-tremolo::calc-slope)
        (beam-width . ,ly:stem-tremolo::calc-width) ; staff-space
         (style . ,ly:stem-tremolo::calc-style)
@@ -1679,8 +1689,6 @@
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (meta . ((class . Item)
                 (interfaces . (piano-pedal-interface
-                               text-spanner-interface
-                               line-spanner-interface
                                text-interface
                                self-alignment-interface
                                piano-pedal-script-interface
@@ -1706,7 +1714,8 @@
        (axes . (0 1))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
-       (skylines . ,ly:axis-group-interface::calc-skylines)
+       (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
@@ -1801,6 +1810,7 @@
 
        (stencil . ,ly:text-interface::print)
        (direction . ,ly:script-interface::calc-direction)
+       (positioning-done . ,ly:script-interface::calc-positioning-done)
 
        (outside-staff-priority . 450)
        (avoid-slur . around)
@@ -1815,7 +1825,6 @@
 
     (TextSpanner
      . (
-       (stencil . ,ly:text-spanner::print)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (font-shape . italic)
        (style . dashed-line)
@@ -1825,9 +1834,21 @@
        (side-axis . ,Y)
        (direction . ,UP)
        (outside-staff-priority . 350)
+
+       (left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+       (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
+       (bound-details . ((left . ((Y . 0)
+                                  (padding . 0.25)
+                                  (attach-dir . ,LEFT)
+                                  ))
+                         (right . ((Y . 0)
+                                   (padding . 0.25)
+                                  ))
+                         ))
+       (stencil . ,ly:line-spanner::print)
+
        (meta . ((class . Spanner)
-                (interfaces . (text-spanner-interface
-                               line-spanner-interface
+                (interfaces . (line-spanner-interface
                                side-position-interface
                                font-interface))))))
 
@@ -1880,6 +1901,7 @@
      . (
        (stencil . ,ly:time-signature::print)
        (break-align-symbol . time-signature)
+       (break-align-anchor . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-visibility . ,all-visible)
        (avoid-slur . inside)
        (space-alist . (
@@ -1895,19 +1917,20 @@
 
     (TrillSpanner
      . (
-       (left-bound-info . ,ly:new-line-spanner::calc-left-bound-info)
-       (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
+       (left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+       (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
 
        (bound-details . ((left . ((text . ,(make-translate-scaled-markup
-                                            '(0 . -0.6)
+                                            '(0.5 . -0.6)
                                             (make-musicglyph-markup "scripts.trill")))
                                   (Y . 0)
                                   (padding . 0.25)
+                                  (attach-dir . ,LEFT)
                                   ))
                          (right . ((Y . 0)))
                          ))
        
-       (stencil . ,ly:new-line-spanner::print)
+       (stencil . ,ly:line-spanner::print)
 
        (style . trill)
        (staff-padding . 1.0)
@@ -1917,8 +1940,9 @@
        (side-axis . ,Y)
        (outside-staff-priority . 50)
        (meta . ((class . Spanner)
-                (interfaces . (text-spanner-interface
-                               new-line-spanner-interface
+                (interfaces . (line-spanner-interface
+                               line-interface
+                               trill-spanner-interface
                                side-position-interface
                                font-interface))))))
 
@@ -1979,6 +2003,7 @@
        (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
        (control-points . ,ly:tuplet-bracket::calc-control-points)
        (stencil . ,ly:tuplet-bracket::print)
+       (cross-staff . ,ly:tuplet-bracket::calc-cross-staff)
        
        (meta . ((class . Spanner)
                 (interfaces . (line-interface
@@ -1991,6 +2016,7 @@
        (font-shape . italic)
        (font-size . -2)
        (avoid-slur . inside)
+       (cross-staff . ,ly:tuplet-number::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (text-interface tuplet-number-interface
                                font-interface))))))
@@ -2043,7 +2069,8 @@
        (X-extent . ,ly:axis-group-interface::width)
        (stacking-dir . -1)
        (padding . 0.5)
-       (skylines . ,ly:axis-group-interface::combine-skylines)
+       (vertical-skylines . ,ly:axis-group-interface::combine-skylines)
+       (max-stretch . ,ly:align-interface::calc-max-stretch)
        (meta . ((class . Spanner)
                 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
                 (interfaces . (align-interface
@@ -2054,7 +2081,9 @@
        (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)
-       (skylines . ,ly:axis-group-interface::calc-skylines);
+       (vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines)
+       (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
+       (stencil . ,ly:axis-group-interface::print)
        (meta . ((class . Spanner)
                 (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common)))
                 (interfaces . (axis-group-interface
@@ -2068,6 +2097,7 @@
        (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
@@ -2099,9 +2129,9 @@
                                   (padding . 1.5)
                                      ))
                          ))
-       (stencil . ,ly:new-line-spanner::print)
-       (left-bound-info . ,ly:new-line-spanner::calc-left-bound-info)
-       (right-bound-info . ,ly:new-line-spanner::calc-right-bound-info)
+       (stencil . ,ly:line-spanner::print)
+       (left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+       (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
        (meta . ((class . Spanner)
                 (interfaces . (line-spanner-interface
                                line-interface))))
@@ -2161,6 +2191,10 @@
 
 (define pure-print-callbacks
   (list
+   print-circled-text-callback
+   lyric-text::print
+   ly:arpeggio::print
+   ly:arpeggio::brew-chord-bracket
    ly:bar-line::print
    ly:note-head::print
    ly:dots::print
@@ -2180,6 +2214,7 @@
 (define pure-conversions-alist
   `(
     (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height)
+    (,ly:arpeggio::height . ,ly:arpeggio::pure-height)
     (,ly:slur::outside-slur-callback . ,ly:slur::pure-outside-slur-callback)
     (,ly:stem::height . ,ly:stem::pure-height)
     (,ly:rest::height . ,ly:rest::pure-height)