X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=f6a82e8ea35b98c53892f41a22b85532b5032956;hb=b3768e70f4497923ad4c1400c4da88e1808c1b22;hp=e2650a18899bed98fbee2c3b9bf7e1a22b93dd03;hpb=ff7c86ab8b803d8c2237d5c305a711f61637d446;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index e2650a1889..f6a82e8ea3 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -386,12 +386,14 @@
 	))
     (DynamicTextSpanner
      . ((print-function . ,Dynamic_text_spanner::print)
-	(font-series . bold)
+
+;; rather ugh with NCSB
+;	(font-series . bold)
 	(font-shape . italic)
 	(style . dashed-line)
 
 	; need to blend with dynamic texts.
-	(font-size . 2)
+	(font-size . 1)
 	(bound-padding . 0.75)
 	(dash-fraction . 0.2)
 	(dash-period . 3.0)
@@ -419,13 +421,14 @@
 	(break-align-symbol . left-edge)
 	(X-extent . (0 . 0))
 	(breakable . #t)
+	(break-visibility . ,center-invisible)
 	(space-alist . (
 			(custos . (extra-space . 0.0))
 			(ambitus . (extra-space . 2.0))
 			(time-signature . (extra-space . 0.0))
 			(staff-bar . (extra-space . 0.0))
 			(breathing-sign . (minimum-space . 0.0))
-			(clef . (extra-space . 0.85))
+			(clef . (extra-space . 0.8))
 			(first-note . (fixed-space . 1.0))
 			(right-edge . (extra-space . 0.0))
 			(key-signature . (extra-space . 0.0))
@@ -452,6 +455,21 @@
 				side-position-interface self-alignment-interface
 				item-interface))))
 	))
+    (StringNumber
+     . (
+	(print-function . ,print-circled-text-callback)
+	(padding . 0.5)
+	(staff-padding . 0.5)
+	(self-alignment-X . 0)
+	(self-alignment-Y . 0)
+	(script-priority . 100)
+	(font-encoding . fetaNumber)
+	(font-size . -5) 		; don't overlap when next to heads.
+	(meta . ((interfaces . (string-number-interface
+				font-interface text-script-interface text-interface
+				side-position-interface self-alignment-interface
+				item-interface))))
+	))
 
     (Glissando
      . (
@@ -469,6 +487,7 @@
     (Hairpin
      . (
 	(print-function . ,Hairpin::print)
+	(after-line-breaking-callback . ,Hairpin::after_line_breaking)
 	(thickness . 1.0)
 	(height . 0.6666)
 	(spacing-procedure . ,Spanner::set_spacing_rods)
@@ -569,7 +588,7 @@
 	(print-function . ,Ledger_line_spanner::print)
 	(X-extent-callback . #f)
 	(Y-extent-callback . #f)
-	(minimum-length-fraction . 0.15)
+	(minimum-length-fraction . 0.25)
 	(length-fraction . 0.25)
 	(spacing-procedure . ,Ledger_line_spanner::set_spacing_rods)
 	(print-function . ,Ledger_line_spanner::print)
@@ -598,7 +617,9 @@
 	(height . 0.42)
 	(dash-period . 10.0)
 	(length . 0.66)
-	(spacing-procedure . ,Hyphen_spanner::set_spacing_rods)
+	(minimum-length . 0.3)
+	(padding . 0.07)
+;	(spacing-procedure . ,Hyphen_spanner::set_spacing_rods)
 	(print-function . ,Hyphen_spanner::print)
 	(Y-extent . (0 . 0))
 	(meta . ((interfaces . (lyric-interface lyric-hyphen-interface
@@ -744,7 +765,7 @@
     (NoteSpacing
      . (
 	(stem-spacing-correction . 0.5)
-
+	(same-direction-correction . 0.25)
 	;; Changed this from 0.75.
 	;; If you ever change this back, please document! --hwn
 	(knee-spacing-correction . 1.0)
@@ -801,7 +822,7 @@
     (PhrasingSlur
      . ((slur-details . ,default-slur-details)
 	(print-function . ,Slur::print)
-	(thickness . 1.2)		
+	(thickness . 1.1)		
 	(spacing-procedure . ,Spanner::set_spacing_rods)		
 	(minimum-length . 1.5)
 	(after-line-breaking-callback . ,Slur::after_line_breaking)
@@ -914,7 +935,7 @@
     (Slur
      . ((slur-details . ,default-slur-details)
 	(print-function . ,Slur::print)
-	(thickness . 1.2)		
+	(thickness . 1.0)		
 	(spacing-procedure . ,Spanner::set_spacing_rods)		
 	(minimum-length . 1.5)
 	(after-line-breaking-callback . ,Slur::after_line_breaking)
@@ -1236,7 +1257,7 @@
 	(spacing-procedure . ,Spanner::set_spacing_rods)
 	(staffline-clearance . 0.35)
 	(details . ((ratio . 0.333) (height-limit . 1.0)))
-	(thickness . 1.2)
+	(thickness . 1.0)
 	(x-gap . -0.1)
 	(y-offset . 0.6)
 	(minimum-length . 2.5)
@@ -1279,7 +1300,7 @@
 	(after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking)
 	(print-function . ,Tuplet_bracket::print)
 	(font-shape . italic)
-	(font-series . bold)
+;	(font-series . bold)
 
 	(font-size . -2)
 	(meta . ((interfaces . (text-interface line-interface tuplet-bracket-interface font-interface spanner-interface))))