lilypond-0.1.7

diff --git a/lily/include/request.hh b/lily/include/request.hh
index 37bf51caa8603d390e873dfa131e44e6c8bb3030..07e480137eb3929efe2671dff3e12305eab48be3 100644 (file)
--- a/lily/include/request.hh
+++ b/lily/include/request.hh
@@ -46,8 +46,10 @@ public:
     virtual Blank_req * blank() { return 0; }
     virtual Musical_req *musical() { return 0; }
     virtual Command_req * command() { return 0; }
+    bool equal_b(Request*) const;
 protected:
-    virtual void do_print()const ;
+    virtual bool do_equal_b(Request*) const;
+    virtual void do_print()const;
 };
 
 #define REQUESTMETHODS(T,accessor)     \
@@ -67,7 +69,8 @@ public:
     General_script_def *scriptdef_p_;
 
     /* *************** */
-    static int compare(const Script_req &, const Script_req &);
+    bool do_equal_b(Request*)const;
+
     Script_req();
     REQUESTMETHODS(Script_req,script);
     ~Script_req();

diff --git a/lily/text-grav.cc b/lily/text-grav.cc
index 5095b23b3c92e7949e872cc6aa1b57e8af4b34a4..be857aaf808ae1a4861c199aa7eb13d3c4ac0bf2 100644 (file)
--- a/lily/text-grav.cc
+++ b/lily/text-grav.cc
@@ -23,9 +23,7 @@ Text_engraver::do_try_request(Request*req_l)
     Musical_req *m = req_l->musical();
     if (!m || ! m->text())
        return false;
-    if (text_req_l_ &&
-       Text_req::compare(*m->text(), *text_req_l_))
-
+    if (text_req_l_ && text_req_l_->equal_b(m))
        return false;
 
     text_req_l_ = m->text();