X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=99fa123ef8e68e8cb39bc6557028fe859e0d4db2;hb=48e056b5b40cca48470866ffa7a13ff1d4fa4963;hp=e715554fb7d702a3742677d034b0881d68bd82ff;hpb=c5d52711febce78e3beff59d635cc7669aa1da2f;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index e715554fb7..99fa123ef8 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -19,8 +19,9 @@
 	(print-function . ,Accidental_interface::print)
 	(inside-slur . #t)
 	(cautionary-style . parentheses)
-	(after-line-breaking-callback . ,Accidental_interface::after_line_breaking)		(meta . ((interfaces . (item-interface accidental-interface
-																       font-interface))))
+	(after-line-breaking-callback . ,Accidental_interface::after_line_breaking)
+	(meta . ((interfaces . (item-interface accidental-interface
+					       font-interface))))
 	))
 
     (AccidentalPlacement
@@ -47,7 +48,8 @@
 	(breakable . #t)
 	(break-align-symbol . ambitus)
 	(break-visibility . ,begin-of-line-visible)
-	(meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface))))
+	(meta . ((interfaces . (axis-group-interface
+				break-aligned-interface ambitus-interface item-interface))))
 	))
 
     (AmbitusLine
@@ -67,7 +69,10 @@
 	(X-offset-callbacks . (,Side_position_interface::aligned_side))
 	(direction . -1)
 	(cautionary-style . parentheses)
-	(after-line-breaking-callback . ,Accidental_interface::after_line_breaking)		(meta . ((interfaces . (item-interface accidental-interface break-aligned-interface side-position-interface font-interface))))
+	(after-line-breaking-callback . ,Accidental_interface::after_line_breaking)
+	(meta . ((interfaces . (item-interface
+				accidental-interface break-aligned-interface
+				side-position-interface font-interface))))
 	))
 
     (AmbitusNoteHead
@@ -88,14 +93,15 @@
     (Arpeggio
      . (
 	(X-extent-callback . ,Arpeggio::width_callback)
-	(Y-extent-callback . #f)	
 	(print-function . ,Arpeggio::print)
 	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(X-offset-callbacks . (,Side_position_interface::aligned_side))
 	(direction . -1)
 	(padding . 0.5)
 	(staff-position . 0.0)
-	(meta . ((interfaces . (arpeggio-interface staff-symbol-referencer-interface side-position-interface item-interface font-interface))))
+	(meta . ((interfaces . (arpeggio-interface
+				staff-symbol-referencer-interface side-position-interface
+				item-interface font-interface))))
 	))
 
     (BarLine
@@ -103,6 +109,7 @@
 	(break-align-symbol . staff-bar)
 	(glyph . "|")
 	(break-glyph-function . ,default-break-barline)
+	(layer . 0)
 	(bar-size-procedure . ,Bar_line::get_staff_bar_size)
 	(print-function . ,Bar_line::print)	
 	(break-visibility . ,all-visible)
@@ -128,7 +135,8 @@
 	(thin-kern . 3.0)
 	(hair-thickness . 1.9)
 	(thick-thickness . 6.0)
-	(meta . ((interfaces . (bar-line-interface item-interface break-aligned-interface font-interface))))
+	(meta . ((interfaces . (bar-line-interface
+				item-interface break-aligned-interface font-interface))))
 	))
 
 
@@ -164,9 +172,9 @@
 	;; layout16 become too small.
 	(font-size . -4)
 	(kern . 0.2)
-	(meta . ((interfaces . (text-interface 							rhythmic-grob-interface
-												bass-figure-interface item-interface
-												self-alignment-interface font-interface))))
+	(meta . ((interfaces . (text-interface
+				rhythmic-grob-interface bass-figure-interface item-interface
+				self-alignment-interface font-interface))))
 	))
     (Beam
      . (
@@ -288,7 +296,9 @@
 			(right-edge . (extra-space . 0.5))
 			))
 	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
