* scm/titling.scm (default-score-title): remove caps for piece.

[lilypond.git] / lily / dynamic-text-spanner.cc

diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc
index 80a955d98b37a337fe4f418c024402c98e34aa2b..d81246dccd1893a9428740e3993d5e2ce4e21621 100644 (file)
--- a/lily/dynamic-text-spanner.cc
+++ b/lily/dynamic-text-spanner.cc
@@ -88,10 +88,9 @@ Dynamic_text_spanner::print (SCM smob)
            }
 
          Interval ext  = b->extent (common, X_AXIS);
-         span_points[d] = -d  * pad +
-           (ext.is_empty ())
-           ? b->relative_coordinate (common, X_AXIS) 
-           : ext.linear_combination (encl);
+         span_points[d] = -d  * pad
+           + robust_relative_extent (b,common, X_AXIS)
+           .linear_combination (encl);
        }
     }
   while (flip (&d) != LEFT);
@@ -101,7 +100,7 @@ Dynamic_text_spanner::print (SCM smob)
   SCM properties = Font_interface::text_font_alist_chain (me);
   SCM edge_text = me->get_property ("edge-text");
   Drul_array<Stencil> edge;
-  if (ly_c_pair_p (edge_text))
+  if (scm_is_pair (edge_text))
     {
       Direction d = LEFT;
       do
@@ -111,8 +110,8 @@ Dynamic_text_spanner::print (SCM smob)
          
          SCM text = index_get_cell (edge_text, d);
 
-         if (Text_item::markup_p (text)) 
-           edge[d] = *unsmob_stencil (Text_item::interpret_markup (paper->self_scm (), properties, text));
+         if (Text_interface::markup_p (text)) 
+           edge[d] = *unsmob_stencil (Text_interface::interpret_markup (paper->self_scm (), properties, text));
          
          if (!edge[d].is_empty ())
            edge[d].align_to (Y_AXIS, CENTER);