* input/regression/repeat-percent-grace.ly: new file.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 02bc9cc8ad924c156ab73cf3cfde1ae2d024f3dd..2257b35f7004d7ba012a6e2846644d29cb257d53 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -67,7 +67,7 @@
      . (
        (axes . (0 1))
        (X-extent . ,ly:axis-group-interface::width)
-       (X-extent . ,ly:axis-group-interface::height)
+       (Y-extent . ,ly:axis-group-interface::height)
        (space-alist . (
                        (clef . (extra-space . 0.5))
                        (key-signature . (extra-space . 0.0))
@@ -142,6 +142,7 @@
      . (
        (break-align-symbol . staff-bar)
        (glyph . "|")
+       (gap . 0.4)
        (layer . 0)
        (break-visibility . ,all-visible)
        (non-musical . #t)
@@ -314,6 +315,14 @@
                 (interfaces . (staff-symbol-referencer-interface
                                beam-interface))))))
 
+    (BendAfter
+     . (
+       (stencil . ,fall::print)
+       (thickness . 2.0)
+       (meta . ((class . Spanner)
+                (interfaces . (spanner-interface
+                               bend-after-interface))))))
+
     (BreakAlignment
      . (
        (non-musical . #t)
@@ -598,10 +607,12 @@
        (meta . ((class . Spanner)
                 (interfaces . (font-interface
                                text-interface
+                               line-spanner-interface
                                dynamic-interface
                                dynamic-text-spanner-interface
                                spanner-interface))))))
 
+                               
     (Fingering
      . (
 
@@ -642,6 +653,16 @@
                 (interfaces . (line-interface
                                line-spanner-interface))))))
 
+    (GraceSpacing
+     . (
+       (common-shortest-duration . ,grace-spacing::calc-shortest-duration)
+       (spacing-increment . 0.8)
+       (shortest-duration-space . 1.6)
+       (meta . ((class . Spanner)
+                (interfaces . (grace-spacing-interface
+                               spacing-interface
+                               spacing-options-interface
+                               spanner-interface))))))
     (GridPoint
      . (
        (X-extent . (0 . 0))
@@ -710,6 +731,20 @@
                                side-position-interface
                                font-interface))))))
 