-	(meta . ((interfaces . (clef-interface staff-symbol-referencer-interface font-interface break-aligned-interface item-interface ))))
+	(meta . ((interfaces . (clef-interface
+				staff-symbol-referencer-interface font-interface
+				break-aligned-interface item-interface ))))
 	))
 
     (ClusterSpannerBeacon
@@ -315,8 +325,9 @@
 	(word-space . 0.0)
 	(font-family . sans)
 	(font-size . 1.5)
-	(meta . ((interfaces . (font-interface 							rhythmic-grob-interface
-												text-interface chord-name-interface item-interface ))))
+	(meta . ((interfaces . (font-interface
+				rhythmic-grob-interface text-interface chord-name-interface
+				item-interface))))
 	))
 
     (Custos
@@ -351,7 +362,8 @@
      . (
 	(print-function . ,Dots::print)
 	(dot-count . 1)
-	(meta . ((interfaces . (font-interface staff-symbol-referencer-interface dots-interface item-interface ))))
+	(meta . ((interfaces . (font-interface
+				staff-symbol-referencer-interface dots-interface item-interface ))))
 	))
 
     (DoublePercentRepeat
@@ -372,8 +384,7 @@
      . (
 	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(print-function . ,Text_interface::print)
-	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
-			       ,Self_alignment_interface::centered_on_parent))
+	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
 	(self-alignment-X . 0)
 	(no-spacing-rods . #t)
 	(script-priority . 100)
@@ -428,7 +439,7 @@
 			(time-signature . (extra-space . 0.0))
 			(staff-bar . (extra-space . 0.0))
 			(breathing-sign . (minimum-space . 0.0))
-			(clef . (extra-space . 0.7))
+			(clef . (extra-space . 0.8))
 			(first-note . (fixed-space . 1.0))
 			(right-edge . (extra-space . 0.0))
 			(key-signature . (extra-space . 0.0))
@@ -455,6 +466,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,9 +495,28 @@
 	(meta . ((interfaces . (line-interface line-spanner-interface spanner-interface))))
 	))
 
+    (GridPoint
+     . (
+	(X-extent . (0 . 0))
+	(Y-extent . (0 . 0))
+	(meta . ((interfaces . (grid-point-interface))))
+	))
+
+    (GridLine
+     . (
+	(print-function . ,Grid_line_interface::print)
+	(X-extent-callback  . ,Grid_line_interface::width_callback)
+	(self-alignment-X . ,CENTER)
+	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
+			       ,Self_alignment_interface::centered_on_parent))
+	(layer . 0)
+	(meta . ((interfaces . (self-alignment-interface grid-line-interface)))
+	)))
+	
     (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)
