release: 1.3.0

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index a8f601e9ee6d27ead0b1b967e827747fa1141249..939baa21612a12f04c016b1f7c02a937db5190eb 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -48,19 +48,19 @@ Rest_engraver::do_process_requests ()
     {
       rest_p_ = new Rest;
       rest_p_->balltype_i_ = rest_req_l_->duration_.durlog_i_; 
-      rest_p_->dots_i_ = rest_req_l_->duration_.dots_i_;
-      if (rest_p_->dots_i_)
+
+      if (rest_req_l_->duration_.dots_i_)
        {
          dot_p_ = new Dots;
          rest_p_->dots_l_  =dot_p_;
+         dot_p_->dots_i_ = rest_req_l_->duration_.dots_i_;       
          announce_element (Score_element_info (dot_p_,0));
        }
       if (rest_p_->balltype_i_ >= 2) 
        {
-         String reststyle = get_property ("restStyle", 0);
-         if (reststyle.length_i ())
-           rest_p_->set_elt_property (style_scm_sym,
-                                      gh_str02scm (reststyle.ch_C()));
+         SCM reststyle = get_property ("restStyle", 0);
+         if (gh_string_p (reststyle))
+           rest_p_->set_elt_property (style_scm_sym,reststyle);
        }
       announce_element (Score_element_info (rest_p_, rest_req_l_));
     }