X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=975d42582ffbd2544bcba886724cbe5dbf63f8f3;hb=fe0606d0a18a65234db75c7424860d656db5e6a8;hp=07a22448302f54c754f7c97ccc9ce47ebfba42f2;hpb=adfdbf4765643e9e12256634d655382fc7966f36;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 07a2244830..975d42582f 100644
--- 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))))))
 
@@ -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)
@@ -1855,6 +1861,7 @@
 	(meta . ((class . Item)
 		 (interfaces . (text-script-interface
 				text-interface
+				instrument-specific-markup-interface
 				side-position-interface
 				font-interface))))))
 
@@ -1914,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)))
 	
@@ -1940,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))
@@ -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