X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=3f2340989dc573bb8a6c755d36f9e822f45b5045;hb=bff637281b422e87a600d30587beb3bd8314e7a3;hp=93f0974f64bcc807bcc812d8ecfaa754c8d60724;hpb=160d482c6a0d59f27c8ccb1c99660a2ade551b29;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 93f0974f64..3f2340989d 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -21,6 +21,7 @@
 	(cautionary-style . parentheses)
 	(after-line-breaking-callback . ,Accidental_interface::after_line_breaking)		(meta . ((interfaces . (item-interface accidental-interface font-interface))))
 	))
+    
     (AccidentalPlacement
      . (
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
@@ -28,7 +29,7 @@
 
 	;; this is quite small, but it is very ugly to have
 	;; accs closer to the previous note than to the next one.
-	(right-padding . 0.2)
+	(right-padding . 0.25)
 	(meta . ((interfaces . (item-interface accidental-placement-interface))))
 	))
 
@@ -435,7 +436,7 @@
 	(meta . ((interfaces . (font-interface self-alignment-interface side-position-interface text-interface break-aligned-interface item-interface ))))
 	))
     
-    (InstrumentName
+    (VocalName
      . (
 	(breakable . #t)
 	(Y-offset-callbacks . (,Side_position_interface::aligned_on_support_refpoints))
@@ -443,7 +444,7 @@
 	(space-alist . ((left-edge . (extra-space . 1.0))
 			))
 	(molecule-callback . ,Text_item::brew_molecule)		
-	(break-align-symbol . instrument-name)
+	(break-align-symbol . clef)
 	(break-visibility . ,begin-of-line-visible)
 	(baseline-skip . 2)
 	(font-family . roman)
@@ -574,7 +575,7 @@
 	(thick-thickness . 6.6)
 	(hair-thickness . 2.0)
 	(padding . 1)
-	(meta . ((interfaces . (multi-measure-rest-interface rest-interface font-interface staff-symbol-referencer-interface))))
+	(meta . ((interfaces . (multi-measure-rest-interface multi-measure-interface rest-interface font-interface staff-symbol-referencer-interface))))
 	))
     
     (MultiMeasureRestNumber
@@ -588,7 +589,7 @@
 	(padding . 1.3)
 	(staff-padding . 1.3)
 	(font-family . number)
-	(meta . ((interfaces . (side-position-interface self-alignment-interface font-interface spanner-interface text-interface))))
+	(meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
 	))
     (MultiMeasureRestText
      . (
@@ -601,7 +602,7 @@
 	(padding . 1.5)
 	(staff-padding . 1.5)
 	(font-family . roman)
-	(meta . ((interfaces . (side-position-interface self-alignment-interface font-interface spanner-interface text-interface))))
+	(meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
 	))
  (NoteCollision
      . (