X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=a132929ac94aa07dd31d58c1f21480c978328aca;hb=26633bbfbf821a7cfdfe7a0367d1ea94a440be2e;hp=7135a0d92ac336b3b90858c88ac11704f22124d4;hpb=ca2340c558b431c64e7e649e0e2844a464a34dae;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 7135a0d92a..a132929ac9 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -101,7 +101,7 @@
 	(padding . 1.0)
 	(direction . 1)
 	(font-family . roman)
-	(font-relative-size . -1)
+	(font-size . -2)
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(self-alignment-X . 1)
@@ -123,7 +123,7 @@
 
 	;; We must do this, other BFs in
 	;; paper16 become too small.
-	(font-relative-size . -2)
+	(font-size . -4)
 	(font-magnification . 0.8) 
 	(kern . 0.2)
 	(meta . ((interfaces . (text-interface 							rhythmic-grob-interface
@@ -369,12 +369,11 @@
      . (
 	(molecule-callback . ,Text_item::brew_molecule)
 	(padding . 0.6)
-	;;		(direction . -1)
 	(self-alignment-X . 0)
 	(self-alignment-Y . 0)
 	(script-priority . 100)
 	(font-family . number)
-	(font-relative-size . -3)
+	(font-size . -4)
 	(font-shape . upright)
 	(meta . ((interfaces . (finger-interface font-interface text-script-interface text-interface side-position-interface self-alignment-interface item-interface ))))
 	))
@@ -519,15 +518,14 @@
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))	
 	(self-alignment-X . 0)
-	(break-align-symbol . time-signature)
 	(direction . 1)
 	(breakable . #t)
-	(font-relative-size . 1)
+	(font-size . 2)
 	(font-family . roman)
 	(baseline-skip . 2)
 	(break-visibility . ,end-of-line-invisible)
 	(padding . 0.8)
-	(meta . ((interfaces . (text-interface side-position-interface font-interface mark-interface self-alignment-interface item-interface ))))
+	(meta . ((interfaces . (break-aligned-interface text-interface side-position-interface font-interface mark-interface self-alignment-interface item-interface ))))
 	))
      (MetronomeMark
      . (
@@ -613,6 +611,8 @@
 	(molecule-callback . ,Note_head::brew_molecule)
 	(ligature-primitive-callback . ,Note_head::brew_molecule)
 	(glyph-name-procedure . ,find-notehead-symbol)
+	(X-extent-callback . ,Note_head::extent)
+	(Y-extent-callback . ,Note_head::extent)
 	(Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
 	(stem-attachment-function . ,note-head-style->attachment-coordinates)
 	(meta . ((interfaces . (rhythmic-grob-interface rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface item-interface ))))
@@ -659,7 +659,7 @@
 	(molecule-callback . ,Text_item::brew_molecule)
 	(font-shape . italic)
 	(padding . 0.4)
-	(font-relative-size . -2)
+	(font-size . -4)
 	(font-family . roman)
 	(meta . ((interfaces . (text-interface self-alignment-interface side-position-interface font-interface item-interface ))))
 	))
@@ -741,7 +741,7 @@
 
     (RepeatSlash
      . (
-	(molecule-callback . , Percent_repeat_item_interface::beat_slash)
+	(molecule-callback . ,Percent_repeat_item_interface::beat_slash)
 	(thickness . 0.48)
 	(slope . 1.7)
 	(meta . ((interfaces . (percent-repeat-interface item-interface ))))
@@ -964,8 +964,6 @@
 	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(adjust-if-on-staffline . #t)
 	(font-family . music)	   
-	(avoid-note-head . #f)
-	(up-to-staff . #f)
 	(meta . ((interfaces . (stem-interface  font-interface item-interface ))))
 	))
 
@@ -1103,7 +1101,7 @@
      . (
 	(font-family . roman)
 	(style . default)
-	(molecule-callback . ,tablature-molecule-callback)
+	(molecule-callback . ,Text_item::brew_molecule)
 	(Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
 	(extra-offset . (0 . -0.65)) ;; UGH! TODO: Clean this up!
 	(stem-attachment-function . ,tablature-stem-attachment-function)
@@ -1168,7 +1166,7 @@
 	(font-shape . italic)
 	(font-series . bold)
 
-	(font-relative-size . -1)
+	(font-size . -2)
 	(meta .  ((interfaces . (text-interface tuplet-bracket-interface font-interface spanner-interface))))
 	))
 
@@ -1217,7 +1215,7 @@
 	(height . 2.0) ; staffspace;
 	(minimum-space . 5)
 	(font-family . number)
-	(font-relative-size . -2)
+	(font-size . -4)
 	(meta . ((interfaces . (volta-bracket-interface text-interface side-position-interface font-interface spanner-interface))))
 	))