patch::: 1.3.95.tca2

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

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index cb276bcf4e6096ab25ad6a7d34fc20177ef2926a..e18619c28a3a98c82b94f7c3d3e4e25cc043db97 100644 (file)
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -4,7 +4,7 @@
   (c) 1999 Glen Prideaux <glenprideaux@iname.com>
 */
 
-#include "proto.hh"
+#include "flower-proto.hh"
 #include "musical-request.hh"
 #include "hyphen-spanner.hh"
 #include "paper-column.hh"
@@ -87,7 +87,7 @@ Hyphen_engraver::do_removal_processing ()
 {
   if (hyphen_p_)
     {
-      req_l_->warning (_ ("unterminated hyphen"));
+      req_l_->origin ()->warning (_ ("unterminated hyphen"));
       hyphen_p_->set_bound(RIGHT, unsmob_element (get_property ("currentCommandColumn")));
     }
 }
@@ -99,14 +99,14 @@ Hyphen_engraver::do_process_music ()
     {
       if (!last_lyric_l_)
        {
-         req_l_->warning (_ ("Nothing to connect hyphen to on the left.  Ignoring hyphen request."));
+         req_l_->origin ()->warning (_ ("Nothing to connect hyphen to on the left.  Ignoring hyphen request."));
          return;
        }
       
-      hyphen_p_ = new Spanner (get_property ("basicHyphenSpannerProperties"));
-      hyphen_p_->set_extent_callback (Score_element::point_dimension_callback,Y_AXIS);
+      hyphen_p_ = new Spanner (get_property ("LyricHyphen"));
+
       Hyphen_spanner (hyphen_p_).set_textitem  (LEFT, last_lyric_l_);
-      announce_element (Score_element_info (hyphen_p_, req_l_));
+      announce_element (hyphen_p_, req_l_);
     }
 }