* scm/output-lib.scm (string-finger::calc-text): new function

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index a82741dc6937a61eb774541fdaaf4fdc6d2389a5..5dc860bd275f6ba5586b0eaf2ed9b315a256b5b6 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1017,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))
@@ -1117,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)
@@ -1150,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
      . (
@@ -1537,6 +1541,27 @@
                                self-alignment-interface
                                item-interface))))))
     
+    (StringFinger
+     . (
+       (stencil . ,ly:text-interface::print)
+       (text . ,string-finger::calc-text)
+       (padding . 0.5)
+       (staff-padding . 0.5)
+       (self-alignment-X . 0)
+       (self-alignment-Y . 0)
+       (script-priority . 100)
+       (font-shape . italic)
+       (font-size . -5)                ; don't overlap when next to heads.
+       (meta . ((class . Item)
+                (interfaces . (string-number-interface
+                               font-interface
+                               text-script-interface
+                               text-interface
+                               side-position-interface
+                               self-alignment-interface
+                               item-interface))))))
+    
+
     (SustainPedal
      . (
        (no-spacing-rods . #t)
@@ -1776,6 +1801,7 @@
        (stencil . ,ly:accidental-interface::print)
        (meta . ((class . Item)
                 (interfaces . (item-interface
+                               trill-pitch-accidental-interface
                                side-position-interface
                                font-interface))))))