The grand \paper -> \layout, \bookpaper -> \paper renaming.

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

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index dd216a5d0dd53502ef9fee83169c334c460542c0..41d7bd3cc625a9fd19a7114841e2f7dc149c0360 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -42,7 +42,7 @@ Text_spanner::print (SCM smob)
   /* Ugh, must be same as Hairpin::print.  */
 
   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 ();
 
   SCM flare = me->get_property ("bracket-flare");
   SCM shorten = me->get_property ("shorten-pair");
@@ -94,7 +94,7 @@ Text_spanner::print (SCM smob)
          SCM text = index_get_cell (edge_text, d);
 
          if (Text_interface::markup_p (text)) 
-           edge[d] = *unsmob_stencil (Text_interface::interpret_markup (paper->self_scm (), properties, 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);