lilypond-0.1.7

diff --git a/lily/symbol.cc b/lily/symbol.cc
index 29674b58d4909909756f4fa2a724babfe50827ff..8a830276104a917548efb524867af6ad78227a41 100644 (file)
--- 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 356565c4f7293a8e9a77e86960bcc621dbc4baad..c337baf38a1084f4693bdff4e2679a7a6dfca61a 100644 (file)
--- 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 437739019ae8b8346667529b5c3ac35c69b3df58..a9e6f4f25722c0499166e9bb6314bbeb54735094 100644 (file)
--- 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