From: fred <fred>
Date: Tue, 26 Mar 2002 22:28:14 +0000 (+0000)
Subject: lilypond-1.3.0
X-Git-Tag: release/1.5.59~2096
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=afe7a382a8e68da01bab3807db028cf428b2ce59;p=lilypond.git

lilypond-1.3.0
---

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 7ac5c8ade6..99477e09d7 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -49,7 +49,7 @@ Note_heads_engraver::do_process_requests()
   if (note_p_arr_.size ())
     return ;
   
-  String noteheadstyle = get_property ("noteHeadStyle", 0);
+  SCM noteheadstyle = get_property ("noteHeadStyle", 0);
   for (int i=0; i < note_req_l_arr_.size (); i++)
     {
       Note_head *note_p  = new Note_head;
@@ -62,10 +62,10 @@ Note_heads_engraver::do_process_requests()
 	  note_p->dots_l_ = d;
 	  d->dots_i_ = note_req_l->duration_.dots_i_;
 
-	  Scalar dir = get_property ("verticalDirection",0);
-	  if (dir.isdir_b())
+	  SCM dir = get_property ("verticalDirection",0);
+	  if (isdir_b (dir))
 	    {
-	      d->resolve_dir_ = (Direction)(int)dir;
+	      d->resolve_dir_ = to_dir (dir);
 	    }
 	  
 	  announce_element (Score_element_info (d,0));
@@ -73,12 +73,13 @@ Note_heads_engraver::do_process_requests()
 	}
       note_p->position_i_  = note_req_l->pitch_.steps ();
 
-      if (noteheadstyle == "transparent")
-	note_p->set_elt_property (transparent_scm_sym, SCM_BOOL_T);
-      else 
-        note_p->set_elt_property (style_scm_sym,
-				  ly_ch_C_to_scm (noteheadstyle.ch_C()));
-
+      if (gh_string_p (noteheadstyle))
+	{
+	  if (ly_scm2string (noteheadstyle) == "transparent")
+	    note_p->set_elt_property (transparent_scm_sym, SCM_BOOL_T);
+	  else 
+	    note_p->set_elt_property (style_scm_sym, noteheadstyle);
+	}
       
       Score_element_info itinf (note_p,note_req_l);
       announce_element (itinf);