Fix #341.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index eefc76fe1343181c821de59f2792f3e4dc52b0c1..196b5501584c3956287745533d28756d798725b2 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
@@ -214,7 +215,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
@@ -290,7 +290,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,7 +319,7 @@
        (beaming . ,ly:beam::calc-beaming)
        (stencil . ,ly:beam::print)
        (clip-edges . #t)
-       (cross-staff . ,ly:beam::cross-staff)
+       (cross-staff . ,ly:beam::calc-cross-staff)
 
        (details .  ((hint-direction-penalty . 20)))
        ;; TODO: should be in SLT.
@@ -537,7 +537,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))))))
@@ -612,6 +611,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)
@@ -686,6 +686,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.
@@ -1256,7 +1258,7 @@
        (minimum-length . 1.5)
        (height-limit . 2.0)
        (ratio . 0.333)
-       (cross-staff . ,ly:slur::cross-staff)
+       (cross-staff . ,ly:slur::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1365,7 +1367,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)
@@ -1401,13 +1403,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
@@ -1429,7 +1433,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))))))
@@ -1455,7 +1460,7 @@
        (height-limit . 2.0)
        (ratio . 0.25)
        (avoid-slur . inside)
-       (cross-staff . ,ly:slur::cross-staff)
+       (cross-staff . ,ly:slur::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1576,7 +1581,7 @@
        (Y-extent . ,ly:stem::height)
        (length . ,ly:stem::calc-length)
        (thickness . 1.3)
-       (cross-staff . ,ly:stem::cross-staff)
+       (cross-staff . ,ly:stem::calc-cross-staff)
        (details
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
@@ -1703,7 +1708,7 @@
        (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)
@@ -1799,6 +1804,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)
@@ -1990,6 +1996,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
@@ -2002,6 +2009,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))))))
@@ -2054,7 +2062,7 @@
        (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)))
@@ -2066,8 +2074,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
@@ -2081,6 +2090,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
@@ -2174,6 +2184,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
@@ -2193,6 +2207,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)