* lily/tuplet-bracket.cc (print): suicide if no control-points.

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 1773f5a7dfc222298d9cc244ced9fd2edaaf13b2..0c5ea1c7324b6ff2ac9a3a651d252c6eff20bcd3 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -593,6 +593,7 @@
        (font-series . bold)
        (font-encoding . fetaDynamic)
        (font-shape . italic)
+       (avoid-slur . avoid)
        (no-spacing-rods . #t)
        (script-priority . 100)
        (meta . ((class . Item)
@@ -1153,7 +1154,7 @@
                                spaceable-grob-interface))))))
 
     (PhrasingSlur
-     . ((slur-details . ,default-slur-details)
+     . ((details . ,default-slur-details)
 
        (control-points . ,Slur::calc_control_points)
        (direction . ,Slur::calc_direction)
@@ -1342,7 +1343,7 @@
                                separation-spanner-interface))))))
 
     (Slur
-     . ((slur-details . ,default-slur-details)
+     . ((details . ,default-slur-details)
 
        (control-points . ,Slur::calc_control_points)
        (direction . ,Slur::calc_direction)
@@ -1703,6 +1704,7 @@
     (Tie
      . (
        (control-points . ,Tie::calc_control_points)
+       (avoid-slur . inside)
        (direction . ,Tie::calc_direction)
        (stencil . ,Tie::print)
        (details . ((ratio . 0.333)
@@ -1803,17 +1805,28 @@
        (thickness . 1.6)
        (edge-height . (0.7 . 0.7))
        (shorten-pair . (-0.2 . -0.2))
+       (staff-padding . 0.25)
+       
        (direction  . ,Tuplet_bracket::calc_direction)
        (positions . ,Tuplet_bracket::calc_positions)
+       (connect-to-neighbor . ,Tuplet_bracket::calc_connect_to_neighbors)
+       (control-points . ,Tuplet_bracket::calc_control_points)
        (stencil . ,Tuplet_bracket::print)
+       
+       (meta . ((class . Spanner)
+                (interfaces . (line-interface
+                               tuplet-bracket-interface))))))
+
+    (TupletNumber
+     . (
+       (stencil . ,Tuplet_number::print)
        (font-shape . italic)
        (font-size . -2)
+       (avoid-slur . inside)
        (meta . ((class . Spanner)
-                (interfaces . (text-interface
-                               line-interface
-                               tuplet-bracket-interface
+                (interfaces . (text-interface tuplet-number-interface
                                font-interface))))))
-
+    
     (UnaCordaPedal
      . (
        (stencil . ,Text_interface::print)