lilypond-1.3.0

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 060b0ad2af56c3184f8e5056fe0348613c5fc19a..68d96cef59cd25f3193dbcb88f7c60a20490e427 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -157,9 +157,9 @@ void
 Clef_engraver::do_creation_processing()
 {
   create_default_b_ = true;    // should read property.
-  Scalar def = get_property ("createInitdefaultClef", 0);
-  if (def.to_bool ()) // egcs: Scalar to bool is ambiguous
-    set_type (def);
+  SCM def = get_property ("createInitdefaultClef", 0);
+  if (gh_string_p (def))
+    set_type (ly_scm2string (def));
   
   if (clef_type_str_.length_i ())
     { 
@@ -191,10 +191,9 @@ Clef_engraver::create_clef()
     {
       Clef_item *c= new Clef_item;
       c->set_elt_property (break_priority_scm_sym, gh_int2scm (-2)); // ugh
-      String clefstyle = get_property ("clefStyle", 0);
-      if (clefstyle.length_i ())
-       c->set_elt_property (style_scm_sym,
-                            ly_ch_C_to_scm (clefstyle.ch_C()));
+      SCM clefstyle = get_property ("clefStyle", 0);
+      if (gh_string_p(clefstyle))
+       c->set_elt_property (style_scm_sym, clefstyle);
       
       announce_element (Score_element_info (c, clef_req_l_));
       clef_p_ = c;
@@ -218,8 +217,11 @@ Clef_engraver::do_process_requests()
     }
   else if (create_default_b_)
     {
-      String type = get_property ("defaultClef", 0);
-      set_type (type.length_i () ? type : "treble");
+      SCM type = get_property ("defaultClef", 0);
+      if (gh_string_p (type))
+       set_type (ly_scm2string (type));
+      else
+       set_type ( "treble");
       create_clef ();
       create_default_b_ =0;
     }

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index fc628db526030cfbddd760dbe4b51d064f527baa..b58ba0eeafe4ba62a307695c30e4419a03074395 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -161,7 +161,7 @@ Paper_outputter::output_comment (String str)
 {
   if (String (output_global_ch) == "scm")
     {
-      *outstream_l_ << "; " << str << '\n';
+      *outstream_l_ << "; " << str << "\n";
     }
   else
     {

diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc
index c716bb1243136106ff84e3cb6fa652a7374899d6..3be9fb02e2a607aae720d5f430b80115fd74a814 100644 (file)
--- a/lily/repeat-engraver.cc
+++ b/lily/repeat-engraver.cc
@@ -55,7 +55,8 @@ Repeat_engraver::queue_events ()
   Music_sequence* alt = repeated_music_l_->alternatives_p_;
   Moment walk_mom = now_mom () + repeated_music_l_->repeat_body_p_->length_mom ();
 
-  bool create_volta = ! get_property ("noVoltaBraces",0).to_bool ();
+  SCM novolta = get_property ("noVoltaBraces",0);
+  bool create_volta = gh_boolean_p (novolta) && !gh_scm2bool (novolta);
 
   Cons_list<Bar_create_event> becel;
   becel.append (new Bar_create_event (now_mom (), "|:"));
@@ -101,11 +102,10 @@ Repeat_engraver::queue_events ()
              becel.append (c);
              last_number = volta_number;
              volta_number ++;
-              Scalar l (get_property ("voltaSpannerDuration", 0));
-              if (l.length_i ()) // voltaSpannerDuration OK?
+              SCM l (get_property ("voltaSpannerDuration", 0));
+              if (SMOB_IS_TYPE_B (Moment, l))
               {
- 
-                Moment vSD_mom = l.to_rat();
+                 Moment vSD_mom = *SMOB_TO_TYPE (Moment,l);
                 if ( vSD_mom < i->car_->length_mom() ) // terminate volta early ?
                 {
                         vSD_mom += walk_mom;

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index d3436d462b13c73237fd628ab75128dd5f2e77bf..939baa21612a12f04c016b1f7c02a937db5190eb 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -58,10 +58,9 @@ Rest_engraver::do_process_requests ()
        }
       if (rest_p_->balltype_i_ >= 2) 
        {
-         String reststyle = get_property ("restStyle", 0);
-         if (reststyle.length_i ())
-           rest_p_->set_elt_property (style_scm_sym,
-                                      ly_ch_C_to_scm (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_));
     }