X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=0e81a6bea299105e2a66cf1459e2de6b8a03a588;hb=5144f52804a78e5eb02007f0d6e5857a46f78a6b;hp=afca79720e976390d13ca9beb9d61a44a6a07502;hpb=f04e7b87930d3a17e18d27c3beb4a4ec835f4f5e;p=lilypond.git

diff --git a/lily/accidental.cc b/lily/accidental.cc
index afca79720e..0e81a6bea2 100644
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "accidental-interface.hh"
@@ -67,7 +67,7 @@ Accidental_interface::pure_height (SCM smob, SCM start_scm, SCM)
 
   if (to_boolean (me->get_property ("forced"))
       || !unsmob_grob (me->get_object ("tie"))
-      || rank != start + 1) /* we are in the middle of a line */
+      || rank == start + 1) /* we are at the start of a line */
     {
       Stencil *s = unsmob_stencil (get_stencil (me));
       if (s)
@@ -109,7 +109,7 @@ Accidental_interface::accurate_boxes (Grob *me, Grob **common)
 	    really close.
 	  */
 	  Direction bulb_dir =
-	    glyph_name=="accidentals.mirroredflat" ? LEFT : RIGHT;
+	    glyph_name == "accidentals.mirroredflat" ? LEFT : RIGHT;
 	  stem[X_AXIS][bulb_dir] = stem[X_AXIS].center ();
 
 	  /*
@@ -189,7 +189,7 @@ Accidental_interface::get_stencil (Grob *me)
       return SCM_EOL;
     }
   
-  Stencil mol (fm->find_by_name (scm_i_string_chars (glyph_name)));
+  Stencil mol (fm->find_by_name (ly_scm2string (glyph_name)));
   if (to_boolean (me->get_property ("restore-first")))
     {
       /*
@@ -212,9 +212,9 @@ Accidental_interface::get_stencil (Grob *me)
 
   
 ADD_INTERFACE (Accidental_interface,
-	       "a single accidental",
+	       "A single accidental.",
 	       
-	       /* props */
+	       /* properties */
 	       "alteration "
 	       "avoid-slur "
 	       "forced "