@@ -479,7 +524,9 @@
 	(bound-padding . 1.0)
 	(self-alignment-Y . 0)
 	(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-	(meta . ((interfaces . (hairpin-interface line-interface self-alignment-interface dynamic-interface spanner-interface))))
+	(meta . ((interfaces . (hairpin-interface
+				line-interface self-alignment-interface dynamic-interface
+				spanner-interface))))
 	))
 
     (HorizontalBracket
@@ -488,6 +535,7 @@
 	(print-function . ,Horizontal_bracket::print)
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(padding . 0.2)
+	(staff-padding . 0.2)
 	(direction . -1)
 	(bracket-flare . (0.5 . 0.5))
 	(meta . ((interfaces . (horizontal-bracket-interface
@@ -512,7 +560,9 @@
 	(break-align-symbol . instrument-name)
 	(break-visibility . ,begin-of-line-visible)
 	(baseline-skip . 2)
-	(meta . ((interfaces . (font-interface self-alignment-interface side-position-interface text-interface break-aligned-interface item-interface ))))
+	(meta . ((interfaces . (font-interface
+				self-alignment-interface side-position-interface text-interface
+				break-aligned-interface item-interface ))))
 	))
 
     (VocalName
@@ -627,7 +677,10 @@
 	(word-space . 0.6)
 	(font-series . bold-narrow)
 	(font-size . 1.0)
-	(meta . ((interfaces . (rhythmic-grob-interface lyric-syllable-interface self-alignment-interface text-interface font-interface item-interface ))))
+	(meta . ((interfaces . (rhythmic-grob-interface
+				lyric-syllable-interface
+				self-alignment-interface text-interface
+				font-interface item-interface ))))
 	))
 
     (MensuralLigature
@@ -675,7 +728,8 @@
 	(thickness . 1)
 	(height . 2.0)
 	(staff-padding . 3)
-	(meta . ((interfaces . (spanner-interface side-position-interface measure-grouping-interface))))
+	(meta . ((interfaces . (spanner-interface side-position-interface
+						  measure-grouping-interface))))
 	))
     (MultiMeasureRest
      . (
@@ -687,7 +741,9 @@
 	(thick-thickness . 6.6)
 	(hair-thickness . 2.0)
 	(padding . 1)
-	(meta . ((interfaces . (multi-measure-rest-interface multi-measure-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
@@ -701,7 +757,9 @@
 	(padding . 0.4)
 	(staff-padding . 0.4)
 	(font-encoding . fetaNumber)
-	(meta . ((interfaces . (side-position-interface multi-measure-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
      . (
@@ -713,7 +771,9 @@
 	(direction . 1)
 	(padding . 0.2)
 	(staff-padding . 0.25)
-	(meta . ((interfaces . (side-position-interface multi-measure-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
@@ -749,7 +809,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)
@@ -806,7 +866,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)
@@ -850,7 +910,8 @@
 	(edge-height . (1.0 . 1.0))
 	(shorten-pair . (0.0 . 0.0))
 	(thickness .  1.0)
-	(meta . ((interfaces . (line-interface piano-pedal-interface piano-pedal-bracket-interface spanner-interface))))
+	(meta . ((interfaces . (line-interface
+				piano-pedal-interface piano-pedal-bracket-interface spanner-interface))))
 	))
 
 
@@ -858,9 +919,10 @@
      . (
 	(Y-offset-callbacks . (,Hara_kiri_group_spanner::force_hara_kiri_callback))
 	(Y-extent-callback . ,Hara_kiri_group_spanner::y_extent)
-	(remove-first . #t)
 	(axes . (1))
-	(meta . ((interfaces . (axis-group-interface vertically-spaceable-interface hara-kiri-group-interface item-interface spanner-interface))))
+	(meta . ((interfaces . (axis-group-interface
+				vertically-spaceable-interface hara-kiri-group-interface
+				item-interface spanner-interface))))
 	))
 
     (RepeatSlash
@@ -880,8 +942,7 @@
 			       ,Rest::polyphonic_offset_callback
 			       ))
 	(minimum-distance . 0.25)
-	(meta . (
-		 (interfaces . (font-interface
+	(meta . ((interfaces . (font-interface
 				rhythmic-head-interface
 				rhythmic-grob-interface
 				staff-symbol-referencer-interface
@@ -907,7 +968,8 @@
 	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
 	(before-line-breaking-callback . ,Script_interface::before_line_breaking)
 	(font-encoding . fetaMusic)
-	(meta . ((interfaces . (script-interface side-position-interface font-interface item-interface ))))
+	(meta . ((interfaces . (script-interface
+				side-position-interface font-interface item-interface ))))
 	))
 
     (ScriptColumn
@@ -919,7 +981,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)
@@ -947,6 +1009,7 @@
 	(print-function . ,Span_bar::print)
 	(X-extent-callback . ,Span_bar::width_callback)
 	(Y-extent-callback . ())
+	(layer . 0)
 	(breakable . #t)
 	(before-line-breaking-callback . ,Span_bar::before_line_breaking)
 	;; ugh duplication!
@@ -968,7 +1031,8 @@
 	(padding . 1.0)
 	(X-offset-callbacks . (,Side_position_interface::aligned_side))
 	(direction . ,LEFT)
-	(meta . ((interfaces . (side-position-interface stanza-number-interface text-interface font-interface item-interface ))))		
+	(meta . ((interfaces . (side-position-interface
+				stanza-number-interface text-interface font-interface item-interface ))))		
 	))
 
     (StaffSpacing
@@ -988,7 +1052,8 @@
 	(padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
 	(font-shape . italic)
 	(self-alignment-X . 0)
-	(meta . ((interfaces . (text-interface self-alignment-interface font-interface item-interface))))
+	(meta . ((interfaces . (text-interface
+				self-alignment-interface font-interface item-interface))))
 	))
 
     (SostenutoPedalLineSpanner
@@ -1001,7 +1066,8 @@
 	(padding . 1.2)
 	(minimum-space . 1.0)
 	(direction . -1)
-	(meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface))))
+	(meta . ((interfaces . (piano-pedal-interface
+				axis-group-interface side-position-interface spanner-interface))))
 	))
 
     (StaffSymbol
@@ -1092,7 +1158,9 @@
 	(direction . 1)
 	(padding . 0.0)  ;; padding relative to SustainPedalLineSpanner
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-	(meta . ((interfaces . (piano-pedal-interface text-spanner-interface text-interface self-alignment-interface font-interface item-interface))))
+	(meta . ((interfaces . (piano-pedal-interface
+				text-spanner-interface text-interface self-alignment-interface
+				font-interface item-interface))))
 	))
 
     (SustainPedalLineSpanner
@@ -1105,7 +1173,8 @@
 	(staff-padding . 1.2)
 	(minimum-space . 1.0)
 	(direction . -1)
-	(meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface))))
+	(meta . ((interfaces . (piano-pedal-interface
+				axis-group-interface side-position-interface spanner-interface))))
 	))
 
     (System
@@ -1129,15 +1198,13 @@
     (SystemStartBracket
      . (
 	(Y-extent-callback . #f)
+	(X-offset-callbacks . (,(lambda (g a) -0.8)))
 	(print-function . ,System_start_delimiter::print)
 	(glyph . "bracket")
-	(arch-height . 1.5)
-	(arch-angle . 50.0)
-	(arch-thick . 0.25)
-	(arch-width . 1.5)
 	(collapse-height . 1)
-	(thickness . 0.25)
-	(meta . ((interfaces . (system-start-delimiter-interface spanner-interface))))
+	(thickness . 0.45)
+	(meta . ((interfaces . (font-interface system-start-delimiter-interface
+					       spanner-interface))))
 	))
 
     (SystemStartBar
@@ -1162,7 +1229,9 @@
 	(staff-padding . 0.5)
 	(script-priority . 200)
 	;; todo: add X self alignment?
-	(meta . ((interfaces . (text-script-interface text-interface side-position-interface font-interface item-interface ))))
+	(meta . ((interfaces . (text-script-interface
+				text-interface side-position-interface font-interface
+				item-interface ))))
 	))
     (CombineTextScript
      . (
@@ -1184,7 +1253,7 @@
 	(print-function . ,Text_spanner::print)
 	(font-shape . italic)
 	(style . dashed-line)
-	(staff-padding . 0.1)
+	(staff-padding . 0.8)
 	(dash-fraction . 0.2)
 	(dash-period . 3.0)
 	(direction . 1)
@@ -1229,7 +1298,7 @@
 	(font-series . bold)
 	(meta . ((interfaces
 		  . (rhythmic-head-interface
-		     font-interface
+		     font-interface 
 		     note-head-interface staff-symbol-referencer-interface
 		     text-interface item-interface ))))
 	))
@@ -1241,7 +1310,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)
@@ -1284,7 +1353,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))))
@@ -1334,7 +1403,9 @@
 	(height . 2.0) ;; staffspace;
 	(minimum-space . 5)
 	(font-size . -4)
-	(meta . ((interfaces . (volta-bracket-interface line-interface text-interface side-position-interface font-interface spanner-interface))))
+	(meta . ((interfaces . (volta-bracket-interface
+				line-interface text-interface
+				side-position-interface font-interface spanner-interface))))
 	))
 
     (VerticalAlignment
@@ -1343,7 +1414,6 @@
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(stacking-dir . -1)
-	;; (threshold . (6 . 1000))
 	(meta . ((interfaces . (align-interface axis-group-interface spanner-interface))))
 	))
 
@@ -1353,13 +1423,10 @@
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)	
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	
-	(meta . ((interfaces . (axis-group-interface vertically-spaceable-interface spanner-interface))))
+	(meta . ((interfaces . (axis-group-interface
+				vertically-spaceable-interface spanner-interface))))
 	))
-   )
- )
-
-
-
+   ))
 
 (define (completize-grob-entry x)
   "transplant assoc key into 'name entry of 'meta of X