* scm/define-grob-interfaces.scm

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 333c6a8e9e1179521727b056976fc916fc570090..7e633bc1261c60b49dcadaf76e124fcfc5efe078 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -692,6 +692,7 @@
        (stencil . ,ly:hairpin::print)
        (springs-and-rods . ,ly:spanner::set-spacing-rods)
        (after-line-breaking . ,ly:hairpin::after-line-breaking)
+       (grow-direction . ,hairpin::calc-grow-direction)
        (circled-tip . #f)
        (thickness . 1.0)
        (height . 0.6666)
@@ -1016,6 +1017,26 @@
                                font-interface
                                text-interface))))))
 
+    (NonMusicalPaperColumn
+     . (
+       (allow-loose-spacing . #t)
+       (axes . (0))
+       (before-line-breaking . ,ly:paper-column::before-line-breaking)
+       (X-extent . ,ly:axis-group-interface::width)
+       ;;                    (stencil . ,ly:paper-column::print)
+       
+       (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)
+
+       (meta . ((class . Paper_column)
+                (interfaces . (paper-column-interface
+                               axis-group-interface
+                               spaceable-grob-interface))))))
+    
     (NoteCollision
      . (
        (axes . (0 1))
@@ -1116,6 +1137,7 @@
     (PaperColumn
      . (
        (axes . (0))
+       (allow-loose-spacing . #t)
        (before-line-breaking . ,ly:paper-column::before-line-breaking)
        ;; (stencil . ,ly:paper-column::print)
        (X-extent . ,ly:axis-group-interface::width)
@@ -1149,24 +1171,7 @@
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
-    (NonMusicalPaperColumn
-     . (
-       (axes . (0))
-       (before-line-breaking . ,ly:paper-column::before-line-breaking)
-       (X-extent . ,ly:axis-group-interface::width)
-       ;;                    (stencil . ,ly:paper-column::print)
-       
-       (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)
-
-       (meta . ((class . Paper_column)
-                (interfaces . (paper-column-interface
-                               axis-group-interface
-                               spaceable-grob-interface))))))
 
     (PercentRepeat
      . (
@@ -1775,6 +1780,7 @@
        (stencil . ,ly:accidental-interface::print)
        (meta . ((class . Item)
                 (interfaces . (item-interface
+                               trill-pitch-accidental-interface
                                side-position-interface
                                font-interface))))))
 
@@ -1985,7 +1991,6 @@
 
 (set! all-grob-descriptions (sort all-grob-descriptions alist<?))
 
-
 (define pure-print-callbacks
   (list
    `(,ly:note-head::print . '())
@@ -2037,14 +2042,18 @@
 
 (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)))))
+           (let
+               ((pure-callback (assq normal-callback conversions)))
+
+             (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