X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=40ab72ddfa4a7b4991acb7177f9ba249588c444d;hb=4348b2762d1101d731add0c01bb77a9ce162efec;hp=fdc5145cfe4bad85965e8ed2e8c965d1ea476fee;hpb=92890273072beeef060b11d9f1438e7d44eda23b;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index fdc5145cfe..40ab72ddfa 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -204,6 +204,47 @@
 				bass-figure-interface
 				self-alignment-interface
 				font-interface))))))
+
+    (NewBassFigure
+     . (
+	(print-function . ,Text_interface::print)
+	(font-size . -2)
+	(meta . ((class . Item)
+		 (interfaces . (text-interface
+				rhythmic-grob-interface
+				bass-figure-interface
+				font-interface))))))
+    (BassFigureBracket
+     . ((print-function . ,Enclosing_bracket::print)
+	(edge-height . (0.2 . 0.2))
+	(meta . ((class . Item)
+		 (interfaces . (enclosing-bracket-interface)) ))
+	))
+    (BassFigureContinuation
+     . (
+	(print-function . ,Figured_bass_continuation::print)
+	(Y-offset-callbacks . (,Figured_bass_continuation::center_on_figures))
+	(meta . ((class . Spanner)
+		 (interfaces . (figured-bass-continuation-interface))
+		 ))))
+    (BassFigureLine
+     . (
+	(axes . (,Y))
+	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+	(meta . ((class . Spanner)
+		 (interfaces . (axis-group-interface
+				))))))
+
+    (BassFigureAlignment
+     . (
+	(axes . (,Y))
+	(threshold . (2 . 1000))
+	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+	(stacking-dir . -1)
+	(meta . ((class . Spanner)
+		 (interfaces . (align-interface
+				axis-group-interface))))))
+    
     (Beam
      . (
 	;; todo: clean this up a bit: the list is getting
@@ -475,6 +516,7 @@
      . (
 	(axes . (1))
 	(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(staff-padding . 0.1)
 	(padding . 0.6)
@@ -676,6 +718,26 @@
 		 (interfaces . (key-signature-interface
 				font-interface
 				break-aligned-interface))))))
+    (LaissezVibrerTie
+     . (
+	(print-function  . ,Laissez_vibrer_tie::print)
+	(details . ((ratio . 0.333)
+		    (height-limit . 1.0)))
+	(thickness . 1.0)
+	(meta . ((class . Item)
+		 (interfaces . (laissez-vibrer-tie-interface))
+		 ))
+	))
+    
+    (LaissezVibrerTieColumn
+     . (
+	(X-extent-callback . #f)
+	(Y-extent-callback . #f)
+	(meta . ((class . Item)
+		 (interfaces . (laissez-vibrer-tie-column-interface))
+		 ))
+	))
+    
     (LedgerLineSpanner
      . (
 	(print-function . ,Ledger_line_spanner::print)
@@ -801,7 +863,6 @@
 				measure-grouping-interface))))))
     (MultiMeasureRest
      . (
-	(spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
 	(print-function . ,Multi_measure_rest::print)
 	(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
 	(staff-position . 0)
@@ -819,6 +880,7 @@
     (MultiMeasureRestNumber
      . (
 	(print-function . ,Text_interface::print)
+	(spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
 	(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
 			       ,Self_alignment_interface::centered_on_other_axis_parent))
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
@@ -833,6 +895,7 @@
 				self-alignment-interface
 				font-interface
 				text-interface))))))
+    
     (MultiMeasureRestText
      . (
 	(print-function . ,Text_interface::print)
@@ -907,7 +970,8 @@
      . (
 	(self-alignment-X . 0)
 	(break-visibility . ,begin-of-line-visible)
-	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent ,Self_alignment_interface::aligned_on_self))
+	(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent
+			       ,Self_alignment_interface::aligned_on_self))
 	(Y-offset-callbacks . (,Side_position_interface::aligned_side))
 	(print-function . ,Text_interface::print)
 
@@ -1367,7 +1431,7 @@
 	(X-offset-callbacks . (,(lambda (g a) -0.8)))
 	(print-function . ,System_start_delimiter::print)
 	(glyph . "bracket")
-	(collapse-height . 1)
+	(collapse-height . 5.0)
 	(thickness . 0.45)
 	(meta . ((class . Spanner)
 		 (interfaces . (font-interface
@@ -1438,8 +1502,6 @@
 	(print-function . ,Tie::print)
 	(details . ((ratio . 0.333) (height-limit . 1.0)))
 	(thickness . 1.0)
-	(y-offset . 0.6)
-	(minimum-length . 2.5)
 	(meta . ((class . Spanner)
 		 (interfaces . (tie-interface))))))