From 2c82cb7dc6160be7f9308423a05805cfda461d5d Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:50:43 +0000 Subject: [PATCH] lilypond-0.1.7 --- lily/symbol.cc | 2 +- lily/tex-beam.cc | 12 ++++++------ lily/text-spanner.cc | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lily/symbol.cc b/lily/symbol.cc index 29674b58d4..8a83027610 100644 --- a/lily/symbol.cc +++ b/lily/symbol.cc @@ -17,5 +17,5 @@ Symbol::Symbol(String s, Box b) String Symbol::str()const { - return "symbol(\'"+tex+"\', (" + dim.x.str() + ", " + dim.y.str() + "))"; + return "symbol(\'"+tex+"\', (" + dim.x().str() + ", " + dim.y().str() + "))"; } diff --git a/lily/tex-beam.cc b/lily/tex-beam.cc index 356565c4f7..c337baf38a 100644 --- a/lily/tex-beam.cc +++ b/lily/tex-beam.cc @@ -24,8 +24,8 @@ Lookup::beam_element(int sidx, int widx, Real slope) const bs.tex = substitute_args(bs.tex,args); int w = 2 << widx; Real width = w PT; - bs.dim.x = Interval(0,width); - bs.dim.y = Interval(0,width*slope); + bs.dim.x() = Interval(0,width); + bs.dim.y() = Interval(0,width*slope); return bs; } @@ -55,8 +55,8 @@ Lookup::rule_symbol(Real height, Real width) const args.push(print_dimen(height)); args.push(print_dimen(width)); bs.tex = substitute_args(bs.tex,args); - bs.dim.x = Interval(0,width); - bs.dim.y = Interval(0,height); + bs.dim.x() = Interval(0,width); + bs.dim.y() = Interval(0,height); return bs; } @@ -97,8 +97,8 @@ Lookup::beam(Real &slope, Real width) const Symbol ret; ret.tex = m.TeX_string(); - ret.dim.y = Interval(0,width*slope); - ret.dim.x = Interval(0,width); + ret.dim.y() = Interval(0,width*slope); + ret.dim.x() = Interval(0,width); return ret; } diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index 437739019a..a9e6f4f257 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -69,7 +69,7 @@ Text_spanner::do_pre_processing() Interval Text_spanner::height()const { - return brew_molecule_p()->extent().y; + return brew_molecule_p()->extent().y(); } void -- 2.39.5