* tex/lilyponddefs.tex (\lyitem): Don't use \topalign to make

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

diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc
index 19963fe4587e215359ddabce3e85b921a68614c7..13b7686c3fc3d689a39786db25fabae19f0e5a9e 100644 (file)
--- a/lily/dynamic-text-spanner.cc
+++ b/lily/dynamic-text-spanner.cc
@@ -60,7 +60,7 @@ Dynamic_text_spanner::print (SCM smob)
   Spanner *spanner = dynamic_cast<Spanner*> (me);
 
   Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
-  Output_def * paper = me->get_paper ();
+  Output_def * layout = me->get_layout ();
 
   Interval span_points;
   Drul_array<bool> broken;
@@ -100,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
@@ -110,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 (layout->self_scm (), properties, text));
          
          if (!edge[d].is_empty ())
            edge[d].align_to (Y_AXIS, CENTER);