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 b22607bfabf7efcf355a837fc671d190934af509..3842cb2cf6f498086f992c33e20e73f1f1e7a2c8 100644 (file)
--- 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 a86022b7094762881087ef8512fcf66317106ddb..2f8c1413d31a7bc473094da67436539bcb311175 100644 (file)
--- 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 a1c70d65990e421b031b6fbb73af1cadee5065d0..138e650eee26301bbbe88043e6210e072a865892 100644 (file)
--- 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.