From 67e9a9052ea34ccdb5f4166fc8029a7fff244a9f Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:47:41 +0000 Subject: [PATCH] lilypond-0.0.74pre --- lily/paper-def.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 65bf8eac9b..9d784050cb 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -14,7 +14,7 @@ #include "debug.hh" #include "lookup.hh" #include "dimen.hh" -#include "input-engraver.hh" +#include "input-translator.hh" #include "engraver-group.hh" #include "assoc-iter.hh" @@ -50,7 +50,7 @@ Paper_def::duration_to_dist(Moment d) Paper_def::Paper_def() { - igrav_p_ = 0; + itrans_p_ = 0; lookup_p_ = 0; real_vars_p_ = new Assoc; outfile_str_ = "lelie.tex"; @@ -58,14 +58,14 @@ Paper_def::Paper_def() Paper_def::~Paper_def() { - delete igrav_p_; + delete itrans_p_; delete real_vars_p_; delete lookup_p_; } Paper_def::Paper_def(Paper_def const&s) { - igrav_p_ = s.igrav_p_ ? new Input_engraver( *s.igrav_p_):0; + itrans_p_ = s.itrans_p_ ? new Input_translator( *s.itrans_p_):0; lookup_p_ = s.lookup_p_? new Lookup(*s.lookup_p_) : 0; lookup_p_->paper_l_ = this; real_vars_p_ = new Assoc (*s.real_vars_p_); @@ -73,10 +73,10 @@ Paper_def::Paper_def(Paper_def const&s) } void -Paper_def::set(Input_engraver * igrav_p) +Paper_def::set(Input_translator * itrans_p) { - delete igrav_p_; - igrav_p_ = igrav_p; + delete itrans_p_; + itrans_p_ = itrans_p; } void @@ -125,6 +125,7 @@ Paper_def::print() const mtor << "Paper {"; mtor << "out: " <print(); + itrans_p_->print(); for (Assoc_iter i(*real_vars_p_); i.ok(); i++) { mtor << i.key() << "= " << i.val() << "\n"; } @@ -142,5 +143,5 @@ Paper_def::lookup_l() Global_translator* Paper_def::get_global_translator_p() const { - return igrav_p_->get_group_engraver_p()->global_l(); + return itrans_p_->get_group_engraver_p()->global_l(); } -- 2.39.5