+    (InstrumentSwitch
+     . (
+       (padding . 0.3)
+       (stencil . ,ly:text-interface::print)
+       (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
+       (staff-padding . 2)
+       (direction . ,UP)
+       (self-alignment-X . ,CENTER)
+       (meta . ((class . Item)
+                (interfaces . (system-start-text-interface
+                               side-position-interface
+                               font-interface))))))
+    
     (KeyCancellation
      . (
        (stencil . ,ly:key-signature-interface::print)
@@ -1120,6 +1155,7 @@
        
        (non-musical . #t)
        (line-break-permission . allow)
+       (page-break-permission . allow)
 
        ;; debugging stuff: print column number.
        ;;               (font-size . -6) (font-name . "sans")  (Y-extent . #f)
@@ -1260,13 +1296,10 @@
      . (
        ;; don't set direction here: it breaks staccato.
 
-       ;; This value is sensitive: if too large, staccato dots will move a
-       ;; space a away.
-       (padding . 0.20)
+       ;; padding set in script definitions.
        (staff-padding . 0.25)
        ;; (script-priority . 0) priorities for scripts, see script.scm
        (X-offset . , ly:self-alignment-interface::centered-on-x-parent)
-       
 
        (stencil . ,ly:script-interface::print)
        (direction . ,ly:script-interface::calc-direction)
@@ -1314,7 +1347,7 @@
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
- (SostenutoPedal
+    (SostenutoPedal
      . (
        (stencil . ,ly:text-interface::print)
        (direction . ,RIGHT)
@@ -1345,13 +1378,15 @@
     (SpacingSpanner
      . (
        (springs-and-rods . ,ly:spacing-spanner::set-springs)
+       (common-shortest-duration . ,ly:spacing-spanner::calc-common-shortest-duration)
        (average-spacing-wishes . #t)
-       (grace-space-factor . 0.6)
        (shortest-duration-space . 2.0)
        (spacing-increment . 1.2)
+       
        (base-shortest-duration . ,(ly:make-moment 3 16))
        (meta . ((class . Spanner)
                 (interfaces . (spacing-interface
+                               spacing-options-interface                               
                                spacing-spanner-interface))))))
 
     (SpanBar
@@ -1506,6 +1541,7 @@
        (meta . ((class . Item)
                 (interfaces . (piano-pedal-interface
                                text-spanner-interface
+                               line-spanner-interface
                                text-interface
                                self-alignment-interface
                                font-interface))))))
@@ -1644,12 +1680,14 @@
        (direction . ,UP)
        (meta . ((class . Spanner)
                 (interfaces . (text-spanner-interface
+                               line-spanner-interface
                                side-position-interface
                                font-interface))))))
 
     (Tie
      . (
        (control-points . ,ly:tie::calc-control-points)
+       (springs-and-rods . ,ly:spanner::set-spacing-rods)
        (avoid-slur . inside)
        (direction . ,ly:tie::calc-direction)
        (stencil . ,ly:tie::print)
@@ -1672,6 +1710,7 @@
                    (outer-tie-vertical-gap . 0.25)
                    (multi-tie-region-size . 1)
                    (between-length-limit . 1.0)))
+       
        (thickness . 1.2)
        (line-thickness . 0.8)
        (meta . ((class . Spanner)
@@ -1716,6 +1755,7 @@
        (side-axis . ,Y)
        (meta . ((class . Spanner)
                 (interfaces . (text-spanner-interface
+                               line-spanner-interface
                                side-position-interface
                                font-interface))))))
 
@@ -1728,7 +1768,6 @@
        (stencil . ,ly:accidental-interface::print)
        (meta . ((class . Item)
                 (interfaces . (item-interface
-                               accidental-interface
                                side-position-interface
                                font-interface))))))
 
@@ -1769,7 +1808,6 @@
        (edge-height . (0.7 . 0.7))
        (shorten-pair . (-0.2 . -0.2))
        (staff-padding . 0.25)
-       
        (direction  . ,ly:tuplet-bracket::calc-direction)
        (positions . ,ly:tuplet-bracket::calc-positions)
        (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
@@ -1783,6 +1821,7 @@
     (TupletNumber
      . (
        (stencil . ,ly:tuplet-number::print)
+       (text . ,tuplet-number::calc-denominator-text)
        (font-shape . italic)
        (font-size . -2)
        (avoid-slur . inside)
@@ -1938,3 +1977,71 @@
 
 (set! all-grob-descriptions (sort all-grob-descriptions alist<?))
 
+
+(define pure-print-callbacks
+  (list
+   `(,ly:note-head::print . '())
+   `(,ly:clef::print . '())
+   `(,ly:text-interface::print . '())
+   `(,ly:script-interface::print . '())))
+
+;; ly:grob::stencil-extent is safe iff the print callback is safe too
+(define (pure-stencil-height grob start stop)
+  (let ((sten (ly:grob-property-data grob 'stencil)))
+    (if (or
+        (ly:stencil? sten)
+        (pair? (assq sten pure-print-callbacks)))
+       (ly:grob::stencil-height grob)
+       '(0 . 0))))
+
+(define pure-Y-extents
+  (list
+   `(,ly:staff-symbol::height . ())))
+
+(define Y-extent-conversions
+  (list
+   `(,ly:stem::height . ,ly:stem::pure-height)
+   `(,ly:grob::stencil-height . ,pure-stencil-height)
+   `(,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)
+   `(,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
+   `(,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)
+   `(,ly:slur::height . ,ly:slur::pure-height)))
+
+(define pure-Y-offsets
+  (list
+   `(,ly:staff-symbol-referencer::callback . ())))
+
+(define Y-offset-conversions
+  (list
+   `(,ly:side-position-interface::y-aligned-side . ,ly:side-position-interface::pure-y-aligned-side)))
+
+(define-public (pure-relevant grob)
+  (let ((extent-callback (ly:grob-property-data grob 'Y-extent)))
+    (or
+     (pair? extent-callback)
+     (pair? (assq extent-callback pure-Y-extents))
+     (and
+      (pair? (assq extent-callback Y-extent-conversions))
+      (or
+       (not (eq? extent-callback ly:grob::stencil-height))
+       (pair? (assq (ly:grob-property-data grob 'stencil) pure-print-callbacks))
+       (ly:stencil? (ly:grob-property-data grob 'stencil)))))))
+
+(define (pure-conversion pures conversions defsymbol defreturn rettype? grob start stop)
+  (let* ((normal-callback (ly:grob-property-data grob defsymbol))
+        (pure-callback (assq normal-callback conversions)))
+    (if (rettype? normal-callback)
+       normal-callback
+       (if (pair? (assq normal-callback pures))
+           (normal-callback grob)
+           (if (pair? pure-callback)
+               ((cdr pure-callback) grob start stop)
+               defreturn)))))
+
+(define-public (pure-Y-extent grob start stop)
+  (pure-conversion pure-Y-extents Y-extent-conversions
+                  'Y-extent '(0 . 0) pair? grob start stop))
+
+(define-public (pure-Y-offset grob start stop)
+  (pure-conversion pure-Y-offsets Y-offset-conversions
+                  'Y-offset 0 number? grob start stop))