lilypond-0.1.7

diff --git a/lily/general-script-def.cc b/lily/general-script-def.cc
index 9bf570e5b8a2d9725a91bcbc7fb17aa6585b1749..e755af94c5446f9e70d462dbc48f3d728a4fb85d 100644 (file)
--- a/lily/general-script-def.cc
+++ b/lily/general-script-def.cc
@@ -38,11 +38,11 @@ General_script_def::equal_b(General_script_def const&g)const
     if (name() != g.name())
        return false;
 
-    return do_equal_b(g);
+    return do_equal_b(&g);
 }
 
 bool
-General_script_def::do_equal_b(General_script_def const&)const
+General_script_def::do_equal_b(General_script_def const*)const
 {
     return true;
 }

diff --git a/lily/text-def.cc b/lily/text-def.cc
index 9ab7d0a25b5f9d6f21f485d9c40cda432a175dec..39318c909454f389f56b4a125b12a820feb38b60 100644 (file)
--- a/lily/text-def.cc
+++ b/lily/text-def.cc
@@ -18,7 +18,7 @@ Text_def::width(Paper_def * p) const
 {
     Atom a = get_atom(p,0);
 
-    Real guess_width_f = text_str_.length_i() * a.sym_.dim.x.length(); // ugh
+    Real guess_width_f = text_str_.length_i() * a.sym_.dim.x().length(); // ugh
     Interval i(0, guess_width_f);
     i += - (align_i_ + 1)* i.center();
     return i;
@@ -39,10 +39,11 @@ Text_def::Text_def()
 }
 
 bool
-Text_def::do_equal_b(Text_def const &def)const
+Text_def::do_equal_b(General_script_def const *gdef) const
 {
-    return align_i_ == def.align_i_ && text_str_ == def.text_str_
-       && style_str_ == def.style_str_;
+    Text_def const *def= (Text_def*)gdef;
+    return align_i_ == def->align_i_ && text_str_ == def->text_str_
+       && style_str_ == def->style_str_;
 }
 
 Atom