X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fgrob-description.scm;h=4425102e63c6b75e5065911426945a1a20b2b356;hb=3471866d047b2e22f6d42eedb936d5eddcb5a06a;hp=27ae0417239835add8616223c97a25a330bad1b7;hpb=3a8bdbfb00fdc32e150baf0b6fa855677fad57dd;p=lilypond.git

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 27ae041723..4425102e63 100644
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -24,7 +24,10 @@
      . (
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(left-padding . 0.3)
-	(right-padding . 0.3)
+
+	;; 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.15)
 	(meta . ((interfaces . (item-interface accidental-placement-interface))))
 	))
 
@@ -146,7 +149,7 @@
 	(slope-limit . 0.2)
 	(flag-width-function . ,default-beam-flag-width-function)
 	(damping . 1)
-	(auto-knee-gap . 7)
+	(auto-knee-gap . 5.5)
 	(font-name . "cmr10")
 	(space-function . ,Beam::space_function)
 	(meta . ((interfaces . (staff-symbol-referencer-interface beam-interface spanner-interface))))
@@ -441,7 +444,8 @@
     (LyricText
      . (
 	(molecule-callback . ,Text_item::brew_molecule)
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
+	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent
+			       ,Self_alignment_interface::aligned_on_self))
 	(self-alignment-X . 0)
 	(word-space . 0.6)
 	(ignore-length-mismatch . #f)
@@ -449,6 +453,7 @@
 	(end-alignment . 2)
 	(font-family . roman)
 	(font-shape . upright)
+	
 	;; duh, side-position-interface?
 	(meta . ((interfaces . (lyric-syllable-interface self-alignment-interface text-interface font-interface item-interface ))))
 	))
@@ -486,6 +491,7 @@
 	(direction . 1)
 	(breakable . #t)
 	(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 ))))
@@ -768,11 +774,13 @@
      . (
 	(breakable . #t)
 	(stem-spacing-correction . 0.4)
+	(knee-spacing-correction . 0.75)
 	(meta . ((interfaces . (spacing-interface staff-spacing-interface item-interface ))))
 	))
     (NoteSpacing
      . (
 	(stem-spacing-correction . 0.5)
+	(knee-spacing-correction . 0.75)
 	(meta . ((interfaces . (spacing-interface note-spacing-interface item-interface ))))
 	))
 
@@ -929,6 +937,7 @@
      . (
 	(molecule-callback . ,Text_item::brew_molecule)
 	(no-spacing-rods . #t)
+	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(direction . -1)
 	(padding . 0.5)
 	(script-priority . 200)