Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 5013e406dfa04e48475febd3b5518243a21f4e11..ff37a4c25827c058a56babb7b11c0d16752bd875 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "line-spanner.hh"
@@ -129,7 +129,7 @@ Line_spanner::line_stencil (Grob *me,
                                              ly_symbol2scm ("fetaMusic")),
                                    SCM_UNDEFINED);
 
-      Font_metric *fm = select_font (me->get_layout (),
+      Font_metric *fm = select_font (me->layout (),
                                     scm_cons (style_alist,
                                               alist_chain));
       Stencil m = fm->find_by_name ("scripts.trill_element");
@@ -223,7 +223,7 @@ Line_spanner::print (SCM smob)
       */
 
       int k = broken_spanner_index (me);
-      Spanner *parent_sp = dynamic_cast<Spanner *> (me->original_);
+      Spanner *parent_sp = dynamic_cast<Spanner *> (me->original ());
       Spanner *next_sp = parent_sp->broken_intos_ [k + 1];
       Item *next_bound = next_sp->get_bound (RIGHT);