ignore gcov

[lilypond.git] / lily / text-engraver.cc

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 2c86f50d67cc4e00aad9e3c144d7d565ec1e9d0f..a3447ccce7175cdceaffd377ac45aa7c4510815e 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -13,6 +13,7 @@
 #include "stem.hh"
 #include "stream-event.hh"
 #include "text-interface.hh"
+#include "item.hh"
 
 #include "translator.icc"
 
@@ -22,7 +23,7 @@
 class Text_engraver : public Engraver
 {
   vector<Stream_event *> evs_;
-  vector<Item*> texts_;
+  vector<Grob*> texts_;
 public:
   TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
@@ -88,14 +89,8 @@ Text_engraver::process_acknowledged ()
       // URG: Text vs TextScript
       Item *text = make_item ("TextScript", r->self_scm ());
 
-      Axis ax = Y_AXIS;
-      Side_position_interface::set_axis (text, ax);
-
-      // Hmm
-      int priority = 200;
-      SCM s = text->get_property ("script-priority");
-      if (scm_is_number (s))
-       priority = scm_to_int (s);
+      int priority = robust_scm2int (text->get_property ("script-priority"),
+                                    200);
 
       /* see script-engraver.cc */
       priority += i;
@@ -130,6 +125,5 @@ ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head);
 ADD_TRANSLATOR (Text_engraver,
                /* doc */ "Create text-scripts",
                /* create */ "TextScript",
-               /* accept */ "text-script-event",
                /* read */ "",
                /* write */ "");