release: 1.1.29

[lilypond.git] / lily / score-engraver.cc

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 783e36399bc418a5819cf5658c931f95b44c1aaa..6ea06ff8f23303ff2be7c8b7e2f6a5cd18d5c2a7 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "super-element.hh"
@@ -16,7 +16,6 @@
 #include "score-column.hh"
 #include "command-request.hh"
 #include "paper-def.hh"
-#include "p-score.hh"
 
 
 
@@ -107,7 +106,7 @@ Score_engraver::do_announces()
          {
            if (Rhythmic_req *rq = dynamic_cast <Rhythmic_req *> (announce_info_arr_[i].req_l_))
              {
-               musical_column_l_->add_duration (rq->duration());
+               musical_column_l_->add_duration (rq->length_mom ());
              }
          }
       Engraver_group_engraver::do_announces();
@@ -268,5 +267,5 @@ Score_engraver::do_add_processing ()
   assert (dynamic_cast<Paper_def *> (output_def_l_));
   assert (!daddy_trans_l_);
   pscore_p_ = new Paper_score;
-  pscore_p_->paper_l_ = (Paper_def*)output_def_l_;
+  pscore_p_->paper_l_ = dynamic_cast<Paper_def*>(output_def_l_);
 }