Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index e75c1b4042653dca5d64662a3c5ef88f72c3a15d..975d42582ffbd2544bcba886724cbe5dbf63f8f3 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -574,6 +574,7 @@
        (meta . ((class . Item)
                 (interfaces . (font-interface
                                break-aligned-interface
+                               percent-repeat-interface
                                percent-repeat-item-interface))))))
 
     (DoublePercentRepeatCounter
@@ -597,6 +598,7 @@
                 (interfaces . (side-position-interface
                                self-alignment-interface
                                percent-repeat-item-interface
+                               percent-repeat-interface
                                font-interface
                                text-interface))))))
 
@@ -718,7 +720,7 @@
 
     (FretBoard
      . ((stencil . ,fret-board::calc-stencil)
-       (finger-code . below-string)
+       (fret-diagram-details . ((finger-code . below-string)))
        (meta . ((class . Item)
                 (interfaces . (fret-diagram-interface
                                font-interface))))))
@@ -1312,7 +1314,8 @@
        (meta . ((class . Spanner)
                 (interfaces . (multi-measure-rest-interface
                                font-interface
-                               percent-repeat-item-interface))))))
+                               percent-repeat-interface
+                               ))))))
 
     (PercentRepeatCounter
      . (
@@ -1333,7 +1336,7 @@
        (meta . ((class . Spanner)
                 (interfaces . (side-position-interface
                                self-alignment-interface
-                               percent-repeat-item-interface
+                               percent-repeat-interface
                                font-interface
                                text-interface))))))
 
@@ -1389,6 +1392,7 @@
        (slope . 1.7)
        (meta . ((class . Item)
                 (interfaces . (rhythmic-grob-interface
+                               percent-repeat-interface
                                percent-repeat-item-interface))))))
 
     (RepeatTie
@@ -1621,6 +1625,7 @@
        (length . ,ly:stem::calc-length)
        (thickness . 1.3)
        (cross-staff . ,ly:stem::calc-cross-staff)
+       (flag . ,ly:stem::calc-flag)
        (details
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
@@ -1679,6 +1684,7 @@
        (self-alignment-X . ,CENTER)
        (self-alignment-Y . ,CENTER)
        (script-priority . 100)
+       (avoid-slur . around)
        (font-encoding . fetaNumber)
        (font-size . -5)                ; don't overlap when next to heads.
        (meta . ((class . Item)
@@ -1815,6 +1821,7 @@
     (TabNoteHead
      . (
        (stencil . ,ly:text-interface::print)
+       (duration-log . ,note-head::calc-duration-log)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (direction . ,CENTER)
@@ -1854,6 +1861,7 @@
        (meta . ((class . Item)
                 (interfaces . (text-script-interface
                                text-interface
+                               instrument-specific-markup-interface
                                side-position-interface
                                font-interface))))))
 
@@ -1913,7 +1921,7 @@
                    (outer-tie-length-symmetry-penalty-factor . 10)
                    (vertical-distance-penalty-factor . 7)
                    (outer-tie-vertical-gap . 0.25)
-                   (multi-tie-region-size . 1)
+                   (multi-tie-region-size . 3)
                    (single-tie-region-size . 4)
                    (between-length-limit . 1.0)))
        
@@ -1939,6 +1947,7 @@
         . ,ly:break-aligned-interface::calc-extent-aligned-anchor)
        (break-visibility . ,all-visible)
        (avoid-slur . inside)
+       (extra-spacing-height . (-1.0 . 1.0))
        (space-alist . (
                        (first-note . (fixed-space . 2.0))
                        (right-edge . (extra-space . 0.5))
@@ -2015,7 +2024,6 @@
                 (interfaces . (side-position-interface
                                parentheses-interface
                                note-head-interface
-                               rhythmic-head-interface
                                font-interface
                                axis-group-interface))))))
 
@@ -2039,6 +2047,7 @@
        (edge-height . (0.7 . 0.7))
        (shorten-pair . (-0.2 . -0.2))
        (staff-padding . 0.25)
+       (full-length-to-extent . #t)
        (direction  . ,ly:tuplet-bracket::calc-direction)
        (positions . ,ly:tuplet-bracket::calc-positions)
        (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
@@ -2244,6 +2253,7 @@
 
 (define pure-print-callbacks
   (list
+   fret-board::calc-stencil
    print-circled-text-callback
    lyric-text::print
    ly:arpeggio::print