From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 24 Jan 2007 14:49:32 +0000 (+0100)
Subject: use -broken bound-info as extra on top of existing left/right settings.
X-Git-Tag: release/2.11.14-1~33
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1c97b751f1fea5f069bcdcf1524455759e2d8fc9;p=lilypond.git

use -broken bound-info as extra on top of existing left/right settings.
---

diff --git a/lily/new-line-spanner.cc b/lily/new-line-spanner.cc
index b22607bfab..3842cb2cf6 100644
--- a/lily/new-line-spanner.cc
+++ b/lily/new-line-spanner.cc
@@ -78,14 +78,20 @@ New_line_spanner::calc_bound_info (SCM smob, Direction dir)
   SCM bound_details = me->get_property ("bound-details");
 
   SCM details = SCM_BOOL_F;
-  if (me->get_bound (dir)->break_status_dir ())
-    details = ly_assoc_get ((dir == LEFT)
-			    ? ly_symbol2scm ("left-broken")
-			    : ly_symbol2scm ("right-broken"), bound_details, SCM_BOOL_F);
   if (details == SCM_BOOL_F)
     details = ly_assoc_get ((dir == LEFT)
 			    ? ly_symbol2scm ("left")
 			    : ly_symbol2scm ("right"), bound_details, SCM_BOOL_F);
+
+  if (me->get_bound (dir)->break_status_dir ())
+    {
+      SCM extra = ly_assoc_get ((dir == LEFT)
+				? ly_symbol2scm ("left-broken")
+				: ly_symbol2scm ("right-broken"), bound_details, SCM_EOL);
+
+      for (SCM s = extra; scm_is_pair (s); s = scm_cdr (s))
+	details = scm_cons (scm_car (s), details);
+    }
   
   if (details == SCM_BOOL_F)
     details = ly_assoc_get (ly_symbol2scm ("default"), bound_details, SCM_EOL);
diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index a86022b709..2f8c1413d3 100644
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -42,7 +42,7 @@
 (ly:add-interface
  'dynamic-text-spanner-interface
    "Dynamic text spanner"
-   '())
+   '(text))
 
 (ly:add-interface
  'finger-interface
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index a1c70d6599..138e650eee 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -642,17 +642,15 @@
 				    (padding . 0.75)
 				    ))
 			  (right-broken . ((attach-dir .  ,RIGHT)
-				    (Y . 0)
 				    (padding . 0.0)
 				    ))
+			  
 			  (left . ((attach-dir .  ,LEFT)
 				   (Y . 0)
 				   (stencil-offset . (0 . -0.5))
 				   (padding . 0.5)
 				   ))
 			  (left-broken . ((attach-dir .  ,RIGHT)
-					  (padding . 0.5)
-					  (Y . 0)
 					  
 					  ;; make sure the - - - stays at reasonable
 					  ;; distance from staff.